From a9c037e69cd8c7a1ab902ca58afd2e5cf504a665 Mon Sep 17 00:00:00 2001 From: umbor <14857490+umbors@users.noreply.github.com> Date: Mon, 12 Jun 2023 13:08:36 +0800 Subject: [PATCH] Remove unplugin-vue-i18n and change language file format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 去除unplugin-vue-i18n,语言文件改为json格式,把i18n-ally的localespaths设置为"src/locales/lang"就可以用。缺少downloader及calendar及format问题也一并修改。 --- webui/package.json | 1 - webui/pnpm-lock.yaml | 166 +----------------- webui/src/components/ab-add-bangumi.vue | 6 +- webui/src/components/ab-change-account.vue | 10 +- webui/src/components/ab-edit-rule.vue | 45 +++-- webui/src/components/ab-rule.vue | 2 +- webui/src/components/ab-status-bar.vue | 4 +- webui/src/components/layout/ab-sidebar.vue | 8 +- webui/src/components/layout/ab-topbar.vue | 11 +- .../components/setting/config-download.vue | 2 +- .../src/components/setting/config-manage.vue | 2 +- .../src/components/setting/config-normal.vue | 4 +- .../setting/config-notification.vue | 10 +- .../src/components/setting/config-parser.vue | 2 +- webui/src/components/setting/config-proxy.vue | 2 +- webui/src/locales/index.ts | 34 ++-- webui/src/locales/lang/en-US.json | 132 ++++++++++++++ webui/src/locales/lang/en-US.yaml | 127 -------------- webui/src/locales/lang/zh-CN.json | 132 ++++++++++++++ webui/src/locales/lang/zh-CN.yaml | 126 ------------- webui/src/pages/index.vue | 11 +- webui/src/pages/index/bangumi.vue | 2 +- webui/src/pages/index/config.vue | 20 ++- webui/src/pages/index/log.vue | 32 ++-- webui/src/pages/index/player.vue | 8 +- webui/src/pages/login.vue | 6 +- webui/vite.config.ts | 5 - 27 files changed, 394 insertions(+), 516 deletions(-) create mode 100644 webui/src/locales/lang/en-US.json delete mode 100644 webui/src/locales/lang/en-US.yaml create mode 100644 webui/src/locales/lang/zh-CN.json delete mode 100644 webui/src/locales/lang/zh-CN.yaml diff --git a/webui/package.json b/webui/package.json index b28cbbe6..ab19d880 100644 --- a/webui/package.json +++ b/webui/package.json @@ -30,7 +30,6 @@ "devDependencies": { "@antfu/eslint-config": "^0.38.6", "@icon-park/vue-next": "^1.4.2", - "@intlify/unplugin-vue-i18n": "^0.11.0", "@storybook/addon-essentials": "^7.0.12", "@storybook/addon-interactions": "^7.0.12", "@storybook/addon-links": "^7.0.12", diff --git a/webui/pnpm-lock.yaml b/webui/pnpm-lock.yaml index c8904dd0..a26fb05d 100644 --- a/webui/pnpm-lock.yaml +++ b/webui/pnpm-lock.yaml @@ -40,9 +40,6 @@ devDependencies: '@icon-park/vue-next': specifier: ^1.4.2 version: 1.4.2(vue@3.3.4) - '@intlify/unplugin-vue-i18n': - specifier: ^0.11.0 - version: 0.11.0(vue-i18n@9.2.2) '@storybook/addon-essentials': specifier: ^7.0.12 version: 7.0.12(react-dom@18.2.0)(react@18.2.0) @@ -1850,31 +1847,6 @@ packages: - supports-color dev: true - /@intlify/bundle-utils@6.0.1(vue-i18n@9.2.2): - resolution: {integrity: sha512-BkeZNKZiC0B7K3OYMwiPLoAqsZmKH3SxTL75vYAkuQ//XWR8WO0NpfjXhTxgLTVFHxMcNb2agAopC0DP6fqDrg==} - engines: {node: '>= 14.16'} - peerDependencies: - petite-vue-i18n: '*' - vue-i18n: '*' - peerDependenciesMeta: - petite-vue-i18n: - optional: true - vue-i18n: - optional: true - dependencies: - '@intlify/message-compiler': 9.3.0-beta.17 - '@intlify/shared': 9.3.0-beta.17 - acorn: 8.8.2 - escodegen: 2.0.0 - estree-walker: 2.0.2 - jsonc-eslint-parser: 1.4.1 - magic-string: 0.30.0 - mlly: 1.2.1 - source-map: 0.6.1 - vue-i18n: 9.2.2(vue@3.3.4) - yaml-eslint-parser: 0.3.2 - dev: true - /@intlify/core-base@9.2.2: resolution: {integrity: sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==} engines: {node: '>= 14'} @@ -1883,12 +1855,14 @@ packages: '@intlify/message-compiler': 9.2.2 '@intlify/shared': 9.2.2 '@intlify/vue-devtools': 9.2.2 + dev: false /@intlify/devtools-if@9.2.2: resolution: {integrity: sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==} engines: {node: '>= 14'} dependencies: '@intlify/shared': 9.2.2 + dev: false /@intlify/message-compiler@9.2.2: resolution: {integrity: sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==} @@ -1896,56 +1870,12 @@ packages: dependencies: '@intlify/shared': 9.2.2 source-map: 0.6.1 - - /@intlify/message-compiler@9.3.0-beta.17: - resolution: {integrity: sha512-i7hvVIRk1Ax2uKa9xLRJCT57to08OhFMhFXXjWN07rmx5pWQYQ23MfX1xgggv9drnWTNhqEiD+u4EJeHoS5+Ww==} - engines: {node: '>= 14'} - dependencies: - '@intlify/shared': 9.3.0-beta.17 - source-map: 0.6.1 - dev: true + dev: false /@intlify/shared@9.2.2: resolution: {integrity: sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==} engines: {node: '>= 14'} - - /@intlify/shared@9.3.0-beta.17: - resolution: {integrity: sha512-mscf7RQsUTOil35jTij4KGW1RC9SWQjYScwLxP53Ns6g24iEd5HN7ksbt9O6FvTmlQuX77u+MXpBdfJsGqizLQ==} - engines: {node: '>= 14'} - dev: true - - /@intlify/unplugin-vue-i18n@0.11.0(vue-i18n@9.2.2): - resolution: {integrity: sha512-ivcLZo08fvepHWV8o5lcKfhcKFSWqhwrqIAU6pUIbvq2ICo9fnXnIPYIZj7FeuHDLW1G3ADm44ZhQC3nYmvDlg==} - engines: {node: '>= 14.16'} - peerDependencies: - petite-vue-i18n: '*' - vue-i18n: '*' - vue-i18n-bridge: '*' - peerDependenciesMeta: - petite-vue-i18n: - optional: true - vue-i18n: - optional: true - vue-i18n-bridge: - optional: true - dependencies: - '@intlify/bundle-utils': 6.0.1(vue-i18n@9.2.2) - '@intlify/shared': 9.3.0-beta.17 - '@rollup/pluginutils': 5.0.2 - '@vue/compiler-sfc': 3.3.4 - debug: 4.3.4 - fast-glob: 3.2.12 - js-yaml: 4.1.0 - json5: 2.2.3 - pathe: 1.1.0 - picocolors: 1.0.0 - source-map: 0.6.1 - unplugin: 1.3.1 - vue-i18n: 9.2.2(vue@3.3.4) - transitivePeerDependencies: - - rollup - - supports-color - dev: true + dev: false /@intlify/vue-devtools@9.2.2: resolution: {integrity: sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==} @@ -1953,6 +1883,7 @@ packages: dependencies: '@intlify/core-base': 9.2.2 '@intlify/shared': 9.2.2 + dev: false /@istanbuljs/load-nyc-config@1.1.0: resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==} @@ -3838,14 +3769,6 @@ packages: negotiator: 0.6.3 dev: true - /acorn-jsx@5.3.2(acorn@7.4.1): - resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} - peerDependencies: - acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 - dependencies: - acorn: 7.4.1 - dev: true - /acorn-jsx@5.3.2(acorn@8.8.2): resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: @@ -5127,19 +5050,6 @@ packages: engines: {node: '>=12'} dev: true - /escodegen@2.0.0: - resolution: {integrity: sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==} - engines: {node: '>=6.0'} - hasBin: true - dependencies: - esprima: 4.0.1 - estraverse: 5.3.0 - esutils: 2.0.3 - optionator: 0.8.3 - optionalDependencies: - source-map: 0.6.1 - dev: true - /eslint-config-prettier@8.8.0(eslint@8.41.0): resolution: {integrity: sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==} hasBin: true @@ -5525,15 +5435,6 @@ packages: - supports-color dev: true - /espree@6.2.1: - resolution: {integrity: sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==} - engines: {node: '>=6.0.0'} - dependencies: - acorn: 7.4.1 - acorn-jsx: 5.3.2(acorn@7.4.1) - eslint-visitor-keys: 1.3.0 - dev: true - /espree@9.5.2: resolution: {integrity: sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -6775,17 +6676,6 @@ packages: hasBin: true dev: true - /jsonc-eslint-parser@1.4.1: - resolution: {integrity: sha512-hXBrvsR1rdjmB2kQmUjf1rEIa+TqHBGMge8pwi++C+Si1ad7EjZrJcpgwym+QGK/pqTx+K7keFAtLlVNdLRJOg==} - engines: {node: '>=8.10.0'} - dependencies: - acorn: 7.4.1 - eslint-utils: 2.1.0 - eslint-visitor-keys: 1.3.0 - espree: 6.2.1 - semver: 6.3.0 - dev: true - /jsonc-eslint-parser@2.3.0: resolution: {integrity: sha512-9xZPKVYp9DxnM3sd1yAsh/d59iIaswDkai8oTxbursfKYbg/ibjX0IzFt35+VZ8iEW453TVTXztnRvYUQlAfUQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -6843,14 +6733,6 @@ packages: engines: {node: '>=6'} dev: true - /levn@0.3.0: - resolution: {integrity: sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==} - engines: {node: '>= 0.8.0'} - dependencies: - prelude-ls: 1.1.2 - type-check: 0.3.2 - dev: true - /levn@0.4.1: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} engines: {node: '>= 0.8.0'} @@ -7439,18 +7321,6 @@ packages: is-wsl: 2.2.0 dev: true - /optionator@0.8.3: - resolution: {integrity: sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==} - engines: {node: '>= 0.8.0'} - dependencies: - deep-is: 0.1.4 - fast-levenshtein: 2.0.6 - levn: 0.3.0 - prelude-ls: 1.1.2 - type-check: 0.3.2 - word-wrap: 1.2.3 - dev: true - /optionator@0.9.1: resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==} engines: {node: '>= 0.8.0'} @@ -7708,11 +7578,6 @@ packages: picocolors: 1.0.0 source-map-js: 1.0.2 - /prelude-ls@1.1.2: - resolution: {integrity: sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==} - engines: {node: '>= 0.8.0'} - dev: true - /prelude-ls@1.2.1: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} @@ -8802,13 +8667,6 @@ packages: typescript: 4.9.5 dev: true - /type-check@0.3.2: - resolution: {integrity: sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==} - engines: {node: '>= 0.8.0'} - dependencies: - prelude-ls: 1.1.2 - dev: true - /type-check@0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} engines: {node: '>= 0.8.0'} @@ -9425,6 +9283,7 @@ packages: '@intlify/vue-devtools': 9.2.2 '@vue/devtools-api': 6.5.0 vue: 3.3.4 + dev: false /vue-inbrowser-compiler-independent-utils@4.71.1(vue@3.3.4): resolution: {integrity: sha512-K3wt3iVmNGaFEOUR4JIThQRWfqokxLfnPslD41FDZB2ajXp789+wCqJyGYlIFsvEQ2P61PInw6/ph5iiqg51gg==} @@ -9682,14 +9541,6 @@ packages: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} dev: true - /yaml-eslint-parser@0.3.2: - resolution: {integrity: sha512-32kYO6kJUuZzqte82t4M/gB6/+11WAuHiEnK7FreMo20xsCKPeFH5tDBU7iWxR7zeJpNnMXfJyXwne48D0hGrg==} - dependencies: - eslint-visitor-keys: 1.3.0 - lodash: 4.17.21 - yaml: 1.10.2 - dev: true - /yaml-eslint-parser@1.2.2: resolution: {integrity: sha512-pEwzfsKbTrB8G3xc/sN7aw1v6A6c/pKxLAkjclnAyo5g5qOh6eL9WGu0o3cSDQZKrTNk4KL4lQSwZW+nBkANEg==} engines: {node: ^14.17.0 || >=16.0.0} @@ -9699,11 +9550,6 @@ packages: yaml: 2.2.2 dev: true - /yaml@1.10.2: - resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} - engines: {node: '>= 6'} - dev: true - /yaml@2.2.2: resolution: {integrity: sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA==} engines: {node: '>= 14'} diff --git a/webui/src/components/ab-add-bangumi.vue b/webui/src/components/ab-add-bangumi.vue index 0bfa0bc5..5b380ab7 100644 --- a/webui/src/components/ab-add-bangumi.vue +++ b/webui/src/components/ab-add-bangumi.vue @@ -124,9 +124,9 @@ async function subscribe() { >