diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 86871ec29e..1b73a35b4d 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -64,6 +64,7 @@ common:
month-and-day: "{month}月 {day}日"
trash: "ゴミ箱"
+ drive: "ドライブ"
weekday-short:
sunday: "日"
@@ -642,7 +643,6 @@ desktop/views/components/crop-window.vue:
desktop/views/components/drive-window.vue:
used: "使用中"
- drive: "ドライブ"
desktop/views/components/drive.file.vue:
avatar: "アイコン"
@@ -675,9 +675,6 @@ desktop/views/components/drive.folder.vue:
rename-folder: "フォルダ名の変更"
input-new-folder-name: "新しいフォルダ名を入力してください"
-desktop/views/components/drive.nav-folder.vue:
- drive: "ドライブ"
-
desktop/views/components/drive.vue:
search: "検索"
load-more: "もっと読み込む"
@@ -836,7 +833,6 @@ desktop/views/components/settings.vue:
notification: "通知"
apps: "アプリ"
mute: "ミュート"
- drive: "ドライブ"
security: "セキュリティ"
signin: "サインイン履歴"
password: "パスワード"
@@ -965,9 +961,10 @@ desktop/views/components/settings.api.vue:
desktop/views/components/settings.apps.vue:
no-apps: "連携しているアプリケーションはありません"
-desktop/views/components/settings.drive.vue:
+common/views/components/drive-settings.vue:
max: "中"
in-use: "使用中"
+ stats: "統計"
desktop/views/components/settings.mute.vue:
no-users: "ミュートしているユーザーはいません"
@@ -1008,7 +1005,6 @@ desktop/views/components/ui.header.vue:
desktop/views/components/ui.header.account.vue:
profile: "プロフィール"
- drive: "ドライブ"
favorites: "お気に入り"
lists: "リスト"
follow-requests: "フォロー申請"
@@ -1063,7 +1059,6 @@ desktop/views/components/window.vue:
desktop/views/pages/admin/admin.vue:
dashboard: "ダッシュボード"
- drive: "ドライブ"
users: "ユーザー"
update: "更新"
announcements: "お知らせ"
@@ -1251,7 +1246,6 @@ desktop/views/widgets/users.vue:
no-one: "いません!"
mobile/views/components/drive.vue:
- drive: "ドライブ"
used: "使用中"
folder-count: "フォルダ"
count-separator: "、"
@@ -1375,7 +1369,6 @@ mobile/views/components/ui.nav.vue:
messaging: "メッセージ"
follow-requests: "フォロー申請"
search: "検索"
- drive: "ドライブ"
favorites: "お気に入り"
user-lists: "リスト"
widgets: "ウィジェット"
@@ -1403,7 +1396,6 @@ mobile/views/pages/user-lists.vue:
enter-list-name: "リスト名を入力してください"
mobile/views/pages/drive.vue:
- drive: "ドライブ"
more: "もっと見る"
mobile/views/pages/signup.vue:
diff --git a/src/client/app/common/views/components/drive-settings.vue b/src/client/app/common/views/components/drive-settings.vue
new file mode 100644
index 0000000000..1e376e8794
--- /dev/null
+++ b/src/client/app/common/views/components/drive-settings.vue
@@ -0,0 +1,174 @@
+
+
+ %fa:cloud% %i18n:common.drive%
+
+
+
+ {{ capacity | bytes }}%i18n:@max%{{ usage | bytes }}%i18n:@in-use%
+
+
+
+
+
+
+
+
+
diff --git a/src/client/app/common/views/components/index.ts b/src/client/app/common/views/components/index.ts
index 0dd013807c..9e50c5abc5 100644
--- a/src/client/app/common/views/components/index.ts
+++ b/src/client/app/common/views/components/index.ts
@@ -1,5 +1,6 @@
import Vue from 'vue';
+import driveSettings from './drive-settings.vue';
import profileEditor from './profile-editor.vue';
import noteSkeleton from './note-skeleton.vue';
import theme from './theme.vue';
@@ -46,6 +47,7 @@ import uiSelect from './ui/select.vue';
import formButton from './ui/form/button.vue';
import formRadio from './ui/form/radio.vue';
+Vue.component('mk-drive-settings', driveSettings);
Vue.component('mk-profile-editor', profileEditor);
Vue.component('mk-note-skeleton', noteSkeleton);
Vue.component('mk-theme', theme);
diff --git a/src/client/app/desktop/views/components/drive-window.vue b/src/client/app/desktop/views/components/drive-window.vue
index 191579538d..aa3c2b6b36 100644
--- a/src/client/app/desktop/views/components/drive-window.vue
+++ b/src/client/app/desktop/views/components/drive-window.vue
@@ -2,7 +2,7 @@
{{ usage.toFixed(1) }}% %i18n:@used%
- %fa:cloud%%i18n:@drive%
+ %fa:cloud%%i18n:common.drive%
diff --git a/src/client/app/desktop/views/components/drive.nav-folder.vue b/src/client/app/desktop/views/components/drive.nav-folder.vue
index 40f620875e..4c20e139aa 100644
--- a/src/client/app/desktop/views/components/drive.nav-folder.vue
+++ b/src/client/app/desktop/views/components/drive.nav-folder.vue
@@ -8,7 +8,7 @@
@drop.stop="onDrop"
>
%fa:cloud%
- {{ folder == null ? '%i18n:@drive%' : folder.name }}
+ {{ folder == null ? '%i18n:common.drive%' : folder.name }}
diff --git a/src/client/app/desktop/views/components/settings.drive.vue b/src/client/app/desktop/views/components/settings.drive.vue
deleted file mode 100644
index efe8636169..0000000000
--- a/src/client/app/desktop/views/components/settings.drive.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
- {{ capacity | bytes }}%i18n:@max%{{ usage | bytes }}%i18n:@in-use%
-
-
-
-
-
-
-
diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue
index 3e64ebf59f..0a8b093a8a 100644
--- a/src/client/app/desktop/views/components/settings.vue
+++ b/src/client/app/desktop/views/components/settings.vue
@@ -5,7 +5,7 @@
%fa:palette .fw%%i18n:@theme%
%fa:desktop .fw%Web
%fa:R bell .fw%%i18n:@notification%
- %fa:cloud .fw%%i18n:@drive%
+ %fa:cloud .fw%%i18n:common.drive%
%fa:hashtag .fw%%i18n:@tags%
%fa:ban .fw%%i18n:@mute%
%fa:puzzle-piece .fw%%i18n:@apps%
@@ -189,12 +189,9 @@
-
- %fa:cloud% %i18n:@drive%
-
-
+
+
+
%fa:hashtag% %i18n:@tags%
@@ -301,7 +298,6 @@ import X2fa from './settings.2fa.vue';
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 XTags from './settings.tags.vue';
import { url, langs, version } from '../../../config';
import checkForUpdate from '../../../common/scripts/check-for-update';
@@ -314,7 +310,6 @@ export default Vue.extend({
XApi,
XApps,
XSignins,
- XDrive,
XTags
},
props: {
diff --git a/src/client/app/desktop/views/components/ui.header.account.vue b/src/client/app/desktop/views/components/ui.header.account.vue
index c3285d92e2..56a3ebdde0 100644
--- a/src/client/app/desktop/views/components/ui.header.account.vue
+++ b/src/client/app/desktop/views/components/ui.header.account.vue
@@ -11,7 +11,7 @@
%fa:user%%i18n:@profile%%fa:angle-right%
- %fa:cloud%%i18n:@drive%%fa:angle-right%
+ %fa:cloud%%i18n:common.drive%%fa:angle-right%
%fa:star%%i18n:@favorites%%fa:angle-right%
diff --git a/src/client/app/desktop/views/pages/admin/admin.vue b/src/client/app/desktop/views/pages/admin/admin.vue
index ad417e5121..c1f5a7f0e0 100644
--- a/src/client/app/desktop/views/pages/admin/admin.vue
+++ b/src/client/app/desktop/views/pages/admin/admin.vue
@@ -13,7 +13,7 @@
%fa:hashtag .fw%%i18n:@hashtags%
-
+
diff --git a/src/client/app/mobile/views/components/drive.vue b/src/client/app/mobile/views/components/drive.vue
index 4daa691d95..603b2ba061 100644
--- a/src/client/app/mobile/views/components/drive.vue
+++ b/src/client/app/mobile/views/components/drive.vue
@@ -1,7 +1,7 @@