From 7dd709f8a63bf55e4f57d216d22b55b7ab3d91d7 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 26 Mar 2017 03:23:19 +0900 Subject: [PATCH] wip #313 --- locales/en.json | 42 ++++++++++++++++++- locales/ja.json | 42 ++++++++++++++++++- src/web/app/desktop/tags/post-form-window.tag | 8 ++-- src/web/app/desktop/tags/post-form.tag | 40 +++++++++--------- .../app/desktop/tags/ui-header-account.tag | 21 ++++++---- src/web/app/desktop/tags/ui-header-nav.tag | 6 +-- src/web/app/desktop/tags/ui-header-search.tag | 2 +- webpack.config.ts | 18 +++++++- 8 files changed, 141 insertions(+), 38 deletions(-) diff --git a/locales/en.json b/locales/en.json index 2153daa00..6d0c96fa8 100644 --- a/locales/en.json +++ b/locales/en.json @@ -29,7 +29,47 @@ "desktop": { "tags": { "mk-ui-header-nav": { - "home": "Home" + "home": "Home", + "messaging": "Messaging", + "info": "Info", + "live": "Live" + }, + "mk-ui-header-search": { + "placeholder": "Search" + }, + "mk-ui-header-account": { + "profile": "Your profile", + "drive": "Drive", + "mentions": "Mentions", + "settings": "Settings", + "signout": "Sign out" + }, + "mk-post-form": { + "post-placeholder": "What's happening?", + "reply-placeholder": "この投稿への返信...", + "quote-placeholder": "この投稿を引用...", + "post": "Post", + "reply": "Reply", + "repost": "Repost", + "posted": "Posted!", + "replied": "Replied!", + "reposted": "Reposted!", + "post-failed": "Failed to post", + "reply-failed": "Failed to reply", + "repost-failed": "Failed to repost", + "posting": "Posting", + "attach-media-from-local": "Attach media from your pc", + "attach-media-from-drive": "Attach media from the drive", + "attach-cancel": "Cancel to attach", + "insert-the-cat": "Insert the cat", + "create-poll": "Create a poll", + "text-remain": "{} characters remaining" + }, + "mk-post-form-window": { + "post": "New post", + "reply": "Reply", + "attaches": "{} media attached", + "uploading-media": "{} media uploading" } } } diff --git a/locales/ja.json b/locales/ja.json index 4131af960..dbe11f5e8 100644 --- a/locales/ja.json +++ b/locales/ja.json @@ -29,7 +29,47 @@ "desktop": { "tags": { "mk-ui-header-nav": { - "home": "ホーム" + "home": "ホーム", + "messaging": "メッセージ", + "info": "お知らせ", + "live": "ライブ" + }, + "mk-ui-header-search": { + "placeholder": "検索" + }, + "mk-ui-header-account": { + "profile": "プロフィール", + "drive": "ドライブ", + "mentions": "あなた宛て", + "settings": "設定", + "signout": "サインアウト" + }, + "mk-post-form": { + "post-placeholder": "いまどうしてる?", + "reply-placeholder": "この投稿への返信...", + "quote-placeholder": "この投稿を引用...", + "post": "投稿", + "reply": "返信", + "repost": "Repost", + "posted": "投稿しました!", + "replied": "返信しました!", + "reposted": "Repostしました!", + "post-failed": "投稿できませんでした", + "reply-failed": "返信できませんでした", + "repost-failed": "Repostできませんでした", + "posting": "投稿中", + "attach-media-from-local": "PCからメディアを添付", + "attach-media-from-drive": "ドライブからメディアを添付", + "attach-cancel": "添付取り消し", + "insert-the-cat": "猫挿入", + "create-poll": "投票を作成", + "text-remain": "のこり{}文字" + }, + "mk-post-form-window": { + "post": "新規投稿", + "reply": "返信", + "attaches": "添付: {}メディア", + "uploading-media": "{}つのメディアをアップロード中" } } } diff --git a/src/web/app/desktop/tags/post-form-window.tag b/src/web/app/desktop/tags/post-form-window.tag index adc70a93f..745aa64c8 100644 --- a/src/web/app/desktop/tags/post-form-window.tag +++ b/src/web/app/desktop/tags/post-form-window.tag @@ -1,10 +1,10 @@ - 新規投稿 - 返信 - 添付: { parent.files.length }ファイル - { parent.uploadingFiles.length }個のファイルをアップロード中 + %i18n:desktop.tags.mk-post-form-window.post% + %i18n:desktop.tags.mk-post-form-window.reply% + { '%i18n:desktop.tags.mk-post-form-window.attaches%'.replace('{}', parent.files.length) } + { '%i18n:desktop.tags.mk-post-form-window.uploading-media%'.replace('{}', parent.uploadingFiles.length) }
diff --git a/src/web/app/desktop/tags/post-form.tag b/src/web/app/desktop/tags/post-form.tag index 1f6303bcb..ca6b5eb9d 100644 --- a/src/web/app/desktop/tags/post-form.tag +++ b/src/web/app/desktop/tags/post-form.tag @@ -5,22 +5,22 @@
  • - +
  • -
  • +

