Recode locale messages with typescript

sheepzh · sheepzh · commit c14d380cc5b8 · 2021-06-06T18:57:24.000+08:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-  - 14
+  - 16
 install:
   - npm install
   - npm install -g jest
diff --git a/src/common/element-plus.ts b/src/common/element-plus.ts
@@ -1,8 +1,9 @@
 // Process locale
-import { locale, Locale } from '../common/vue-i18n'
+import { locale } from '../common/vue-i18n'
 import zhLocale from 'element-plus/lib/locale/lang/zh-cn'
 import enLang from 'element-plus/lib/locale/lang/en'
 import { locale as eleLocale } from 'element-plus'
+import { Locale } from '../locale/constant'
 
 if (locale === Locale.EN) {
     eleLocale(enLang)
diff --git a/src/common/vue-i18n.ts b/src/common/vue-i18n.ts
@@ -1,17 +1,14 @@
 import { VNode } from 'vue'
-import { vueMessages, defaultLocale } from '../locale'
-
-export enum Locale {
-  ZH_CN = 'zh_CN',
-  EN = 'en'
-}
+import messages from '../locale'
+import { defaultLocale, Locale } from '../locale/constant'
 
 // Standardize the locale code according to the Chrome locale code
 const chrome2I18n: { [key: string]: Locale } = {
   'zh-CN': Locale.ZH_CN,
   'zh-TW': Locale.ZH_CN,
   'en-US': Locale.EN,
-  'en-GB': Locale.EN
+  'en-GB': Locale.EN,
+  'ja': Locale.JA
 }
 
 /**
@@ -31,7 +28,7 @@ const chromeLocale2ExtensionLocale = (chromeLocale: string) => {
 
 export const locale = chromeLocale2ExtensionLocale(chrome.i18n.getUILanguage())
 
-const message: any = vueMessages[locale] || {}
+const message: any = messages[locale] || {}
 
 export declare type I18nResultItem = VNode | string
 
diff --git a/src/locale/components/app.ts b/src/locale/components/app.ts
@@ -1,4 +1,13 @@
-module.exports = {
+import { Messages } from "../constant"
+
+export type AppMessage = {
+    name: string
+    marketName: string
+    description: string
+    currentVersion: string
+}
+
+const _default: Messages<AppMessage> = {
     en: {
         name: 'Timer',
         marketName: 'Timer - Running & Browsing Time & Visit count',
@@ -17,4 +26,6 @@ module.exports = {
         description: '最高のオンライン時間統計ツールを作成します。',
         currentVersion: 'バージョン: v{version}'
     }
-}
+}
+
+export default _default
diff --git a/src/locale/components/clear.ts b/src/locale/components/clear.ts
@@ -1,4 +1,29 @@
-module.exports = {
+import { Messages } from "../constant"
+
+export type ClearMessage = {
+    totalMemoryAlert: string
+    usedMemoryAlert: string
+    operationAlert: string
+    filterItems: string
+    filterFocus: string
+    filterTotal: string
+    filterTime: string
+    filterDate: string
+    unlimited: string
+    archiveAlert: string
+    dateShortcut: {
+        tillYesturday: string
+        till7DaysAgo: string
+        till30DaysAgo: string
+    }
+    paramError: string
+    deleteConfirm: string
+    deleteSuccess: string
+    archiveConfirm: string
+    archiveSuccess: string
+}
+
+const _default: Messages<ClearMessage> = {
     zh_CN: {
         totalMemoryAlert: '浏览器为每个扩展提供 {size}MB 来存储本地数据',
         usedMemoryAlert: '当前已使用 {size}MB',
@@ -27,7 +52,7 @@ module.exports = {
         operationAlert: 'You can archive or delete those irrelevant data to reduce memory usage',
         filterItems: 'Filter data',
         filterFocus: 'The browse time of the day is between {start} seconds and {end} seconds.',
-        filterFocus: 'The run time of the day is between {start} seconds and {end} seconds.',
+        filterTotal: 'The run time of the day is between {start} seconds and {end} seconds.',
         filterTime: 'Opens on the day are between {start} and {end}.',
         filterDate: 'Generated between {picker}.',
         unlimited: 'Unlimited',
@@ -65,4 +90,6 @@ module.exports = {
         archiveConfirm: '合計 {count} 個のデータが除外されました。それらはすべてアーカイブされていますか？',
         archiveSuccess: '正常にアーカイブされました'
     }
-}
+}
+
+export default _default
diff --git a/src/locale/components/item.ts b/src/locale/components/item.ts
@@ -1,4 +1,26 @@
-module.exports = {
+import { Messages } from "../constant"
+
+export type ItemMessage = {
+    date: string
+    host: string
+    total: string
+    focus: string
+    time: string
+    operation: {
+        label: string
+        delete: string
+        add2Whitelist: string
+        removeFromWhitelist: string
+        archive: string
+        confirmMsg: string
+        cancelMsg: string
+        deleteConfirmMsgAll: string
+        deleteConfirmMsgRange: string
+        deleteConfirmMsg: string
+    }
+}
+
+const _default: Messages<ItemMessage> = {
     zh_CN: {
         date: '日期',
         host: '域名',
@@ -56,4 +78,6 @@ module.exports = {
             deleteConfirmMsg: '{date} の {url} の訪問記録は削除されます'
         }
     }
-}
+}
+
+export default _default
diff --git a/src/locale/components/menu.ts b/src/locale/components/menu.ts
@@ -1,4 +1,13 @@
-module.exports = {
+import { Messages } from "../constant"
+
+export type MenuMessage = {
+    data: string
+    dataReport: string
+    dataHistory: string
+    dataClear: string
+    setting: string
+}
+const _default: Messages<MenuMessage> = {
     zh_CN: {
         data: '我的数据',
         dataReport: '报表明细',
@@ -20,4 +29,6 @@ module.exports = {
         dataClear: '記憶状況',
         setting: '拡張設定',
     }
-}
+}
+
+export default _default
diff --git a/src/locale/components/message.ts b/src/locale/components/message.ts
@@ -1,32 +1,35 @@
-module.exports = {
+import { Messages } from "../constant"
+
+export type MsgMessage = {
+    openTimesConsoleLog: string
+    usedTimeInConsoleLog: string
+    timeWithHour: string
+    timeWithMinute: string
+    timeWithSecond: string
+}
+const _default: Messages<MsgMessage> = {
     zh_CN: {
         openTimesConsoleLog: '今天您打开了 {time} 次 {host}。',
         usedTimeInConsoleLog: '它今天在您的电脑上运行了 {total}，其中您花费了 {focus}来浏览它。',
         timeWithHour: '{hour} 小时 {minute} 分 {second} 秒',
         timeWithMinute: '{minute} 分 {second} 秒',
         timeWithSecond: '{second} 秒',
-        updateNotification: '版本已更新，需要您授权将新功能应用到所有页面。',
-        updateNotificationForFirefox: '版本已更新，你需要重启浏览器来适应新功能。',
-        notificationGrant: '授权'
+
     },
     en: {
         openTimesConsoleLog: 'You have open {host} for {time} time(s) today.',
         usedTimeInConsoleLog: 'And it rans on your PC for {total} today, and is browsed for {focus}.',
         timeWithHour: '{hour} hour(s) {minute} minute(s) {second} second(s)',
         timeWithMinute: '{minute} minute(s) {second} second(s)',
         timeWithSecond: '{second} second(s)',
-        updateNotification: 'The extension updated and requires authorization to apply the new features to all pages.',
-        updateNotificationForFirefox: 'The extension updated and requires relaunch to apply the new features to all pages.',
-        notificationGrant: 'OK, I GRANT'
     },
     ja: {
         openTimesConsoleLog: '今日、あなたは {host} を {time} 回開きました。',
         usedTimeInConsoleLog: 'それは今日あなたのコンピュータで {total} 実行されました、そのうちあなたはそれを閲覧するために {focus} を費やしました。',
         timeWithHour: '{hour} 時間 {minute} 分 {second} 秒',
         timeWithMinute: '{minute} 分 {second} 秒',
         timeWithSecond: '{second} 秒',
-        updateNotification: 'バージョンが更新されており、すべてのページに新機能を適用するには承認が必要です。',
-        updateNotificationForFirefox: 'バージョンが更新されました。新しい機能に適応するには、ブラウザを再起動する必要があります。',
-        notificationGrant: '承認'
     }
-}
+}
+
+export default _default
diff --git a/src/locale/components/popup.ts b/src/locale/components/popup.ts
@@ -1,4 +1,16 @@
-module.exports = {
+import { Messages } from "../constant"
+
+export type PopupMessage = {
+    title: string
+    mergeDomainLabel: string
+    viewMore: string
+    fileName: string
+    saveAsImageTitle: string
+    totalTime: string
+    totalCount: string
+    otherLabel: string
+}
+const _default: Messages<PopupMessage> = {
     zh_CN: {
         title: '今日数据',
         mergeDomainLabel: '合并子域名',
@@ -29,4 +41,6 @@ module.exports = {
         totalCount: '合計 {totalCount} 回',
         otherLabel: 'その他'
     }
-}
+}
+
+export default _default
diff --git a/src/locale/components/report.ts b/src/locale/components/report.ts
@@ -1,4 +1,23 @@
-module.exports = {
+import { Messages } from "../constant"
+
+export type ReportMessage = {
+    title: string
+    startDate: string
+    endDate: string
+    latestWeek: string
+    latest30Days: string
+    today: string
+    yesterday: string
+    mergeDate: string
+    mergeDomain: string
+    displayBySecond: string
+    hostPlaceholder: string
+    exportFileName: string
+    added2Whitelist: string
+    removeFromWhitelist: string
+}
+
+const _default: Messages<ReportMessage> = {
     zh_CN: {
         title: '数据统计',
         startDate: '开始日期',
@@ -47,4 +66,6 @@ module.exports = {
         added2Whitelist: 'ホワイトリストに正常に追加されました',
         removeFromWhitelist: 'ホワイトリストから正常に削除されました'
     }
-}
+}
+
+export default _default
diff --git a/src/locale/components/setting.ts b/src/locale/components/setting.ts
@@ -1,4 +1,43 @@
-module.exports = {
+import { Messages } from "../constant"
+
+type WhitelistMessage = {
+    label: string
+    addConfirmMsg: string
+    removeConfirmMsg: string
+    duplicateMsg: string
+    infoAlert: string
+}
+
+type MergeMessage = {
+    label: string
+    resultOfOrigin: string
+    resultOfLevel: string
+    removeConfirmMsg: string
+    originPlaceholder: string
+    mergedPlaceholder: string
+    errorOrigin: string
+    duplicateMsg: string
+    addConfirmMsg: string
+    infoAlertTitle: string
+    infoAlert0: string
+    infoAlert1: string
+    infoAlert2: string
+    infoAlert3: string
+    infoAlert4: string
+    infoAlert5: string
+}
+export type SettingMessage = {
+    whitelist: WhitelistMessage
+    merge: MergeMessage
+    confirmTitle: string
+    successMsg: string
+    scoreRequest: string
+    issueRequest: string
+    newOne: string
+    save: string
+}
+
+const _default: Messages<SettingMessage> = {
     zh_CN: {
         whitelist: {
             label: '白名单',
@@ -98,4 +137,6 @@ module.exports = {
         newOne: '追加',
         save: '保存'
     }
-}
+}
+
+export default _default
diff --git a/src/locale/components/trender.ts b/src/locale/components/trender.ts
@@ -1,4 +1,21 @@
-module.exports = {
+import { Messages } from "../constant"
+
+export type TrenderMessage = {
+    hostPlaceholder: string
+    startDate: string,
+    endDate: string
+    latestWeek: string
+    latest15Days: string
+    latest30Days: string
+    latest90Days: string
+    history: {
+        title: string
+        timeUnit: string
+        numberUnit: string
+    }
+}
+
+const _default: Messages<TrenderMessage> = {
     zh_CN: {
         hostPlaceholder: '输入并选择域名',
         startDate: '开始日期',
@@ -41,4 +58,6 @@ module.exports = {
             numberUnit: '回'
         }
     }
-}
+}
+
+export default _default
diff --git a/src/locale/constant.ts b/src/locale/constant.ts
diff --git a/src/locale/index.js b/src/locale/index.js
diff --git a/src/locale/index.ts b/src/locale/index.ts
diff --git a/src/manifest.js b/src/manifest.js
diff --git a/webpack/plugins/generate-locale-for-chrome.js b/webpack/plugins/generate-locale-for-chrome.js
diff --git a/webpack/webpack.base.js b/webpack/webpack.base.js
