From 0332b22c4a2227e0f13b5389d2c5b1d70a102298 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sun, 23 Feb 2020 23:56:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E4=B8=8A=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/App.vue                      | 11 +++++++----
 src/renderer/lang/cns/view/song_list.json |  4 ++++
 src/renderer/lang/cnt/view/song_list.json |  4 ++++
 src/renderer/lang/en/view/song_list.json  |  4 ++++
 src/renderer/store/actions.js             |  8 +++++---
 src/renderer/views/SongList.vue           |  4 ++--
 6 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 src/renderer/lang/cns/view/song_list.json
 create mode 100644 src/renderer/lang/cnt/view/song_list.json
 create mode 100644 src/renderer/lang/en/view/song_list.json

diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index 9ce01883..efc09ae0 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -219,10 +219,13 @@ export default {
       }
     },
     showUpdateModal() {
-      (this.version.newVersion && this.version.newVersion.history ? Promise.resolve(this.version.newVersion) : this.getVersionInfo().then(body => {
-        this.setNewVersion(body)
-        return body
-      })).catch(() => {
+      (this.version.newVersion && this.version.newVersion.history
+        ? Promise.resolve(this.version.newVersion)
+        : this.getVersionInfo().then(body => {
+          this.setNewVersion(body)
+          return body
+        })
+      ).catch(() => {
         if (this.version.newVersion) return this.version.newVersion
         this.setVersionModalVisible({ isUnknow: true })
         let result = {
diff --git a/src/renderer/lang/cns/view/song_list.json b/src/renderer/lang/cns/view/song_list.json
new file mode 100644
index 00000000..df6676f5
--- /dev/null
+++ b/src/renderer/lang/cns/view/song_list.json
@@ -0,0 +1,4 @@
+{
+  "back": "返回",
+  "loding_list": "列表加載中..."
+}
diff --git a/src/renderer/lang/cnt/view/song_list.json b/src/renderer/lang/cnt/view/song_list.json
new file mode 100644
index 00000000..e5ebd831
--- /dev/null
+++ b/src/renderer/lang/cnt/view/song_list.json
@@ -0,0 +1,4 @@
+{
+  "back": "返回",
+  "loding_list": "列表加载中..."
+}
diff --git a/src/renderer/lang/en/view/song_list.json b/src/renderer/lang/en/view/song_list.json
new file mode 100644
index 00000000..986f6428
--- /dev/null
+++ b/src/renderer/lang/en/view/song_list.json
@@ -0,0 +1,4 @@
+{
+  "back": "Back",
+  "loding_list": "List loading..."
+}
diff --git a/src/renderer/store/actions.js b/src/renderer/store/actions.js
index b2aaa8dc..ed8b8ec1 100644
--- a/src/renderer/store/actions.js
+++ b/src/renderer/store/actions.js
@@ -10,8 +10,8 @@ export default {
       }, (err, resp, body) => {
         if (err) {
           return ++retryNum > 3
-            ? this.dispatch('getVersionInfo2').then(ver => resolve(ver)).catch(err => reject(err))
-            : this.dispatch('getVersionInfo', retryNum).then(ver => resolve(ver)).catch(err => reject(err))
+            ? this.dispatch('getVersionInfo2').then(resolve).catch(reject)
+            : this.dispatch('getVersionInfo', retryNum).then(resolve).catch(reject)
         }
         resolve(body)
       })
@@ -23,7 +23,9 @@ export default {
         timeout: 20000,
       }, (err, resp, body) => {
         if (err) {
-          return ++retryNum > 3 ? reject() : this.dispatch('getVersionInfo2', retryNum).then(ver => resolve(ver)).catch(err => reject(err))
+          return ++retryNum > 3
+            ? reject(err)
+            : this.dispatch('getVersionInfo2', retryNum).then(resolve).catch(reject)
         }
         resolve(body)
       })
diff --git a/src/renderer/views/SongList.vue b/src/renderer/views/SongList.vue
index 3063f4d2..8eafed23 100644
--- a/src/renderer/views/SongList.vue
+++ b/src/renderer/views/SongList.vue
@@ -14,7 +14,7 @@
             //- | &nbsp;
             //- material-btn(:class="$style.closeDetailButton" :disabled="detailLoading" @click="playSongListDetail") 播放
             //- | &nbsp;
-            material-btn(:class="$style.closeDetailButton" @click="hideListDetail") 返回
+            material-btn(:class="$style.closeDetailButton" @click="hideListDetail") {{$t('view.song_list.back')}}
         material-song-list(v-model="selectdData" @action="handleSongListAction" :source="source" :page="listDetail.page" :limit="listDetail.limit" :total="listDetail.total" :noItem="$t('material.song_list.loding_list')" :list="listDetail.list")
     transition(enter-active-class="animated-fast fadeIn" leave-active-class="animated-fast fadeOut")
       div(:class="$style.songListContainer" v-if="!isVisibleListDetail")
@@ -44,7 +44,7 @@
                       use(xlink:href='#icon-right')
           transition(enter-active-class="animated-fast fadeIn" leave-active-class="animated-fast fadeOut")
             div(v-show="!listData.list.length" :class="$style.noitem")
-              p {{$t('material.song_list.loding_list')}}
+              p {{$t('view.song_list.loding_list')}}
     material-download-modal(:show="isShowDownload" :musicInfo="musicInfo" @select="handleAddDownload" @close="isShowDownload = false")
     material-download-multiple-modal(:show="isShowDownloadMultiple" :list="selectdData" @select="handleAddDownloadMultiple" @close="isShowDownloadMultiple = false")
     material-list-add-modal(:show="isShowListAdd" :musicInfo="musicInfo" @close="isShowListAdd = false")