9.4.2

.github/workflows/linux.yml

@@ -13,12 +13,17 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+
     steps:
     - uses: actions/checkout@v1
       with:
         fetch-depth: 1
         submodules: false
-    - name: Use Node.js ${{ matrix.node-version }}
+    - name: Install Snapcraft
+      uses: samuelmeuli/action-snapcraft@v1
+      with:
+        snapcraft_token: ${{ secrets.SNAP_TOKEN }}
+    - name: Set up Node.js
       uses: actions/setup-node@v1
       with:
         node-version: 12.x
@@ -33,12 +38,15 @@ jobs:
           ${{ runner.os }}-yarn-
     - run: yarn
     - run: yarn lint
+    - name: Get tag name
+      run: echo ::set-env name=CI_BUILD_TAG::${GITHUB_REF/refs\/tags\//}
+      if: startsWith(github.ref, 'refs/tags/')
     - run: yarn dist
       env:
         CI: true
+        CI_PULL_REQUEST: ${{ github.event_name == 'pull_request' }}
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         REACT_APP_LICENSE_SECRET: ${{ secrets.REACT_APP_LICENSE_SECRET }}
         REACT_APP_OCR_SPACE_API_KEY: ${{ secrets.REACT_APP_OCR_SPACE_API_KEY }}
         REACT_APP_YANDEX_DICTIONARY_API_KEY: ${{ secrets.REACT_APP_YANDEX_DICTIONARY_API_KEY_LINUX }}
-        REACT_APP_YANDEX_TRANSLATE_API_KEY: ${{ secrets.REACT_APP_YANDEX_TRANSLATE_API_KEY_LINUX }}
-        SNAP_TOKEN: ${{ secrets.SNAP_TOKEN }}
+        REACT_APP_YANDEX_TRANSLATE_API_KEY: ${{ secrets.REACT_APP_YANDEX_TRANSLATE_API_KEY_LINUX }}

.github/workflows/macos.yml

@@ -13,12 +13,13 @@ on:
 jobs:
   build:
     runs-on: macos-latest
+
     steps:
     - uses: actions/checkout@v1
       with:
         fetch-depth: 1
         submodules: false
-    - name: Use Node.js ${{ matrix.node-version }}
+    - name: Set up Node.js
       uses: actions/setup-node@v1
       with:
         node-version: 12.x
@@ -33,16 +34,19 @@ jobs:
           ${{ runner.os }}-yarn-
     - run: yarn
     - run: yarn lint
+    - name: Get tag name
+      run: echo ::set-env name=CI_BUILD_TAG::${GITHUB_REF/refs\/tags\//}
+      if: startsWith(github.ref, 'refs/tags/')
     - run: yarn dist
       env:
         CI: true
+        CI_PULL_REQUEST: ${{ github.event_name == 'pull_request' }}
         APPLE_ID: ${{ secrets.APPLE_ID }}
         APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
         CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
         CSC_LINK: ${{ secrets.CSC_LINK }}
-        GH_REF: ${{ github.ref }}
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         REACT_APP_LICENSE_SECRET: ${{ secrets.REACT_APP_LICENSE_SECRET }}
         REACT_APP_OCR_SPACE_API_KEY: ${{ secrets.REACT_APP_OCR_SPACE_API_KEY }}
         REACT_APP_YANDEX_DICTIONARY_API_KEY: ${{ secrets.REACT_APP_YANDEX_DICTIONARY_API_KEY_MAC }}
-        REACT_APP_YANDEX_TRANSLATE_API_KEY: ${{ secrets.REACT_APP_YANDEX_TRANSLATE_API_KEY_MAC }}
+        REACT_APP_YANDEX_TRANSLATE_API_KEY: ${{ secrets.REACT_APP_YANDEX_TRANSLATE_API_KEY_MAC }}

.github/workflows/windows.yml

@@ -13,12 +13,13 @@ on:
 jobs:
   build:
     runs-on: windows-latest
+
     steps:
     - uses: actions/checkout@v1
       with:
         fetch-depth: 1
         submodules: false
-    - name: Use Node.js ${{ matrix.node-version }}
+    - name: Set up Node.js
       uses: actions/setup-node@v1
       with:
         node-version: 12.x
@@ -33,9 +34,13 @@ jobs:
           ${{ runner.os }}-yarn-
     - run: yarn
     - run: yarn lint
+    - name: Get tag name
+      run: echo ::set-env name=CI_BUILD_TAG::${GITHUB_REF/refs\/tags\//}
+      if: startsWith(github.ref, 'refs/tags/')
     - run: yarn dist
       env:
         CI: true
+        CI_PULL_REQUEST: ${{ github.event_name == 'pull_request' }}
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         REACT_APP_LICENSE_SECRET: ${{ secrets.REACT_APP_LICENSE_SECRET }}
         REACT_APP_OCR_SPACE_API_KEY: ${{ secrets.REACT_APP_OCR_SPACE_API_KEY }}

docs/_config.yml

@@ -18,7 +18,7 @@ baseurl: "" # the subpath of your site, e.g. /blog
 url: "https://translatiumapp.com" # the base hostname & protocol for your site, e.g. http://example.com
 
 # Custom
-translatium_version: 9.4.1
+translatium_version: 9.4.2
 
 # Build settings
 markdown: kramdown

docs/_layouts/default.html

@@ -37,11 +37,6 @@
                     <p>All Your Apps in One Single Window.</p>
                   </a>
                   <hr class="dropdown-divider">
-                  <a class="dropdown-item" href="https://quanglam2807.com/latte">
-                    <img src="{{ '/images/latte-logo.png' | relative_url }}" alt="Latte">
-                    <p>Distraction-Free Daily News Briefing.</p>
-                  </a>
-                  <hr class="dropdown-divider">
                   <a class="dropdown-item" href="https://quanglam2807.com">
                     <img src="/images/quanglam-logo.png" alt="Quang Lam">
                   </a>

package.json

@@ -1,7 +1,7 @@
 {
   "name": "translatium",
   "description": "Translate Any Languages like a Pro",
-  "version": "9.4.1",
+  "version": "9.4.2",
   "main": "public/electron.js",
   "repository": "https://github.com/translatium/translatium",
   "author": {
@@ -19,7 +19,7 @@
     "build": "react-scripts build",
     "test-ui": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject",
-    "dist": "npm run build && babel-node packager.js",
+    "dist": "yarn run build && babel-node packager.js",
     "lint": "eslint ./src ./public ./packager.js --ext js --fix",
     "test": "mocha"
   },

packager.js

@@ -40,7 +40,7 @@ switch (process.platform) {
   }
   default:
   case 'linux': {
-    targets = Platform.LINUX.createTarget(['snap', 'AppImage']);
+    targets = Platform.LINUX.createTarget(['AppImage', 'snap']);
     break;
   }
 }
@@ -84,16 +84,16 @@ const opts = {
       category: 'Utility',
       packageCategory: 'utils',
     },
-    publish: process.platform === 'linux' ? [
-      {
-        provider: 'snapStore',
-        channels: ['stable'],
-      },
-      'github',
-    ] : undefined, // use default on non-linux platforms
+    snap: {
+      publish: [
+        {
+          provider: 'snapStore',
+          channels: ['edge'],
+        },
+        'github',
+      ],
+    },
     afterPack: ({ appOutDir }) => new Promise((resolve, reject) => {
-      console.log('afterPack', appOutDir, process.platform);
-
       const languages = Object.keys(displayLanguages);
 
       if (process.platform === 'darwin') {
@@ -108,12 +108,11 @@ const opts = {
     }),
     afterSign: (context) => {
       // Only notarize app when forced in pull requests or when releasing using tag
-      const shouldNotarize = process.platform === 'darwin' && process.env.GH_REF && process.env.GH_REF.startsWith('refs/tags/v');
+      const shouldNotarize = process.platform === 'darwin' && context.electronPlatformName === 'darwin' && process.env.CI_BUILD_TAG;
       if (!shouldNotarize) return null;
 
       console.log('Notarizing app...');
       // https://kilianvalkhof.com/2019/electron/notarizing-your-electron-application/
-      console.log(context);
       const { appOutDir } = context;
 
       const appName = context.packager.appInfo.productFilename;

patches/builder-util+10.1.2.patch → patches/builder-util+21.2.0.patch

@@ -1,8 +1,8 @@
 diff --git a/node_modules/builder-util/out/util.js b/node_modules/builder-util/out/util.js
-index deeeec2..14d41d4 100644
+index 8064112..b6e3d81 100644
 --- a/node_modules/builder-util/out/util.js
 +++ b/node_modules/builder-util/out/util.js
-@@ -503,7 +503,7 @@ function isEmptyOrSpaces(s) {
+@@ -505,7 +505,7 @@ function isEmptyOrSpaces(s) {
  }
 
  function isTokenCharValid(token) {