diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 4cdb4a798..9df3b0e27 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -637,15 +637,13 @@ common/views/components/emoji-picker.vue:
symbols: "記号"
flags: "旗"
-common/views/components/settings/client-mode.vue:
+common/views/components/settings/app-type.vue:
title: "モード"
intro: "デスクトップ版とモバイル版のどちらを使うかを指定できます。"
choices:
auto: "自動で選択"
desktop: "デスクトップ版に固定"
mobile: "モバイル版に固定"
- desktop: "デスクトップ"
- mobile: "モバイル"
info: "変更はページの再度読み込み後に反映されます。"
common/views/components/signin.vue:
diff --git a/src/client/app/boot.js b/src/client/app/boot.js
index 87a12e5cf..29052c151 100644
--- a/src/client/app/boot.js
+++ b/src/client/app/boot.js
@@ -35,12 +35,12 @@
const url = new URL(location.href);
//#region Detect app name
- window.appType = null;
+ let app = null;
- if (`${url.pathname}/`.startsWith('/docs/')) window.appType = 'docs';
- if (`${url.pathname}/`.startsWith('/dev/')) window.appType = 'dev';
- if (`${url.pathname}/`.startsWith('/auth/')) window.appType = 'auth';
- if (`${url.pathname}/`.startsWith('/admin/')) window.appType = 'admin';
+ if (`${url.pathname}/`.startsWith('/docs/')) app = 'docs';
+ if (`${url.pathname}/`.startsWith('/dev/')) app = 'dev';
+ if (`${url.pathname}/`.startsWith('/auth/')) app = 'auth';
+ if (`${url.pathname}/`.startsWith('/admin/')) app = 'admin';
//#endregion
// Script version
@@ -105,15 +105,15 @@
}
// Switch desktop or mobile version
- if (window.appType == null) {
- window.appType = isMobile ? 'mobile' : 'desktop';
+ if (app == null) {
+ app = isMobile ? 'mobile' : 'desktop';
}
// Load an app script
// Note: 'async' make it possible to load the script asyncly.
// 'defer' make it possible to run the script when the dom loaded.
const script = document.createElement('script');
- script.setAttribute('src', `/assets/${window.appType}.${ver}.js`);
+ script.setAttribute('src', `/assets/${app}.${ver}.js`);
script.setAttribute('async', 'true');
script.setAttribute('defer', 'true');
head.appendChild(script);
diff --git a/src/client/app/common/views/components/settings/app-type.vue b/src/client/app/common/views/components/settings/app-type.vue
index 61a23866e..90ff28803 100644
--- a/src/client/app/common/views/components/settings/app-type.vue
+++ b/src/client/app/common/views/components/settings/app-type.vue
@@ -7,7 +7,6 @@
- Current: {{ $t(currentAppType) }}
{{ $t('info') }}
@@ -19,12 +18,10 @@ import i18n from '../../../../i18n';
import { faMobileAlt } from '@fortawesome/free-solid-svg-icons'
export default Vue.extend({
- i18n: i18n('common/views/components/settings/client-mode.vue'),
+ i18n: i18n('common/views/components/settings/app-type.vue'),
data() {
return {
- currentAppType: (window as any).appType,
-
faMobileAlt
};
},