From 8487fa6248d1d5dac81640de9c55c1eab9f324b3 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Fri, 15 May 2020 17:31:21 +0200 Subject: Reformat i18n correctly (#2976) * Ignore i18n gen.dir key * Add a makefile target to update an i18n key * Mark some i18n keys to ignore * Reformat i18n files correctly * Make i18n keys sort case-sensitive Calling `make i18n-format` was always inverting 4 lines: - gen.date.dec with gen.date.Dec - and gen.date.nov with gen.date.Nov I don't know why these particular lines and not the others, but it appeared the sort function was case insensitive due to the `SORT_FLAG_CASE` flag passed to the `ksort` function. Removing this flag makes the calls to the formatter idempotent and more reliable. Unfortunately it moves a lot of lines since the `_` character is considered differently. * Check i18n files are correctly formatted on Travis --- app/i18n/cz/sub.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'app/i18n/cz/sub.php') diff --git a/app/i18n/cz/sub.php b/app/i18n/cz/sub.php index 4e415f378..3bf29012a 100644 --- a/app/i18n/cz/sub.php +++ b/app/i18n/cz/sub.php @@ -11,6 +11,7 @@ return array( 'title' => 'Bookmarklet', // TODO - Translation ), 'category' => array( + '_' => 'Kategorie', 'add' => 'Přidat kategorii', 'archiving' => 'Archivace', 'empty' => 'Vyprázdit kategorii', @@ -19,7 +20,6 @@ return array( 'position' => 'Display position', // TODO - Translation 'position_help' => 'To control category sort order', // TODO - Translation 'title' => 'Název', - '_' => 'Kategorie', ), 'feed' => array( 'add' => 'Přidat RSS kanál', @@ -39,16 +39,16 @@ return array( 'empty' => 'Kanál je prázdný. Ověřte prosím zda je ještě autorem udržován.', 'error' => 'Vyskytl se problém s kanálem. Ověřte že je vždy dostupný, prosím, a poté jej aktualizujte.', 'filteractions' => array( - 'help' => 'Write one search filter per line.', // TODO - Translation '_' => 'Filter actions', // TODO - Translation + 'help' => 'Write one search filter per line.', // TODO - Translation ), 'information' => 'Informace', 'keep_min' => 'Zachovat tento minimální počet článků', 'maintenance' => array( 'clear_cache' => 'Clear cache', // TODO - Translation - 'clear_cache_help' => 'Clear the cache of this feed on disk', // TODO - Translation + 'clear_cache_help' => 'Clear the cache for this feed.', // TODO - Translation 'reload_articles' => 'Reload articles', // TODO - Translation - 'reload_articles_help' => 'Reload articles and fetch complete content', // TODO - Translation + 'reload_articles_help' => 'Reload articles and fetch complete content if a selector is defined.', // TODO - Translation 'title' => 'Maintenance', // TODO - Translation ), 'moved_category_deleted' => 'Po smazání kategorie budou v ní obsažené kanály automaticky přesunuty do %s.', @@ -56,13 +56,13 @@ return array( 'no_selected' => 'Nejsou označeny žádné kanály.', 'number_entries' => '%d článků', 'priority' => array( + '_' => 'Visibility', // TODO - Translation 'archived' => 'Do not show (archived)', // TODO - Translation 'main_stream' => 'Zobrazit ve “Všechny kanály”', 'normal' => 'Show in its category', // TODO - Translation - '_' => 'Visibility', // TODO - Translation ), 'selector_preview' => array( - 'show_raw' => 'Show source', // TODO - Translation + 'show_raw' => 'Show source code', // TODO - Translation 'show_rendered' => 'Show content', // TODO - Translation ), 'show' => array( @@ -108,8 +108,8 @@ return array( 'subscription_tools' => 'Subscription tools', // TODO - Translation ), 'title' => array( + '_' => 'Správa subskripcí', 'feed_management' => 'Správa RSS kanálů', 'subscription_tools' => 'Subscription tools', // TODO - Translation - '_' => 'Správa subskripcí', ), ); -- cgit v1.2.3