diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-04-15 06:16:50 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-04-15 06:16:50 +0900 |
| commit | a53746e9d07a7089947480b1893eb829c0560a28 (patch) | |
| tree | d73052a018c799ee8998c16f384b467492d25e00 /src | |
| parent | wip (diff) | |
| download | misskey-a53746e9d07a7089947480b1893eb829c0560a28.tar.gz misskey-a53746e9d07a7089947480b1893eb829c0560a28.tar.bz2 misskey-a53746e9d07a7089947480b1893eb829c0560a28.zip | |
:v:
Diffstat (limited to 'src')
| -rw-r--r-- | src/build/i18n.ts | 2 | ||||
| -rw-r--r-- | src/client/app/boot.js | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/build/i18n.ts b/src/build/i18n.ts index 35204c34a4..2790191191 100644 --- a/src/build/i18n.ts +++ b/src/build/i18n.ts @@ -63,6 +63,8 @@ export default class Replacer { key = key.substr(1); } + if (ctx && ctx.lang) this.lang = ctx.lang; + if (match[0] == '"') { return '"' + this.get(name, key).replace(/"/g, '\\"') + '"'; } else if (match[0] == "'") { diff --git a/src/client/app/boot.js b/src/client/app/boot.js index 2675fa233a..12b0d220a9 100644 --- a/src/client/app/boot.js +++ b/src/client/app/boot.js @@ -31,11 +31,9 @@ // Detect the user language // Note: The default language is Japanese - //let lang = navigator.language.split('-')[0]; - //if (!/^(en|ja)$/.test(lang)) lang = 'ja'; - //if (localStorage.getItem('lang')) lang = localStorage.getItem('lang'); - //if (ENV != 'production') lang = 'ja'; - const lang = 'ja'; + let lang = navigator.language.split('-')[0]; + if (!/^(en|ja)$/.test(lang)) lang = 'ja'; + if (localStorage.getItem('lang')) lang = localStorage.getItem('lang'); // Detect the user agent const ua = navigator.userAgent.toLowerCase(); |