add gettext to js, bump translations

diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 4295006a72e47df093975742abb1173b9f9dcd27..3f638cebeebfbfe2416f795b0bc31bd6446f6668 100644 (file)
Binary files a/locale/ru_RU/LC_MESSAGES/messages.mo and b/locale/ru_RU/LC_MESSAGES/messages.mo differ

diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index dd36603db7807d2d1c8025a6c84d4dd59f85b1fd..993784c5826352a1b34cc3fcb06b66025bea2fa5 100644 (file)
--- a/locale/ru_RU/LC_MESSAGES/messages.po
+++ b/locale/ru_RU/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-05 19:53+0300\n"
+"POT-Creation-Date: 2007-03-06 12:07+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -114,18 +114,10 @@ msgstr ""
 msgid "This program requires XmlHttpRequest "
 msgstr ""
 
-#: errors.php:6
-msgid "to function properly. Your browser doesn't seem to support it."
-msgstr ""
-
 #: errors.php:8
 msgid "This program requires cookies "
 msgstr ""
 
-#: errors.php:9
-msgid "to function properly. Your browser doesn't seem to support them."
-msgstr ""
-
 #: errors.php:11
 msgid "Backend sanity check failed"
 msgstr ""
@@ -175,39 +167,39 @@ msgstr ""
 
 #: functions.php:2038 functions.php:2852
 msgid "Special"
-msgstr ""
+msgstr "Особые"
 
 #: functions.php:2040 functions.php:2878
 msgid "Labels"
-msgstr ""
+msgstr "Метки"
 
 #: functions.php:2058 functions.php:2344 functions.php:2862
 msgid "Starred articles"
-msgstr ""
+msgstr "Отмеченные статьи"
 
 #: functions.php:2308
 msgid "Global search results"
-msgstr ""
+msgstr "Результаты поиска"
 
 #: functions.php:2310
 msgid "Tag search results"
-msgstr ""
+msgstr "Результаты поиска"
 
 #: functions.php:2326
 msgid "Category search results"
-msgstr ""
+msgstr "Результаты поиска"
 
 #: functions.php:2339
 msgid "Feed search results"
-msgstr ""
+msgstr "Результаты поиска"
 
 #: functions.php:2352
 msgid "Label search results"
-msgstr ""
+msgstr "Результаты поиска"
 
 #: functions.php:2547
 msgid "New headlines for last 24 hours, as of "
-msgstr ""
+msgstr "Новые заголовки за последние 24 часа, на "
 
 #: functions.php:2591
 msgid ""
@@ -222,11 +214,11 @@ msgstr ""
 
 #: functions.php:2760 functions.php:2789
 msgid "All"
-msgstr ""
+msgstr "Все"
 
 #: functions.php:2761 functions.php:2790 functions.php:2793 tt-rss.php:162
 msgid "Unread"
-msgstr ""
+msgstr "Непрочитанные"
 
 #: functions.php:2762 functions.php:2791
 msgid "None"
@@ -242,15 +234,15 @@ msgstr ""
 
 #: functions.php:2768
 msgid "Mark as read"
-msgstr ""
+msgstr "Пометить как прочитанные"
 
 #: functions.php:2769
 msgid "This page"
-msgstr ""
+msgstr "Эту страницу"
 
 #: functions.php:2770
 msgid "Entire feed"
-msgstr ""
+msgstr "Весь фид"
 
 #: functions.php:2775
 msgid "Next page"
@@ -266,15 +258,15 @@ msgstr ""
 
 #: functions.php:2788
 msgid "Select:"
-msgstr ""
+msgstr "Выбрать:"
 
 #: functions.php:2793
 msgid "Toggle:"
-msgstr ""
+msgstr "Изменить:"
 
 #: functions.php:2794 tt-rss.php:161
 msgid "Starred"
-msgstr ""
+msgstr "Отмеченные"
 
 #: functions.php:2796
 msgid "Mark as read:"
@@ -282,7 +274,7 @@ msgstr ""
 
 #: functions.php:2797
 msgid "Page"
-msgstr ""
+msgstr "Страница"
 
 #: functions.php:2798 modules/pref-filters.php:261
 msgid "Feed"
@@ -304,6 +296,14 @@ msgstr ""
 msgid "Tags"
 msgstr ""
 
+#: localized_js.php:14
+msgid "display feeds"
+msgstr "показать фиды"
+
+#: localized_js.php:15
+msgid "display tags"
+msgstr "показать теги"
+
 #: login_form.php:49 modules/pref-feeds.php:264 modules/pref-users.php:29
 msgid "Login:"
 msgstr "Пользователь:"
@@ -423,10 +423,6 @@ msgstr ""
 msgid "config: SESSION_EXPIRE_TIME should be greater or equal to"
 msgstr ""
 
