Merge branch 'master' into totp-copy-page-load-2

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Set up cloc
         run: |
@@ -30,7 +30,7 @@ jobs:
       adj_build_number: ${{ steps.gen_vars.outputs.adj_build_number }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Get Package Version
         id: gen_vars
@@ -41,21 +41,51 @@ jobs:
           echo "::set-output name=repo_url::$repo_url" 
           echo "::set-output name=adj_build_number::$adj_build_num" 
 
-
-  browser:
-    runs-on: windows-latest
+  locales-test:
+    runs-on: ubuntu-latest
     needs: setup
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+
+      - name: Testing locales - extName length
+        run: |
+         found_error=false
+
+         echo "Locales Test"
+         echo "============"
+         echo "extName string must be 40 characters or less"
+         echo
+         for locale in $(ls src/_locales/); do
+           string_length=$(jq '.extName.message | length' src/_locales/$locale/messages.json)
+           if [[ $string_length -gt 40 ]]; then
+             echo "$locale: $string_length"
+             found_error=true
+           fi
+         done
+         
+         if $found_error; then
+           echo
+           echo "Please fix 'extName' for the locales listed above."
+           exit 1
+         else
+           echo "Test passed!"
+         fi 
+
+  build:
+    runs-on: windows-latest
+    needs: [ setup, locales-test ]
     env:
       REPO_URL: ${{ needs.setup.outputs.repo_url }}
       BUILD_NUMBER: ${{ needs.setup.outputs.adj_build_number }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Set up Node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
         with:
-          node-version: '14.x'
+          node-version: '14'
 
       - name: Print environment
         run: |
@@ -72,31 +102,31 @@ jobs:
         run: gulp ci
 
       - name: Upload opera artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
           name: dist-opera-${{ env.BUILD_NUMBER }}.zip
           path: dist/dist-opera-${{ env.BUILD_NUMBER }}.zip
 
       - name: Upload chrome artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
           name: dist-chrome-${{ env.BUILD_NUMBER }}.zip
           path: dist/dist-chrome-${{ env.BUILD_NUMBER }}.zip
 
       - name: Upload firefox artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
           name: dist-firefox-${{ env.BUILD_NUMBER }}.zip
           path: dist/dist-firefox-${{ env.BUILD_NUMBER }}.zip
 
       - name: Upload edge artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
           name: dist-edge-${{ env.BUILD_NUMBER }}.zip
           path: dist/dist-edge-${{ env.BUILD_NUMBER }}.zip
 
       - name: Upload coverage artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
         with:
           name: coverage-${{ env.BUILD_NUMBER }}.zip
           path: coverage/coverage-${{ env.BUILD_NUMBER }}.zip

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
       adj_build_number: ${{ steps.gen_vars.outputs.adj_build_number }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Get Package Version
         id: gen_vars
@@ -54,7 +54,7 @@ jobs:
 
       - name: Create Draft Release
         id: create_release
-        uses: actions/create-release@v1
+        uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -64,20 +64,51 @@ jobs:
           prerelease: false
 
 
-  browser:
-    runs-on: windows-latest
+  locales-test:
+    runs-on: ubuntu-latest
     needs: setup
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+
+      - name: Testing locales - extName length
+        run: |
+         found_error=false
+
+         echo "Locales Test"
+         echo "============"
+         echo "extName string must be 40 characters or less"
+         echo
+         for locale in $(ls src/_locales/); do
+           string_length=$(jq '.extName.message | length' src/_locales/$locale/messages.json)
+           if [[ $string_length -gt 40 ]]; then
+             echo "$locale: $string_length"
+             found_error=true
+           fi
+         done
+
+         if $found_error; then
+           echo
+           echo "Please fix 'extName' for the locales listed above."
+           exit 1
+         else
+           echo "Test passed!"
+         fi
+
+  build:
+    runs-on: windows-latest
+    needs: [ setup, locales-test ]
     env:
       REPO_URL: ${{ needs.setup.outputs.repo_url }}
       BUILD_NUMBER: ${{ needs.setup.outputs.adj_build_number }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Set up Node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
         with:
-          node-version: '14.x'
+          node-version: '14'
 
       - name: Print environment
         run: |
@@ -106,7 +137,7 @@ jobs:
           call 7z a browser-source-%BUILD_NUMBER%.zip "Source\*"
 
       - name: upload opera release asset
-        uses: actions/upload-release-asset@v1
+        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -116,7 +147,7 @@ jobs:
           asset_content_type: application
 
       - name: upload chrome release asset
-        uses: actions/upload-release-asset@v1
+        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -126,7 +157,7 @@ jobs:
           asset_content_type: application/zip
 
       - name: upload firefox release asset
-        uses: actions/upload-release-asset@v1
+        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -136,7 +167,7 @@ jobs:
           asset_content_type: application/zip
 
       - name: upload edge release asset
-        uses: actions/upload-release-asset@v1
+        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -146,7 +177,7 @@ jobs:
           asset_content_type: application/zip
 
       - name: upload browser source zip release asset
-        uses: actions/upload-release-asset@v1
+        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -156,7 +187,7 @@ jobs:
           asset_content_type: application/zip
 
       - name: upload coverage release asset
-        uses: actions/upload-release-asset@v1
+        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

src/popup/app.module.ts

@@ -103,7 +103,7 @@ import localeIt from '@angular/common/locales/it';
 import localeJa from '@angular/common/locales/ja';
 import localeKo from '@angular/common/locales/ko';
 import localeLv from '@angular/common/locales/lv';
-import localeMlIn from '@angular/common/locales/ml-IN';
+import localeMl from '@angular/common/locales/ml';
 import localeNb from '@angular/common/locales/nb';
 import localeNl from '@angular/common/locales/nl';
 import localePl from '@angular/common/locales/pl';
@@ -144,7 +144,7 @@ registerLocaleData(localeIt, 'it');
 registerLocaleData(localeJa, 'ja');
 registerLocaleData(localeKo, 'ko');
 registerLocaleData(localeLv, 'lv');
-registerLocaleData(localeMlIn, 'ml-IN');
+registerLocaleData(localeMl, 'ml');
 registerLocaleData(localeNb, 'nb');
 registerLocaleData(localeNl, 'nl');
 registerLocaleData(localePl, 'pl');

src/services/i18n.service.ts

@@ -10,7 +10,7 @@ export default class I18nService extends BaseI18nService {
 
         this.supportedTranslationLocales = [
             'en', 'be', 'bg', 'bn', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'en-IN', 'es', 'et', 'fa', 'fi', 'fr', 'he', 'hr', 'hu',
-            'id', 'it', 'ja', 'ko', 'lv', 'ml-IN', 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru', 'sk', 'sr', 'sv', 'th', 'tr', 'uk',
+            'id', 'it', 'ja', 'ko', 'lv', 'ml', 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru', 'sk', 'sr', 'sv', 'th', 'tr', 'uk',
             'vi', 'zh-CN', 'zh-TW',
         ];
     }