diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-10-04 14:23:52 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-10-04 14:23:52 +0300 |
| commit | 412571a4dfbf90d85df1393fa0075aacae27137d (patch) | |
| tree | 7e6f349542472d2679fb5d8013f4c39eeb95960f /config | |
| parent | 086784411c73d61a296e923b2274f81344646a77 (diff) | |
Load only the currently needed JS locale file
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 1 | ||||
| -rw-r--r-- | config/initializers/gettext_rails_i18n_patch.rb | 14 | ||||
| -rw-r--r-- | config/webpack.config.js | 6 |
3 files changed, 16 insertions, 5 deletions
diff --git a/config/application.rb b/config/application.rb index 30117b6a98e..ca2ab83becc 100644 --- a/config/application.rb +++ b/config/application.rb @@ -105,6 +105,7 @@ module Gitlab config.assets.precompile << "lib/ace.js" config.assets.precompile << "vendor/assets/fonts/*" config.assets.precompile << "test.css" + config.assets.precompile << "locale/**/app.js" # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' diff --git a/config/initializers/gettext_rails_i18n_patch.rb b/config/initializers/gettext_rails_i18n_patch.rb index 377e5104f9d..49551319435 100644 --- a/config/initializers/gettext_rails_i18n_patch.rb +++ b/config/initializers/gettext_rails_i18n_patch.rb @@ -39,3 +39,17 @@ module GettextI18nRailsJs end end end + +class PoToJson + # This is required to modify the JS locale file output to our import needs + # Overwrites: https://github.com/webhippie/po_to_json/blob/master/lib/po_to_json.rb#L46 + def generate_for_jed(language, overwrite = {}) + @options = parse_options(overwrite.merge(language: language)) + @parsed ||= inject_meta(parse_document) + + generated = build_json_for(build_jed_for(@parsed)) + [ + "window.translations = #{generated};" + ].join(" ") + end +end diff --git a/config/webpack.config.js b/config/webpack.config.js index 2eb4444916b..c515a170d2d 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -123,10 +123,6 @@ var config = { } }, { - test: /locale\/\w+\/(.*)\.js$/, - loader: 'exports-loader?locales', - }, - { test: /monaco-editor\/\w+\/vs\/loader\.js$/, use: [ { loader: 'exports-loader', options: 'l.global' }, @@ -224,7 +220,7 @@ var config = { // create cacheable common library bundles new webpack.optimize.CommonsChunkPlugin({ - names: ['main', 'locale', 'common', 'webpack_runtime'], + names: ['main', 'common', 'webpack_runtime'], }), // enable scope hoisting |