From a603602f32ad6ca40e407c768e1cb71c8649db60 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 21 Aug 2018 05:42:31 +0900 Subject: [PATCH] Clean up --- locales/ja-ks.yml | 1 - src/client/app/config.ts | 2 -- .../app/desktop/views/components/settings.vue | 13 +------------ webpack.config.ts | 4 +--- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/locales/ja-ks.yml b/locales/ja-ks.yml index 283b3f3e7..b72dc26c1 100644 --- a/locales/ja-ks.yml +++ b/locales/ja-ks.yml @@ -691,7 +691,6 @@ desktop/views/components/settings.vue: password: "パスワード" 2fa: "二段階認証" other: "その他" - license: "ライセンス" behaviour: "動作" fetch-on-scroll: "スクロールで自動読み込み" diff --git a/src/client/app/config.ts b/src/client/app/config.ts index 76cd536a4..74b9ea21c 100644 --- a/src/client/app/config.ts +++ b/src/client/app/config.ts @@ -4,7 +4,6 @@ declare const _THEME_COLOR_: string; declare const _COPYRIGHT_: string; declare const _VERSION_: string; declare const _CODENAME_: string; -declare const _LICENSE_: string; const address = new URL(location.href); @@ -19,4 +18,3 @@ export const themeColor = _THEME_COLOR_; export const copyright = _COPYRIGHT_; export const version = _VERSION_; export const codename = _CODENAME_; -export const license = _LICENSE_; diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue index e249afed8..759463981 100644 --- a/src/client/app/desktop/views/components/settings.vue +++ b/src/client/app/desktop/views/components/settings.vue @@ -191,12 +191,6 @@ - -
-

%i18n:@license%

-
- %i18n:@third-parties% -
@@ -211,7 +205,7 @@ import XApi from './settings.api.vue'; import XApps from './settings.apps.vue'; import XSignins from './settings.signins.vue'; import XDrive from './settings.drive.vue'; -import { url, docsUrl, license, lang, langs, version } from '../../../config'; +import { url, langs, version } from '../../../config'; import checkForUpdate from '../../../common/scripts/check-for-update'; import MkTaskManager from './taskmanager.vue'; @@ -230,7 +224,6 @@ export default Vue.extend({ return { page: 'profile', meta: null, - license, version, langs, latestVersion: undefined, @@ -238,10 +231,6 @@ export default Vue.extend({ }; }, computed: { - licenseUrl(): string { - return `${docsUrl}/${lang}/license`; - }, - apiViaStream: { get() { return this.$store.state.device.apiViaStream; }, set(value) { this.$store.commit('device/set', { key: 'apiViaStream', value }); } diff --git a/webpack.config.ts b/webpack.config.ts index 4c6da768d..1e295c245 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -16,7 +16,6 @@ import I18nReplacer from './src/misc/i18n'; import { pattern as i18nPattern, replacement as i18nReplacement } from './webpack/i18n'; import { pattern as faPattern, replacement as faReplacement } from './src/misc/fa'; const constants = require('./src/const.json'); -import { licenseHtml } from './src/misc/license'; const locales = require('./locales'); const meta = require('./package.json'); @@ -74,8 +73,7 @@ const consts = { _VERSION_: version, _CODENAME_: codename, _LANG_: '%lang%', - _LANGS_: Object.keys(locales).map(l => [l, locales[l].meta.lang]), - _LICENSE_: licenseHtml + _LANGS_: Object.keys(locales).map(l => [l, locales[l].meta.lang]) }; const _consts: { [ key: string ]: any } = {};