diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index cccbbafd..92e60433 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -19,6 +19,10 @@ jobs: tools: composer extensions: sqlite3, gd + - name: Check language catalogs + working-directory: languages + run: /bin/bash language-update.sh + - name: Get composer cache directory if: ${{ !env.ACT }} id: composer-cache @@ -42,7 +46,10 @@ jobs: - name: Install dependencies run: composer update --prefer-dist -n - - name: check formatting + - name: lint checks + run: composer lint + + - name: formatting checks run: composer check-format - name: touch config.local.php diff --git a/composer.json b/composer.json index 06b5972e..dd4ca2f9 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ ], "check-format": "@php vendor/bin/php-cs-fixer fix --ansi --dry-run --diff", "format": "@php vendor/bin/php-cs-fixer fix --ansi", - "lint": "@php ./vendor/bin/parallel-lint --exclude vendor/ --exclude debian/ .", + "lint": "@php ./vendor/bin/parallel-lint --exclude vendor/ --exclude debian/ -e php,lang .", "test": "@php ./vendor/bin/phpunit --coverage-clover ./clover.xml --do-not-cache-result tests/", "test-fixup": "mkdir -p templates_c ; test -f config.local.php || touch config.local.php", "psalm": "@php ./vendor/bin/psalm.phar --no-cache --show-info=false ", diff --git a/languages/bg.lang b/languages/bg.lang index 955dec3e..ea564978 100644 --- a/languages/bg.lang +++ b/languages/bg.lang @@ -470,8 +470,8 @@ $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuratio $PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX $PALANG['pLegal_char_warning'] = 'Illegal character'; # XXX diff --git a/languages/ca.lang b/languages/ca.lang index f2de836f..70ed983a 100644 --- a/languages/ca.lang +++ b/languages/ca.lang @@ -469,8 +469,8 @@ $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuratio $PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX $PALANG['pLegal_char_warning'] = 'Caràcter il·legal'; diff --git a/languages/cn.lang b/languages/cn.lang index 061cace2..a0af695c 100644 --- a/languages/cn.lang +++ b/languages/cn.lang @@ -469,8 +469,8 @@ $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuratio $PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX diff --git a/languages/da.lang b/languages/da.lang index 5b10ee98..ad5a5f8a 100644 --- a/languages/da.lang +++ b/languages/da.lang @@ -483,8 +483,8 @@ $PALANG['pFetchmail_desc_date'] = 'Dato for seneste prøve/konfigura $PALANG['pFetchmail_desc_returned_text'] = 'Tekstbesked fra seneste prøve'; $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX diff --git a/languages/et.lang b/languages/et.lang index 6605adff..132becea 100644 --- a/languages/et.lang +++ b/languages/et.lang @@ -473,8 +473,8 @@ $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuratio $PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX diff --git a/languages/eu.lang b/languages/eu.lang index 09d41aa5..87be6fc0 100644 --- a/languages/eu.lang +++ b/languages/eu.lang @@ -468,8 +468,8 @@ $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuratio $PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX diff --git a/languages/fi.lang b/languages/fi.lang index 9c8ef4a2..d619ce46 100644 --- a/languages/fi.lang +++ b/languages/fi.lang @@ -469,8 +469,8 @@ $PALANG['pFetchmail_desc_date'] = 'Viimeisen tarkistuksen/konfiguraa $PALANG['pFetchmail_desc_returned_text'] = 'Viesti edellisestä tarkistuksesta'; $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX diff --git a/languages/fo.lang b/languages/fo.lang index ee6be9e2..0612c202 100644 --- a/languages/fo.lang +++ b/languages/fo.lang @@ -474,8 +474,8 @@ $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuratio $PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX diff --git a/languages/hr.lang b/languages/hr.lang index 93a275a5..f5b0ab0e 100644 --- a/languages/hr.lang +++ b/languages/hr.lang @@ -468,8 +468,8 @@ $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuratio $PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX diff --git a/languages/hu.lang b/languages/hu.lang index 0b29b830..ab7f3771 100644 --- a/languages/hu.lang +++ b/languages/hu.lang @@ -482,8 +482,8 @@ $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuratio $PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX diff --git a/languages/is.lang b/languages/is.lang index afb7d546..cec67e94 100644 --- a/languages/is.lang +++ b/languages/is.lang @@ -469,8 +469,8 @@ $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuratio $PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX diff --git a/languages/it.lang b/languages/it.lang index 8ede2f70..9f97358c 100644 --- a/languages/it.lang +++ b/languages/it.lang @@ -470,8 +470,8 @@ $PALANG['pFetchmail_desc_date'] = 'Data dell\'ultima modifica o atti $PALANG['pFetchmail_desc_returned_text'] = 'Risultato dell\'ultima attività'; $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX diff --git a/languages/ja.lang b/languages/ja.lang index 1069e631..374cabd7 100644 --- a/languages/ja.lang +++ b/languages/ja.lang @@ -480,8 +480,8 @@ $PALANG['pFetchmail_desc_date'] = '最終取得確認/設定変更 $PALANG['pFetchmail_desc_returned_text'] = '新着確認の戻りテキストメッセージ'; $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX diff --git a/languages/language-update.sh b/languages/language-update.sh index 290fe7c5..94e80c75 100755 --- a/languages/language-update.sh +++ b/languages/language-update.sh @@ -28,6 +28,17 @@ function update_string_list() { # order, which the old diff-based approach did. PA_NOTEXT="$notext" PA_PATCH="$patch" php /dev/stdin en.lang $filelist <<'ENDOFPHP' getMessage()} ***\n"); + return false; + } +} + # Parse $PALANG['key'] = ...; statements from a language file's SOURCE (never # include()d, to avoid executing it) and return them in file order as # [key, startLine, endLine, sourceText]. @@ -69,13 +80,22 @@ function parse_palang(string $src): array { $notext = getenv('PA_NOTEXT') === '1'; $patch = getenv('PA_PATCH') === '1'; +$failed = false; $reference = 'en.lang'; if (!is_file($reference)) { fwrite(STDERR, "*** $reference not found in current directory ***\n"); exit(1); } -$enStmts = parse_palang(file_get_contents($reference)); +$referenceSrc = file_get_contents($reference); +if ($referenceSrc === false) { + fwrite(STDERR, "*** unable to read $reference ***\n"); + exit(1); +} +if (!validate_php_syntax($referenceSrc, $reference)) { + exit(1); +} +$enStmts = parse_palang($referenceSrc); $enOrder = []; // ordered list of keys $enSource = []; // key => source text foreach ($enStmts as [$key, , , $text]) { @@ -92,10 +112,22 @@ foreach ($files as $file) { } if (!is_file($file)) { fwrite(STDERR, "*** $file not found, skipping ***\n"); + $failed = true; continue; } $src = file_get_contents($file); + if ($src === false) { + fwrite(STDERR, "*** unable to read $file ***\n"); + $failed = true; + continue; + } + + if (!validate_php_syntax($src, $file)) { + $failed = true; + break; + } + $transStmts = parse_palang($src); $transKeys = []; // key => endLine (last definition wins) foreach ($transStmts as [$key, , $endLine, ]) { @@ -121,6 +153,13 @@ foreach ($files as $file) { continue; } + // Read-only checks must report incomplete catalogs through the exit code. + // --patch can still succeed when it adds every missing key, but obsolete + // keys remain an error because that mode deliberately leaves them in place. + if (!$patch) { + $failed = true; + } + if ($notext) { echo "### $file ###\n"; foreach ($missing as [$key, ]) { @@ -186,6 +225,7 @@ foreach ($files as $file) { file_put_contents($file, implode("\n", $out)); echo "*** $file: added " . count($missing) . " missing string(s)"; if ($obsolete) { + $failed = true; echo ", " . count($obsolete) . " obsolete string(s) left in place (see --remove/--obsolete)"; } echo " ***\n"; @@ -193,6 +233,7 @@ foreach ($files as $file) { fwrite(STDERR, "# obsolete in $file (not in en.lang): $key\n"); } } +exit($failed ? 1 : 0); ENDOFPHP } # end update_string_list() @@ -526,4 +567,7 @@ test "$comparetext" = 1 && { comparetext ; cleanup ; exit 0 ; } test "$stats" = 1 && { statistics ; exit 0 ; } -update_string_list ; cleanup # default operation +update_string_list +status=$? +cleanup # default operation +exit $status diff --git a/languages/lt.lang b/languages/lt.lang index b4e91b8b..4c6729b0 100644 --- a/languages/lt.lang +++ b/languages/lt.lang @@ -475,8 +475,8 @@ $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuratio $PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX diff --git a/languages/mk.lang b/languages/mk.lang index 3c7c5418..ea29fd3a 100644 --- a/languages/mk.lang +++ b/languages/mk.lang @@ -470,8 +470,8 @@ $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuratio $PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX diff --git a/languages/nb.lang b/languages/nb.lang index aeb866c0..8fe13250 100644 --- a/languages/nb.lang +++ b/languages/nb.lang @@ -470,8 +470,8 @@ $PALANG['pFetchmail_desc_date'] = 'Dato for siste spørring/konfigur $PALANG['pFetchmail_desc_returned_text'] = 'Tekstmelding fra siste spørring'; $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX diff --git a/languages/nn.lang b/languages/nn.lang index 3c3e6706..8a9caf0c 100644 --- a/languages/nn.lang +++ b/languages/nn.lang @@ -469,8 +469,8 @@ $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuratio $PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX diff --git a/languages/pl.lang b/languages/pl.lang index 02aef690..3121e9e3 100644 --- a/languages/pl.lang +++ b/languages/pl.lang @@ -475,8 +475,8 @@ $PALANG['pFetchmail_desc_date'] = 'Data ostatniego sprawdzenia/zmian $PALANG['pFetchmail_desc_returned_text'] = 'Wiadomość tekstowa z ostatniego sprawdzenia'; $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX diff --git a/languages/pt-br.lang b/languages/pt-br.lang index 3e399c0a..6c2e6566 100644 --- a/languages/pt-br.lang +++ b/languages/pt-br.lang @@ -482,8 +482,8 @@ $PALANG['pFetchmail_desc_date'] = 'Data da última checagem/mudança $PALANG['pFetchmail_desc_returned_text'] = 'Mensagem de texto da última checagem'; $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX diff --git a/languages/ro.lang b/languages/ro.lang index 68db05e0..8291a2da 100644 --- a/languages/ro.lang +++ b/languages/ro.lang @@ -481,8 +481,8 @@ $PALANG['pFetchmail_desc_returned_text'] = 'Mesaj text'; $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX diff --git a/languages/sk.lang b/languages/sk.lang index bef8d01a..aa8d4be8 100644 --- a/languages/sk.lang +++ b/languages/sk.lang @@ -470,8 +470,8 @@ $PALANG['pFetchmail_desc_date'] = 'Dátum poslednej zmeny konfigurá $PALANG['pFetchmail_desc_returned_text'] = 'Správa z posledného sťahovania'; $PALANG['dateformat_pgsql'] = 'dd.mm.YYYY'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format $PALANG['dateformat_mysql'] = '%d.%m.%Y'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX diff --git a/languages/sl.lang b/languages/sl.lang index f8533bb9..1e05f6eb 100644 --- a/languages/sl.lang +++ b/languages/sl.lang @@ -469,8 +469,8 @@ $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuratio $PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX diff --git a/languages/sv.lang b/languages/sv.lang index e2f581ce..e147a2e7 100644 --- a/languages/sv.lang +++ b/languages/sv.lang @@ -482,8 +482,8 @@ $PALANG['pFetchmail_desc_returned_text'] = 'Textmeddelande från senaste kont $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX diff --git a/languages/tw.lang b/languages/tw.lang index ea61203e..cee1c0c0 100644 --- a/languages/tw.lang +++ b/languages/tw.lang @@ -471,8 +471,8 @@ $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuratio $PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX $PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX $PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX -$PALANG['password_expiration'] = 'Password expiration (days)' # XXX -$PALANG['password_expiration_desc'] = 'Number of days before the password expires' # XXX +$PALANG['password_expiration'] = 'Password expiration (days)'; # XXX +$PALANG['password_expiration_desc'] = 'Number of days before the password expires'; # XXX $PALANG['To_Mailbox'] = 'Mailbox'; # XXX # XXX $PALANG['To_Forward_Only'] = 'Forward Only'; # XXX # XXX diff --git a/tests/LanguageUpdateScriptTest.php b/tests/LanguageUpdateScriptTest.php new file mode 100644 index 00000000..d5a46872 --- /dev/null +++ b/tests/LanguageUpdateScriptTest.php @@ -0,0 +1,121 @@ +markTestSkipped('language-update.sh requires a Unix-like environment with Bash'); + } + + $this->directory = sys_get_temp_dir() . '/postfixadmin-language-update-' . bin2hex(random_bytes(6)); + self::assertTrue(mkdir($this->directory)); + $script = realpath(__DIR__ . '/../languages/language-update.sh'); + self::assertNotFalse($script); + $this->script = $script; + + file_put_contents($this->directory . '/en.lang', <<<'PHP' +directory) || !is_dir($this->directory)) { + return; + } + + foreach (new DirectoryIterator($this->directory) as $file) { + if (!$file->isDot()) { + unlink($file->getPathname()); + } + } + rmdir($this->directory); + } + + public function testInvalidSyntaxStopsBeforeMissingKeyDetection(): void + { + file_put_contents($this->directory . '/test.lang', <<<'PHP' +directory . '/after.lang', <<<'PHP' +runScript(['test.lang', 'after.lang']); + + self::assertSame(1, $status); + self::assertStringContainsString('PHP syntax error', $stderr); + self::assertStringNotContainsString('--fix', $stderr); + self::assertStringNotContainsString(' missing,', $stdout); + self::assertStringNotContainsString('after.lang', $stdout); + } + + public function testMissingTranslationsReturnFailure(): void + { + file_put_contents($this->directory . '/test.lang', <<<'PHP' +runScript(['test.lang']); + + self::assertSame(1, $status, $stderr); + self::assertStringContainsString('1 missing, 0 obsolete', $stdout); + } + + public function testObsoleteTranslationsReturnFailure(): void + { + file_put_contents($this->directory . '/test.lang', <<<'PHP' +runScript(['test.lang']); + + self::assertSame(1, $status, $stderr); + self::assertStringContainsString('0 missing, 1 obsolete', $stdout); + } + + private function runScript(array $arguments): array + { + $command = array_merge(['/bin/bash', $this->script], $arguments); + $pipes = []; + $process = proc_open($command, [ + 0 => ['pipe', 'r'], + 1 => ['pipe', 'w'], + 2 => ['pipe', 'w'], + ], $pipes, $this->directory); + self::assertIsResource($process); + fclose($pipes[0]); + $stdout = stream_get_contents($pipes[1]); + $stderr = stream_get_contents($pipes[2]); + fclose($pipes[1]); + fclose($pipes[2]); + + return [proc_close($process), $stdout, $stderr]; + } +}