From de448fc99f521d03883b6050f16a7154cfe159c1 Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Sat, 4 Aug 2018 13:13:29 -0400 Subject: [PATCH 01/17] Added start.sh --- start.sh | 1 + 1 file changed, 1 insertion(+) create mode 100644 start.sh diff --git a/start.sh b/start.sh new file mode 100644 index 000000000..86ee8aab3 --- /dev/null +++ b/start.sh @@ -0,0 +1 @@ +/sbin/start-stop-daemon /usr/bin/node /var/www/misskey/built/ --pidfile /run/misskey -S \ No newline at end of file From 911762fedfd05c112ce9135a9477349cc8cb173b Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Sat, 4 Aug 2018 13:13:56 -0400 Subject: [PATCH 02/17] Removed start.sh --- start.sh | 1 - 1 file changed, 1 deletion(-) delete mode 100644 start.sh diff --git a/start.sh b/start.sh deleted file mode 100644 index 86ee8aab3..000000000 --- a/start.sh +++ /dev/null @@ -1 +0,0 @@ -/sbin/start-stop-daemon /usr/bin/node /var/www/misskey/built/ --pidfile /run/misskey -S \ No newline at end of file From 06390380f86e7cd505283e00fa93eb354ecd0f0b Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Mon, 6 Aug 2018 03:18:52 -0400 Subject: [PATCH 03/17] Translated mute. --- locales/ja.yml | 1 + src/client/app/desktop/views/pages/user/user.profile.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/locales/ja.yml b/locales/ja.yml index 1e0359254..492817806 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -964,6 +964,7 @@ desktop/views/pages/user/user.profile.vue: mute: "ミュートする" muted: "ミュートしています" unmute: "ミュート解除" + add-to-list: "リストに追加" desktop/views/pages/user/user.header.vue: posts: "投稿" diff --git a/src/client/app/desktop/views/pages/user/user.profile.vue b/src/client/app/desktop/views/pages/user/user.profile.vue index b74dbc7e2..35993f19a 100644 --- a/src/client/app/desktop/views/pages/user/user.profile.vue +++ b/src/client/app/desktop/views/pages/user/user.profile.vue @@ -13,7 +13,7 @@ %fa:eye% %i18n:@unmute% %fa:eye-slash% %i18n:@mute% - + From a303d52990a9796bcdec8c7479e709d9e884dd87 Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Mon, 6 Aug 2018 15:53:06 -0400 Subject: [PATCH 04/17] Fix typo --- src/client/app/common/scripts/compose-notification.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/app/common/scripts/compose-notification.ts b/src/client/app/common/scripts/compose-notification.ts index 4fb0610fd..f42af9437 100644 --- a/src/client/app/common/scripts/compose-notification.ts +++ b/src/client/app/common/scripts/compose-notification.ts @@ -38,7 +38,7 @@ export default function(type, data): Notification { switch (data.type) { case 'mention': return { - title: '%i18n:common.notification.notified-by%'.split("{}")[0] + `${getUserName(data.user)}さんから:` + '%i18n:common.notification.notified-by%'.split("{}")[1], + title: '%i18n:common.notification.notified-by%'.split("{}")[0] + `${getUserName(data.user)}:` + '%i18n:common.notification.notified-by%'.split("{}")[1], body: getNoteSummary(data), icon: data.user.avatarUrl }; From 790e6ceca4497e0748d0153b391c456bfa072fa4 Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Mon, 6 Aug 2018 15:53:21 -0400 Subject: [PATCH 05/17] Localize unlocalized line --- locales/ja.yml | 1 + src/client/app/common/views/components/messaging-room.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/locales/ja.yml b/locales/ja.yml index 6aac8acca..a77ce4653 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -253,6 +253,7 @@ common/views/components/messaging-room.vue: no-history: "これより過去の履歴はありません" resize-form: "ドラッグしてフォームの広さを調整" new-message: "新しいメッセージがあります" + only-one-file-attached: "メッセージに添付できるのはひとつのファイルのみです" common/views/components/messaging-room.form.vue: input-message-here: "ここにメッセージを入力" diff --git a/src/client/app/common/views/components/messaging-room.vue b/src/client/app/common/views/components/messaging-room.vue index b2831d692..e4cc30ded 100644 --- a/src/client/app/common/views/components/messaging-room.vue +++ b/src/client/app/common/views/components/messaging-room.vue @@ -111,7 +111,7 @@ export default Vue.extend({ this.form.upload(e.dataTransfer.files[0]); return; } else if (e.dataTransfer.files.length > 1) { - alert('メッセージに添付できるのはひとつのファイルのみです'); + alert('%i18n:@only-one-file-attached%'); return; } From be12e23aa1750693097c382a5f8e4892f3318fe3 Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Mon, 6 Aug 2018 15:55:39 -0400 Subject: [PATCH 06/17] Localize unlocalized line. --- locales/ja.yml | 2 ++ src/client/app/desktop/views/components/notes.note.vue | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/locales/ja.yml b/locales/ja.yml index a77ce4653..08a2d6d8f 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -606,6 +606,8 @@ desktop/views/components/notes.note.vue: detail: "詳細" private: "この投稿は非公開です" deleted: "この投稿は削除されました" + hide: "隠す" + see-more: "もっと見る" desktop/views/components/notes.vue: error: "読み込みに失敗しました。" diff --git a/src/client/app/desktop/views/components/notes.note.vue b/src/client/app/desktop/views/components/notes.note.vue index fbbd52407..a98df104a 100644 --- a/src/client/app/desktop/views/components/notes.note.vue +++ b/src/client/app/desktop/views/components/notes.note.vue @@ -18,7 +18,7 @@

{{ p.cw }} - {{ showContent ? '隠す' : 'もっと見る' }} + {{ showContent ? '%i18n:@hide%' : '%i18n:@see-more%' }}

From 1e4f11a9798419fc341d247292b8b97f3aba0389 Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Mon, 6 Aug 2018 15:58:09 -0400 Subject: [PATCH 07/17] Localize japanese adjective. --- locales/ja.yml | 1 + src/client/app/desktop/views/components/ui.header.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/locales/ja.yml b/locales/ja.yml index 08a2d6d8f..47f3ea990 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -834,6 +834,7 @@ desktop/views/components/timeline.vue: desktop/views/components/ui.header.vue: welcome-back: "おかえりなさい、" + adjective: "さん" desktop/views/components/ui.header.account.vue: profile: "プロフィール" diff --git a/src/client/app/desktop/views/components/ui.header.vue b/src/client/app/desktop/views/components/ui.header.vue index 1ed5c3523..83df4b2fb 100644 --- a/src/client/app/desktop/views/components/ui.header.vue +++ b/src/client/app/desktop/views/components/ui.header.vue @@ -4,7 +4,7 @@
-

%i18n:@welcome-back%{{ $store.state.i | userName }}さん

+

%i18n:@welcome-back%{{ $store.state.i | userName }}%i18n:@adjective%

From 1f75cf4ace1d9262131e487f91ad55b403e0a564 Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Mon, 6 Aug 2018 16:00:12 -0400 Subject: [PATCH 08/17] Localize missing line --- src/client/app/dev/views/app.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/app/dev/views/app.vue b/src/client/app/dev/views/app.vue index a35b032b7..54d99ec82 100644 --- a/src/client/app/dev/views/app.vue +++ b/src/client/app/dev/views/app.vue @@ -1,6 +1,6 @@ From 24de518922c05cd35aba4da9e65b35244147871f Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Mon, 6 Aug 2018 16:08:54 -0400 Subject: [PATCH 13/17] Localized 2 missing lines for mobile widgets.vue --- locales/ja.yml | 2 ++ src/client/app/mobile/views/pages/widgets.vue | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/locales/ja.yml b/locales/ja.yml index d72a0a19f..d1cc5c325 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -1195,6 +1195,8 @@ mobile/views/pages/welcome.vue: mobile/views/pages/widgets.vue: dashboard: "ダッシュボード" widgets-hints: "ウィジェットを追加/削除したり並べ替えたりできます。ウィジェットを移動するには「三」をドラッグします。ウィジェットを削除するには「x」をタップします。いくつかのウィジェットはタップすることで表示を変更できます。" + add-widget: "追加" + customization-tips: "カスタマイズのヒント" mobile/views/pages/widgets/activity.vue: activity: "アクティビティ" diff --git a/src/client/app/mobile/views/pages/widgets.vue b/src/client/app/mobile/views/pages/widgets.vue index 4400132bf..543ee8f7d 100644 --- a/src/client/app/mobile/views/pages/widgets.vue +++ b/src/client/app/mobile/views/pages/widgets.vue @@ -24,8 +24,8 @@ - -

カスタマイズのヒント

+ +

%i18n:customization-tips%

Date: Mon, 6 Aug 2018 20:57:14 -0400 Subject: [PATCH 14/17] Localize "only one file attached" popup --- locales/ja.yml | 1 + .../app/common/views/components/messaging-room.form.vue | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/locales/ja.yml b/locales/ja.yml index d1cc5c325..87de0f662 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -261,6 +261,7 @@ common/views/components/messaging-room.form.vue: send: "送信" attach-from-local: "PCからファイルを添付する" attach-from-drive: "ドライブからファイルを添付する" + only-one-file-attached: "メッセージに添付できるのはひとつのファイルのみです" common/views/components/messaging-room.message.vue: is-read: "既読" diff --git a/src/client/app/common/views/components/messaging-room.form.vue b/src/client/app/common/views/components/messaging-room.form.vue index b6ca90266..f183749fa 100644 --- a/src/client/app/common/views/components/messaging-room.form.vue +++ b/src/client/app/common/views/components/messaging-room.form.vue @@ -83,7 +83,7 @@ export default Vue.extend({ } } else { if (items[0].kind == 'file') { - alert('メッセージに添付できるのはひとつのファイルのみです'); + alert('%i18n:only-one-file-attached%'); } } }, @@ -105,7 +105,7 @@ export default Vue.extend({ return; } else if (e.dataTransfer.files.length > 1) { e.preventDefault(); - alert('メッセージに添付できるのはひとつのファイルのみです'); + alert('%i18n:only-one-file-attached%'); return; } From ff325d9588f8c1beab0b258d29691001af9dc32a Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Mon, 6 Aug 2018 21:00:58 -0400 Subject: [PATCH 15/17] Localized annotations line --- locales/ja.yml | 1 + src/client/app/desktop/views/components/post-form.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/locales/ja.yml b/locales/ja.yml index 87de0f662..efc4e575e 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -648,6 +648,7 @@ desktop/views/components/post-form.vue: geolocation-alert: "お使いの端末は位置情報に対応していません" error: "エラー" enter-username: "ユーザー名を入力してください" + annotations: "内容への注釈 (オプション)" desktop/views/components/post-form-window.vue: note: "新規投稿" diff --git a/src/client/app/desktop/views/components/post-form.vue b/src/client/app/desktop/views/components/post-form.vue index 9b8a0c0f1..334a45750 100644 --- a/src/client/app/desktop/views/components/post-form.vue +++ b/src/client/app/desktop/views/components/post-form.vue @@ -14,7 +14,7 @@ %i18n:@recent-tags%: #{{ tag }}
- +