mirror of
https://github.com/FreshRSS/FreshRSS.git
synced 2026-04-18 05:17:17 -04:00
1acc646222
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>
51 lines
1.5 KiB
PHP
51 lines
1.5 KiB
PHP
<?php
|
|
declare(strict_types=1);
|
|
|
|
use PHPUnit\Framework\Attributes\DataProvider;
|
|
|
|
final class TranslateTest extends \PHPUnit\Framework\TestCase {
|
|
/**
|
|
* @return list<array{string,int,string}>
|
|
*/
|
|
public static function providePluralTranslations(): array {
|
|
return [
|
|
['en', 1, '1 day ago'],
|
|
['en', 2, '2 days ago'],
|
|
['fr', 0, 'il y a 0 jour'],
|
|
['fr', 2, 'il y a 2 jours'],
|
|
['id', 5, '5 hari yang lalu'],
|
|
['lv', 0, 'pirms 0 dienu'],
|
|
['lv', 1, 'pirms 1 diena'],
|
|
['lv', 2, 'pirms 2 dienas'],
|
|
['he', 2, 'לפני 2 ימים'],
|
|
['ru', 5, '5 дней назад'],
|
|
['zh-CN', 3, '3天前'],
|
|
];
|
|
}
|
|
|
|
#[DataProvider('providePluralTranslations')]
|
|
public function testPluralUsesLocalePluralForms(string $language, int $value, string $expected): void {
|
|
Minz_Translate::init($language);
|
|
|
|
self::assertSame($expected, Minz_Translate::plural('gen.interval.day', $value));
|
|
}
|
|
|
|
public function testTimeagoUsesPluralCatalogues(): void {
|
|
Minz_Translate::init('ru');
|
|
|
|
self::assertSame('5 минут назад', timeago(0, 5 * 60));
|
|
|
|
Minz_Translate::reset('fr');
|
|
self::assertSame('il y a 2 jours', timeago(0, 2 * 86400));
|
|
}
|
|
|
|
public function testCompiledPluralFileProvidesRuntimeCallable(): void {
|
|
$pluralData = include APP_PATH . '/i18n/cs/plurals.php';
|
|
|
|
self::assertIsArray($pluralData);
|
|
self::assertSame(3, $pluralData['nplurals']);
|
|
self::assertInstanceOf(Closure::class, $pluralData['plural']);
|
|
self::assertSame(1, $pluralData['plural'](3));
|
|
}
|
|
}
|