Files
FreshRSS/cli/i18n/I18nCompletionValidator.php
Christian Weiske 1acc646222 Show time since when a feed has problems + new timeago() method and i18n plurals (#8670)
Closes https://github.com/FreshRSS/FreshRSS/issues/8508

Changes proposed in this pull request:

- Use an integer for `Feed::error` everywhere (follow up to #8646)
- Extract `Entry::machineReadableDate()` into function for use in HTML templates
- Add `timeago()` function that converts a unix timestamp into a "4 weeks ago" string
- Show the last successful feed update, and the last erroneous update

How to test the feature manually:

1. Update a feed
2. Modify the feed URL in the database and set it to a non-existing URL
3. Update the feed again
4. Open the "Manage feed" and see the expanded error message:

>  Blast! This feed has encountered a problem. If this situation persists, please verify that it is still reachable.
> Last successful update 3 hours ago, last erroneous update 1 hour ago. 

You can hover the relative dates to see the timestamp.

* Make Feed::error an int everywhere

Related: https://github.com/FreshRSS/FreshRSS/pull/8646

* Extract timestamptomachinedate()

.. for later usage in the feed error time display.

* Show time since when a feed has problems

We add our own "timeago" function that converts a unix timestamp
into a "4 weeks ago" string.

Resolves: https://github.com/FreshRSS/FreshRSS/issues/8508

* Add new translation keys

* i18n fr, en-US

* Minor XHTML preference

* Slightly shorter rewrite, also hopefully easier to read

* Rewrite to allow (simple) plural
I also moved some functions around for hopefully a more generic and better structure.
I made some changes for the sake of speed (e.g. second-based logic instead of datetime intervals).
Note: I used automatic translation as I was worried it would be too complicated to explain to translators... I proofread the few languages I have some familiarity with.

* Add reference to CLDR

* Slightly more compact syntax

* Always show last update, fix case of unknown error date

* Remove forgotten span

* No need for multi-lines anymore

* Fix error date thresshold

* plurals forms

* Extract gettext formula conversion script to cli

* Simplify a bit

* Escort excess parentheses to the door

* Simplify

* Avoid being too clever in localization

* Fix German

* Fix plural TODO parsing

* Ignore en-US translation

* make fix-all

* git update-index --chmod=+x cli/compile.plurals.php

* Heredoc indent PHP 7.3+

* compileAll: Continue on error

* PHP strict comparisons

* Light logical simplification

* Cache plural_message_families

* Avoid case of empty value

* A bit of documentation

---------

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
Co-authored-by: Frans de Jonge <frans@clevercast.com>
Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>
2026-04-07 22:56:02 +02:00

158 lines
4.0 KiB
PHP

<?php
declare(strict_types=1);
require_once __DIR__ . '/I18nValidatorInterface.php';
class I18nCompletionValidator implements I18nValidatorInterface {
private int $totalEntries = 0;
private int $passEntries = 0;
private string $result = '';
/**
* @param array<string,array<string,I18nValue>> $reference
* @param array<string,array<string,I18nValue>> $language
*/
public function __construct(
private readonly array $reference,
private array $language,
) {
}
private static function isPluralVariantKey(string $key): bool {
return preg_match('/\.\d+$/', $key) === 1;
}
/**
* @return array{base:string,index:int}|null
*/
private static function parsePluralVariantKey(string $key): ?array {
if (preg_match('/^(?P<base>.+)\.(?P<index>\d+)$/', $key, $matches) !== 1) {
return null;
}
return [
'base' => $matches['base'],
'index' => (int)$matches['index'],
];
}
#[\Override]
public function displayReport(bool $percentage_only = false): string {
if ($this->passEntries > $this->totalEntries) {
throw new \RuntimeException('The number of translated strings cannot be higher than the number of strings');
}
if ($this->totalEntries === 0) {
return 'There is no data.' . PHP_EOL;
}
$percentage = sprintf('%5.1f%%', $this->passEntries / $this->totalEntries * 100);
if ($percentage_only) {
return trim($percentage);
}
return 'Translation is ' . $percentage . ' complete.' . PHP_EOL;
}
#[\Override]
public function displayResult(): string {
return $this->result;
}
#[\Override]
public function validate(): bool {
foreach ($this->reference as $file => $data) {
foreach ($data as $refKey => $refValue) {
if (!$this->pluralVariantAppliesToLanguage($file, $refKey)) {
continue;
}
$this->totalEntries++;
if (!array_key_exists($file, $this->language) || !array_key_exists($refKey, $this->language[$file])) {
$this->result .= "Missing key $refKey" . PHP_EOL;
continue;
}
$this->validateValue($refKey, $refValue, $this->language[$file][$refKey]);
}
}
foreach ($this->language as $file => $data) {
$referenceValues = $this->reference[$file] ?? [];
foreach ($data as $key => $value) {
if (!self::isPluralVariantKey($key) || array_key_exists($key, $referenceValues)) {
continue;
}
$referenceValue = $this->referenceValueForKey($referenceValues, $key);
if ($referenceValue === null) {
continue;
}
$this->totalEntries++;
$this->validateValue($key, $referenceValue, $value);
}
}
return $this->totalEntries === $this->passEntries;
}
/**
* @param array<string,I18nValue> $referenceValues
*/
private function referenceValueForKey(array $referenceValues, string $key): ?I18nValue {
if (array_key_exists($key, $referenceValues)) {
return $referenceValues[$key];
}
$parsedKey = self::parsePluralVariantKey($key);
if ($parsedKey === null) {
return null;
}
$pluralKey = $parsedKey['base'] . '.1';
if (array_key_exists($pluralKey, $referenceValues)) {
return $referenceValues[$pluralKey];
}
$singularKey = $parsedKey['base'] . '.0';
return $referenceValues[$singularKey] ?? null;
}
private function validateValue(string $key, I18nValue $referenceValue, I18nValue $value): void {
if ($value->isIgnore()) {
$this->passEntries++;
return;
}
if ($referenceValue->equal($value)) {
$this->result .= "Untranslated key $key - $referenceValue" . PHP_EOL;
return;
}
$this->passEntries++;
}
private function pluralVariantAppliesToLanguage(string $file, string $key): bool {
$parsedKey = self::parsePluralVariantKey($key);
if ($parsedKey === null) {
return true;
}
$indexes = [];
foreach ($this->language[$file] ?? [] as $languageKey => $value) {
$parsedLanguageKey = self::parsePluralVariantKey($languageKey);
if ($parsedLanguageKey === null || $parsedLanguageKey['base'] !== $parsedKey['base']) {
continue;
}
$indexes[$parsedLanguageKey['index']] = true;
}
if ($indexes === []) {
return true;
}
return array_key_exists($parsedKey['index'], $indexes);
}
}