diff options
| author | 2020-05-15 17:31:21 +0200 | |
|---|---|---|
| committer | 2020-05-15 17:31:21 +0200 | |
| commit | 8487fa6248d1d5dac81640de9c55c1eab9f324b3 (patch) | |
| tree | f3209fdeb8341870bd4fe765e30a0a395a12c4ea /app/i18n/zh-cn/gen.php | |
| parent | 62a42a20630c5dfb4a677a42bbc3dd6c7cd203d2 (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 'app/i18n/zh-cn/gen.php')
| -rw-r--r-- | app/i18n/zh-cn/gen.php | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/app/i18n/zh-cn/gen.php b/app/i18n/zh-cn/gen.php index 2d9695068..fdefc13fd 100644 --- a/app/i18n/zh-cn/gen.php +++ b/app/i18n/zh-cn/gen.php @@ -32,45 +32,50 @@ return array( 'login' => '登录', 'logout' => '登出', 'password' => array( - 'format' => '<small>至少 7 个字符</small>', '_' => '密码', + 'format' => '<small>至少 7 个字符</small>', ), 'registration' => array( + '_' => '新用户', 'ask' => '创建新用户?', 'title' => '用户创建', - '_' => '新用户', ), 'reset' => '密码重置', 'username' => array( + '_' => '用户名', 'admin' => '管理员用户名', 'format' => '<small>最多 16 个数字或字母</small>', - '_' => '用户名', ), ), 'date' => array( - 'apr' => '四月', 'Apr' => '\\四\\月', - 'april' => '四月', 'Aug' => '\\八\\月', + 'Dec' => '\\十\\二\\月', + 'Feb' => '\\二\\月', + 'Jan' => '\\一\\月', + 'Jul' => '\\七\\月', + 'Jun' => '\\六\\月', + 'Mar' => '\\三\\月', + 'May' => '\\五\\月', + 'Nov' => '\\十\\一\\月', + 'Oct' => '\\十\\月', + 'Sep' => '\\九\\月', + 'apr' => '四月', + 'april' => '四月', 'aug' => '八月', 'august' => '八月', 'before_yesterday' => '昨天以前', - 'Dec' => '\\十\\二\\月', 'dec' => '十二月', 'december' => '十二月', - 'Feb' => '\\二\\月', 'feb' => '二月', 'february' => '二月', 'format_date' => 'Y\\年n\\月j\\日', 'format_date_hour' => 'Y\\年n\\月j\\日 H\\:i', 'fri' => '周五', - 'Jan' => '\\一\\月', 'jan' => '一月', 'january' => '一月', 'jul' => '七月', - 'Jul' => '\\七\\月', 'july' => '七月', - 'Jun' => '\\六\\月', 'jun' => '六月', 'june' => '六月', 'last_2_year' => '过去两年', @@ -81,22 +86,17 @@ return array( 'last_month' => '上月', 'last_week' => '上周', 'last_year' => '去年', - 'Mar' => '\\三\\月', 'mar' => '三月', 'march' => '三月', 'may' => '五月', - 'May' => '\\五\\月', 'may_' => '五月', 'mon' => '周一', 'month' => '个月', - 'Nov' => '\\十\\一\\月', 'nov' => '十一月', 'november' => '十一月', - 'Oct' => '\\十\\月', 'oct' => '十月', 'october' => '十月', 'sat' => '周日', - 'Sep' => '\\九\\月', 'sep' => '九月', 'september' => '九月', 'sun' => '周日', @@ -108,8 +108,8 @@ return array( ), 'dir' => 'ltr', 'freshrss' => array( - 'about' => '关于 FreshRSS', '_' => 'FreshRSS', + 'about' => '关于 FreshRSS', ), 'js' => array( 'category_empty' => '清空分类', @@ -178,13 +178,13 @@ return array( 'years' => '年', ), 'share' => array( + 'Known' => '基于 Known 的站点', 'blogotext' => 'Blogotext', 'diaspora' => 'Diaspora*', 'email' => '邮箱', 'facebook' => '脸书', 'gnusocial' => 'GNU social', 'jdh' => 'Journal du hacker', - 'Known' => '基于 Known 的站点', 'lemmy' => 'Lemmy', 'linkedin' => 'LinkedIn', 'mastodon' => 'Mastodon', |
