fix: { Git(_G) => &Git }

JimLyu · Feb 19, 2022 · c38f701 · c38f701
1 parent 0659881
commit c38f701
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/lib/build/properties-replace.ts b/lib/build/properties-replace.ts
@@ -8,6 +8,7 @@ import { async as FastGlob } from '@bluelovers/fast-glob/bluebird';
 import { outputJSON } from 'fs-extra';
 import { createSingleBar } from '../cli-progress';
 import { textIncludeCJK } from '../util/include-cjk';
+import { sortObjectKeys } from 'sort-object-keys2';
 
 export const LAZY_PROPERTIES = new DotProperties({
 	file: __dict_properties_lazy,
@@ -97,6 +98,10 @@ export function replaceProperties(lang: string | 'zh')
 				})
 				.tap(() =>
 				{
+					sortObjectKeys(maybeRecord, {
+						useSource: true,
+					});
+
 					return Promise.all([
 						outputJSON(join(__plugin_dev_raw_dir, lang + '.list.properties.changed.json'), changedList, {
 							spaces: 2,

diff --git a/lib/static/lazy.properties b/lib/static/lazy.properties
@@ -36,3 +36,6 @@ uninstalling.air.runtime=正在解除安裝 AIR 運行時
 yeoman.generators.dialog.uninstall.generator=解除安裝生成器
 yeoman.generators.prompt.uninstall=確實要解除安裝生成器 ''{0}'' 嗎？
 yeoman.generators.prompt.uninstall.title=Yeoman 生成器解除安裝
+group.Git.Menu.text=&Git
+group.Git.ContextMenu.text=&Git
+git4idea.vcs.name.with.mnemonic=&Git
diff --git a/plugin-dev-raw/zh.list.properties.maybe.json b/plugin-dev-raw/zh.list.properties.maybe.json
@@ -618,14 +618,14 @@
     "gauge.manifest.json.schema": "Gauge 1.0 Manifest"
   },
   "messages/GitBundle.properties": {
-    "git4idea.vcs.name.with.mnemonic": "Git(_G)",
+    "git4idea.vcs.name.with.mnemonic": "&Git",
     "abort.operation.indicator.text": "git {0} --abort{1}",
     "errors.message.item": "\n{0}",
     "local.changes.freeze.message.git.operation.prefix": "Git {0}",
     "init.warning.title": "Git Init",
     "git.add.to.exclude.file.action.text": ".git/info/exclude",
-    "group.Git.ContextMenu.text": "Git(_G)",
-    "group.Git.Menu.text": "Git(_G)",
+    "group.Git.ContextMenu.text": "&Git",
+    "group.Git.Menu.text": "&Git",
     "action.Git.Fixup.To.Commit.text": "Fixup…",
     "push.rejected.merge": "&Merge",
     "git.light.status.bar.text": "Git: {0}",

diff --git a/scripts/plugin-build-install-file.ts b/scripts/plugin-build-install-file.ts
@@ -17,10 +17,4 @@ import { mergePaths } from '../lib/merge-paths';
 import { getBuildFileList } from '../lib/get-build-file-list';
 import { packPluginJar } from '../lib/build/pack-plugin-jar';
 
-export default FastGlob<string>([
-	'*',
-	'!*.list.json',
-], {
-	cwd: __plugin_downloaded_dir_unzip,
-	onlyDirectories: true,
-}).mapSeries(packPluginJar);
+export default packPluginJar('zh');