Skip to content

Commit 6566097

Browse files
fix: Revert ember-l10n to 3.2.1 (#3971)
1 parent e984a1d commit 6566097

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

app/services/l10n.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ export default L10n.extend({
3131

3232
autoInitialize: false,
3333

34+
jsonPath: '/assets/locales',
35+
3436
switchLanguage(locale) {
3537
this.setLocale(locale);
3638
this.cookies.write(this.localStorageKey, locale);

config/environment.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,7 @@ module.exports = function(environment) {
8282
hostWhitelist: [/.+/]
8383
},
8484

85-
torii: {},
86-
87-
'ember-l10n': {
88-
jsonPath: 'assets/locales'
89-
}
85+
torii: {}
9086
};
9187

9288
if (environment === 'production') {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"ember-g-map": "0.0.25",
8787
"ember-href-to": "3.1.0",
8888
"ember-infinity": "^2.1.0",
89-
"ember-l10n": "^4.0.0",
89+
"ember-l10n": "^3.2.1",
9090
"ember-link-action": "1.0.0",
9191
"ember-load-initializers": "^2.1.1",
9292
"ember-math-helpers": "^2.12.1",

yarn.lock

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,6 @@
835835

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

841840
"@bower_components/pace@HubSpot/pace#^1.0.2":
@@ -6639,10 +6638,10 @@ ember-invoke-action@^1.4.0, ember-invoke-action@^1.5.1:
66396638
dependencies:
66406639
ember-cli-babel "^6.6.0"
66416640

6642-
ember-l10n@^4.0.0:
6643-
version "4.0.0"
6644-
resolved "https://registry.yarnpkg.com/ember-l10n/-/ember-l10n-4.0.0.tgz#c1bc495115e8d691f19ea14101f4588445f47d63"
6645-
integrity sha512-gX288kuhYSHxIn7Sp3qkmJKvfK3ok6UFumvEqU0ndin2dVDER8JcrUlm4YjdewXbq8Y03l6iyMViL3YDRdbSAg==
6641+
ember-l10n@^3.2.1:
6642+
version "3.2.1"
6643+
resolved "https://registry.yarnpkg.com/ember-l10n/-/ember-l10n-3.2.1.tgz#0cec02ed96a3e143a889d44a55ec86ba8f6398e9"
6644+
integrity sha512-heQZj7UXuA70QsZ04Tq7uGotZ5NhQH/ZYko1xHmIO4nW2Pi+sqpMWGWGAwtmU3uJq/EMWps12m+08G0zCS9OEg==
66466645
dependencies:
66476646
"@babel/parser" "^7.5.5"
66486647
"@glimmer/syntax" "^0.38.0"
@@ -8479,7 +8478,6 @@ fsevents@^1.2.3:
84798478
dependencies:
84808479
bindings "^1.5.0"
84818480
nan "^2.12.1"
8482-
node-pre-gyp "*"
84838481

84848482
fsevents@~2.1.2:
84858483
version "2.1.2"

0 commit comments

Comments
 (0)