mirror of
https://github.com/FreshRSS/FreshRSS.git
synced 2026-05-14 18:23:52 -04:00
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>
135 lines
3.9 KiB
PHP
135 lines
3.9 KiB
PHP
<?php
|
|
declare(strict_types=1);
|
|
require_once dirname(__DIR__, 3) . '/cli/i18n/I18nValue.php';
|
|
require_once dirname(__DIR__, 3) . '/cli/i18n/I18nUsageValidator.php';
|
|
|
|
final class I18nUsageValidatorTest extends \PHPUnit\Framework\TestCase {
|
|
|
|
private I18nValue $value;
|
|
|
|
#[\Override]
|
|
public function setUp(): void {
|
|
$this->value = $this->getMockBuilder(I18nValue::class)
|
|
->disableOriginalConstructor()
|
|
->getMock();
|
|
}
|
|
|
|
public function testDisplayReport(): void {
|
|
$validator = new I18nUsageValidator([], []);
|
|
|
|
self::assertSame("There is no data.\n", $validator->displayReport());
|
|
|
|
$reflectionTotalEntries = new ReflectionProperty(I18nUsageValidator::class, 'totalEntries');
|
|
$reflectionTotalEntries->setValue($validator, 100);
|
|
|
|
self::assertSame(" 0.0% of translation keys are unused.\n", $validator->displayReport());
|
|
|
|
$reflectionFailedEntries = new ReflectionProperty(I18nUsageValidator::class, 'failedEntries');
|
|
$reflectionFailedEntries->setValue($validator, 25);
|
|
|
|
self::assertSame(" 25.0% of translation keys are unused.\n", $validator->displayReport());
|
|
|
|
$reflectionFailedEntries->setValue($validator, 100);
|
|
|
|
self::assertSame("100.0% of translation keys are unused.\n", $validator->displayReport());
|
|
|
|
$reflectionFailedEntries->setValue($validator, 200);
|
|
|
|
$this->expectException(\RuntimeException::class);
|
|
$this->expectExceptionMessage('The number of unused strings cannot be higher than the number of strings');
|
|
$validator->displayReport();
|
|
}
|
|
|
|
public static function testValidateWhenNoData(): void {
|
|
$validator = new I18nUsageValidator([], []);
|
|
self::assertTrue($validator->validate());
|
|
self::assertSame('', $validator->displayResult());
|
|
}
|
|
|
|
public function testValidateWhenParentKeyExistsWithoutTransformation(): void {
|
|
$validator = new I18nUsageValidator([
|
|
'file1' => [
|
|
'file1.l1.l2._' => $this->value,
|
|
],
|
|
'file2' => [
|
|
'file2.l1.l2._' => $this->value,
|
|
],
|
|
], [
|
|
'file1.l1.l2._',
|
|
'file2.l1.l2._',
|
|
]);
|
|
self::assertTrue($validator->validate());
|
|
self::assertSame('', $validator->displayResult());
|
|
}
|
|
|
|
public function testValidateWhenParentKeyExistsWithTransformation(): void {
|
|
$validator = new I18nUsageValidator([
|
|
'file1' => [
|
|
'file1.l1.l2._' => $this->value,
|
|
],
|
|
'file2' => [
|
|
'file2.l1.l2._' => $this->value,
|
|
],
|
|
], [
|
|
'file1.l1.l2',
|
|
'file2.l1.l2',
|
|
]);
|
|
self::assertTrue($validator->validate());
|
|
self::assertSame('', $validator->displayResult());
|
|
}
|
|
|
|
public function testValidateWhenParentKeyDoesNotExist(): void {
|
|
$validator = new I18nUsageValidator([
|
|
'file1' => [
|
|
'file1.l1.l2._' => $this->value,
|
|
],
|
|
'file2' => [
|
|
'file2.l1.l2._' => $this->value,
|
|
],
|
|
], []);
|
|
self::assertFalse($validator->validate());
|
|
self::assertSame("Unused key file1.l1.l2._ - \nUnused key file2.l1.l2._ - \n", $validator->displayResult());
|
|
}
|
|
|
|
public function testValidateWhenChildKeyExists(): void {
|
|
$validator = new I18nUsageValidator([
|
|
'file1' => [
|
|
'file1.l1.l2.k1' => $this->value,
|
|
],
|
|
'file2' => [
|
|
'file2.l1.l2.k1' => $this->value,
|
|
],
|
|
], [
|
|
'file1.l1.l2.k1',
|
|
'file2.l1.l2.k1',
|
|
]);
|
|
self::assertTrue($validator->validate());
|
|
self::assertSame('', $validator->displayResult());
|
|
}
|
|
|
|
public function testValidateWhenChildKeyDoesNotExist(): void {
|
|
$validator = new I18nUsageValidator([
|
|
'file1' => [
|
|
'file1.l1.l2.k1' => $this->value,
|
|
],
|
|
'file2' => [
|
|
'file2.l1.l2.k1' => $this->value,
|
|
],
|
|
], []);
|
|
self::assertFalse($validator->validate());
|
|
self::assertSame("Unused key file1.l1.l2.k1 - \nUnused key file2.l1.l2.k1 - \n", $validator->displayResult());
|
|
}
|
|
|
|
public function testValidateWhenPluralPrefixExists(): void {
|
|
$validator = new I18nUsageValidator([
|
|
'plurals.php' => [
|
|
'gen.interval.day' => $this->value,
|
|
'gen.interval.hour' => $this->value,
|
|
],
|
|
], [], ['gen.interval.']);
|
|
|
|
self::assertTrue($validator->validate());
|
|
self::assertSame('', $validator->displayResult());
|
|
}
|
|
}
|