update build process and locales

build/buildUniversalPkg.js

@@ -1,10 +0,0 @@
-const { makeUniversalApp } = require('@electron/universal');
-
-const path = '/Users/bruce/Documents/repos/fluent-reader/bin/'
-
-makeUniversalApp({
-    x64AppPath: path + '/darwin/x64/mas/Fluent Reader.app',
-    arm64AppPath: path + '/darwin/arm64/mas/Fluent Reader.app',
-    outAppPath: path + '/Fluent Reader.app',
-    force: true
-});

build/resignAndPackage.sh

@@ -1,4 +1,7 @@
-#TODO: add "<key>ElectronTeamID</key><string>EM8VE646TZ</string>" to Info.plist
+# Build the MAS app
+CSC_IDENTITY_AUTO_DISCOVERY=false npx electron-builder -c electron-builder-mas.yml --mac mas:universal
+# Add ElectronTeamID to Info.plist
+sed -i '' -e 's/<\/dict>/<key>ElectronTeamID<\/key><string>EM8VE646TZ<\/string><\/dict>/g' "/Users/haoyuanliu/Developer/fluent-reader/bin/darwin/universal/mas-universal/Fluent Reader.app/Contents/Info.plist"
 
 printf "......................\nresignAndPackage start\n\n"
 
@@ -7,11 +10,11 @@ APP="Fluent Reader"
 # Your Certificate name.
 CERT="Jieyu Yan (EM8VE646TZ)"
 # The path of your app to sign.
-APP_PATH="/Users/bruce/Documents/repos/fluent-reader/bin/$APP.app"
+APP_PATH="/Users/haoyuanliu/Developer/fluent-reader/bin/darwin/universal/mas-universal/Fluent Reader.app"
 # The path to the location you want to put the signed package.
-RESULT_PATH="/Users/bruce/Documents/repos/fluent-reader/bin/$APP-mac_store.pkg"
+RESULT_PATH="/Users/haoyuanliu/Developer/fluent-reader/bin/$APP-mac_store.pkg"
 # The name of certificates you requested.
-APP_KEY="3rd Party Mac Developer Application: $CERT"
+APP_KEY="Apple Distribution: $CERT"
 INSTALLER_KEY="3rd Party Mac Developer Installer: $CERT"
 # The path of your plist files.
 PARENT_PLIST="build/entitlements.mas.plist"

electron-builder-mas.yml

@@ -0,0 +1,35 @@
+appId: DevHYLiu.FluentReader
+buildVersion: 24
+productName: Fluent Reader
+copyright: Copyright © 2020 Haoyuan Liu
+files:
+  - "./dist/**/*"
+  - "!**/*.js.map"
+directories:
+  output: "./bin/${platform}/${arch}/"
+mac:
+  darkModeSupport: true
+  target:
+    - dmg
+  category: public.app-category.news
+  electronLanguages:
+    - zh_CN
+    - zh_TW
+    - en
+    - fr
+    - es
+    - de
+    - tr
+    - ja
+    - sv
+    - uk
+    - it
+    - nl
+  minimumSystemVersion: 10.14.0
+mas:
+  entitlements: build/entitlements.mas.plist
+  entitlementsInherit: build/entitlements.mas.inherit.plist
+  provisioningProfile: build/embedded.provisionprofile
+  hardenedRuntime: false
+  gatekeeperAssess: false
+  asarUnpack: []

electron-builder.yml

@@ -0,0 +1,61 @@
+appId: me.hyliu.fluentreader
+productName: Fluent Reader
+copyright: Copyright © 2020 Haoyuan Liu
+files:
+  - "./dist/**/*"
+  - "!**/*.js.map"
+directories:
+  output: "./bin/${platform}/${arch}/"
+mac:
+  darkModeSupport: true
+  target:
+    - dmg
+  category: public.app-category.news
+  electronLanguages:
+    - zh_CN
+    - zh_TW
+    - en
+    - fr
+    - es
+    - de
+    - tr
+    - sv
+    - uk
+    - it
+    - nl
+win:
+  target:
+    - nsis
+    - appx
+    - zip
+appx:
+  applicationId: FluentReader
+  identityName: 25286HaoyuanLiu.FluentReader
+  publisher: CN=FD70E7FA-E5AC-41C4-B9C4-6E8708A6616A
+  backgroundColor: transparent
+  languages:
+    - zh-CN
+    - zh-TW
+    - en-US
+    - fr-FR
+    - es
+    - de
+    - tr
+    - sv
+    - uk
+    - it
+    - nl
+  showNameOnTiles: true
+  setBuildNumber: true
+nsis:
+  oneClick: false
+  perMachine: true
+  allowToChangeInstallationDirectory: true
+  deleteAppDataOnUninstall: true
+linux:
+  target:
+    - AppImage
+  icon: build/icons
+  category: Utility
+  desktop:
+    StartupWMClass: fluent-reader

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fluent-reader",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Modern desktop RSS reader",
   "main": "./dist/electron.js",
   "scripts": {
@@ -9,95 +9,15 @@
     "start": "npm run build && npm run electron",
     "package-win": "electron-builder -w --x64 && electron-builder -w --ia32 && electron-builder -w appx:arm64",
     "package-win-ci": "electron-builder -w --x64 -p never && electron-builder -w --ia32 -p never",
-    "package-mac": "sudo electron-builder --mac",
+    "package-mac": "electron-builder --mac --x64",
-    "package-mas": "sudo CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder --mac mas",
+    "package-mas": "bash build/resignAndPackage.sh",
-    "package-mas-arm": "sudo CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder --mac mas:arm64",
-    "package-mas-sign": "node build/buildUniversalPkg.js && sudo vim \"bin/Fluent Reader.app/Contents/Info.plist\" && sudo bash build/resignAndPackage.sh",
     "package-linux": "electron-builder --linux -p never"
   },
   "keywords": [],
   "author": "Haoyuan Liu",
   "license": "BSD-3-Clause",
   "repository": "github:yang991178/fluent-reader",
