From 7bd33ecc72c7cbb53a15f3a74f7548564c75fa6b Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 7 Aug 2018 13:25:50 +0900 Subject: [PATCH] :v: --- locales/ja.yml | 6 +++--- src/client/app/auth/script.ts | 4 ++-- .../app/common/views/components/messaging-room.vue | 2 +- src/client/app/common/views/pages/follow.vue | 1 - src/client/app/desktop/views/components/notes.vue | 8 ++++---- .../app/desktop/views/components/notifications.vue | 2 +- src/client/app/desktop/views/pages/deck/deck.notes.vue | 2 +- .../desktop/views/pages/deck/deck.notifications.vue | 2 +- src/client/app/desktop/views/pages/home-customize.vue | 4 +++- src/client/app/desktop/views/pages/home.vue | 3 ++- src/client/app/desktop/views/pages/share.vue | 4 +++- src/client/app/desktop/views/pages/user/user.vue | 1 - src/client/app/desktop/views/pages/welcome.vue | 10 +++++----- src/client/app/dev/views/ui.vue | 2 +- src/client/app/mobile/views/components/notes.vue | 5 +++-- .../app/mobile/views/components/notifications.vue | 2 +- src/client/app/mobile/views/components/ui.header.vue | 4 +++- src/client/app/mobile/views/pages/drive.vue | 9 +++++---- src/client/app/mobile/views/pages/favorites.vue | 3 ++- src/client/app/mobile/views/pages/followers.vue | 3 ++- src/client/app/mobile/views/pages/following.vue | 3 ++- src/client/app/mobile/views/pages/games/reversi.vue | 3 ++- src/client/app/mobile/views/pages/home.vue | 3 ++- src/client/app/mobile/views/pages/messaging-room.vue | 3 ++- src/client/app/mobile/views/pages/messaging.vue | 3 ++- src/client/app/mobile/views/pages/note.vue | 3 ++- src/client/app/mobile/views/pages/notifications.vue | 2 +- .../mobile/views/pages/received-follow-requests.vue | 2 +- src/client/app/mobile/views/pages/search.vue | 3 ++- src/client/app/mobile/views/pages/settings.vue | 2 +- src/client/app/mobile/views/pages/share.vue | 4 +++- src/client/app/mobile/views/pages/user-lists.vue | 2 +- src/client/app/mobile/views/pages/user.vue | 3 ++- src/client/app/mobile/views/pages/welcome.vue | 4 ++-- src/client/app/mobile/views/pages/widgets.vue | 3 ++- src/config/load.ts | 2 ++ 36 files changed, 72 insertions(+), 50 deletions(-) diff --git a/locales/ja.yml b/locales/ja.yml index ed0ad4f3ff..ecde1bb6a1 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -28,7 +28,6 @@ common: notified-by: "{}さんから" reply-from: "{}さんから返信:" quoted-by: "{}さんが引用:" - name: "Misskey" time: unknown: "なぞのじかん" future: "未来" @@ -40,6 +39,7 @@ common: weeks_ago: "{}週間前" months_ago: "{}ヶ月前" years_ago: "{}年前" + month-and-day: "{month}月 {day}日" trash: "ゴミ箱" @@ -1353,6 +1353,6 @@ docs: type: "型" description: "説明" - + dev/views/index.vue: - manage-apps: "アプリの管理" \ No newline at end of file + manage-apps: "アプリの管理" diff --git a/src/client/app/auth/script.ts b/src/client/app/auth/script.ts index bdfdf70be3..64ab6536db 100644 --- a/src/client/app/auth/script.ts +++ b/src/client/app/auth/script.ts @@ -8,14 +8,14 @@ import VueRouter from 'vue-router'; import './style.styl'; import init from '../init'; - import Index from './views/index.vue'; +import * as config from '../config'; /** * init */ init(launch => { - document.title = '%i18n:common.name% | %i18n:common.application-authorization%'; + document.title = `${config.name} | %i18n:common.application-authorization%`; // Init router const router = new VueRouter({ diff --git a/src/client/app/common/views/components/messaging-room.vue b/src/client/app/common/views/components/messaging-room.vue index e4cc30ded9..30143b4f1d 100644 --- a/src/client/app/common/views/components/messaging-room.vue +++ b/src/client/app/common/views/components/messaging-room.vue @@ -61,7 +61,7 @@ export default Vue.extend({ const date = new Date(message.createdAt).getDate(); const month = new Date(message.createdAt).getMonth() + 1; message._date = date; - message._datetext = `${month}月 ${date}日`; + message._datetext = '%i18n:common.month-and-day%'.replace('{month}', month.toString()).replace('{day}', date.toString()); return message; }); }, diff --git a/src/client/app/common/views/pages/follow.vue b/src/client/app/common/views/pages/follow.vue index e1b5b1f120..13d855d20a 100644 --- a/src/client/app/common/views/pages/follow.vue +++ b/src/client/app/common/views/pages/follow.vue @@ -71,7 +71,6 @@ export default Vue.extend({ this.user = user; this.fetching = false; Progress.done(); - document.title = getUserName(this.user) + ' | %i18n:common.name%'; }); }, diff --git a/src/client/app/desktop/views/components/notes.vue b/src/client/app/desktop/views/components/notes.vue index 0ec2f16dbc..02167ef85c 100644 --- a/src/client/app/desktop/views/components/notes.vue +++ b/src/client/app/desktop/views/components/notes.vue @@ -33,7 +33,7 @@ diff --git a/src/client/app/desktop/views/pages/home.vue b/src/client/app/desktop/views/pages/home.vue index 0c42e42bd2..3d3c24bfa4 100644 --- a/src/client/app/desktop/views/pages/home.vue +++ b/src/client/app/desktop/views/pages/home.vue @@ -7,6 +7,7 @@