From e73fae159168b1ed9c0469e1d5bce55a3ef1f911 Mon Sep 17 00:00:00 2001 From: Alexis Degrugillier Date: Mon, 1 Jan 2018 18:53:53 +0100 Subject: Add shortcuts to switch views (#1755) --- app/i18n/zh-cn/conf.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'app/i18n/zh-cn/conf.php') diff --git a/app/i18n/zh-cn/conf.php b/app/i18n/zh-cn/conf.php index 1b52ac38f..d63ff7d92 100644 --- a/app/i18n/zh-cn/conf.php +++ b/app/i18n/zh-cn/conf.php @@ -148,6 +148,7 @@ return array( 'collapse_article' => '收起文章', 'first_article' => '跳转到第一篇文章', 'focus_search' => '聚焦到搜索框', + 'global_view' => 'Switch to global view', // TODO 'help' => '显示帮助文档', 'javascript' => '若要使用快捷键，必须启用 JavaScript', 'last_article' => '跳转到最后一篇文章', @@ -157,13 +158,17 @@ return array( 'navigation' => '浏览', 'navigation_help' => '搭配 "Shift" 键，浏览快捷键将生效于 RSS 源。
搭配 "Alt" 键，浏览快捷键将生效于分类。', 'next_article' => '跳转到下一篇文章', + 'normal_view' => 'Switch to normal view', // TODO 'other_action' => '其他操作', 'previous_article' => '跳转到上一篇文章', + 'reading_view' => 'Switch to reading view', // TODO + 'rss_view' => 'Open RSS view in a new tab', // TODO 'see_on_website' => '在原网站上查看', 'shift_for_all_read' => '+ shift 可以将全部文章设为已读', 'title' => '快捷键', 'user_filter' => '显示自定义查询', 'user_filter_help' => '如果有多个自定义过滤器，则会按照它们的编号依次访问。', + 'views' => 'Views', // TODO ), 'user' => array( 'articles_and_size' => '%s 篇文章 (%s)', -- cgit v1.2.3 From b285a83c6561cc50f53af3f854c34c0d7fba3ebe Mon Sep 17 00:00:00 2001 From: hoilc Date: Wed, 17 Jan 2018 00:41:49 +0800 Subject: [i18n] Add ignore/zh-cn and update simplified Chinese translation (#1769) * update Simplified Chinese translation * update the description of buttons #1766 * trim space to pass PHPCS --- app/i18n/zh-cn/admin.php | 14 +++++++------- app/i18n/zh-cn/conf.php | 10 +++++----- app/i18n/zh-cn/gen.php | 28 ++++++++++++++-------------- app/i18n/zh-cn/index.php | 8 ++++---- app/i18n/zh-cn/sub.php | 8 ++++---- cli/i18n/ignore/zh-cn.php | 41 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 75 insertions(+), 34 deletions(-) create mode 100644 cli/i18n/ignore/zh-cn.php (limited to 'app/i18n/zh-cn/conf.php') diff --git a/app/i18n/zh-cn/admin.php b/app/i18n/zh-cn/admin.php index ca18bf63d..0e31ed12e 100644 --- a/app/i18n/zh-cn/admin.php +++ b/app/i18n/zh-cn/admin.php @@ -112,13 +112,13 @@ return array( ), 'title' => '扩展', 'user' => '用户扩展', - 'community' => 'Available community extensions', // @todo translate - 'name' => 'Name', // @todo translate - 'version' => 'Version', // @todo translate - 'description' => 'Description', // @todo translate - 'author' => 'Author', // @todo translate - 'latest' => 'Installed', // @todo translate - 'update' => 'Update available', // @todo translate + 'community' => '可用的社区扩展', + 'name' => '名称', + 'version' => '版本', + 'description' => '描述', + 'author' => '作者', + 'latest' => '已安装', + 'update' => '更新可用', ), 'stats' => array( '_' => '统计', diff --git a/app/i18n/zh-cn/conf.php b/app/i18n/zh-cn/conf.php index d63ff7d92..599f42234 100644 --- a/app/i18n/zh-cn/conf.php +++ b/app/i18n/zh-cn/conf.php @@ -148,7 +148,7 @@ return array( 'collapse_article' => '收起文章', 'first_article' => '跳转到第一篇文章', 'focus_search' => '聚焦到搜索框', - 'global_view' => 'Switch to global view', // TODO + 'global_view' => '切换到全屏视图', 'help' => '显示帮助文档', 'javascript' => '若要使用快捷键，必须启用 JavaScript', 'last_article' => '跳转到最后一篇文章', @@ -158,17 +158,17 @@ return array( 'navigation' => '浏览', 'navigation_help' => '搭配 "Shift" 键，浏览快捷键将生效于 RSS 源。
搭配 "Alt" 键，浏览快捷键将生效于分类。', 'next_article' => '跳转到下一篇文章', - 'normal_view' => 'Switch to normal view', // TODO + 'normal_view' => '切换到普通视图', 'other_action' => '其他操作', 'previous_article' => '跳转到上一篇文章', - 'reading_view' => 'Switch to reading view', // TODO - 'rss_view' => 'Open RSS view in a new tab', // TODO + 'reading_view' => '切换到阅读视图', + 'rss_view' => '在新标签中打开 RSS 视图', 'see_on_website' => '在原网站上查看', 'shift_for_all_read' => '+ shift 可以将全部文章设为已读', 'title' => '快捷键', 'user_filter' => '显示自定义查询', 'user_filter_help' => '如果有多个自定义过滤器，则会按照它们的编号依次访问。', - 'views' => 'Views', // TODO + 'views' => '视图', ), 'user' => array( 'articles_and_size' => '%s 篇文章 (%s)', diff --git a/app/i18n/zh-cn/gen.php b/app/i18n/zh-cn/gen.php index caaa388c7..17f30f001 100644 --- a/app/i18n/zh-cn/gen.php +++ b/app/i18n/zh-cn/gen.php @@ -42,18 +42,18 @@ return array( ), ), 'date' => array( - 'Apr' => '\\A\\p\\r\\i\\l', - 'Aug' => '\\A\\u\\g\\u\\s\\t', - 'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r', - 'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y', - 'Jan' => '\\J\\a\\n\\u\\a\\r\\y', - 'Jul' => '\\J\\u\\l\\y', - 'Jun' => '\\J\\u\\n\\e', - 'Mar' => '\\M\\a\\r\\c\\h', - 'May' => '\\M\\a\\y', - 'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r', - 'Oct' => '\\O\\c\\t\\o\\b\\e\\r', - 'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r', + 'Apr' => '\\四\\月', + 'Aug' => '\\八\\月', + 'Dec' => '\\十\\二\\月', + 'Feb' => '\\二\\月', + 'Jan' => '\\一\\月', + 'Jul' => '\\七\\月', + 'Jun' => '\\六\\月', + 'Mar' => '\\三\\月', + 'May' => '\\五\\月', + 'Nov' => '\\十\\一\\月', + 'Oct' => '\\十\\月', + 'Sep' => '\\九\\月', 'apr' => '四月', 'april' => '四月', 'aug' => '八月', @@ -159,7 +159,7 @@ return array( 'previous' => '上一页', ), 'share' => array( - 'Known' => 'Known based sites', + 'Known' => '基于 Known 的站点', 'blogotext' => 'Blogotext', 'diaspora' => 'Diaspora*', 'email' => 'Email', @@ -169,7 +169,7 @@ return array( 'jdh' => 'Journal du hacker', 'mastodon' => 'Mastodon', 'movim' => 'Movim', - 'print' => 'Print', + 'print' => '打印', 'shaarli' => 'Shaarli', 'twitter' => 'Twitter', 'wallabag' => 'wallabag v1', diff --git a/app/i18n/zh-cn/index.php b/app/i18n/zh-cn/index.php index 0d6e8e82d..6729524f5 100644 --- a/app/i18n/zh-cn/index.php +++ b/app/i18n/zh-cn/index.php @@ -41,18 +41,18 @@ return array( 'mark_cat_read' => '此分类设为已读', 'mark_feed_read' => '此源设为已读', 'newer_first' => '由新到旧', - 'non-starred' => '不显示收藏', + 'non-starred' => '显示未收藏', 'normal_view' => '普通视图', 'older_first' => '由旧到新', 'queries' => '自定义查询', - 'read' => '只显示已读', + 'read' => '显示已读', 'reader_view' => '阅读视图', 'rss_view' => 'RSS 源', 'search_short' => '搜索', - 'starred' => '只显示收藏', + 'starred' => '显示收藏', 'stats' => '统计', 'subscription' => '订阅管理', - 'unread' => '只显示未读', + 'unread' => '显示未读', ), 'share' => '分享', 'tag' => array( diff --git a/app/i18n/zh-cn/sub.php b/app/i18n/zh-cn/sub.php index c25875b41..bf73f82c4 100644 --- a/app/i18n/zh-cn/sub.php +++ b/app/i18n/zh-cn/sub.php @@ -35,14 +35,14 @@ return array( 'informations' => '信息', 'keep_history' => '至少保存的文章数', 'moved_category_deleted' => '删除分类时，其中的 RSS 源会自动归类到 %s', - 'mute' => 'mute', // TODO + 'mute' => '暂停', 'no_selected' => '未选择 RSS 源。', 'number_entries' => '%d 篇文章', 'priority' => array( - '_' => 'Visibility', // TODO - 'archived' => 'Do not show (archived)', // TODO + '_' => '可见性', + 'archived' => '不显示 (存档)', 'main_stream' => '在首页中显示', - 'normal' => 'Show in its category', // TODO + 'normal' => '在分类中显示', ), 'stats' => '统计', 'think_to_add' => '你可以添加一些 RSS 源。', diff --git a/cli/i18n/ignore/zh-cn.php b/cli/i18n/ignore/zh-cn.php new file mode 100644 index 000000000..c00ac79d3 --- /dev/null +++ b/cli/i18n/ignore/zh-cn.php @@ -0,0 +1,41 @@ + Date: Mon, 19 Feb 2018 09:36:18 -0500 Subject: Option to hide nav_entries (#1764) * put nav_entries in a div so they can be hidden, add config option, no labels yet * add English text for hide_nav_entries, choose better name * Update conf.php add comma to last item * hide nav_entries by optionally not rendering in normal.phtml * fix logic, remove containing div * apply phpcbf to ConfigurationSetter.php * Make navigation buttons options positive And add TODOs for i18n, and add default config. --- app/Controllers/configureController.php | 1 + app/Models/ConfigurationSetter.php | 4 ++++ app/i18n/cz/conf.php | 1 + app/i18n/de/conf.php | 1 + app/i18n/en/conf.php | 1 + app/i18n/es/conf.php | 1 + app/i18n/fr/conf.php | 1 + app/i18n/he/conf.php | 1 + app/i18n/it/conf.php | 1 + app/i18n/kr/conf.php | 1 + app/i18n/nl/conf.php | 1 + app/i18n/pt-br/conf.php | 1 + app/i18n/ru/conf.php | 1 + app/i18n/tr/conf.php | 1 + app/i18n/zh-cn/conf.php | 1 + app/views/configure/display.phtml | 11 ++++++++++- app/views/index/normal.phtml | 2 +- config-user.default.php | 1 + 18 files changed, 30 insertions(+), 2 deletions(-) (limited to 'app/i18n/zh-cn/conf.php') diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php index 2c7739c55..d34b5d59d 100755 --- a/app/Controllers/configureController.php +++ b/app/Controllers/configureController.php @@ -55,6 +55,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController { FreshRSS_Context::$user_conf->bottomline_date = Minz_Request::param('bottomline_date', false); FreshRSS_Context::$user_conf->bottomline_link = Minz_Request::param('bottomline_link', false); FreshRSS_Context::$user_conf->html5_notif_timeout = Minz_Request::param('html5_notif_timeout', 0); + FreshRSS_Context::$user_conf->show_nav_buttons = Minz_Request::param('show_nav_buttons', false); FreshRSS_Context::$user_conf->save(); Minz_Session::_param('language', FreshRSS_Context::$user_conf->language); diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php index 645ef644e..ad703dfc5 100644 --- a/app/Models/ConfigurationSetter.php +++ b/app/Models/ConfigurationSetter.php @@ -184,6 +184,10 @@ class FreshRSS_ConfigurationSetter { $data['mark_updated_article_unread'] = $this->handleBool($value); } + private function _show_nav_buttons(&$data, $value) { + $data['show_nav_buttons'] = $this->handleBool($value); + } + private function _display_categories(&$data, $value) { $data['display_categories'] = $this->handleBool($value); } diff --git a/app/i18n/cz/conf.php b/app/i18n/cz/conf.php index 8193b9575..649724e80 100644 --- a/app/i18n/cz/conf.php +++ b/app/i18n/cz/conf.php @@ -37,6 +37,7 @@ return array( 'no_limit' => 'Bez limitu', 'thin' => 'Tenká', ), + 'show_nav_buttons' => 'Show the navigation buttons', //TODO ), 'query' => array( '_' => 'Uživatelské dotazy', diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php index 86c738dd1..9f1edffb9 100644 --- a/app/i18n/de/conf.php +++ b/app/i18n/de/conf.php @@ -37,6 +37,7 @@ return array( 'no_limit' => 'Keine Begrenzung', 'thin' => 'Klein', ), + 'show_nav_buttons' => 'Show the navigation buttons', //TODO ), 'query' => array( '_' => 'Benutzerabfragen', diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php index 5e3b723fe..60231b825 100644 --- a/app/i18n/en/conf.php +++ b/app/i18n/en/conf.php @@ -37,6 +37,7 @@ return array( 'no_limit' => 'No limit', 'thin' => 'Thin', ), + 'show_nav_buttons' => 'Show the navigation buttons', ), 'query' => array( '_' => 'User queries', diff --git a/app/i18n/es/conf.php b/app/i18n/es/conf.php index 2d9a476cb..65858fefe 100755 --- a/app/i18n/es/conf.php +++ b/app/i18n/es/conf.php @@ -37,6 +37,7 @@ return array( 'no_limit' => 'Sin límite', 'thin' => 'Estrecho', ), + 'show_nav_buttons' => 'Show the navigation buttons', //TODO ), 'query' => array( '_' => 'Consultas de usuario', diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php index b126a77c9..b4c39e1ca 100644 --- a/app/i18n/fr/conf.php +++ b/app/i18n/fr/conf.php @@ -37,6 +37,7 @@ return array( 'no_limit' => 'Pas de limite', 'thin' => 'Fine', ), + 'show_nav_buttons' => 'Afficher les boutons de navigation', ), 'query' => array( '_' => 'Filtres utilisateurs', diff --git a/app/i18n/he/conf.php b/app/i18n/he/conf.php index 0dd277d78..50d1936a8 100644 --- a/app/i18n/he/conf.php +++ b/app/i18n/he/conf.php @@ -37,6 +37,7 @@ return array( 'no_limit' => 'ללא הגבלה', 'thin' => 'צר', ), + 'show_nav_buttons' => 'Show the navigation buttons', //TODO ), 'query' => array( '_' => 'שאילתות', diff --git a/app/i18n/it/conf.php b/app/i18n/it/conf.php index 25cfbb7bf..9e20236f1 100644 --- a/app/i18n/it/conf.php +++ b/app/i18n/it/conf.php @@ -37,6 +37,7 @@ return array( 'no_limit' => 'Nessun limite', 'thin' => 'Stretto', ), + 'show_nav_buttons' => 'Show the navigation buttons', //TODO ), 'query' => array( '_' => 'Ricerche personali', diff --git a/app/i18n/kr/conf.php b/app/i18n/kr/conf.php index dbd902062..31b042f57 100644 --- a/app/i18n/kr/conf.php +++ b/app/i18n/kr/conf.php @@ -37,6 +37,7 @@ return array( 'no_limit' => '제한 없음', 'thin' => '얇음', ), + 'show_nav_buttons' => 'Show the navigation buttons', //TODO ), 'query' => array( '_' => '사용자 쿼리', diff --git a/app/i18n/nl/conf.php b/app/i18n/nl/conf.php index 0d1d9b70d..360e1c5e7 100644 --- a/app/i18n/nl/conf.php +++ b/app/i18n/nl/conf.php @@ -37,6 +37,7 @@ return array( 'no_limit' => 'Geen limiet', 'thin' => 'Smal', ), + 'show_nav_buttons' => 'Show the navigation buttons', //TODO ), 'query' => array( '_' => 'Gebruikers queries (informatie aanvragen)', diff --git a/app/i18n/pt-br/conf.php b/app/i18n/pt-br/conf.php index a5a0a9197..71b6afb20 100644 --- a/app/i18n/pt-br/conf.php +++ b/app/i18n/pt-br/conf.php @@ -37,6 +37,7 @@ return array( 'no_limit' => 'Sem lmite', 'thin' => 'Fino', ), + 'show_nav_buttons' => 'Show the navigation buttons', //TODO ), 'query' => array( '_' => 'Queries do usuário', diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.php index 0265ede9c..15109dd15 100644 --- a/app/i18n/ru/conf.php +++ b/app/i18n/ru/conf.php @@ -37,6 +37,7 @@ return array( 'no_limit' => 'No limit', 'thin' => 'Thin', ), + 'show_nav_buttons' => 'Show the navigation buttons', //TODO ), 'query' => array( '_' => 'User queries', diff --git a/app/i18n/tr/conf.php b/app/i18n/tr/conf.php index 424c030c5..596adaf9a 100644 --- a/app/i18n/tr/conf.php +++ b/app/i18n/tr/conf.php @@ -37,6 +37,7 @@ return array( 'no_limit' => 'Sınırsız', 'thin' => 'Zayıf', ), + 'show_nav_buttons' => 'Show the navigation buttons', //TODO ), 'query' => array( '_' => 'Kullanıcı sorguları', diff --git a/app/i18n/zh-cn/conf.php b/app/i18n/zh-cn/conf.php index 599f42234..2e068be42 100644 --- a/app/i18n/zh-cn/conf.php +++ b/app/i18n/zh-cn/conf.php @@ -37,6 +37,7 @@ return array( 'no_limit' => '无限制', 'thin' => '小', ), + 'show_nav_buttons' => 'Show the navigation buttons', //TODO ), 'query' => array( '_' => '自定义查询', diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml index 62ecc1080..414fd2cd6 100644 --- a/app/views/configure/display.phtml +++ b/app/views/configure/display.phtml @@ -106,7 +106,7 @@
- +
@@ -114,6 +114,15 @@
+
+
+ +
+
+
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml index ba48b2501..c7cab2d3f 100644 --- a/app/views/index/normal.phtml +++ b/app/views/index/normal.phtml @@ -83,7 +83,7 @@ if (!empty($this->entries)) { $this->renderHelper('pagination'); ?>
-partial('nav_entries'); ?> +show_nav_buttons) $this->partial('nav_entries'); ?>
diff --git a/config-user.default.php b/config-user.default.php index 2e4a96239..5e67d8d9b 100644 --- a/config-user.default.php +++ b/config-user.default.php @@ -76,5 +76,6 @@ return array ( 'queries' => array ( ), 'html5_notif_timeout' => 0, + 'show_nav_buttons' => true, 'extensions_enabled' => array(), ); -- cgit v1.2.3