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: Fix typo --- src/client/app/common/scripts/compose-notification.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/client/app/common') diff --git a/src/client/app/common/scripts/compose-notification.ts b/src/client/app/common/scripts/compose-notification.ts index 4fb0610fd7..f42af94370 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 }; -- cgit v1.2.3-freya 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: Localize unlocalized line --- locales/ja.yml | 1 + src/client/app/common/views/components/messaging-room.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src/client/app/common') diff --git a/locales/ja.yml b/locales/ja.yml index 6aac8acca2..a77ce46531 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 b2831d6928..e4cc30ded9 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; } -- cgit v1.2.3-freya From a98392ff27add48fb62a875865ec6bd39413c7a7 Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Mon, 6 Aug 2018 20:57:14 -0400 Subject: Localize "only one file attached" popup --- locales/ja.yml | 1 + src/client/app/common/views/components/messaging-room.form.vue | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/client/app/common') diff --git a/locales/ja.yml b/locales/ja.yml index d1cc5c325c..87de0f6624 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 b6ca902660..f183749fad 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; } -- cgit v1.2.3-freya