-  "build": {
-    "appId": "me.hyliu.fluentreader",
-    "productName": "Fluent Reader",
-    "copyright": "Copyright © 2020 Haoyuan Liu",
-    "files": [
-      "./dist/**/*",
-      "!**/*.js.map"
-    ],
-    "directories": {
-      "output": "./bin/${platform}/${arch}/"
-    },
-    "win": {
-      "target": [
-        "nsis",
-        "appx",
-        "zip"
-      ]
-    },
-    "appx": {
-      "applicationId": "FluentReader",
-      "identityName": "25286HaoyuanLiu.FluentReader",
-      "publisher": "CN=FD70E7FA-E5AC-41C4-B9C4-6E8708A6616A",
-      "backgroundColor": "transparent",
-      "languages": [
-        "zh-CN",
-        "zh-TW",
-        "en-US",
-        "fr-FR",
-        "es",
-        "de",
-        "tr"
-      ],
-      "showNameOnTiles": true,
-      "setBuildNumber": true
-    },
-    "nsis": {
-      "oneClick": false,
-      "perMachine": true,
-      "allowToChangeInstallationDirectory": true,
-      "deleteAppDataOnUninstall": true
-    },
-    "mac": {
-      "darkModeSupport": true,
-      "target": [
-        "dmg"
-      ],
-      "category": "public.app-category.news",
-      "electronLanguages": [
-        "zh_CN",
-        "zh_TW",
-        "en",
-        "fr",
-        "es",
-        "de",
-        "tr"
-      ]
-    },
-    "mas": {
-      "appId": "DevHYLiu.FluentReader",
-      "entitlements": "build/entitlements.mas.plist",
-      "entitlementsInherit": "build/entitlements.mas.inherit.plist",
-      "provisioningProfile": "build/embedded.provisionprofile",
-      "hardenedRuntime": false,
-      "gatekeeperAssess": false,
-      "asarUnpack": []
-    },
-    "linux": {
-      "target": [
-        "AppImage"
-      ],
-      "icon": "build/icons",
-      "category": "Utility",
-      "desktop": {
-        "StartupWMClass": "fluent-reader"
-      }
-    }
-  },
   "devDependencies": {
-    "@electron/universal": "^1.0.4",
     "@fluentui/react": "^7.126.2",
     "@types/lovefield": "^2.1.3",
     "@types/nedb": "^1.8.9",
@@ -105,8 +25,8 @@
     "@types/react-dom": "^16.9.8",
     "@types/react-redux": "^7.1.9",
     "@yang991178/rss-parser": "^3.8.1",
-    "electron": "^11.0.3",
+    "electron": "^13.1.4",
-    "electron-builder": "^22.9.1",
+    "electron-builder": "^22.11.3",
     "electron-react-devtools": "^0.5.3",
     "electron-store": "^5.2.0",
     "electron-window-state": "^5.0.3",
@@ -128,6 +48,5 @@
     "typescript": "^3.9.2",
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11"
-  },
+  }
-  "dependencies": {}
 }

src/components/settings/app.tsx

@@ -107,7 +107,12 @@ class AppTab extends React.Component<AppTabProps, AppTabState> {
         { key: "en-US", text: "English" },
         { key: "es", text: "Español" },
         { key: "fr-FR", text: "Français" },
+        { key: "it", text: "Italiano" },
+        { key: "nl", text: "Nederlands" },
+        { key: "sv", text: "Svenska" },
         { key: "tr", text: "Türkçe" },
+        { key: "uk", text: "Українська" },
+        { key: "ja", text: "日本語" },
         { key: "zh-CN", text: "中文（简体）" },
         { key: "zh-TW", text: "中文（繁體）" },
     ]

