From 61d65c4081e932f13643c59deb40aa626606e07c Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Sat, 11 Aug 2018 00:59:48 +0900
Subject: [PATCH] refs #151 Translate at new toot

---
 src/config/locales/en/translation.json        |  7 ++++
 src/config/locales/ja/translation.json        |  7 ++++
 .../TimelineSpace/Modals/NewToot.vue          | 33 +++++++++++++------
 .../TimelineSpace/Modals/NewToot/Status.vue   |  2 +-
 .../store/TimelineSpace/Modals/NewToot.js     | 12 -------
 5 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/src/config/locales/en/translation.json b/src/config/locales/en/translation.json
index e4eb7c72..42fd1f18 100644
--- a/src/config/locales/en/translation.json
+++ b/src/config/locales/en/translation.json
@@ -101,5 +101,12 @@
       "cancel": "Cancel",
       "confirm_message": "Are you sure to remove all associations?"
     }
+  },
+  "new_toot": {
+    "title": "New Toot",
+    "cw": "Write your waring here",
+    "status": "What is on your mind?",
+    "cancel": "Cancel",
+    "toot": "Toot"
   }
 }
diff --git a/src/config/locales/ja/translation.json b/src/config/locales/ja/translation.json
index 94dcee4b..7f736070 100644
--- a/src/config/locales/ja/translation.json
+++ b/src/config/locales/ja/translation.json
@@ -101,5 +101,12 @@
       "cancel": "キャンセル",
       "confirm_message": "本当に全ての連携を削除しますか？"
     }
+  },
+  "new_toot": {
+    "title": "トゥート",
+    "cw": "ここに警告を書いてください",
+    "status": "今なにしてる?",
+    "cancel": "キャンセル",
+    "toot": "トゥート！"
   }
 }
diff --git a/src/renderer/components/TimelineSpace/Modals/NewToot.vue b/src/renderer/components/TimelineSpace/Modals/NewToot.vue
index 79273b41..f6bf884f 100644
--- a/src/renderer/components/TimelineSpace/Modals/NewToot.vue
+++ b/src/renderer/components/TimelineSpace/Modals/NewToot.vue
@@ -1,12 +1,12 @@
 <template>
   <el-dialog
-    title="New Toot"
+    :title="$t('new_toot.title')"
     :visible.sync="newTootModal"
     width="400px"
     class="new-toot-modal">
     <el-form v-on:submit.prevent="toot">
       <div class="spoiler" v-show="showContentWarning">
-        <el-input placeholder="Write your warning here" v-model="spoiler"></el-input>
+        <el-input :placeholder="$t('new_toot.cw')" v-model="spoiler"></el-input>
       </div>
       <Status
         v-model="status"
@@ -29,10 +29,22 @@
         <el-dropdown trigger="click" @command="changeVisibility">
           <el-button size="small" type="text"><icon :name="visibilityIcon"></icon></el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="public"><icon name="globe" class="privacy-icon"></icon>Public</el-dropdown-item>
-            <el-dropdown-item command="unlisted"><icon name="unlock" class="privacy-icon"></icon>Unlisted</el-dropdown-item>
-            <el-dropdown-item command="private"><icon name="lock" class="privacy-icon"></icon>Private</el-dropdown-item>
-            <el-dropdown-item command="direct"><icon name="envelope" class="privacy-icon" scale="0.8"></icon>Direct</el-dropdown-item>
+            <el-dropdown-item :command="visibilityList.Public.value">
+              <icon name="globe" class="privacy-icon"></icon>
+              {{ visibilityList.Public.name }}
+            </el-dropdown-item>
+            <el-dropdown-item :command="visibilityList.Unlisted.value">
+              <icon name="unlock" class="privacy-icon"></icon>
+              {{ visibilityList.Unlisted.name }}
+            </el-dropdown-item>
+            <el-dropdown-item :command="visibilityList.Private.value">
+              <icon name="lock" class="privacy-icon"></icon>
+              {{ visibilityList.Private.name }}
+            </el-dropdown-item>
+            <el-dropdown-item :command="visibilityList.Direct.value">
+              <icon name="envelope" class="privacy-icon" scale="0.8"></icon>
+              {{ visibilityList.Direct.name }}
+            </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
       </div>
@@ -48,8 +60,8 @@
         </el-button>
       </div>
       <span class="text-count">{{ 500 - status.length }}</span>
-      <el-button @click="close">Cancel</el-button>
-      <el-button type="primary" @click="toot" v-loading="blockSubmit">Toot</el-button>
+      <el-button @click="close">{{ $t('new_toot.cancel') }}</el-button>
+      <el-button type="primary" @click="toot" v-loading="blockSubmit">{{ $t('new_toot.toot') }}</el-button>
       <div class="clearfix"></div>
     </div>
   </el-dialog>
@@ -67,7 +79,8 @@ export default {
   },
   data () {
     return {
-      showContentWarning: false
+      showContentWarning: false,
+      visibilityList: Visibility
     }
   },
   computed: {
@@ -217,7 +230,7 @@ export default {
       this.$store.commit('TimelineSpace/Modals/NewToot/removeMedia', media)
     },
     changeVisibility (level) {
-      this.$store.dispatch('TimelineSpace/Modals/NewToot/changeVisibility', level)
+      this.$store.commit('TimelineSpace/Modals/NewToot/changeVisibilityValue', level)
     },
     changeSensitive () {
       this.$store.commit('TimelineSpace/Modals/NewToot/changeSensitive', !this.sensitive)
diff --git a/src/renderer/components/TimelineSpace/Modals/NewToot/Status.vue b/src/renderer/components/TimelineSpace/Modals/NewToot/Status.vue
index 6900fad2..f10ad056 100644
--- a/src/renderer/components/TimelineSpace/Modals/NewToot/Status.vue
+++ b/src/renderer/components/TimelineSpace/Modals/NewToot/Status.vue
@@ -6,7 +6,7 @@
     v-shortkey="openSuggest ? {up: ['arrowup'], down: ['arrowdown'], enter: ['enter']} : {linux: ['ctrl', 'enter'], mac: ['meta', 'enter']}"
     @shortkey="handleKey"
     v-on:input="startSuggest"
-    placeholder="What is on your mind?"
+    :placeholder="$t('new_toot.status')"
     autofocus>
   </textarea>
   <el-popover
diff --git a/src/renderer/store/TimelineSpace/Modals/NewToot.js b/src/renderer/store/TimelineSpace/Modals/NewToot.js
index 8cf80ff5..a4e3177f 100644
--- a/src/renderer/store/TimelineSpace/Modals/NewToot.js
+++ b/src/renderer/store/TimelineSpace/Modals/NewToot.js
@@ -139,18 +139,6 @@ const NewToot = {
     },
     resetMediaId ({ commit }) {
       commit('updateMediaId', 0)
-    },
-    /**
-     * changeVisibility
-     * @param commit vuex commit object
-     * @param level visibility level string object
-     **/
-    changeVisibility ({ commit }, level) {
-      Object.keys(Visibility).map((key, index) => {
-        if (Visibility[key].name === level) {
-          commit('changeVisibility', Visibility[key])
-        }
-      })
     }
   }
 }