diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 12:07:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 12:07:48 +0000 |
| commit | 5a6b36b60502c50ab59c0bc3c345793b70a3d548 (patch) | |
| tree | 7cf2effbd48359b44970f8f345cfa12ce6843dfd /config | |
| parent | a76d34e6716aa8267111ecdcd21416e9dec3a08d (diff) | |
| download | gitlab-ce-5a6b36b60502c50ab59c0bc3c345793b70a3d548.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/9_fast_gettext.rb | 7 | ||||
| -rw-r--r-- | config/initializers_before_autoloader/001_fast_gettext.rb | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/config/initializers/9_fast_gettext.rb b/config/initializers/9_fast_gettext.rb index fd0167aa476..f836e6e971d 100644 --- a/config/initializers/9_fast_gettext.rb +++ b/config/initializers/9_fast_gettext.rb @@ -1,9 +1,2 @@ -FastGettext.add_text_domain 'gitlab', - path: File.join(Rails.root, 'locale'), - type: :po, - ignore_fuzzy: true -FastGettext.default_text_domain = 'gitlab' FastGettext.default_available_locales = Gitlab::I18n.available_locales -FastGettext.default_locale = :en - I18n.available_locales = Gitlab::I18n.available_locales diff --git a/config/initializers_before_autoloader/001_fast_gettext.rb b/config/initializers_before_autoloader/001_fast_gettext.rb new file mode 100644 index 00000000000..ede38450582 --- /dev/null +++ b/config/initializers_before_autoloader/001_fast_gettext.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +FastGettext.add_text_domain 'gitlab', + path: File.join(Rails.root, 'locale'), + type: :po, + ignore_fuzzy: true +FastGettext.default_text_domain = 'gitlab' +FastGettext.default_locale = :en |