diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-10-06 10:03:56 +0200 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-10-06 10:03:56 +0200 |
| commit | 0f6d20e39453b106e42ab53fa3649674b403eba5 (patch) | |
| tree | 205e685ae0c4c02cf658b2c7775763cc4fc4735e | |
| parent | 6c5837ae4933b17f657c80c96431e528ff62d971 (diff) | |
| download | gitlab-ce-38845-skip-loading-english-frontend-translation-file.tar.gz | |
Made the insertion of the English Translation File conditional + removed window.translations from the global object to save some memory38845-skip-loading-english-frontend-translation-file
| -rw-r--r-- | app/assets/javascripts/locale/index.js | 1 | ||||
| -rw-r--r-- | app/views/layouts/_head.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/locale/index.js b/app/assets/javascripts/locale/index.js index ce05b3eabec..1003b9ba0af 100644 --- a/app/assets/javascripts/locale/index.js +++ b/app/assets/javascripts/locale/index.js @@ -4,6 +4,7 @@ import sprintf from './sprintf'; const langAttribute = document.querySelector('html').getAttribute('lang'); const lang = (langAttribute || 'en').replace(/-/g, '_'); const locale = new Jed(window.translations || {}); +delete window.translations; /** Translates `text` diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 0d5350f873b..f1b32274664 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -37,7 +37,7 @@ - if content_for?(:library_javascripts) = yield :library_javascripts - = javascript_include_tag asset_path("locale/#{I18n.locale.to_s || I18n.default_locale.to_s}/app.js") + = javascript_include_tag asset_path("locale/#{I18n.locale.to_s || I18n.default_locale.to_s}/app.js") unless I18n.locale == :en = webpack_bundle_tag "webpack_runtime" = webpack_bundle_tag "common" = webpack_bundle_tag "main" |