Merge pull request #497 from gfrenoy/master

More hard-coded "loading..." texts + typos

src/config/locales/en/translation.json

@@ -217,15 +217,12 @@
     "add_user_error": "Failed to add user",
     "authorize_url_error": "Failed to get authorize url",
     "domain_confirmed": "{{domain}} is confirmed, please login",
-    "domain_doesnt_exist": "{{domain}} does not exist"
+    "domain_doesnt_exist": "{{domain}} does not exist",
-  },
-  "timeline": {
     "loading": "Loading..."
   },
   "validation": {
     "login": {
-      "loading": "Loading...",
+      "require_domain_name": "Domain name is required",
-      "rquire_domain_name": "Domain name is required",
       "domain_format": "Please write only domain name"
     },
     "new_toot": {

src/config/locales/fr/translation.json

@@ -217,15 +217,12 @@
     "add_user_error": "Erreur lors de l'ajout d'un utilisateur⋅trice",
     "authorize_url_error": "Erreur à la récupération de l'URL d'autorisation",
     "domain_confirmed": "{{domain}} est confirmé, veuillez à présent vous connecter",
-    "domain_doesnt_exist": "{{domain}} n'existe pas"
+    "domain_doesnt_exist": "{{domain}} n'existe pas",
-  },
-  "timeline": {
     "loading": "Chargement..."
   },
   "validation": {
     "login": {
-      "loading": "Chargement...",
+      "require_domain_name": "Un nom de domaine est requis",
-      "rquire_domain_name": "Un nom de domaine est requis",
       "domain_format": "Veuillez uniquement indiquer le nom de domaine"
     },
     "new_toot": {

src/config/locales/ja/translation.json

@@ -217,15 +217,12 @@
     "add_user_error": "メンバー追加に失敗しました",
     "authorize_url_error": "認証用URLの取得に失敗しました",
     "domain_confirmed": "{{domain}} が確認できました，ログインしてください",
-    "domain_doesnt_exist": "{{domain}} は存在しません"
+    "domain_doesnt_exist": "{{domain}} は存在しません",
-  },
-  "timeline": {
     "loading": "読み込み中..."
   },
   "validation": {
     "login": {
-      "loading": "読み込み中...",
+      "require_domain_name": "ドメイン名は必須です",
-      "rquire_domain_name": "ドメイン名は必須です",
       "domain_format": "ドメイン名のみを入力してください"
     },
     "new_toot": {

src/config/locales/ja/translation.missing.json

@@ -1,10 +0,0 @@
-{
-  "timeline": {
-    "loading": "Loading..."
-  },
-  "validation": {
-    "login": {
-      "loading": "Loading..."
-    }
-  }
-}

src/renderer/components/Login/LoginForm.vue

@@ -68,7 +68,7 @@ export default {
     login () {
       const loading = this.$loading({
         lock: true,
-        text: this.$t('validation.login.loading'),
+        text: this.$t('message.loading'),
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })

src/renderer/components/TimelineSpace.vue

@@ -2,7 +2,7 @@
 <div
   id="timeline_space"
   v-loading="loading"
-  :element-loading-text="$t('timeline.loading')"
+  :element-loading-text="$t('message.loading')"
   element-loading-spinner="el-icon-loading"
   element-loading-background="rgba(0, 0, 0, 0.8)"
   >

src/renderer/components/TimelineSpace/Contents/SideBar.vue

@@ -11,7 +11,7 @@
       <div
         class="loading"
         v-loading="true"
-        element-loading-text="Loading..."
+        :element-loading-text="$t('message.loading')"
         element-loading-spinner="el-icon-loading"
         :element-loading-background="backgroundColor"
         v-else>

src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile.vue

@@ -1,7 +1,7 @@
 <template>
 <div id="account_profile"
      v-loading="loading"
-     element-loading-text="Loading..."
+     :element-loading-text="$t('message.loading')"
      element-loading-spinner="el-icon-loading"
      element-loading-background="rgba(0, 0, 0, 0.8)">
   <div class="header-background" v-bind:style="{ backgroundImage: 'url(' + account.header + ')' }">