Merge branch 'main' into dependabot/npm_and_yarn/angular/compiler-20.3.16

Author: cryptalith

.github/scripts/pull_and_clean_properties.sh

@@ -1,4 +1,10 @@
 #!/bin/bash
+
+# ⚠️  DEPRECATED: This script is part of the old .properties translation workflow.
+# ⚠️  The project now uses XLIFF files with Transifex instead.
+# ⚠️  For the new workflow, see .github/workflows/pull-translations.yml
+# ⚠️  This file is kept for reference during the migration period.
+
 # Function to process each .properties file
 process_file() {
   local file=$1

.github/workflows/format_i18n.yml

@@ -18,7 +18,7 @@ jobs:
           node-version: 'v20.x'
           cache: 'yarn'
       - run: yarn
-      - run: yarn build:i18n:generate-testing
+      - run: yarn build:i18n
 
       - name: add and commit any files that have changed
         id: add_and_commit

…/workflows/pull-and-clean-properties.yml .github/workflows/pull-translations.yml.github/workflows/pull-and-clean-properties.yml renamed to .github/workflows/pull-translations.yml .github/workflows/pull-and-clean-properties.yml renamed to .github/workflows/pull-translations.yml

@@ -1,4 +1,4 @@
-name: Pull and clean properties
+name: Pull translations from Transifex
 
 on:
   workflow_dispatch: {}
@@ -10,11 +10,11 @@ permissions:
   pull-requests: write
 
 concurrency:
-  group: pull-and-clean-${{ github.ref }}
+  group: pull-translations-${{ github.ref }}
   cancel-in-progress: false
 
 jobs:
-  pull-clean:
+  pull-translations:
     runs-on: ubuntu-latest
     env:
       TX_TOKEN: ${{ secrets.TRANSIFEX_TOKEN }}
@@ -40,17 +40,13 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
 
-      - name: Install Transifex CLI (Go)
+      - name: Install Transifex CLI
         run: |
           curl -sSfL https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash
-          # Move the tx binary into a directory on PATH for subsequent steps
           mkdir -p "$HOME/bin"
-
           install -m 0755 ./tx "$HOME/bin/tx"
           echo "$HOME/bin" >> "$GITHUB_PATH"
-          command -v tx || true
-          tx --version || true
-       
+          tx --version
 
       - name: Configure Transifex credentials
         run: |
@@ -67,15 +63,12 @@ jobs:
           chmod 600 "$HOME/.transifexrc"
           echo "Created ~/.transifexrc"
 
-      - name: Verify Transifex CLI
-        run: tx --version
-
       - name: Configure Git user
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
 
-      - name: Prepare transifex branch (hard reset to main)
+      - name: Prepare transifex branch
         id: prep
         run: |
           set -euo pipefail
@@ -115,11 +108,12 @@ jobs:
             git checkout -B transifex origin/main
           fi
 
-      - name: Make scripts executable
-        run: chmod +x .github/scripts/pull_and_clean_properties.sh
-
-      - name: Run pull_and_clean_properties.sh
-        run: bash .github/scripts/pull_and_clean_properties.sh
+      - name: Pull translations from Transifex
+        run: |
+          set -euo pipefail
+          echo "Pulling XLF translation files from Transifex..."
+          TX_CONFIG=.tx/config tx pull -a -r orcid-angular.messages-xlf --force --minimum-perc=0
+          echo "Translation pull complete"
 
       - name: Commit and push changes (if any)
         id: commit
@@ -131,7 +125,7 @@ jobs:
               git checkout transifex
             fi
             git add -A
-            git commit -m "Transifex: pull and normalize .properties via CI"
+            git commit -m "Transifex: pull XLF translations via CI"
             git push -f origin transifex
             echo "Changes pushed to transifex branch."
             echo "changes=true" >> "$GITHUB_OUTPUT"
@@ -236,11 +230,11 @@ jobs:
                 prevLine = 'Branch was created from main (no previous head).';
               }
               const body = [
-                'Automated update of .properties files via CI.',
+                'Automated update of XLF translation files via CI.',
                 '',
                 prevLine
               ].join('\n');
