From 12f472b3fc8d0cef17e87785a84e49b96409637b Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 3 Mar 2018 14:25:36 +0900 Subject: [PATCH] :v: --- src/web/app/auth/views/form.vue | 1 + .../app/common/views/components/switch.vue | 2 +- .../views/components/settings.profile.vue | 2 +- .../app/desktop/views/components/settings.vue | 2 +- src/web/app/init.ts | 22 +++++++++++++------ src/web/app/reset.styl | 1 - 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/web/app/auth/views/form.vue b/src/web/app/auth/views/form.vue index 30ad64ed2d..d86ed58b38 100644 --- a/src/web/app/auth/views/form.vue +++ b/src/web/app/auth/views/form.vue @@ -123,6 +123,7 @@ export default Vue.extend({ > button margin 0 8px + padding 0 @media (max-width 600px) > header diff --git a/src/web/app/common/views/components/switch.vue b/src/web/app/common/views/components/switch.vue index 2ac57be6fc..ffbab843ea 100644 --- a/src/web/app/common/views/components/switch.vue +++ b/src/web/app/common/views/components/switch.vue @@ -88,7 +88,7 @@ export default Vue.extend({ .mk-switch display flex - margin 8px 0 + margin 12px 0 cursor pointer transition all 0.3s diff --git a/src/web/app/desktop/views/components/settings.profile.vue b/src/web/app/desktop/views/components/settings.profile.vue index b57ac10287..23a1663768 100644 --- a/src/web/app/desktop/views/components/settings.profile.vue +++ b/src/web/app/desktop/views/components/settings.profile.vue @@ -19,7 +19,7 @@
diff --git a/src/web/app/desktop/views/components/settings.vue b/src/web/app/desktop/views/components/settings.vue index 04004d2ff6..182a9a1d5e 100644 --- a/src/web/app/desktop/views/components/settings.vue +++ b/src/web/app/desktop/views/components/settings.vue @@ -38,7 +38,7 @@
-

%fa:inffo-circle%変更はページの再度読み込み後に反映されます。

+

%fa:info-circle%変更はページの再度読み込み後に反映されます。

diff --git a/src/web/app/init.ts b/src/web/app/init.ts index dc3057935f..716fe45e7a 100644 --- a/src/web/app/init.ts +++ b/src/web/app/init.ts @@ -6,10 +6,24 @@ import Vue from 'vue'; import VueRouter from 'vue-router'; import VModal from 'vue-js-modal'; import Element from 'element-ui'; +import ElementLocaleEn from 'element-ui/lib/locale/lang/en'; +import ElementLocaleJa from 'element-ui/lib/locale/lang/ja'; + +import App from './app.vue'; +import checkForUpdate from './common/scripts/check-for-update'; +import MiOS, { API } from './common/mios'; +import { version, host, lang } from './config'; + +let elementLocale; +switch (lang) { + case 'ja': elementLocale = ElementLocaleJa; break; + case 'en': elementLocale = ElementLocaleEn; break; + default: elementLocale = ElementLocaleEn; break; +} Vue.use(VueRouter); Vue.use(VModal); -Vue.use(Element); +Vue.use(Element, { locale: elementLocale }); // Register global directives require('./common/views/directives'); @@ -29,12 +43,6 @@ Vue.mixin({ } }); -import App from './app.vue'; - -import checkForUpdate from './common/scripts/check-for-update'; -import MiOS, { API } from './common/mios'; -import { version, host, lang } from './config'; - /** * APP ENTRY POINT! */ diff --git a/src/web/app/reset.styl b/src/web/app/reset.styl index db4d874861..10bd3113a2 100644 --- a/src/web/app/reset.styl +++ b/src/web/app/reset.styl @@ -16,7 +16,6 @@ textarea button margin 0 - padding 0 background transparent border none cursor pointer