aboutsummaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2020-05-15 17:31:21 +0200
committerGravatar GitHub <noreply@github.com> 2020-05-15 17:31:21 +0200
commit8487fa6248d1d5dac81640de9c55c1eab9f324b3 (patch)
treef3209fdeb8341870bd4fe765e30a0a395a12c4ea /cli
parent62a42a20630c5dfb4a677a42bbc3dd6c7cd203d2 (diff)
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
Diffstat (limited to 'cli')
-rw-r--r--cli/i18n/I18nFile.php2
-rw-r--r--cli/i18n/ignore/cz.php5
-rw-r--r--cli/i18n/ignore/de.php5
-rw-r--r--cli/i18n/ignore/es.php21
-rw-r--r--cli/i18n/ignore/fr.php10
-rw-r--r--cli/i18n/ignore/it.php5
-rw-r--r--cli/i18n/ignore/kr.php1
-rw-r--r--cli/i18n/ignore/nl.php1
-rw-r--r--cli/i18n/ignore/oc.php12
-rw-r--r--cli/i18n/ignore/pt-br.php54
-rw-r--r--cli/i18n/ignore/ru.php5
-rw-r--r--cli/i18n/ignore/sk.php1
-rw-r--r--cli/i18n/ignore/tr.php5
-rw-r--r--cli/i18n/ignore/zh-cn.php1
14 files changed, 127 insertions, 1 deletions
diff --git a/cli/i18n/I18nFile.php b/cli/i18n/I18nFile.php
index c97520862..222d07692 100644
--- a/cli/i18n/I18nFile.php
+++ b/cli/i18n/I18nFile.php
@@ -79,7 +79,7 @@ class I18nFile implements I18nFileInterface{
private function unflatten($translation) {
$a = array();
- ksort($translation, SORT_NATURAL | SORT_FLAG_CASE);
+ ksort($translation, SORT_NATURAL);
foreach ($translation as $compoundKey => $value) {
$keys = explode('.', $compoundKey);
array_shift($keys);
diff --git a/cli/i18n/ignore/cz.php b/cli/i18n/ignore/cz.php
new file mode 100644
index 000000000..1c987d8b3
--- /dev/null
+++ b/cli/i18n/ignore/cz.php
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+ 'gen.dir',
+);
diff --git a/cli/i18n/ignore/de.php b/cli/i18n/ignore/de.php
new file mode 100644
index 000000000..1c987d8b3
--- /dev/null
+++ b/cli/i18n/ignore/de.php
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+ 'gen.dir',
+);
diff --git a/cli/i18n/ignore/es.php b/cli/i18n/ignore/es.php
new file mode 100644
index 000000000..f6684fd81
--- /dev/null
+++ b/cli/i18n/ignore/es.php
@@ -0,0 +1,21 @@
+<?php
+
+return array(
+ 'gen.dir',
+ 'gen.lang.cz',
+ 'gen.lang.de',
+ 'gen.lang.en',
+ 'gen.lang.es',
+ 'gen.lang.fr',
+ 'gen.lang.he',
+ 'gen.lang.it',
+ 'gen.lang.kr',
+ 'gen.lang.nl',
+ 'gen.lang.oc',
+ 'gen.lang.pt-br',
+ 'gen.lang.ru',
+ 'gen.lang.sk',
+ 'gen.lang.tr',
+ 'gen.lang.zh-cn',
+ 'gen.short.no',
+);
diff --git a/cli/i18n/ignore/fr.php b/cli/i18n/ignore/fr.php
index d7e54ed98..a2718b625 100644
--- a/cli/i18n/ignore/fr.php
+++ b/cli/i18n/ignore/fr.php
@@ -1,10 +1,13 @@
<?php
return array(
+ 'admin.extensions.description',
'admin.extensions.title',
+ 'admin.extensions.version',
'admin.stats.number_entries',
'admin.user.article_count',
'admin.user.articles_and_size',
+ 'conf.archiving.maintenance',
'conf.display.width.large',
'conf.sharing.blogotext',
'conf.sharing.diaspora',
@@ -15,17 +18,21 @@ return array(
'conf.sharing.wallabag',
'conf.shortcut.navigation',
'conf.user.articles_and_size',
+ 'gen.dir',
'gen.freshrss._',
'gen.lang.cz',
'gen.lang.de',
'gen.lang.en',
'gen.lang.es',
'gen.lang.fr',
+ 'gen.lang.he',
'gen.lang.it',
'gen.lang.kr',
'gen.lang.nl',
+ 'gen.lang.oc',
'gen.lang.pt-br',
'gen.lang.ru',
+ 'gen.lang.sk',
'gen.lang.tr',
'gen.lang.zh-cn',
'gen.menu.admin',
@@ -38,6 +45,8 @@ return array(
'gen.share.gnusocial',
'gen.share.jdh',
'gen.share.lemmy',
+ 'gen.share.linkedin',
+ 'gen.share.mastodon',
'gen.share.movim',
'gen.share.shaarli',
'gen.share.twitter',
@@ -51,5 +60,6 @@ return array(
'install.title',
'sub.bookmarklet.title',
'sub.feed.description',
+ 'sub.feed.maintenance.title',
'sub.feed.number_entries',
);
diff --git a/cli/i18n/ignore/it.php b/cli/i18n/ignore/it.php
new file mode 100644
index 000000000..1c987d8b3
--- /dev/null
+++ b/cli/i18n/ignore/it.php
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+ 'gen.dir',
+);
diff --git a/cli/i18n/ignore/kr.php b/cli/i18n/ignore/kr.php
index 9fd7a6ff0..184c94b98 100644
--- a/cli/i18n/ignore/kr.php
+++ b/cli/i18n/ignore/kr.php
@@ -19,6 +19,7 @@ return array(
'gen.date.Nov',
'gen.date.Oct',
'gen.date.Sep',
+ 'gen.dir',
'gen.freshrss._',
'gen.lang.cz',
'gen.lang.de',
diff --git a/cli/i18n/ignore/nl.php b/cli/i18n/ignore/nl.php
index 1a3221003..f8c3d8c99 100644
--- a/cli/i18n/ignore/nl.php
+++ b/cli/i18n/ignore/nl.php
@@ -15,6 +15,7 @@ return array(
'gen.date.Dec',
'gen.date.Nov',
'gen.date.Sep',
+ 'gen.dir',
'gen.freshrss._',
'gen.lang.cz',
'gen.lang.de',
diff --git a/cli/i18n/ignore/oc.php b/cli/i18n/ignore/oc.php
index fed73078e..facb78702 100644
--- a/cli/i18n/ignore/oc.php
+++ b/cli/i18n/ignore/oc.php
@@ -2,7 +2,11 @@
return array(
'admin.extensions.title',
+ 'admin.extensions.version',
'admin.stats.number_entries',
+ 'admin.stats.status_total',
+ 'admin.user.admin',
+ 'admin.user.article_count',
'admin.user.articles_and_size',
'conf.display.width.large',
'conf.sharing.blogotext',
@@ -14,18 +18,21 @@ return array(
'conf.sharing.wallabag',
'conf.shortcut.navigation',
'conf.user.articles_and_size',
+ 'gen.dir',
'gen.freshrss._',
'gen.lang.cz',
'gen.lang.de',
'gen.lang.en',
'gen.lang.es',
'gen.lang.fr',
+ 'gen.lang.he',
'gen.lang.it',
'gen.lang.kr',
'gen.lang.nl',
'gen.lang.oc',
'gen.lang.pt-br',
'gen.lang.ru',
+ 'gen.lang.sk',
'gen.lang.tr',
'gen.lang.zh-cn',
'gen.menu.admin',
@@ -38,7 +45,11 @@ return array(
'gen.share.gnusocial',
'gen.share.jdh',
'gen.share.lemmy',
+ 'gen.share.linkedin',
+ 'gen.share.mastodon',
'gen.share.movim',
+ 'gen.share.pinboard',
+ 'gen.share.pocket',
'gen.share.shaarli',
'gen.share.twitter',
'gen.share.wallabag',
@@ -49,6 +60,7 @@ return array(
'index.log.title',
'install.this_is_the_end',
'install.title',
+ 'sub.api.title',
'sub.bookmarklet.title',
'sub.feed.description',
'sub.feed.number_entries',
diff --git a/cli/i18n/ignore/pt-br.php b/cli/i18n/ignore/pt-br.php
new file mode 100644
index 000000000..7721d23b6
--- /dev/null
+++ b/cli/i18n/ignore/pt-br.php
@@ -0,0 +1,54 @@
+<?php
+
+return array(
+ 'admin.stats.feed',
+ 'admin.stats.status_total',
+ 'admin.user.feed_count',
+ 'conf.query.number',
+ 'conf.sharing.blogotext',
+ 'conf.sharing.diaspora',
+ 'conf.sharing.facebook',
+ 'conf.sharing.print',
+ 'conf.sharing.shaarli',
+ 'conf.sharing.twitter',
+ 'conf.sharing.wallabag',
+ 'gen.dir',
+ 'gen.freshrss._',
+ 'gen.lang.cz',
+ 'gen.lang.de',
+ 'gen.lang.en',
+ 'gen.lang.es',
+ 'gen.lang.fr',
+ 'gen.lang.he',
+ 'gen.lang.it',
+ 'gen.lang.kr',
+ 'gen.lang.nl',
+ 'gen.lang.oc',
+ 'gen.lang.pt-br',
+ 'gen.lang.ru',
+ 'gen.lang.sk',
+ 'gen.lang.tr',
+ 'gen.lang.zh-cn',
+ 'gen.menu.logs',
+ 'gen.share.blogotext',
+ 'gen.share.diaspora',
+ 'gen.share.facebook',
+ 'gen.share.gnusocial',
+ 'gen.share.jdh',
+ 'gen.share.lemmy',
+ 'gen.share.linkedin',
+ 'gen.share.mastodon',
+ 'gen.share.movim',
+ 'gen.share.pinboard',
+ 'gen.share.pocket',
+ 'gen.share.shaarli',
+ 'gen.share.twitter',
+ 'gen.share.wallabag',
+ 'gen.share.wallabagv2',
+ 'gen.short.ok',
+ 'index.about.agpl3',
+ 'index.log._',
+ 'index.log.title',
+ 'install.bdd.host',
+ 'sub.api.title',
+);
diff --git a/cli/i18n/ignore/ru.php b/cli/i18n/ignore/ru.php
new file mode 100644
index 000000000..1c987d8b3
--- /dev/null
+++ b/cli/i18n/ignore/ru.php
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+ 'gen.dir',
+);
diff --git a/cli/i18n/ignore/sk.php b/cli/i18n/ignore/sk.php
index 244c22dbe..66940c758 100644
--- a/cli/i18n/ignore/sk.php
+++ b/cli/i18n/ignore/sk.php
@@ -27,6 +27,7 @@ return array(
'gen.date.november',
'gen.date.sep',
'gen.date.september',
+ 'gen.dir',
'gen.freshrss._',
'gen.lang.cz',
'gen.lang.de',
diff --git a/cli/i18n/ignore/tr.php b/cli/i18n/ignore/tr.php
new file mode 100644
index 000000000..1c987d8b3
--- /dev/null
+++ b/cli/i18n/ignore/tr.php
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+ 'gen.dir',
+);
diff --git a/cli/i18n/ignore/zh-cn.php b/cli/i18n/ignore/zh-cn.php
index e8f3f91a2..e687a3de9 100644
--- a/cli/i18n/ignore/zh-cn.php
+++ b/cli/i18n/ignore/zh-cn.php
@@ -8,6 +8,7 @@ return array(
'conf.sharing.shaarli',
'conf.sharing.twitter',
'conf.sharing.wallabag',
+ 'gen.dir',
'gen.freshrss._',
'gen.lang.cz',
'gen.lang.de',