Fix release i18n guard and recovery path

Author: alexphillips-dev

.github/workflows/release-on-main.yml

@@ -31,6 +31,7 @@ jobs:
         shell: bash
         run: |
           set -euo pipefail
+          MANUAL_DISPATCH='${{ github.event_name == 'workflow_dispatch' && '1' || '0' }}'
           BEFORE_SHA='${{ github.event.before }}'
           AFTER_SHA='${{ github.sha }}'
           RANGE="${BEFORE_SHA}..${AFTER_SHA}"
@@ -48,9 +49,13 @@ jobs:
                 ;;
             esac
           done
+          if [[ "${MANUAL_DISPATCH}" == '1' ]]; then
+            should_publish=1
+          fi
 
           {
             echo "range=${RANGE}"
+            echo "manual_dispatch=${MANUAL_DISPATCH}"
             echo "should_publish=${should_publish}"
           } >> "${GITHUB_OUTPUT}"
 

scripts/lang_usage_guard.sh

@@ -100,8 +100,22 @@ for (const fullPath of sourceFiles.sort()) {
     }
   }
 
-  const jqueryI18nRegex = /\$\.i18n\(\s*['"]([^'"]+)['"]/g;
-  while ((match = jqueryI18nRegex.exec(source)) !== null) {
+  const i18nCallRegexes = [
+    /\$\.i18n\(\s*['"]([^'"]+)['"]/g,
+    /\bjq\.i18n\(\s*['"]([^'"]+)['"]/g
+  ];
+  for (const i18nCallRegex of i18nCallRegexes) {
+    while ((match = i18nCallRegex.exec(source)) !== null) {
+      const key = match[1].trim();
+      if (!key) continue;
+      const line = lineNumberAt(source, match.index);
+      if (!referencedKeys.has(key)) referencedKeys.set(key, []);
+      referencedKeys.get(key).push(`${relPath}:${line}`);
+    }
+  }
+
+  const i18nWrapperRegex = /\b(?:i18nLabel|i18nText)\(\s*['"]([^'"]+)['"]/g;
+  while ((match = i18nWrapperRegex.exec(source)) !== null) {
     const key = match[1].trim();
     if (!key) continue;
     const line = lineNumberAt(source, match.index);

tests/versioning-guard.test.mjs

@@ -435,7 +435,10 @@ test('validation workflows delegate to the shared ci suite with dev coverage, fa
 
 test('release-on-main validates remote raw publish artifacts before publishing releases', () => {
     assert.match(releaseOnMainWorkflow, /Detect release artifact changes/);
+    assert.match(releaseOnMainWorkflow, /MANUAL_DISPATCH='.*workflow_dispatch.*'/);
     assert.match(releaseOnMainWorkflow, /should_publish/);
+    assert.match(releaseOnMainWorkflow, /manual_dispatch=\$\{MANUAL_DISPATCH\}/);
+    assert.match(releaseOnMainWorkflow, /if \[\[ "\$\{MANUAL_DISPATCH\}" == '1' \]\]; then/);
     assert.match(releaseOnMainWorkflow, /Skip release publish for non-release main pushes/);
     assert.match(releaseOnMainWorkflow, /Validate remote raw publish artifacts/);
     assert.match(releaseOnMainWorkflow, /FVPLUS_REMOTE_PUBLISH_ATTEMPTS:\s*'30'/);
@@ -585,6 +588,11 @@ test('standards guard scripts exist with expected core checks', () => {
     assert.match(i18nGuard, /Missing base locale file/);
     assert.match(langUsageGuard, /Language usage guard passed/);
     assert.match(langUsageGuard, /data-i18n/);
+    assert.match(langUsageGuard, /i18nCallRegexes/);
+    assert.match(langUsageGuard, /\$\\\.i18n/);
+    assert.match(langUsageGuard, /jq\\\.i18n/);
+    assert.match(langUsageGuard, /i18nWrapperRegex/);
+    assert.match(langUsageGuard, /i18nLabel\|i18nText/);
     assert.match(themeScopeGuard, /Theme scope guard passed/);
     assert.match(themeScopeGuard, /#fv-settings-root/);
     assert.match(themeRuntimeGuard, /Theme runtime guard passed/);