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/zh-cn/install.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'app/i18n/zh-cn/install.php') diff --git a/app/i18n/zh-cn/install.php b/app/i18n/zh-cn/install.php index 7f5924364..7e2794498 100644 --- a/app/i18n/zh-cn/install.php +++ b/app/i18n/zh-cn/install.php @@ -17,19 +17,20 @@ return array( 'type' => '认证方式', ), 'bdd' => array( + '_' => '数据库', 'conf' => array( + '_' => '数据库配置', 'ko' => '请验证你的数据库信息', 'ok' => '数据库配置已保存', - '_' => '数据库配置', ), 'host' => '主机', 'password' => '密码', 'prefix' => '表前缀', 'type' => '数据库类型', 'username' => '用户名', - '_' => '数据库', ), 'check' => array( + '_' => '检查', 'already_installed' => '我们检测到 FreshRSS 已经安装！', 'cache' => array( 'nok' => '请检查 ./data/cache 目录权限。HTTP 服务器必须有其写入权限。', @@ -95,11 +96,10 @@ return array( 'nok' => '找不到用于 XML 解析库', 'ok' => '已找到 XML 解析库', ), - '_' => '检查', ), 'conf' => array( - 'ok' => '常规配置已保存', '_' => '常规配置', + 'ok' => '常规配置已保存', ), 'congratulations' => '恭喜！', 'default_user' => '默认用户名 (最多 16 个数字或字母)', @@ -110,9 +110,9 @@ return array( 'confirm_reinstall' => '重新安装 FreshRSS 将会重置之前的配置。你确定要继续吗？', ), 'language' => array( + '_' => '语言', 'choose' => '为 FreshRSS 选择语言', 'defined' => '语言已指定', - '_' => '语言', ), 'not_deleted' => '出错！你必须手动删除文件 %s', 'ok' => '安装成功', -- cgit v1.2.3