refactor(locales): fix locales errors (#5080)

.yarn/patches/app-builder-lib-npm-26.0.13-a064c9e1d0.patch

@@ -0,0 +1,92 @@
+diff --git a/out/electron/ElectronFramework.js b/out/electron/ElectronFramework.js
+index 5a4b4546870ee9e770d5a50d79790d39baabd268..3f0ac05dfd6bbaeaf5f834341a823718bd10f55c 100644
+--- a/out/electron/ElectronFramework.js
++++ b/out/electron/ElectronFramework.js
+@@ -55,26 +55,27 @@ async function removeUnusedLanguagesIfNeeded(options) {
+     if (!wantedLanguages.length) {
+         return;
+     }
+-    const { dir, langFileExt } = getLocalesConfig(options);
++    const { dirs, langFileExt } = getLocalesConfig(options);
+     // noinspection SpellCheckingInspection
+-    await (0, tiny_async_pool_1.default)(builder_util_1.MAX_FILE_REQUESTS, await (0, fs_extra_1.readdir)(dir), async (file) => {
+-        if (!file.endsWith(langFileExt)) {
++    const deletedFiles = async (dir) => {
++        await (0, tiny_async_pool_1.default)(builder_util_1.MAX_FILE_REQUESTS, await (0, fs_extra_1.readdir)(dir), async (file) => {
++            if (!file.endsWith(langFileExt)) {
++                return;
++            }
++            const language = file.substring(0, file.length - langFileExt.length);
++            if (!wantedLanguages.includes(language)) {
++                return fs.rm(path.join(dir, file), { recursive: true, force: true });
++            }
+             return;
+-        }
+-        const language = file.substring(0, file.length - langFileExt.length);
+-        if (!wantedLanguages.includes(language)) {
+-            return fs.rm(path.join(dir, file), { recursive: true, force: true });
+-        }
+-        return;
+-    });
++        });
++    };
++    await Promise.all(dirs.map(deletedFiles));
+     function getLocalesConfig(options) {
+         const { appOutDir, packager } = options;
+         if (packager.platform === index_1.Platform.MAC) {
+-            return { dir: packager.getResourcesDir(appOutDir), langFileExt: ".lproj" };
+-        }
+-        else {
+-            return { dir: path.join(packager.getResourcesDir(appOutDir), "..", "locales"), langFileExt: ".pak" };
++            return { dirs: [packager.getResourcesDir(appOutDir), packager.getMacOsElectronFrameworkResourcesDir(appOutDir)], langFileExt: ".lproj" };
+         }
++        return { dirs: [path.join(packager.getResourcesDir(appOutDir), "..", "locales")], langFileExt: ".pak" };
+     }
+ }
+ class ElectronFramework {
+diff --git a/out/node-module-collector/index.d.ts b/out/node-module-collector/index.d.ts
+index 8e808be0fa0d5971b9f9605c8eb88f71630e34b7..1b97dccd8a150a67c4312d2ba4757960e624045b 100644
+--- a/out/node-module-collector/index.d.ts
++++ b/out/node-module-collector/index.d.ts
+@@ -2,6 +2,6 @@ import { NpmNodeModulesCollector } from "./npmNodeModulesCollector";
+ import { PnpmNodeModulesCollector } from "./pnpmNodeModulesCollector";
+ import { detect, PM, getPackageManagerVersion } from "./packageManager";
+ import { NodeModuleInfo } from "./types";
+-export declare function getCollectorByPackageManager(rootDir: string): Promise<NpmNodeModulesCollector | PnpmNodeModulesCollector>;
++export declare function getCollectorByPackageManager(rootDir: string): Promise<PnpmNodeModulesCollector | NpmNodeModulesCollector>;
+ export declare function getNodeModules(rootDir: string): Promise<NodeModuleInfo[]>;
+ export { detect, getPackageManagerVersion, PM };
+diff --git a/out/platformPackager.d.ts b/out/platformPackager.d.ts
+index 2df1ba2725c54c7b0e8fed67ab52e94f0cdb17bc..c7ff756564cfd216d2c7d8f72f367527010c06f9 100644
+--- a/out/platformPackager.d.ts
++++ b/out/platformPackager.d.ts
+@@ -67,6 +67,7 @@ export declare abstract class PlatformPackager<DC extends PlatformSpecificBuildO
+     getElectronSrcDir(dist: string): string;
+     getElectronDestinationDir(appOutDir: string): string;
+     getResourcesDir(appOutDir: string): string;
++    getMacOsElectronFrameworkResourcesDir(appOutDir: string): string;
+     getMacOsResourcesDir(appOutDir: string): string;
+     private checkFileInPackage;
+     private sanityCheckPackage;
+diff --git a/out/platformPackager.js b/out/platformPackager.js
+index 6f799ce0d1cdb5f0b18a9c8187b2db84b3567aa9..879248e6c6786d3473e1a80e3930d3a8d0190aab 100644
+--- a/out/platformPackager.js
++++ b/out/platformPackager.js
+@@ -465,12 +465,13 @@ class PlatformPackager {
+         if (this.platform === index_1.Platform.MAC) {
+             return this.getMacOsResourcesDir(appOutDir);
+         }
+-        else if ((0, Framework_1.isElectronBased)(this.info.framework)) {
++        if ((0, Framework_1.isElectronBased)(this.info.framework)) {
+             return path.join(appOutDir, "resources");
+         }
+-        else {
+-            return appOutDir;
+-        }
++        return appOutDir;
++    }
++    getMacOsElectronFrameworkResourcesDir(appOutDir) {
++        return path.join(appOutDir, `${this.appInfo.productFilename}.app`, "Contents", "Frameworks", "Electron Framework.framework", "Resources");
+     }
+     getMacOsResourcesDir(appOutDir) {
+         return path.join(appOutDir, `${this.appInfo.productFilename}.app`, "Contents", "Resources");

electron-builder.yml

@@ -3,9 +3,12 @@ productName: Cherry Studio
 electronLanguages:
   - zh-CN
   - zh-TW
-  - en-GB
   - en-US
-  - ru-RU
+  - ja # macOS/linux/win
+  - ru # macOS/linux/win
+  - zh_CN # for macOS
+  - zh_TW # for macOS
+  - en # for macOS
 directories:
   buildResources: build
 files:

package.json

@@ -206,7 +206,8 @@
     "node-gyp": "^9.1.0",
     "libsql@npm:^0.4.4": "patch:libsql@npm%3A0.4.7#~/.yarn/patches/libsql-npm-0.4.7-444e260fb1.patch",
     "openai@npm:^4.77.0": "patch:openai@npm%3A4.87.3#~/.yarn/patches/openai-npm-4.87.3-2b30a7685f.patch",
-    "pkce-challenge@npm:^4.1.0": "patch:pkce-challenge@npm%3A4.1.0#~/.yarn/patches/pkce-challenge-npm-4.1.0-fbc51695a3.patch"
+    "pkce-challenge@npm:^4.1.0": "patch:pkce-challenge@npm%3A4.1.0#~/.yarn/patches/pkce-challenge-npm-4.1.0-fbc51695a3.patch",
+    "app-builder-lib@npm:26.0.13": "patch:app-builder-lib@npm%3A26.0.13#~/.yarn/patches/app-builder-lib-npm-26.0.13-a064c9e1d0.patch"
   },
   "packageManager": "yarn@4.6.0",
   "lint-staged": {

scripts/after-pack.js

@@ -1,10 +1,8 @@
 const { Arch } = require('electron-builder')
-const { default: removeLocales } = require('./remove-locales')
 const fs = require('fs')
 const path = require('path')
 
 exports.default = async function (context) {
-  await removeLocales(context)
   const platform = context.packager.platform.name
   const arch = context.arch
 

scripts/remove-locales.js

@@ -1,58 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-
-exports.default = async function (context) {
-  const platform = context.packager.platform.name
-
-  // 根据平台确定 locales 目录位置
-  let resourceDirs = []
-  if (platform === 'mac') {
-    // macOS 的语言文件位置
-    resourceDirs = [
-      path.join(context.appOutDir, 'Cherry Studio.app', 'Contents', 'Resources'),
-      path.join(
-        context.appOutDir,
-        'Cherry Studio.app',
-        'Contents',
-        'Frameworks',
-        'Electron Framework.framework',
-        'Resources'
-      )
-    ]
-  } else {
-    // Windows 和 Linux 的语言文件位置
-    resourceDirs = [path.join(context.appOutDir, 'locales')]
-  }
-
-  // 处理每个资源目录
-  for (const resourceDir of resourceDirs) {
-    if (!fs.existsSync(resourceDir)) {
-      console.log(`Resource directory not found: ${resourceDir}, skipping...`)
-      continue
-    }
-
-    // 读取所有文件和目录
-    const items = fs.readdirSync(resourceDir)
-
-    // 遍历并删除不需要的语言文件
-    for (const item of items) {
-      if (platform === 'mac') {
-        // 在 macOS 上检查 .lproj 目录
-        if (item.endsWith('.lproj') && !item.match(/^(en|zh|ru)/)) {
-          const dirPath = path.join(resourceDir, item)
-          fs.rmSync(dirPath, { recursive: true, force: true })
-          console.log(`Removed locale directory: ${item} from ${resourceDir}`)
-        }
-      } else {
-        // 其他平台处理 .pak 文件
-        if (!item.match(/^(en|zh|ru)/)) {
-          const filePath = path.join(resourceDir, item)
-          fs.unlinkSync(filePath)
-          console.log(`Removed locale file: ${item} from ${resourceDir}`)
-        }
-      }
-    }
-  }
-
-  console.log('Locale cleanup completed!')
-}

yarn.lock

@@ -4632,6 +4632,50 @@ __metadata:
   languageName: node
   linkType: hard
 
+"app-builder-lib@patch:app-builder-lib@npm%3A26.0.13#~/.yarn/patches/app-builder-lib-npm-26.0.13-a064c9e1d0.patch":
+  version: 26.0.13
+  resolution: "app-builder-lib@patch:app-builder-lib@npm%3A26.0.13#~/.yarn/patches/app-builder-lib-npm-26.0.13-a064c9e1d0.patch::version=26.0.13&hash=ba34e0"
+  dependencies:
+    "@develar/schema-utils": "npm:~2.6.5"
+    "@electron/asar": "npm:3.2.18"
+    "@electron/fuses": "npm:^1.8.0"
+    "@electron/notarize": "npm:2.5.0"
+    "@electron/osx-sign": "npm:1.3.1"
+    "@electron/rebuild": "npm:3.7.2"
+    "@electron/universal": "npm:2.0.1"
+    "@malept/flatpak-bundler": "npm:^0.4.0"
+    "@types/fs-extra": "npm:9.0.13"
+    async-exit-hook: "npm:^2.0.1"
+    builder-util: "npm:26.0.13"
+    builder-util-runtime: "npm:9.3.2"
+    chromium-pickle-js: "npm:^0.2.0"
+    config-file-ts: "npm:0.2.8-rc1"
+    debug: "npm:^4.3.4"
+    dotenv: "npm:^16.4.5"
+    dotenv-expand: "npm:^11.0.6"
+    ejs: "npm:^3.1.8"
+    electron-publish: "npm:26.0.13"
+    fs-extra: "npm:^10.1.0"
+    hosted-git-info: "npm:^4.1.0"
+    is-ci: "npm:^3.0.0"
+    isbinaryfile: "npm:^5.0.0"
+    js-yaml: "npm:^4.1.0"
+    json5: "npm:^2.2.3"
+    lazy-val: "npm:^1.0.5"
+    minimatch: "npm:^10.0.0"
+    plist: "npm:3.1.0"
+    resedit: "npm:^1.7.0"
+    semver: "npm:^7.3.8"
+    tar: "npm:^6.1.12"
+    temp-file: "npm:^3.4.0"
+    tiny-async-pool: "npm:1.3.0"
+  peerDependencies:
+    dmg-builder: 26.0.13
+    electron-builder-squirrel-windows: 26.0.13
+  checksum: 10c0/4a84db5f93398e0004a5b7138ca62ddb36d5c7281703fc42471d77601ecd17c3e6d77678ae799098d3a9457af1a852e1949cc942db4dd8eaf899d5bfc2151339
+  languageName: node
+  linkType: hard
+
 "applescript@npm:^1.0.0":
   version: 1.0.0
   resolution: "applescript@npm:1.0.0"