Merge pull request #281 from penguin-statistics/hotfix-1.1.9

Hotfix 1.1.9
penguin-statistics · Apr 23, 2020 · 7818c93 · 7818c93 · vercel · Apr 23, 2020
2 parents 037a190 + f269b1e
commit 7818c93
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 17 deletions.
diff --git a/src/components/drawer/LocaleSwitcher.vue b/src/components/drawer/LocaleSwitcher.vue
@@ -67,6 +67,11 @@
           this.busy = localeId
           setTimeout(() => {
             this.changeLocale(localeId, true)
+            this.$ga.event(
+              'settings',
+              'language',
+              localeId
+            )
             this.$nextTick(function () {
               this.busy = null
             })

diff --git a/src/components/drawer/ThemeSwitcher.vue b/src/components/drawer/ThemeSwitcher.vue
@@ -45,6 +45,11 @@
         },
         set (value) {
           this.$store.commit('settings/switchDark', value)
+          this.$ga.event(
+            'settings',
+            'theme',
+            value
+          )
         }
       },
       themes () {

diff --git a/src/components/global/MirrorSelector.vue b/src/components/global/MirrorSelector.vue
@@ -142,7 +142,9 @@
       }
     },
     created () {
-      if (!this.ignoreNotification) {
+      if (this.ignoreNotification) {
+        Console.info("MirrorSelector", "ignored notification")
+      } else {
         external.geoip()
           .then(({data}) => {
             Console.info("MirrorSelector", "successfully retrived geoip info", data)
@@ -156,14 +158,23 @@
               (!this.isCNMirror && this.mirror === "cn")
             ) {
               this.enabled = true
+              this.$ga.event(
+                'mirror',
+                'notification',
+                'opened',
+                this.mirror
+              )
             }
             Console.info("MirrorSelector", "current mirror:", this.mirror, "| popup?", this.enabled)
           })
           .catch((err) => {
+            this.$ga.event(
+              'mirror',
+              'notification',
+              'getIpFailed'
+            )
             Console.warn("MirrorSelector", "failed to get geoip information", err)
           })
-      } else {
-        Console.info("MirrorSelector", "ignored notification")
       }
     },
     methods: {

diff --git a/src/locales/zh.json b/src/locales/zh.json
@@ -146,10 +146,10 @@
   },
   "mirrors": {
     "global": {
-      "notification": "推荐使用海外镜像站 {0} 以获得更高访问速度"
+      "notification": "推荐使用海外镜像站 {0}，可以提升访问速度哦！"
     },
     "cn": {
-      "notification": "推荐使用国内镜像站 {0} 以获得更高访问速度"
+      "notification": "推荐使用国内镜像站 {0}，可以提升访问速度哦！"
     },
     "_notification": {
       "ignore": {

diff --git a/src/views/About/Bulletin.vue b/src/views/About/Bulletin.vue
@@ -2,30 +2,30 @@
   {
     "zh": {
       "bulletin": [
-        "1月16日海外版正式上线，为了避免数据混淆，请只上传国服的掉落。",
-        "专用于海外版的素材统计站是否开放正在计划中。",
-        "全站翻译已经完成，感谢Syaro和方舟航海図的帮助！"
+        "为了优化国内和海外的访问速度，我们建立了相应的镜像站，推荐各位博士根据所处地理位置进行选择。（如果您拥有本站的ID，更换镜像后请重新登录）",
+        "国内：penguin-stats.cn",
+        "国际：penguin-stats.io"
       ]
     },
     "en": {
       "bulletin": [
-        "Arknights EN server was officially released on 1/16. In order to not mess up the current data, please only submit drop data from the CN server.",
-        "We are considering whether to open another website for overseas servers.",
-        "The translation of the entire website has been finished. Thanks to Syaro and 方舟航海図 for their efforts!"
+        "In order to increase the site speed, we built up two mirror websites. Please select the corresponding mirror according to your geographical location. (If you have Penguin Statistics user ID, you need to re-login after you switch to another mirror site)",
+        "China: penguin-stats.cn",
+        "Global: penguin-stats.io"
       ]
     },
     "ja": {
       "bulletin": [
-        "1月16日に海外版が正式にリリースされます。データの混雑を避けるために、当サイトでは大陸版のドロップデータのみをアップロードして下さい。",
-        "海外版のドロップまとめサイトを開設するかは現時点では思案中のみとなっています。",
-        "Webサイトの翻訳は全て完了しました。Syaroと方舟航海図のご協力に感謝します！"
+        "In order to increase the site speed, we built up two mirror websites. Please select the corresponding mirror according to your geographical location. (If you have Penguin Statistics user ID, you need to re-login after you switch to another mirror site)",
+        "China: penguin-stats.cn",
+        "Global: penguin-stats.io"
       ]
     },
     "ko": {
       "bulletin": [
-        "명일방주 해외서버가 1/16일에 오픈하였습니다. 데이터의 혼란을 방지하기 위해, 중국 서버의 보고서만 작성하여 주십시오.",
-        "저희는 해외서버를 위한 웹 사이트 개설을 검토하고 있습니다.",
-        "웹 사이트 전체의 번역이 끝났습니다. Syaro님과 方舟航海図님의 노력에 감사드립니다!"
+        "In order to increase the site speed, we built up two mirror websites. Please select the corresponding mirror according to your geographical location. (If you have Penguin Statistics user ID, you need to re-login after you switch to another mirror site)",
+        "China: penguin-stats.cn",
+        "Global: penguin-stats.io"
       ]
     }
   }