-#: sanity_check.php:53
-msgid "SESSION_COOKIE_LIFETIME"
-msgstr ""
-
 #: sanity_check.php:61
 msgid "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE"
 msgstr ""
@@ -474,7 +470,7 @@ msgstr ""
 
 #: tt-rss.php:142
 msgid "&nbsp;&nbsp;Mark as read"
-msgstr ""
+msgstr "&nbsp;&nbsp;Отметить как прочитанные"
 
 #: tt-rss.php:143
 msgid "&nbsp;&nbsp;(Un)hide read feeds"
@@ -482,15 +478,15 @@ msgstr ""
 
 #: tt-rss.php:145
 msgid "Other actions:"
-msgstr ""
+msgstr "Другое:"
 
 #: tt-rss.php:146
 msgid "&nbsp;&nbsp;Create filter"
-msgstr ""
+msgstr "&nbsp;&nbsp;Создать фильтр"
 
 #: tt-rss.php:152 modules/popup-dialog.php:95
 msgid "Search:"
-msgstr "Ð\9fоиÑ\81к:"
+msgstr "Ð\98Ñ\81каÑ\82Ñ\8c:"
 
 #: tt-rss.php:157
 msgid "View:"
@@ -587,7 +583,7 @@ msgstr "Категория:"
 
 #: modules/popup-dialog.php:73 modules/pref-feeds.php:118
 msgid "Subscribe"
-msgstr ""
+msgstr "Подписаться"
 
 #: modules/popup-dialog.php:76 modules/popup-dialog.php:155
 #: modules/popup-dialog.php:207 modules/popup-dialog.php:294
@@ -615,23 +611,23 @@ msgstr ""
 
 #: modules/popup-dialog.php:135
 msgid "Match on:"
-msgstr ""
+msgstr "Искать по:"
 
 #: modules/popup-dialog.php:138
 msgid "Title"
-msgstr ""
+msgstr "Заголовок"
 
 #: modules/popup-dialog.php:139
 msgid "Content"
-msgstr ""
+msgstr "Содержимое"
 
 #: modules/popup-dialog.php:140
 msgid "Title or content"
-msgstr ""
+msgstr "Заголовок или содержимое"
 
 #: modules/popup-dialog.php:164 modules/pref-labels.php:209
 msgid "Create label"
-msgstr ""
+msgstr "Создать метку"
 
 #: modules/popup-dialog.php:174
 msgid "Caption:"

diff --git a/localized_js.php b/localized_js.php
new file mode 100644 (file)
index 0000000..b46ba83
--- /dev/null
+++ b/localized_js.php
@@ -0,0 +1,26 @@
+<?php 
+require "functions.php";
+header("Content-Type: text/plain; charset=UTF-8");
+
+function js_decl($s1, $s2) {
+       return "T_messages[\"$s1\"] = \"$s2\";\n";
+}
+?>
+
+var T_messages = new Object();
+
+function __(msg) {
+       if (T_messages[msg]) {
+               return T_messages[msg];
+       } else {
+               return msg;
+       }
+}
+
+<?php
+
+print js_decl("display feeds", __("display feeds"));
+print js_decl("display tags", __("display tags"));
+
+?>
+

diff --git a/tt-rss.js b/tt-rss.js
index 52ce95f2ff92c99bcbae5ef403a157c108952924..eefc90e7f4ead282ccbc85dc4347d3e386ba0f80 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -32,9 +32,9 @@ function toggleTags() {
        var p = document.getElementById("dispSwitchPrompt");
 
        if (display_tags) {
-               p.innerHTML = "display feeds";
+               p.innerHTML = __("display feeds");
        } else {
-               p.innerHTML = "display tags";
+               p.innerHTML = __("display tags");
        }
        
        notify_progress("Loading, please wait...");

diff --git a/tt-rss.php b/tt-rss.php
index e7c28f0362157bf3c803da48f16b19afd095d0bb..420aaf5f5be17d5588c1330b7cf6de2744e63169 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -45,6 +45,7 @@
        <link rel="shortcut icon" type="image/png" href="images/favicon.png">
 
        <script type="text/javascript" src="prototype.js"></script>
+       <script type="text/javascript" src="localized_js.php?<?php echo $dt_add ?>"></script>
 
        <script type="text/javascript" src="tt-rss.js?<?php echo $dt_add ?>"></script>
        <script type="text/javascript" src="functions.js?<?php echo $dt_add ?>"></script>
@@ -116,7 +117,8 @@ window.onload = init;
 
 <div id="feeds-holder">
        <div id="dispSwitch"> 
-               <a id="dispSwitchPrompt" href="javascript:toggleTags()">display tags</a>
+               <a id="dispSwitchPrompt" 
+                       href="javascript:toggleTags()"><?php echo __("display tags") ?></a>
        </div>
        <div id="feeds-frame">&nbsp;</div>
 </div>