Fix custom translations with options #3959
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
houndci-bot
reviewed
Mar 31, 2020
decabeza
force-pushed
the
i18n-custom-translations
branch
from
8eb4b0e
to
ff64afe
Compare
javierm
reviewed
Apr 5, 2020
| @@ -12,7 +12,15 @@ def t(key, options = {}) | |||
| i18_content = I18nContent.find_by(key: key) | |||
| translation = I18nContentTranslation.find_by(i18n_content_id: i18_content&.id, | |||
| locale: current_locale)&.value | |||
| translation.presence || translate(key, options) | |||
| if translation.present? | |||
| if options.present? | |||
There was a problem hiding this comment.
I'm not sure this condition is necessary 🤔. What do you think about:
if translation.present?
translation % options
else
translate(key, options)
endWe could also write translation.presence&.%(options) || translate(key, options) but IMHO it would be hard to understand it 😅.
There was a problem hiding this comment.
I used the first option that seems simpler. The second one is also very hard to understand for me. 😂
decabeza
force-pushed
the
i18n-custom-translations
branch
from
ff64afe
to
af1e118
Compare
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.
References
This PR resolves #3676.
Objectives
There was a bug when an admin user tries to change a text on the "Custom information text" section
/admin/site_customization/information_textswith the keys that include some%{variable}in the text.Screenshot
BEFORE
AFTER