{ 4 - files.length }/4

- - - - -

のこり{ 1000 - refs.text.value.length }文字

+ + + + +

{ '%i18n:desktop.tags.mk-post-form.text-remain%'.replace('{}', 1000 - refs.text.value.length) }

@@ -329,16 +329,16 @@ if (this.repost == '') this.repost = null; this.placeholder = this.repost - ? 'この投稿を引用...' + ? '%i18n:desktop.tags.mk-post-form.quote-placeholder%' : this.inReplyToPost - ? 'この投稿への返信...' - : 'いまどうしてる?'; + ? '%i18n:desktop.tags.mk-post-form.reply-placeholder%' + : '%i18n:desktop.tags.mk-post-form.post-placeholder%'; this.submitText = this.repost - ? 'Repost' + ? '%i18n:desktop.tags.mk-post-form.repost%' : this.inReplyToPost - ? '返信' - : '投稿'; + ? '%i18n:desktop.tags.mk-post-form.reply%' + : '%i18n:desktop.tags.mk-post-form.post%'; this.draftId = this.repost ? 'repost:' + this.repost.id @@ -489,16 +489,16 @@ this.removeDraft(); this.trigger('post'); notify(this.repost - ? 'Repostしました!' + ? '%i18n:desktop.tags.mk-post-form.reposted%' : this.inReplyToPost - ? '返信しました!' - : '投稿しました!'); + ? '%i18n:desktop.tags.mk-post-form.replied%' + : '%i18n:desktop.tags.mk-post-form.posted%'); }).catch(err => { notify(this.repost - ? 'Repostできませんでした' + ? '%i18n:desktop.tags.mk-post-form.repost-failed%' : this.inReplyToPost - ? '返信できませんでした' - : '投稿できませんでした'); + ? '%i18n:desktop.tags.mk-post-form.reply-failed%' + : '%i18n:desktop.tags.mk-post-form.post-failed%'); }).then(() => { this.update({ wait: false diff --git a/src/web/app/desktop/tags/ui-header-account.tag b/src/web/app/desktop/tags/ui-header-account.tag index e47572edb..a8f83ad00 100644 --- a/src/web/app/desktop/tags/ui-header-account.tag +++ b/src/web/app/desktop/tags/ui-header-account.tag @@ -1,21 +1,28 @@ - + diff --git a/src/web/app/desktop/tags/ui-header-nav.tag b/src/web/app/desktop/tags/ui-header-nav.tag index 2fb0f8c51..80352dc12 100644 --- a/src/web/app/desktop/tags/ui-header-nav.tag +++ b/src/web/app/desktop/tags/ui-header-nav.tag @@ -9,20 +9,20 @@
  • -

    メッセージ

    +

    %i18n:desktop.tags.mk-ui-header-nav.messaging%

  • -

    お知らせ

    +

    %i18n:desktop.tags.mk-ui-header-nav.info%

  • -

    ライブ

    +

    %i18n:desktop.tags.mk-ui-header-nav.live%

  • diff --git a/src/web/app/desktop/tags/ui-header-search.tag b/src/web/app/desktop/tags/ui-header-search.tag index ff1a313ce..616476f42 100644 --- a/src/web/app/desktop/tags/ui-header-search.tag +++ b/src/web/app/desktop/tags/ui-header-search.tag @@ -1,6 +1,6 @@