Merge pull request #120 from Ashuaidehao/feature-upgrade

upgrade
neo-ngd · Jul 20, 2021 · 5c3e7ea · 5c3e7ea
2 parents e214565 + 72fb266
commit 5c3e7ea
Show file tree

Hide file tree

Showing 18 changed files with 1,041 additions and 669 deletions.
diff --git a/neo b/neo
diff --git a/neo3-gui/neo3-gui/ClientApp/.vscode/settings.json b/neo3-gui/neo3-gui/ClientApp/.vscode/settings.json
@@ -1,5 +1,10 @@
 {
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "javascript.autoImports": false,
-    "react-i18n.i18nPaths": "build\\locales,public\\locales,build-electron\\win-unpacked\\locales,build-electron\\win-unpacked\\resources\\app.asar\\build\\locales"
+    "react-i18n.i18nPaths": "build\\locales,public\\locales,build-electron\\win-unpacked\\locales,build-electron\\win-unpacked\\resources\\app.asar\\build\\locales",
+    "i18n-ally.localesPaths": [
+        "public/locales",
+        "build-electron/win-unpacked/locales"
+    ],
+    "i18n-ally.keystyle": "nested"
 }
diff --git a/neo3-gui/neo3-gui/ClientApp/package-lock.json b/neo3-gui/neo3-gui/ClientApp/package-lock.json
diff --git a/neo3-gui/neo3-gui/ClientApp/package.json b/neo3-gui/neo3-gui/ClientApp/package.json
@@ -1,6 +1,6 @@
 {
     "name": "neo-gui",
-    "version": "1.2.4",
+    "version": "1.2.5",
     "private": true,
     "main": "main.js",
     "homepage": "./",