src/scripts/i18n/README.md

@@ -8,10 +8,13 @@ Currently, Fluent Reader supports the following languages.
 | es | Español | [@kant](https://github.com/kant) |
 | fr-FR | Français | [@Toinane](https://github.com/Toinane) |
 | zh-CN | 中文（简体） | [@yang991178](https://github.com/yang991178) |
+| zh-TW | 中文（繁體） | [@jerryc127](https://github.com/jerryc127) |
 | ja | 日本語 | [@tiancheng2000](https://github.com/tiancheng2000) |
 | de | Deutsch | [@NoNamePro0](https://github.com/NoNamePro0) |
 | sv | Svenska | [@eson57](https://github.com/eson57) |
 | tr | Türkçe | [@mustafagenc](https://github.com/mustafagenc) |
-| ua | Ukrainian | [@thevllad](https://github.com/thevllad) |
+| uk | Ukrainian | [@thevllad](https://github.com/thevllad) |
+| nl | Nederlands | [@Vistaus](https://github.com/Vistaus) |
+| it | Italiano | [@andrewasd](https://github.com/andrewasd) |
 
 Refer to the repo of [react-intl-universal](https://github.com/alibaba/react-intl-universal) to get started on internationalization. 

src/scripts/i18n/_locales.ts

@@ -9,7 +9,7 @@ import es from "./es.json"
 import sv from "./sv.json"
 import tr from "./tr.json"
 import it from "./it.json"
-import ua from "./ua.json"
+import uk from "./uk.json"
 
 const locales = {
     "en-US": en_US,
@@ -23,7 +23,7 @@ const locales = {
     "sv": sv,
     "tr": tr,
     "it": it,
-    "ua": ua
+    "uk": uk
 }
 
 export default locales

src/scripts/i18n/ja.json

@@ -107,7 +107,7 @@
         "fetching": "フィードを更新中、しばらくお待ちください…",
         "exit": "終了",
         "sources": "フィード",
-        "grouping": "グルーピングとソーティング",
+        "grouping": "グルーピング",
         "rules": "ルール",
         "service": "サービス",
         "app": "環境設定",

src/scripts/i18n/nl.json

@@ -23,9 +23,9 @@
         "m": "m",
         "h": "u",
         "d": "d",
-        "minuut": "{m, plural, =1 {# minute} other {# minutes}}",
+        "minute": "{m, plural, =1 {# minuut} other {# minuten}}",
-        "uur": "{h, plural, =1 {# hour} other {# hours}}",
+        "hour": "{h, plural, =1 {# uur} other {# uur}}",
-        "dag": "{d, plural, =1 {# day} other {# days}}"
+        "day": "{d, plural, =1 {# dag} other {# dagen}}"
     },
     "log": {
         "empty": "Geen meldingen",
@@ -211,7 +211,7 @@
         "cacheSize": "In cache: {size} aan gegevens",
         "deleteChoices": "Artikelen verwijderen die ouder zijn dan … dagen",
         "confirmDelete": "Verwijderen",
-        "daysAgo": "{days, plural, =1 {# day} other {# days}} geleden",
+        "daysAgo": "{days, plural, =1 {# dag} other {# dagen}} geleden",
         "deleteAll": "Alle artikelen verwijderen",
         "calculatingSize": "Bezig met grootteberekening…",
         "itemSize": "De artikelen nemen ongeveer {size} aan lokale opslag in beslag",

src/scripts/i18n/sv.json

@@ -211,7 +211,7 @@
         "cacheSize": "Cache-lagra {size} data",
         "deleteChoices": "Ta bort artiklar från ... dagar sedan",
         "confirmDelete": "Ta bort",
-        "daysAgo": "{dagar, plural, =1 {# dag} other {# dagar}} sedan",
+        "daysAgo": "{day, plural, =1 {# dag} other {# dagar}} sedan",
         "deleteAll": "Ta bort alla artiklar",
         "calculatingSize": "Beräknar storlek...",
         "itemSize": "Omkring {size} lokal datalagring upptas av artiklar",

src/scripts/i18n/uk.json

@@ -211,7 +211,7 @@
         "cacheSize": "Кешовано {size} даних",
         "deleteChoices": "Видалити статті з ... днів тому",
         "confirmDelete": "Видалити",
-        "daysAgo": "{days, plural, =1 {# день} other {# днів}} ago",
+        "daysAgo": "{days, plural, =1 {# день} other {# днів}} тому",
         "deleteAll": "Видалити всі статті",
         "calculatingSize": "Розрахунок розміру ...",
         "itemSize": "Близько {size} локальної пам'яті займають статті",