diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2017-12-24 22:11:36 +0100 |
|---|---|---|
| committer | Stefan Malzner <stefan@adlk.io> | 2017-12-24 22:11:36 +0100 |
| commit | df44b69c4655415fe1e44689ece443ec06ef0f52 (patch) | |
| tree | e677ed5f5328bb3b14bc976c7392d8e259f89034 /src/i18n/translations.js | |
| parent | [wip] add icon upload (diff) | |
| parent | Merge pull request #494 from heavypackets/websecurity-enable-patch (diff) | |
| download | ferdium-app-df44b69c4655415fe1e44689ece443ec06ef0f52.tar.gz ferdium-app-df44b69c4655415fe1e44689ece443ec06ef0f52.tar.zst ferdium-app-df44b69c4655415fe1e44689ece443ec06ef0f52.zip | |
Merge branch 'develop' into feature/icon-upload
Diffstat (limited to 'src/i18n/translations.js')
| -rw-r--r-- | src/i18n/translations.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i18n/translations.js b/src/i18n/translations.js index 492a6cc4e..161a172ba 100644 --- a/src/i18n/translations.js +++ b/src/i18n/translations.js | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | import languages from './languages'; | 1 | import { APP_LOCALES } from './languages'; |
| 2 | 2 | ||
| 3 | const translations = []; | 3 | const translations = []; |
| 4 | Object.keys(languages).forEach((key) => { | 4 | Object.keys(APP_LOCALES).forEach((key) => { |
| 5 | try { | 5 | try { |
| 6 | const translation = require(`./locales/${key}.json`); // eslint-disable-line | 6 | const translation = require(`./locales/${key}.json`); // eslint-disable-line |
| 7 | translations[key] = translation; | 7 | translations[key] = translation; |