More i18n fixes #3467
Merged
More i18n fixes #3467
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
This is where the actual title is set, not on the exercise view render method. So we put the gettext method here!
Revert back to the string found in the po file.
Ugh. Looks like $._ was a noop, as it just interpolated strings? This time, we actually translate them by passing it into our own gettext method.
| @@ -534,8 +534,7 @@ def smart_translate_item_data(item_data): | |||
| elif isinstance(field_data, list): | |||
| item_data[field] = map(smart_translate_item_data, field_data) | |||
|
|
|||
|
|
|||
| return item_data | |||
| return item_data | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
Everything else looks good. After addressing that gettext thing as discussed, feel free to merge. |
Before, we translated based on exercise_lang, whose value is whatever get_best_available_language returns for a given set of languages. However, those set of language choices we pass in are those we have translated exercise templates for. When translating for perseus, this is not the case. So what we do here instead is just localize for whatever language we originally requested for get_exercise_cache in the first place. If it's not there, gettext automatically falls back to English.
This reverts commit 354c2d4.
| @@ -165,7 +165,7 @@ def get_exercise_cache(force=False, language=settings.LANGUAGE_CODE): | |||
| exercise_template = os.path.join(exercise_lang, exercise_file) | |||
|
|
|||
|
|
|||
| with i18n.translate_block(exercise_lang): | |||
| with i18n.translate_block(language): | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
Tests pass. Merge! |
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.
Summary of changes:
Remaining issues:
Couldn't i18nize the "Remaining hints" text in the hint button:
Fixing this properly would require more extensive changes to the perseus codebase, related to integrating Django's and
jed.js's catalog file. I'm getting there, but I need more time, and I believe this shouldn't be a blocker for 0.13.