Fix broken tests caused by locale configuration #1875
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
- Add LocaleSet - Add LocaleFormatter to force proper string formats - Rename I18n formats to use hyphen - Add rake task for updating existing languages on DB - Fix instances of US english in the templates
This reverts commit 366c1a7.
Bodacious
force-pushed
the
bug/locale-formats
branch
2 times, most recently
from
dc3d2c4 to
419e365
Compare
Was breaking rake db:seed file
Bodacious
force-pushed
the
bug/locale-formats
branch
from
419e365 to
0ef9a80
Compare
xsrust
approved these changes
Sep 20, 2018
| FastGettext.default_available_locales = available_locales | ||
|
|
||
| I18n.default_locale = available_locales.for(:i18n).first | ||
| FastGettext.default_locale = available_locales.for(:fast_gettext).first |
There was a problem hiding this comment.
This looks like a clean way of managing the fastGettext vs I18n expectations.
| @@ -1,25 +0,0 @@ | |||
| # Sample localization file for English. Add more files in this directory for other locales. | |||
There was a problem hiding this comment.
We have a full translation for Brazillian due to their translation work with CDL so we'll actually want to keep and update this file rather than remove it.
| @@ -1,6 +1,21 @@ | |||
| require 'set' | |||
| namespace :upgrade do | |||
|
|
|||
| desc "Update Language abbreviations to use ISO format" | |||
| task :normalize_language_formats => :environment do | |||
There was a problem hiding this comment.
We can flag this needs to be run with the release
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.
Locale formats
FastGettext expects locales to be in the format 'en_GB'. I18n uses the ISO standard for language formats 'en-GB' (a hyphen instead of an underscore). FastGettext does re-format locale strings when setting locale (e.g.
FastGettext.locale = "en-GB" # => "en_GB"), but the lookups were tending to fail, causing lots of unpredictable bugs in testing.See this issue for more info: grosser/fast_gettext#81
This PR adds a couple of helper classes to mediate between I18n expectations and FastGettext expectations. Namely,
LocaleFormatterandLocaleSet.By forcing the use of these classes throughout the code, it seems to have sorted most of the sporadic failures in the tests.
Default locale
There was another issue that was happening sporadically: Some tests would fail because the text on the page was the wrong locale. I think this was some sort of race condition, in which the test was inspecting the page before strings had been updated in the browser by FastGetext. This meant that strings like "Customize" were being loaded in the page in US English, whereas the tests were searching for GB English strings "Customise". Since
en-GBis the default locale, I rewrote those strings to use GB spelling.Migration
I've added a rake task
rake upgrade:normalize_language_formatsto change the locale formats for existing Languages, Themes, and Templates on the DB.