-              const created = await github.rest.pulls.create({ owner, repo, head, base, title: 'Transifex: update properties', body });
+              const created = await github.rest.pulls.create({ owner, repo, head, base, title: 'Transifex: update translations', body });
               core.info('Opened PR from transifex to main.');
               core.setOutput('pr_state', 'created');
               core.setOutput('pr_number', String(created.data.number));

.gitignore

@@ -8,13 +8,13 @@ temp/**
 /dist
 /tmp
 /out-tsc
-src/locale/messages.xlf
 
 # dependencies
 /node_modules
 
 # have a persistent yarn cache in a single 'code' volume in a docker container
 /yarn_cache
+.yarn-cache
 
 # IDEs and editors
 /.idea
@@ -49,7 +49,6 @@ testem.log
 Thumbs.db
 .vscode/settings.json
 src/locale/translate-file-generator.js
-*.xlf
 src/locale/messages.translation.log.json
 sripts/lighthouse/environment.ts.js
 

.tx/config

@@ -1,6 +1,15 @@
 [main]
 host = https://www.transifex.com
 
+[o:orcid-inc-1:p:orcid-angular:r:messages-xlf]
+file_filter            = src/locale/messages.<lang>.xlf
+source_file            = src/locale/messages.xlf
+source_lang            = en
+type                   = XLIFF
+minimum_perc           = 0
+replace_edited_strings = false
+keep_translations      = false
+
 [o:orcid-inc-1:p:orcid-angular:r:environment-banner]
 file_filter            = src/locale/properties/environment-banner/environment-banner.<lang>.properties
 source_file            = src/locale/properties/environment-banner/environment-banner.en.properties

CHANGELOG.md

@@ -1,3 +1,19 @@
+## v2.128.6 - 2026-01-15
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.128.5...v2.128.6)
+
+## v2.128.5 - 2026-01-15
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.128.4...v2.128.5)
+
+- [#2717](https://github.com/ORCID/orcid-angular/pull/2717): Lmendoza PD-3909
+
+## v2.128.4 - 2026-01-15
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.128.3...v2.128.4)
+
+- [#2713](https://github.com/ORCID/orcid-angular/pull/2713): PD-4733 - Bump @angular/core from 20.1.6 to 20.3.16
+
 ## v2.128.3 - 2026-01-14
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.128.2...v2.128.3)

SUPPORTED_BROWSERS.md

@@ -6,9 +6,9 @@
 | ---------------- | --------------- |
 | Android WebView  | 142 or newer    |
 | Apple Safari     | 16.4 or newer   |
-| Google Chrome    | 111 or newer    |
-| Microsoft Edge   | 111 or newer    |
-| Mozilla Firefox  | 114 or newer    |
-| Opera            | 97 or newer     |
+| Google Chrome    | 112 or newer    |
+| Microsoft Edge   | 112 or newer    |
+| Mozilla Firefox  | 115 or newer    |
+| Opera            | 98 or newer     |
 | Opera Mobile     | 80 or newer     |
-| Samsung Internet | 22 or newer     |
+| Samsung Internet | 23 or newer     |

angular.json

@@ -5,89 +5,86 @@
   "projects": {
     "ng-orcid": {
       "i18n": {
+        "sourceLocale": "en",
         "locales": {
-          "en": {
-            "translation": "src/locale/messages.static.en.xlf",
-            "baseHref": "/"
-          },
           "fr": {
-            "translation": "src/locale/messages.static.fr.xlf",
+            "translation": "src/locale/messages.fr.xlf",
             "baseHref": "/"
           },
           "ar": {
-            "translation": "src/locale/messages.static.ar.xlf",
+            "translation": "src/locale/messages.ar.xlf",
             "baseHref": "/"
           },
           "ca": {
-            "translation": "src/locale/messages.static.ca.xlf",
+            "translation": "src/locale/messages.ca.xlf",
             "baseHref": "/"
           },
           "cs": {
-            "translation": "src/locale/messages.static.cs.xlf",
+            "translation": "src/locale/messages.cs.xlf",
             "baseHref": "/"
           },
           "de": {
-            "translation": "src/locale/messages.static.de.xlf",
+            "translation": "src/locale/messages.de.xlf",
             "baseHref": "/"
           },
           "es": {
-            "translation": "src/locale/messages.static.es.xlf",
+            "translation": "src/locale/messages.es.xlf",
             "baseHref": "/"
           },
           "it": {
-            "translation": "src/locale/messages.static.it.xlf",
+            "translation": "src/locale/messages.it.xlf",
             "baseHref": "/"
           },
           "ja": {
-            "translation": "src/locale/messages.static.ja.xlf",
+            "translation": "src/locale/messages.ja.xlf",
             "baseHref": "/"
           },
           "ko": {
-            "translation": "src/locale/messages.static.ko.xlf",
+            "translation": "src/locale/messages.ko.xlf",
             "baseHref": "/"
           },
           "lr": {
-            "translation": "src/locale/messages.static.lr.xlf",
+            "translation": "src/locale/messages.lr.xlf",
             "baseHref": "/"
           },
           "pl": {
-            "translation": "src/locale/messages.static.pl.xlf",
+            "translation": "src/locale/messages.pl_PL.xlf",
             "baseHref": "/"
           },
           "pt": {
-            "translation": "src/locale/messages.static.pt.xlf",
+            "translation": "src/locale/messages.pt.xlf",
             "baseHref": "/"
           },
           "rl": {
-            "translation": "src/locale/messages.static.rl.xlf",
+            "translation": "src/locale/messages.rl.xlf",
             "baseHref": "/"
           },
           "ru": {
-            "translation": "src/locale/messages.static.ru.xlf",
+            "translation": "src/locale/messages.ru.xlf",
             "baseHref": "/"
           },
           "tr": {
-            "translation": "src/locale/messages.static.tr.xlf",
+            "translation": "src/locale/messages.tr_TR.xlf",
             "baseHref": "/"
           },
           "uk": {
-            "translation": "src/locale/messages.static.uk.xlf",
+            "translation": "src/locale/messages.uk.xlf",
             "baseHref": "/"
           },
           "xx": {
-            "translation": "src/locale/messages.static.xx.xlf",
+            "translation": "src/locale/messages.xx.xlf",
             "baseHref": "/"
           },
           "src": {
-            "translation": "src/locale/messages.static.source.xlf",
+            "translation": "src/locale/messages.source.xlf",
             "baseHref": "/"
           },
           "zh-CN": {
-            "translation": "src/locale/messages.static.zh_CN.xlf",
+            "translation": "src/locale/messages.zh_CN.xlf",
             "baseHref": "/"
           },
           "zh-TW": {
-            "translation": "src/locale/messages.static.zh_TW.xlf",
+            "translation": "src/locale/messages.zh_TW.xlf",
             "baseHref": "/"
           }
         }
@@ -112,7 +109,7 @@
             "crossOrigin": "use-credentials",
             "outputHashing": "all",
             "outputPath": "dist",
-            "i18nMissingTranslation": "error",
+            "i18nMissingTranslation": "warning",
             "assets": [
               {
                 "glob": "**/*",

