Dup frozen strings before force_encoding #196
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jrafanie
commented
Apr 26, 2023
grosser
reviewed
Apr 26, 2023
| @@ -23,7 +23,12 @@ def translate(locale, key, options) | |||
| interpolate(translation, options) | |||
| else | |||
| result = backend.translate(locale, key, options) | |||
| (RUBY19 and result.is_a?(String)) ? result.dup.force_encoding("UTF-8") : result | |||
| if RUBY19 && result.is_a?(String) | |||
There was a problem hiding this comment.
RUBY19 cleanup can be it's own PR
On it's way.
I18n 1.13.0 changed the behavior of interpolate to retain the original object when no interpolation occurs: https://github.com/ruby-i18n/i18n/pull/649/files With that change, a frozen string is no longer duplicated by i18n and retains the frozen state. This causes an error when we try to force_encoding as it's a modification in place. This worked previously because i18n interpolate would return a new unfrozen string from a frozen string input. ```ruby irb(main):003:0> I18n::VERSION => "1.13.0" irb(main):004:0> I18n.interpolate(("get".freeze), {}).frozen? => true ``` vs. ```ruby irb(main):002:0> I18n::VERSION => "1.12.0" irb(main):003:0> I18n.interpolate(("get".freeze), {}).frozen? => false ```
jrafanie
force-pushed
the
do_not_force_encoding_in_place_to_play_well_with_i18n_1_13_0
branch
from
beb8cd2
to
84ea65e
Compare
jrafanie
changed the title
|
RUBY19 cleanup can be it's own PR |
|
1.10.1 thanks! |
jrafanie
deleted the
do_not_force_encoding_in_place_to_play_well_with_i18n_1_13_0
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I18n 1.13.0 changed the behavior of interpolate to retain the original object when no interpolation occurs:
https://github.com/ruby-i18n/i18n/pull/649/files
With that change, a frozen string is no longer duplicated by i18n and retains the frozen state. This causes an error when we try to force_encoding as it's a modification in place. This worked previously because i18n interpolate would return a new unfrozen string from a frozen string input.
vs.