Fix unescaped interpolated reserved key in help text and handle escaped interpolations in inconsistent interpolations check

[Bilka2]

This fixes #552 if and only if ruby-i18n/i18n#688 or an equivalent is merged for the i18n gem. Otherwise escaping the offending interpolations does not appease the reserved keyword check.

This PR also contains a workaround for another issue related to escaped interpolations (ruby-i18n/i18n#689), see the code comment.

I removed some unused translations that had interpolations in them, their usage was removed in c1d1312.

[edolix]

Thanks @Bilka2! It would be nice to have this branch merged - are you going to review the failed tests? Otherwise i can start from your branch and open up another PR 🙏

[Bilka2]

@edolix As per the PR description, the tests are failing because they need they need the PR in the i18n gem to be merged: ruby-i18n/i18n#688. Without that PR, escaping the variables does nothing to avoid the error.

Merging that PR is the plan for the i18n gem: ruby-i18n/i18n#689 (comment)

The only way to fix this here in i18n-tasks without the i18n PR would be to completely remove %{default} from the locale.

[edolix]

Apologies for the noise here, i realised that right after submitting my comment 🙏

[Bilka2]

The i18n gem v1.14.5 has been released with the needed fix to respect escaped interpolations. So this PR is now good to go.

[davidwessman]

@Bilka2 Could you fix the last lint errors?

[Bilka2]

Done. Apologies for the force pushes, a testing commit ended up on the wrong branch.

[davidwessman]

Done. Apologies for the force pushes, a testing commit ended up on the wrong branch.

No worries, I appreciate it 🙂

[davidwessman]

It looks good to me, but I'll let @glebm review as well.

[davidwessman]

I extracted the rubocop fixes to #564 and rebased this branch

[davidwessman]

I'll merge it to main so we can get the tests running and can keep on iterating. Well done with the upstream change @Bilka2 !

[mjankowski]

Thanks for merging this - will there be version bump soon, or should we point to repo for now to get this change?

[davidwessman]

Thanks for merging this - will there be version bump soon, or should we point to repo for now to get this change?

Please try it out in your repo, then we can cut a release faster.

@glebm is the one doing releases.

[tagliala]

Please try it out in your repo, then we can cut a release faster.

Hi, I'm testing main branch with I18n 1.18.5 and it is working fine

[mjankowski]

Please try it out in your repo, then we can cut a release faster.

Sure thing. I updated a PR branch to point to the repo - mastodon/mastodon#30198 - and it both a) resolved the previous errors we were seeing that this change fixed, b) had a nice side effect of the fixed escape logic helping us find a place where we had a mistaken interpolation escape, c) as far as I can tell, at least via CI runs and some local checks, everything else is working correctly as before.

[glebm]

Thanks for testing @mjankowski and @tagliala! Released v1.0.14

Thanks everyone!