From f56e308090f460d97dbe834ad88754231c3459e9 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 10 Aug 2007 05:25:06 +0100 Subject: [PATCH] localization updates --- functions.php | 16 +++- locale/ru_RU/LC_MESSAGES/messages.mo | Bin 19092 -> 19092 bytes locale/ru_RU/LC_MESSAGES/messages.po | 123 +++++++++++++++++--------- locale/zh_CN/LC_MESSAGES/messages.mo | Bin 21209 -> 21169 bytes locale/zh_CN/LC_MESSAGES/messages.po | 125 ++++++++++++++++++--------- localized_js.php | 3 + modules/backend-rpc.php | 5 +- modules/pref-feeds.php | 5 +- prefs.js | 18 ++-- 9 files changed, 191 insertions(+), 104 deletions(-) diff --git a/functions.php b/functions.php index 336a6d4b9..7a9591535 100644 --- a/functions.php +++ b/functions.php @@ -3855,7 +3855,11 @@ $feed_title = $qfh_ret[1]; $feed_site_url = $qfh_ret[2]; $last_error = $qfh_ret[3]; - + + if ($feed == -2) { + $feed_site_url = article_publish_url($link); + } + /// STOP ////////////////////////////////////////////////////////////////////////////////// if (!$offset) { @@ -4208,4 +4212,14 @@ return sha1(uniqid(rand(), true)); } + function article_publish_url($link) { + + $url_path = 'http://' . $_SERVER["HTTP_HOST"] . \ + parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH); + + $url_path .= "?op=publish&key=" . get_pref($link, "_PREFS_PUBLISH_KEY"); + + return $url_path; + } + ?> diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo index 4adcc34ba5c5e67d1c44408749f911933ee192c9..c92062c14b4c6c3d838b3c58fb8aabff7faf2157 100644 GIT binary patch delta 25 gcmbO-m2t{c#tr)FTo$^91`38oRz}8~E!Cry0b\n" "Language-Team: LANGUAGE \n" @@ -140,152 +140,162 @@ msgid "" "\t\tofficial site for more information." msgstr "" -#: functions.php:2203 functions.php:2242 functions.php:2559 functions.php:3294 -#: functions.php:3324 modules/pref-feeds.php:890 +#: functions.php:2239 functions.php:2278 functions.php:2602 functions.php:3384 +#: functions.php:3414 modules/pref-feeds.php:890 msgid "Uncategorized" msgstr "Нет категории" -#: functions.php:2232 functions.php:3142 +#: functions.php:2268 functions.php:3224 msgid "Special" msgstr "Особые" -#: functions.php:2234 functions.php:3168 +#: functions.php:2270 functions.php:3258 msgid "Labels" msgstr "Метки" -#: functions.php:2252 functions.php:2581 functions.php:3152 +#: functions.php:2288 functions.php:2624 functions.php:3235 msgid "Starred articles" msgstr "Отмеченные статьи" -#: functions.php:2545 functions.php:2547 +#: functions.php:2290 functions.php:2626 functions.php:3242 +#, fuzzy +msgid "Published articles" +msgstr "Отмеченные статьи" + +#: functions.php:2588 functions.php:2590 msgid "Search results" msgstr "Результаты поиска" -#: functions.php:2563 functions.php:2576 functions.php:2589 +#: functions.php:2606 functions.php:2619 functions.php:2634 msgid "Searched for" msgstr "Поиск" -#: functions.php:2809 +#: functions.php:2857 msgid "New headlines for last 24 hours, as of " msgstr "Новые заголовки за последние 24 часа, на " -#: functions.php:2853 +#: functions.php:2901 msgid "" "You have been sent this email because you have enabled daily digests in Tiny " "Tiny RSS at " msgstr "" -#: functions.php:2855 +#: functions.php:2903 msgid "" "To unsubscribe, visit your configuration options or contact instance owner.\n" msgstr "" -#: functions.php:3034 functions.php:3069 modules/pref-feeds.php:615 -#: modules/pref-feeds.php:852 modules/pref-filters.php:255 -#: modules/pref-labels.php:234 modules/pref-users.php:208 +#: functions.php:3109 functions.php:3151 functions.php:4049 +#: modules/pref-feeds.php:615 modules/pref-feeds.php:852 +#: modules/pref-filters.php:255 modules/pref-labels.php:234 +#: modules/pref-users.php:208 msgid "Select:" msgstr "Выбрать:" -#: functions.php:3035 functions.php:3070 modules/pref-feeds.php:616 +#: functions.php:3110 functions.php:3152 modules/pref-feeds.php:616 #: modules/pref-feeds.php:853 modules/pref-filters.php:256 #: modules/pref-labels.php:235 modules/pref-users.php:209 msgid "All" msgstr "Все" -#: functions.php:3036 functions.php:3040 functions.php:3071 functions.php:3074 +#: functions.php:3111 functions.php:3115 functions.php:3153 functions.php:3156 #: tt-rss.php:172 msgid "Unread" msgstr "Новые" -#: functions.php:3037 functions.php:3072 modules/pref-feeds.php:617 +#: functions.php:3112 functions.php:3154 modules/pref-feeds.php:617 #: modules/pref-feeds.php:854 modules/pref-filters.php:257 #: modules/pref-labels.php:236 modules/pref-users.php:210 msgid "None" msgstr "Ничего" -#: functions.php:3041 functions.php:3075 tt-rss.php:171 +#: functions.php:3116 functions.php:3157 tt-rss.php:171 msgid "Starred" msgstr "Отмеченные" -#: functions.php:3043 +#: functions.php:3117 +msgid "Published" +msgstr "" + +#: functions.php:3120 msgid "Mark as read" msgstr "Как прочитанные" -#: functions.php:3044 +#: functions.php:3121 msgid "This page" msgstr "Эту страницу" -#: functions.php:3045 +#: functions.php:3122 msgid "Entire feed" msgstr "Весь канал" -#: functions.php:3050 +#: functions.php:3130 msgid "Next page" msgstr "След. стр." -#: functions.php:3051 +#: functions.php:3131 msgid "Previous page" msgstr "Пред. cтр." -#: functions.php:3052 +#: functions.php:3132 msgid "First page" msgstr "На первую" -#: functions.php:3060 functions.php:3086 +#: functions.php:3142 functions.php:3168 msgid "Convert to label" msgstr "Превратить в метку" -#: functions.php:3074 +#: functions.php:3156 msgid "Toggle:" msgstr "Изменить:" -#: functions.php:3077 +#: functions.php:3159 msgid "Mark as read:" msgstr "Пометить как прочит.:" -#: functions.php:3078 +#: functions.php:3160 msgid "Page" msgstr "Страница" -#: functions.php:3079 modules/pref-filters.php:263 +#: functions.php:3161 modules/pref-filters.php:263 msgid "Feed" msgstr "Канал" -#: functions.php:3124 +#: functions.php:3206 msgid "Generated feed" msgstr "" -#: functions.php:3364 +#: functions.php:3454 msgid "No feeds to display." msgstr "Нет каналов для отображения." -#: functions.php:3381 +#: functions.php:3471 msgid "Tags" msgstr "Теги" -#: functions.php:3600 +#: functions.php:3693 msgid " - by " msgstr ", автор - " -#: functions.php:3644 +#: functions.php:3738 msgid "no tags" msgstr "нет тегов" -#: functions.php:3657 +#: functions.php:3750 msgid "Tags:" msgstr "Теги:" -#: functions.php:3713 +#: functions.php:3807 msgid "Feed not found." msgstr "Канал не найден." -#: functions.php:3770 +#: functions.php:3869 msgid "" "Could not display feed (query failed). Please check label match syntax or " "local configuration." msgstr "" -#: functions.php:3972 +#: functions.php:4110 msgid "No articles found." msgstr "Статей не найдено." @@ -297,7 +307,7 @@ msgstr "показать каналы" msgid "display tags" msgstr "показать теги" -#: localized_js.php:34 prefs.php:124 tt-rss.php:79 +#: localized_js.php:34 prefs.php:126 tt-rss.php:79 msgid "Loading, please wait..." msgstr "Идет загрузка..." @@ -497,6 +507,18 @@ msgstr "" msgid "No feed selected." msgstr "Канал не выбран." +#: localized_js.php:93 +msgid "Replace current publishing address with a new one?" +msgstr "" + +#: localized_js.php:94 +msgid "Address changed." +msgstr "" + +#: localized_js.php:95 +msgid "Could not change address." +msgstr "" + #: login_form.php:49 modules/pref-feeds.php:264 modules/pref-users.php:29 msgid "Login:" msgstr "Пользователь:" @@ -554,18 +576,23 @@ msgid "Other Feeds" msgstr "Другие каналы" #: prefs.php:112 +#, fuzzy +msgid "Published Articles" +msgstr "Все статьи" + +#: prefs.php:114 msgid "Content Filtering" msgstr "Фильтры" -#: prefs.php:115 +#: prefs.php:117 msgid "Label Editor" msgstr "Метки" -#: prefs.php:119 +#: prefs.php:121 msgid "User Manager" msgstr "Пользователи" -#: prefs.php:127 tt-rss.php:82 +#: prefs.php:129 tt-rss.php:82 msgid "" "Your browser doesn't support Javascript, which is required\n" "\t\tfor this application to function properly. Please check your\n" @@ -981,7 +1008,7 @@ msgid "Showing most popular tags " msgstr "" #: modules/popup-dialog.php:427 -msgid "browse all" +msgid "browse more" msgstr "" #: modules/pref-feed-browser.php:77 @@ -1148,6 +1175,16 @@ msgstr "Импортировать" msgid "Export OPML" msgstr "Экспортировать OPML" +#: modules/pref-feeds.php:1053 +msgid "" +"Published articles are exported as a public RSS feed and can be subscribed " +"by anyone who knows the address specified below." +msgstr "" + +#: modules/pref-feeds.php:1060 +msgid "Generate another address" +msgstr "" + #: modules/pref-filters.php:22 msgid "Filter editor" msgstr "Редактор фильтров" diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo index 5f979b021625c39cf96a6dc6d8880d6e3526e940..057886a77c2ebd662cb474a26a18bd7d0a7803c5 100644 GIT binary patch delta 5116 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\n" "Language-Team: hicode.org \n" @@ -141,152 +141,162 @@ msgstr "" "不支持你的MySQL版本. 请访问 \n" "\t\t官方网站获取更多信息。" -#: functions.php:2203 functions.php:2242 functions.php:2559 functions.php:3294 -#: functions.php:3324 modules/pref-feeds.php:890 +#: functions.php:2239 functions.php:2278 functions.php:2602 functions.php:3384 +#: functions.php:3414 modules/pref-feeds.php:890 msgid "Uncategorized" msgstr "未分类" -#: functions.php:2232 functions.php:3142 +#: functions.php:2268 functions.php:3224 msgid "Special" msgstr "专用" -#: functions.php:2234 functions.php:3168 +#: functions.php:2270 functions.php:3258 msgid "Labels" msgstr "标记" -#: functions.php:2252 functions.php:2581 functions.php:3152 +#: functions.php:2288 functions.php:2624 functions.php:3235 msgid "Starred articles" msgstr "星级文章" -#: functions.php:2545 functions.php:2547 +#: functions.php:2290 functions.php:2626 functions.php:3242 +#, fuzzy +msgid "Published articles" +msgstr "星级文章" + +#: functions.php:2588 functions.php:2590 msgid "Search results" msgstr "搜索结果" -#: functions.php:2563 functions.php:2576 functions.php:2589 +#: functions.php:2606 functions.php:2619 functions.php:2634 msgid "Searched for" msgstr "搜索" -#: functions.php:2809 +#: functions.php:2857 msgid "New headlines for last 24 hours, as of " msgstr "24小时最新头条,截至" -#: functions.php:2853 +#: functions.php:2901 msgid "" "You have been sent this email because you have enabled daily digests in Tiny " "Tiny RSS at " msgstr "由于您启用了Tiny Tiny RSS每日文摘，会收到此邮件。" -#: functions.php:2855 +#: functions.php:2903 msgid "" "To unsubscribe, visit your configuration options or contact instance owner.\n" msgstr "若要退订,访问你的配置选项或联络管理员。\n" -#: functions.php:3034 functions.php:3069 modules/pref-feeds.php:615 -#: modules/pref-feeds.php:852 modules/pref-filters.php:255 -#: modules/pref-labels.php:234 modules/pref-users.php:208 +#: functions.php:3109 functions.php:3151 functions.php:4049 +#: modules/pref-feeds.php:615 modules/pref-feeds.php:852 +#: modules/pref-filters.php:255 modules/pref-labels.php:234 +#: modules/pref-users.php:208 msgid "Select:" msgstr "选择：" -#: functions.php:3035 functions.php:3070 modules/pref-feeds.php:616 +#: functions.php:3110 functions.php:3152 modules/pref-feeds.php:616 #: modules/pref-feeds.php:853 modules/pref-filters.php:256 #: modules/pref-labels.php:235 modules/pref-users.php:209 msgid "All" msgstr "所有" -#: functions.php:3036 functions.php:3040 functions.php:3071 functions.php:3074 +#: functions.php:3111 functions.php:3115 functions.php:3153 functions.php:3156 #: tt-rss.php:172 msgid "Unread" msgstr "未读" -#: functions.php:3037 functions.php:3072 modules/pref-feeds.php:617 +#: functions.php:3112 functions.php:3154 modules/pref-feeds.php:617 #: modules/pref-feeds.php:854 modules/pref-filters.php:257 #: modules/pref-labels.php:236 modules/pref-users.php:210 msgid "None" msgstr "无" -#: functions.php:3041 functions.php:3075 tt-rss.php:171 +#: functions.php:3116 functions.php:3157 tt-rss.php:171 msgid "Starred" msgstr "星级" -#: functions.php:3043 +#: functions.php:3117 +msgid "Published" +msgstr "" + +#: functions.php:3120 msgid "Mark as read" msgstr "标记为已读" -#: functions.php:3044 +#: functions.php:3121 msgid "This page" msgstr "本页" -#: functions.php:3045 +#: functions.php:3122 msgid "Entire feed" msgstr "输入feed" -#: functions.php:3050 +#: functions.php:3130 msgid "Next page" msgstr "下页" -#: functions.php:3051 +#: functions.php:3131 msgid "Previous page" msgstr "上页" -#: functions.php:3052 +#: functions.php:3132 msgid "First page" msgstr "首页" -#: functions.php:3060 functions.php:3086 +#: functions.php:3142 functions.php:3168 msgid "Convert to label" msgstr "转换标签" -#: functions.php:3074 +#: functions.php:3156 msgid "Toggle:" msgstr "触发:" -#: functions.php:3077 +#: functions.php:3159 msgid "Mark as read:" msgstr "标记为已读：" -#: functions.php:3078 +#: functions.php:3160 msgid "Page" msgstr "页" -#: functions.php:3079 modules/pref-filters.php:263 +#: functions.php:3161 modules/pref-filters.php:263 msgid "Feed" msgstr "Feed" -#: functions.php:3124 +#: functions.php:3206 msgid "Generated feed" msgstr "产生feed" -#: functions.php:3364 +#: functions.php:3454 msgid "No feeds to display." msgstr "无feed显示。" -#: functions.php:3381 +#: functions.php:3471 msgid "Tags" msgstr "标签" -#: functions.php:3600 +#: functions.php:3693 msgid " - by " msgstr ", 由 - " -#: functions.php:3644 +#: functions.php:3738 msgid "no tags" msgstr "无标签" -#: functions.php:3657 +#: functions.php:3750 msgid "Tags:" msgstr "标签:" -#: functions.php:3713 +#: functions.php:3807 msgid "Feed not found." msgstr "未找到Feed." -#: functions.php:3770 +#: functions.php:3869 msgid "" "Could not display feed (query failed). Please check label match syntax or " "local configuration." msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置." -#: functions.php:3972 +#: functions.php:4110 msgid "No articles found." msgstr "未找到文章。" @@ -298,7 +308,7 @@ msgstr "显示Feed" msgid "display tags" msgstr "显示标签" -#: localized_js.php:34 prefs.php:124 tt-rss.php:79 +#: localized_js.php:34 prefs.php:126 tt-rss.php:79 msgid "Loading, please wait..." msgstr "读取中，请等待..." @@ -498,6 +508,19 @@ msgstr "显示条目失败（缺少XML支持）" msgid "No feed selected." msgstr "无选定feed." +#: localized_js.php:93 +msgid "Replace current publishing address with a new one?" +msgstr "" + +#: localized_js.php:94 +msgid "Address changed." +msgstr "" + +#: localized_js.php:95 +#, fuzzy +msgid "Could not change address." +msgstr "未能更新数据库" + #: login_form.php:49 modules/pref-feeds.php:264 modules/pref-users.php:29 msgid "Login:" msgstr "登陆:" @@ -555,18 +578,23 @@ msgid "Other Feeds" msgstr "其他feed" #: prefs.php:112 +#, fuzzy +msgid "Published Articles" +msgstr "所有文章" + +#: prefs.php:114 msgid "Content Filtering" msgstr "内容过滤器" -#: prefs.php:115 +#: prefs.php:117 msgid "Label Editor" msgstr "标记编辑" -#: prefs.php:119 +#: prefs.php:121 msgid "User Manager" msgstr "用户管理" -#: prefs.php:127 tt-rss.php:82 +#: prefs.php:129 tt-rss.php:82 msgid "" "Your browser doesn't support Javascript, which is required\n" "\t\tfor this application to function properly. Please check your\n" @@ -998,7 +1026,8 @@ msgid "Showing most popular tags " msgstr "显示最热标签" #: modules/popup-dialog.php:427 -msgid "browse all" +#, fuzzy +msgid "browse more" msgstr "浏览所有" #: modules/pref-feed-browser.php:77 @@ -1165,6 +1194,16 @@ msgstr "导入" msgid "Export OPML" msgstr "导出OPML" +#: modules/pref-feeds.php:1053 +msgid "" +"Published articles are exported as a public RSS feed and can be subscribed " +"by anyone who knows the address specified below." +msgstr "" + +#: modules/pref-feeds.php:1060 +msgid "Generate another address" +msgstr "" + #: modules/pref-filters.php:22 msgid "Filter editor" msgstr "过滤器编辑" diff --git a/localized_js.php b/localized_js.php index bfb60cba6..a1c423c19 100644 --- a/localized_js.php +++ b/localized_js.php @@ -90,5 +90,8 @@ print T_js_decl("No articles are selected."); print T_js_decl("Could not update headlines (missing XML object)"); print T_js_decl("Could not display article (missing XML object)"); print T_js_decl("No feed selected."); +print T_js_decl("Replace current publishing address with a new one?"); +print T_js_decl("Address changed."); +print T_js_decl("Could not change address."); ?> diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index 2705f45f5..7e83e816a 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -306,11 +306,8 @@ print ""; set_pref($link, "_PREFS_PUBLISH_KEY", generate_publish_key()); - - $url_path = 'http://' . $_SERVER["HTTP_HOST"] . \ - parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH); - $new_link = $url_path . "?op=publish&key=" . get_pref($link, "_PREFS_PUBLISH_KEY"); + $new_link = article_publish_url($link); print ""; diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index 173244245..193a1a4bc 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -1052,10 +1052,7 @@ print "