package.json

@@ -19,11 +19,12 @@
     "prebuild": "rimraf dist && yarn build:i18n && yarn build:browserslist && npm run build-runtime-env",
     "build": "ng build --configuration production --localize",
     "postbuild": "ts-node -P scripts/tsconfig.json scripts/postbuild.ts",
-    "build:i18n:clone": "ts-node -P scripts/tsconfig.json scripts/properties-clone.postbuild.ts",
-    "build:i18n:generate-testing": "ts-node -P scripts/tsconfig.json scripts/properties-test-generator.postbuild.ts",
-    "build:i18n:extract": "ng extract-i18n --format=xlf2 --output-path src/locale",
-    "build:i18n:generate": "ts-node -P scripts/tsconfig.json scripts/translate-file-generator.prebuild.ts",
-    "build:i18n": "yarn build:i18n:extract && yarn build:i18n:generate",
+    "build:i18n:clone": "echo '⚠️  DEPRECATED: Cloning .properties files. This is part of the deprecated .properties workflow.' && ts-node -P scripts/tsconfig.json scripts/properties-clone.postbuild.ts",
+    "build:i18n:generate-testing": "echo '⚠️  DEPRECATED: Generating test languages from .properties. This is part of the deprecated .properties workflow.' && ts-node -P scripts/tsconfig.json scripts/properties-test-generator.postbuild.ts",
+    "build:i18n:extract": "ng extract-i18n --format=xlf --output-path src/locale --out-file messages.xlf && tsx scripts/normalize-xlf.prebuild.ts",
+    "build:i18n:generate": "echo '⚠️  DEPRECATED: Generating XLF from .properties files. Use Transifex for translations instead.' && ts-node -P scripts/tsconfig.json scripts/translate-file-generator.prebuild.ts",
+    "build:i18n": "yarn build:i18n:extract",
+    "build-with-properties": "echo '⚠️  DEPRECATED: This build regenerates XLF files from .properties (deprecated workflow). Prefer using tx pull to get translations from Transifex.' && rimraf dist && yarn build:i18n:extract && yarn build:i18n:generate && yarn build:browserslist && npm run build-runtime-env && ng build --configuration production --localize && npm run postbuild",
     "build:prod": "yarn build",
     "build:sandbox": "yarn build",
     "build:qa": "yarn build",
