Skip to content

Commit

Permalink
fix: Revert ember-l10n to 3.2.1 (#3971)
Browse files Browse the repository at this point in the history
  • Loading branch information
iamareebjamal authored Feb 1, 2020
1 parent e984a1d commit 6566097
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 12 deletions.
2 changes: 2 additions & 0 deletions app/services/l10n.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ export default L10n.extend({

autoInitialize: false,

jsonPath: '/assets/locales',

switchLanguage(locale) {
this.setLocale(locale);
this.cookies.write(this.localStorageKey, locale);
Expand Down
6 changes: 1 addition & 5 deletions config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,7 @@ module.exports = function(environment) {
hostWhitelist: [/.+/]
},

torii: {},

'ember-l10n': {
jsonPath: 'assets/locales'
}
torii: {}
};

if (environment === 'production') {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"ember-g-map": "0.0.25",
"ember-href-to": "3.1.0",
"ember-infinity": "^2.1.0",
"ember-l10n": "^4.0.0",
"ember-l10n": "^3.2.1",
"ember-link-action": "1.0.0",
"ember-load-initializers": "^2.1.1",
"ember-math-helpers": "^2.12.1",
Expand Down
10 changes: 4 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,6 @@

"@bower_components/open-event-theme@fossasia/open-event-theme#^0.0.6":
version "0.0.6"
uid "5ab0b1399862441fe6d1dd4927600f8d9fef1021"
resolved "https://codeload.github.com/fossasia/open-event-theme/tar.gz/5ab0b1399862441fe6d1dd4927600f8d9fef1021"

"@bower_components/pace@HubSpot/pace#^1.0.2":
Expand Down Expand Up @@ -6639,10 +6638,10 @@ ember-invoke-action@^1.4.0, ember-invoke-action@^1.5.1:
dependencies:
ember-cli-babel "^6.6.0"

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==
ember-l10n@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/ember-l10n/-/ember-l10n-3.2.1.tgz#0cec02ed96a3e143a889d44a55ec86ba8f6398e9"
integrity sha512-heQZj7UXuA70QsZ04Tq7uGotZ5NhQH/ZYko1xHmIO4nW2Pi+sqpMWGWGAwtmU3uJq/EMWps12m+08G0zCS9OEg==
dependencies:
"@babel/parser" "^7.5.5"
"@glimmer/syntax" "^0.38.0"
Expand Down Expand Up @@ -8479,7 +8478,6 @@ fsevents@^1.2.3:
dependencies:
bindings "^1.5.0"
nan "^2.12.1"
node-pre-gyp "*"

fsevents@~2.1.2:
version "2.1.2"
Expand Down

0 comments on commit 6566097

Please sign in to comment.