Merge branch 'main' into repo-sync

Author: Octomerger

script/i18n/lint-translation-files.js

@@ -9,6 +9,7 @@
 
 import { execSync } from 'child_process'
 import program from 'commander'
+import fs from 'fs'
 
 // Set up supported linting check types and their corresponding commands.
 const CHECK_COMMANDS = {
@@ -48,7 +49,7 @@ if (SUPPORTED_CHECK_TYPES.includes(specifiedCheckType)) {
 function lintAndResetFiles(checkType) {
   console.log(`Running ${checkType} check...`)
 
-  const log = `~/docs-translation-${checkType}-error.txt`
+  const log = `${process.env.HOME}/docs-translation-${checkType}-error.txt`
   const cmd = `${CHECK_COMMANDS[checkType]} > ${log}`
 
   // Lint the files based on the check type and output the errors to a log file.
@@ -58,10 +59,28 @@ function lintAndResetFiles(checkType) {
     console.log(`There were new ${checkType} errors! Check ${log} for more details.`)
   }
 
-  // Reset the files
-  execSync(
-    `cat ${log} | egrep "^translations/.*/(.+.md|.+.yml)$" | uniq | xargs -L1 script/i18n/reset-translated-file.js --prefer-main`
-  )
+  // return if file does not exist
+  if (!fs.existsSync(log)) {
+    console.log(`${log}: no such file`)
+    return
+  }
+
+  const filesToReset = fs
+    .readFileSync(log)
+    .toString()
+    .split('\n')
+    .filter((p) => p.startsWith('translations') && (p.endsWith('.md') || p.endsWith('.yml')))
+
+  if (filesToReset.length === 0) {
+    console.log('There are no violations')
+    return
+  }
+
+  // We are not passing --prefer-main because we want to remove the file so we
+  // reset it directly to the English source
+  filesToReset.forEach((file) => {
+    execSync(`script/i18n/reset-translated-file.js ${file}`)
+  })
 
   // Print a message with next steps
   console.log(`Success!

tests/linting/lint-files.js

@@ -277,14 +277,15 @@ if (!process.env.TEST_TRANSLATION) {
 } else {
   // get all translated markdown or yaml files by comparing files changed to main branch
   const changedFilesRelPaths = execSync(
-    'git -c diff.renameLimit=10000 diff --name-only origin/main | egrep "^translations/.*/.+.(yml|md)$"',
+    'git -c diff.renameLimit=10000 diff --name-only origin/main',
     { maxBuffer: 1024 * 1024 * 100 }
   )
     .toString()
     .split('\n')
-  if (changedFilesRelPaths === '') process.exit(0)
+    .filter((p) => p.startsWith('translations') && (p.endsWith('.md') || p.endsWith('.yml')))
 
-  console.log('testing translations.')
+  // If there are no changed files, there's nothing to lint: signal a successful termination.
+  if (changedFilesRelPaths.length === 0) process.exit(0)
 
   console.log(`Found ${changedFilesRelPaths.length} translated files.`)