@@ -45,8 +46,8 @@
     "@angular/animations": "^20.1.6",
     "@angular/cdk": "^20.1.5",
     "@angular/common": "^20.1.6",
-    "@angular/compiler": "^20.3.16",
-    "@angular/core": "^20.1.6",
+    "@angular/compiler": "^20.1.6",
+    "@angular/core": "^20.3.16",
     "@angular/elements": "20.1.6",
     "@angular/forms": "^20.1.6",
     "@angular/localize": "^20.1.6",

scripts/normalize-xlf.prebuild.ts

@@ -0,0 +1,53 @@
+import * as fs from 'fs'
+import { parseString, Builder } from 'xml2js'
+
+function normalizeText(input: string): string {
+  return input
+    .replace(/\r/g, '')
+    .replace(/\n/g, ' ')
+    .replace(/\s\s+/g, ' ')
+    .trim()
+}
+
+function normalizeXlf12Sources(path: string) {
+  const xml = fs.readFileSync(path, 'utf8')
+  parseString(xml, (error, data) => {
+    if (error) {
+      throw error
+    }
+
+    const fileNode = data?.xliff?.file?.[0]
+    const transUnits = fileNode?.body?.[0]?.['trans-unit']
+
+    if (!Array.isArray(transUnits)) {
+      throw new Error('No trans-units found in XLF 1.2 file')
+    }
+
+    transUnits.forEach((tu) => {
+      // Provide a stable key for Transifex (some parsers rely on resname over id/source)
+      if (tu?.$?.id) {
+        tu.$.resname = tu.$.id
+      }
+      const src = tu?.source?.[0]
+      if (typeof src === 'string') {
+        tu.source[0] = normalizeText(src)
+      }
+    })
+
+    const builder = new Builder()
+    let out = builder.buildObject(data)
+    // Match tx pull header formatting (xml decl + <xliff ...> on same line)
+    out = out.replace(
+      /<xliff[^>]*>/,
+      '<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">'
+    )
+    out = out.replace(/^<\?xml[^>]*\?>/, '<?xml version="1.0" ?>')
+    out = out.replace(
+      /^<\?xml version="1\.0" \?>\s*\n\s*<xliff/,
+      '<?xml version="1.0" ?><xliff'
+    )
+    fs.writeFileSync(path, out, { encoding: 'utf8' })
+  })
+}
+
+normalizeXlf12Sources('./src/locale/messages.xlf')