Keep the script output in English, like the other translation scripts

Author: lacatoire

scripts/translation/README.md

@@ -120,10 +120,6 @@ The script accepts a `--github` option, to report alerts as GitHub Actions
 annotations instead of plain text, so that they land on the right file of the
 pull request.
 
-It also accepts a `--messages=` option, pointing to a PHP file that returns
-an array of messages, for translations that would rather alert their
-contributors in their own language. Missing entries fall back to English.
-
 Files marked with `<?do-not-translate?>`, and files without a revision tag,
 are skipped. `qaxml-revtag.php` is the script that reports the latter.
 

scripts/translation/check-structure.php

@@ -35,18 +35,10 @@
     'screen' , 'seg' , 'segtitle' , 'synopsis' ,
 ];
 
-const DEFAULT_MESSAGES = [
-    'invalid'   => '<<INVALID>>' ,
-    'none'      => '(none)' ,
-    'violation' => 'structure differs from doc-en (EN: %s | translation: %s) [blocks EN=%d translation=%d]' ,
-    'summary'   => "checked=%d divergent=%d\n" ,
-];
-
 $argv     = new ArgvParser( $argv );
 $argv->consume( position: 0 ); // script name
 $help     = $argv->consume( equals: "--help" ) ?? $argv->consume( equals: "-h" );
 $lang     = $argv->consume( prefix: "--lang=" );
-$msgFile  = $argv->consume( prefix: "--messages=" );
 $github   = $argv->consume( equals: "--github" );
 $files    = [];
 foreach ( $argv->residual() as $arg )
@@ -59,15 +51,14 @@
 
 if ( $help !== null )
 {
-    fwrite( STDERR , "Usage: check-structure.php [--lang=xx] [--messages=file] [--github] [files...]\n\n" );
+    fwrite( STDERR , "Usage: check-structure.php [--lang=xx] [--github] [files...]\n\n" );
     fwrite( STDERR , "Reads file names from the command line, or from standard input when none\n" );
     fwrite( STDERR , "are given. Paths are relative to the translation directory.\n\n" );
     fwrite( STDERR , "See https://github.com/php/doc-base/tree/master/scripts/translation#readme for more info.\n" );
     exit( 0 );
 }
 
 $lang     = requireLang( $lang );
-$messages = loadMessages( $msgFile );
 $files    = $files === [] ? readPathsFromStdin() : $files;
 
 // -- Setup -----------------------------------------------------------------
@@ -91,33 +82,6 @@ function requireLang( ?string $lang ) : string
     return trim( file_get_contents( $file ) );
 }
 
-/**
- * Message catalog. A translation may hand its own file over --messages=, so
- * that contributors read alerts in their language. The file returns an array
- * with any of the DEFAULT_MESSAGES keys; missing keys fall back to English.
- */
-function loadMessages( ?string $filename ) : array
-{
-    if ( $filename === null || $filename === '' )
-        return DEFAULT_MESSAGES;
-
-    if ( ! is_file( $filename ) )
-    {
-        fwrite( STDERR , "Message file not found: $filename\n" );
-        exit( 1 );
-    }
-
-    $messages = require $filename;
-
-    if ( ! is_array( $messages ) )
-    {
-        fwrite( STDERR , "Message file must return an array: $filename\n" );
-        exit( 1 );
-    }
-
-    return array_merge( DEFAULT_MESSAGES , $messages );
-}
-
 /**
  * File names read from standard input, one per line, .xml only. This is how a
  * CI job hands over the list of files a pull request touches.
@@ -189,12 +153,12 @@ function collectSkeleton( DOMElement $element , string $depth , array & $skeleto
  * Undeclared entities are left to XmlUtil::loadText(), which recovers from
  * them; both sides go through the same loader, so the treatment is symmetric.
  */
-function buildSkeleton( string $xml , array $messages ) : array
+function buildSkeleton( string $xml ) : array
 {
     $document = XmlUtil::loadText( $xml );
 
     if ( $document->documentElement === null )
-        return [ $messages[ 'invalid' ] ];
+        return [ '<<INVALID>>' ];
 
     $skeleton = [];
     collectSkeleton( $document->documentElement , '' , $skeleton );
@@ -226,7 +190,7 @@ function docEnFileAtRevision( string $hash , string $file ) : ?string
  * First position where two skeletons differ, as [ enLine , targetLine ], or
  * null when they are identical. A missing line is reported as "(none)".
  */
-function firstDivergence( array $enSkeleton , array $targetSkeleton , array $messages ) : ?array
+function firstDivergence( array $enSkeleton , array $targetSkeleton ) : ?array
 {
     $length = max( count( $enSkeleton ) , count( $targetSkeleton ) );
 
@@ -237,8 +201,8 @@ function firstDivergence( array $enSkeleton , array $targetSkeleton , array $mes
 
         if ( $enLine !== $targetLine )
             return [
-                trim( $enSkeleton[ $i ] ?? $messages[ 'none' ] ) ,
-                trim( $targetSkeleton[ $i ] ?? $messages[ 'none' ] ) ,
+                trim( $enSkeleton[ $i ] ?? '(none)' ) ,
+                trim( $targetSkeleton[ $i ] ?? '(none)' ) ,
             ];
     }
 
@@ -281,9 +245,9 @@ function firstDivergence( array $enSkeleton , array $targetSkeleton , array $mes
 
     $checked++;
 
-    $enSkeleton     = buildSkeleton( $enXml , $messages );
-    $targetSkeleton = buildSkeleton( $targetXml , $messages );
-    $divergence     = firstDivergence( $enSkeleton , $targetSkeleton , $messages );
+    $enSkeleton     = buildSkeleton( $enXml );
+    $targetSkeleton = buildSkeleton( $targetXml );
+    $divergence     = firstDivergence( $enSkeleton , $targetSkeleton );
 
     if ( $divergence === null )
         continue;
@@ -298,7 +262,10 @@ function firstDivergence( array $enSkeleton , array $targetSkeleton , array $mes
 
 foreach ( $violations as [ $file , $enLine , $targetLine , $enCount , $targetCount ] )
 {
-    $message = sprintf( $messages[ 'violation' ] , $enLine , $targetLine , $enCount , $targetCount );
+    $message = sprintf(
+        'structure differs from doc-en (EN: %s | translation: %s) [blocks EN=%d translation=%d]' ,
+        $enLine , $targetLine , $enCount , $targetCount
+    );
 
     // Under GitHub Actions the path must be relative to the repository being
     // annotated, so that the alert lands on the right file of the pull request.
@@ -309,6 +276,6 @@ function firstDivergence( array $enSkeleton , array $targetSkeleton , array $mes
         printf( "%s/%s: %s\n" , $lang , $file , $message );
 }
 
-fprintf( STDERR , $messages[ 'summary' ] , $checked , count( $violations ) );
+fprintf( STDERR , "checked=%d divergent=%d\n" , $checked , count( $violations ) );
 
 exit( $violations === [] ? 0 : 1 );