".__('Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the address specified below.')."

"; - $url_path = 'http://' . $_SERVER["HTTP_HOST"] . \ - parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH); - - $url_path .= "?op=publish&key=" . get_pref($link, "_PREFS_PUBLISH_KEY"); + $url_path = article_publish_url($link); print "

$url_path

"; diff --git a/prefs.js b/prefs.js index 0fec36206..071bb8a4c 100644 --- a/prefs.js +++ b/prefs.js @@ -29,13 +29,13 @@ function replace_pubkey_callback() { link.href = new_link.firstChild.nodeValue; link.innerHTML = new_link.firstChild.nodeValue; - notify_info("Address changed"); + notify_info("Address changed."); } else { - notify_error("Could not change address"); + notify_error("Could not change address."); } } else { - notify_error("Could not change address"); + notify_error("Could not change address."); } } catch (e) { exception_error("replace_pubkey_callback", e); @@ -535,7 +535,7 @@ function removeSelectedLabels() { if (sel_rows.length > 0) { - var ok = confirm("Remove selected labels?"); + var ok = confirm(__("Remove selected labels?")); if (ok) { notify_progress("Removing selected labels..."); @@ -563,7 +563,7 @@ function removeSelectedUsers() { if (sel_rows.length > 0) { - var ok = confirm("Remove selected users?"); + var ok = confirm(__("Remove selected users?")); if (ok) { notify_progress("Removing selected users..."); @@ -592,7 +592,7 @@ function removeSelectedFilters() { if (sel_rows.length > 0) { - var ok = confirm("Remove selected filters?"); + var ok = confirm(__("Remove selected filters?")); if (ok) { notify_progress("Removing selected filters..."); @@ -621,7 +621,7 @@ function removeSelectedFeeds() { if (sel_rows.length > 0) { - var ok = confirm("Unsubscribe from selected feeds?"); + var ok = confirm(__("Unsubscribe from selected feeds?")); if (ok) { @@ -653,7 +653,7 @@ function removeSelectedFeedCats() { if (sel_rows.length > 0) { - var ok = confirm("Remove selected categories?"); + var ok = confirm(__("Remove selected categories?")); if (ok) { notify_progress("Removing selected categories..."); @@ -1764,7 +1764,7 @@ function pubRegenKey() { return false; } - var ok = confirm("Replace current publishing address with a new one?"); + var ok = confirm(__("Replace current publishing address with a new one?")); if (ok) {