diff --git a/app/services/l10n.js b/app/services/l10n.js index 5ff3a232152..4480e5fd2e4 100644 --- a/app/services/l10n.js +++ b/app/services/l10n.js @@ -31,8 +31,6 @@ export default L10n.extend({ autoInitialize: false, - jsonPath: '/assets/locales', - switchLanguage(locale) { this.setLocale(locale); this.cookies.write(this.localStorageKey, locale); diff --git a/config/environment.js b/config/environment.js index c559383df34..094ac97c93a 100644 --- a/config/environment.js +++ b/config/environment.js @@ -82,7 +82,11 @@ module.exports = function(environment) { hostWhitelist: [/.+/] }, - torii: {} + torii: {}, + + 'ember-l10n': { + jsonPath: 'assets/locales' + } }; if (environment === 'production') { diff --git a/netlify.toml b/netlify.toml index f464a54268f..e12530d448b 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,6 +1,7 @@ +[build] + command = "node scripts/l10n.js generate && ember build -prod" [build.environment] -NODE_VERSION = "12" + NODE_VERSION = "12" [context.production] - command = "ember build -prod" [context.production.environment] API_HOST = "https://open-event-api-dev.herokuapp.com" diff --git a/package.json b/package.json index 531e1fce94c..f468ddbb6a4 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "ember-g-map": "0.0.25", "ember-href-to": "3.1.0", "ember-infinity": "^2.1.0", - "ember-l10n": "^3.1.1", + "ember-l10n": "^4.0.0", "ember-link-action": "1.0.0", "ember-load-initializers": "^2.0.0", "ember-math-helpers": "^2.11.1", diff --git a/yarn.lock b/yarn.lock index 2d800e347c6..7b7554b23ae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -354,22 +354,10 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.1.2": - version "7.1.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz#2c92469bac2b7fbff810b67fca07bd138b48af77" - -"@babel/parser@^7.2.3": - version "7.3.1" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.1.tgz#8f4ffd45f779e6132780835ffa7a215fa0b2d181" - -"@babel/parser@^7.3.4", "@babel/parser@^7.4.5", "@babel/parser@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.3.tgz#790874091d2001c9be6ec426c2eed47bc7679081" - integrity sha512-/V72F4Yp/qmHaTALizEm9Gf2eQHV3QyTL3K0cNfijwnMnb1L+LDlAubb/ZnSdGAVzVSWakujHYs1I26x66sMeQ== - -"@babel/parser@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.4.tgz#5977129431b8fe33471730d255ce8654ae1250b6" +"@babel/parser@^7.1.2", "@babel/parser@^7.2.3", "@babel/parser@^7.3.4", "@babel/parser@^7.4.4", "@babel/parser@^7.4.5", "@babel/parser@^7.5.5", "@babel/parser@^7.8.3": + version "7.8.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.4.tgz#d1dbe64691d60358a974295fa53da074dd2ce8e8" + integrity sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw== "@babel/plugin-proposal-async-generator-functions@^7.8.3": version "7.8.3" @@ -2085,7 +2073,7 @@ ast-traverse@~0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/ast-traverse/-/ast-traverse-0.1.1.tgz#69cf2b8386f19dcda1bb1e05d68fe359d8897de6" -ast-types@0.13.2: +ast-types@0.13.2, ast-types@^0.13.2: version "0.13.2" resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.2.tgz#df39b677a911a83f3a049644fb74fdded23cea48" integrity sha512-uWMHxJxtfj/1oZClOxDEV1sQ1HCDkA4MG8Gr69KKeBjEVH0R84WlejZ0y2DcwyBlpAEMltmVYkVgqfLFb2oyiA== @@ -6676,17 +6664,18 @@ ember-jquery-legacy@^1.0.0: dependencies: ember-cli-babel "^6.6.0" -ember-l10n@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/ember-l10n/-/ember-l10n-3.1.1.tgz#f56b7eb158921c005d286fabaed633c294f5e630" - integrity sha512-HDaROL2441nlj/zl2KEfbhEYIgez/3llUKPTfi3dm1HK5XxVUIGZEh6liFA3XTd4pMDThZV+K5TYTnxEce2J1A== +ember-l10n@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/ember-l10n/-/ember-l10n-4.0.0.tgz#c1bc495115e8d691f19ea14101f4588445f47d63" + integrity sha512-gX288kuhYSHxIn7Sp3qkmJKvfK3ok6UFumvEqU0ndin2dVDER8JcrUlm4YjdewXbq8Y03l6iyMViL3YDRdbSAg== dependencies: + "@babel/parser" "^7.5.5" "@glimmer/syntax" "^0.38.0" + ast-types "^0.13.2" chalk "^2.4.1" - ember-cli-babel "^7.1.3" - ember-cli-htmlbars "^3.0.0" + ember-cli-babel "^7.7.3" + ember-cli-htmlbars "^3.0.1" ember-get-config "^0.2.4" - esprima "^4.0.1" gettext-parser "^3.0.0" inquirer "^6.2.1" shelljs "^0.8.2" @@ -7719,7 +7708,7 @@ external-editor@^2.0.4: iconv-lite "^0.4.17" tmp "^0.0.33" -external-editor@^3.0.0, external-editor@^3.0.3: +external-editor@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27" dependencies: @@ -9363,7 +9352,7 @@ inquirer@^3.3.0: strip-ansi "^4.0.0" through "^2.3.6" -inquirer@^6, inquirer@^6.2.1: +inquirer@^6, inquirer@^6.1.0, inquirer@^6.2.1: version "6.2.2" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.2.tgz#46941176f65c9eb20804627149b743a218f25406" dependencies: @@ -9381,24 +9370,6 @@ inquirer@^6, inquirer@^6.2.1: strip-ansi "^5.0.0" through "^2.3.6" -inquirer@^6.1.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz#9943fc4882161bdb0b0c9276769c75b32dbfcd52" - dependencies: - ansi-escapes "^3.0.0" - chalk "^2.0.0" - cli-cursor "^2.1.0" - cli-width "^2.0.0" - external-editor "^3.0.0" - figures "^2.0.0" - lodash "^4.17.10" - mute-stream "0.0.7" - run-async "^2.2.0" - rxjs "^6.1.0" - string-width "^2.1.0" - strip-ansi "^5.0.0" - through "^2.3.6" - interpret@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614" @@ -13582,12 +13553,6 @@ rx-lite@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102" -rxjs@^6.1.0: - version "6.3.3" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55" - dependencies: - tslib "^1.9.0" - rxjs@^6.4.0: version "6.4.0" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"