From 8487fa6248d1d5dac81640de9c55c1eab9f324b3 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
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/en/admin.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'app/i18n/en/admin.php')

diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index e8bab3a75..3a10dc7e7 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -83,9 +83,9 @@ return array(
 			'ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite, pdo_pgsql).',
 		),
 		'php' => array(
+			'_' => 'PHP installation',
 			'nok' => 'Your PHP version is %s but FreshRSS requires at least version %s.',
 			'ok' => 'Your PHP version is %s, which is compatible with FreshRSS.',
-			'_' => 'PHP installation',
 		),
 		'tables' => array(
 			'nok' => 'There are one or more missing tables in the database.',
@@ -116,8 +116,8 @@ return array(
 		'name' => 'Name',
 		'no_configure_view' => 'This extension cannot be configured.',
 		'system' => array(
-			'no_rights' => 'System extension (you have no rights on it)',
 			'_' => 'System extensions',
+			'no_rights' => 'System extension (you have no rights on it)',
 		),
 		'title' => 'Extensions',
 		'update' => 'Update available',
@@ -125,6 +125,7 @@ return array(
 		'version' => 'Version',
 	),
 	'stats' => array(
+		'_' => 'Statistics',
 		'all_feeds' => 'All feeds',
 		'category' => 'Category',
 		'entry_count' => 'Entry count',
@@ -154,9 +155,9 @@ return array(
 		'status_unread' => 'Unread',
 		'title' => 'Statistics',
 		'top_feed' => 'Top ten feeds',
-		'_' => 'Statistics',
 	),
 	'system' => array(
+		'_' => 'System configuration',
 		'auto-update-url' => 'Auto-update server URL',
 		'cookie-duration' => array(
 			'help' => 'in seconds',
@@ -170,21 +171,20 @@ return array(
 			'help' => '0 means that there is no account limit',
 			'number' => 'Max number of accounts',
 		),
-		'_' => 'System configuration',
 	),
 	'update' => array(
+		'_' => 'Update system',
 		'apply' => 'Apply',
 		'check' => 'Check for new updates',
 		'current_version' => 'Your current version of FreshRSS is %s.',
 		'last' => 'Last verification: %s',
 		'none' => 'No update to apply',
 		'title' => 'Update system',
-		'_' => 'Update system',
 	),
 	'user' => array(
 		'admin' => 'Administrator',
-		'articles_and_size' => '%s articles (%s)',
 		'article_count' => 'Articles',
+		'articles_and_size' => '%s articles (%s)',
 		'back_to_manage' => '← Return to user list',
 		'create' => 'Create new user',
 		'database_size' => 'Database size',
@@ -202,8 +202,8 @@ return array(
 		'selected' => 'Selected user',
 		'title' => 'Manage users',
 		'update_users' => 'Update user',
+		'user_list' => 'List of users',
 		'username' => 'Username',
 		'users' => 'Users',
-		'user_list' => 'List of users',
 	),
 );
-- 
cgit v1.2.3