localize help dialogs

diff --git a/functions.php b/functions.php
index a8cb09fe40a33882c0eeba002d37401125441c59..ac949dd497e122988226ef85b07e959950f75d72 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -5517,15 +5517,15 @@
                }
        }
 
-       function rounded_table_start($classname) {
+       function rounded_table_start($classname, $header = " ") {
                print "<table width='100%' class='$classname' cellspacing='0' cellpadding='0'>";
-               print "<tr><td class='c1'>&nbsp;</td><td class='top'>&nbsp;</td><td class='c2'>&nbsp;</tr>";
+               print "<tr><td class='c1'>&nbsp;</td><td class='top'>$header</td><td class='c2'>&nbsp;</tr>";
                print "<tr><td class='left'>&nbsp;</td><td class='content'>";
        }
 
-       function rounded_table_end() {
+       function rounded_table_end($footer = "&nbsp;") {
                print "</td><td class='right'>&nbsp;</td></tr>";
-               print "<tr><td class='c4'>&nbsp;</td><td class='bottom'>&nbsp;</td><td class='c3'>&nbsp;</tr>";
+               print "<tr><td class='c4'>&nbsp;</td><td class='bottom'>$footer</td><td class='c3'>&nbsp;</tr>";
                print "</table>";
        }
 

diff --git a/help/1.php b/help/1.php
index 8c7756330fe0295aa2f36d360a3b0a3a2fadbfb0..a2b4566f1829cc971c06f16a1a3680c2626918dc 100644 (file)
--- a/help/1.php
+++ b/help/1.php
@@ -1,26 +1,23 @@
-<h1>Labels and SQL Expressions</h1>
+<h1><?php echo __("Labels and SQL Expressions") ?></h1>
 
-<p>Labels are generated by using SQL expressions. The &laquo;SQL expression&raquo; is added to WHERE clause of view feed query. You can match on ttrss_entries table fields and even use subselect to query additional information. This       functionality is considered to be advanced and requires some understanding of SQL.</p>
+<p><?php echo __("Label content is generated using SQL expressions. The &laquo;SQL expression&raquo; is added to WHERE clause of view feed query. You can match on ttrss_entries table fields and even use subselect to query additional information. This     functionality is considered to be advanced and requires some understanding of SQL.") ?></p>
        
-<h2>Examples</h2>
+<h2><?php echo __("Examples") ?></h2>
 
-<p>Match all unread articles:</p>
+<p><?php echo __("Match all unread articles:") ?></p>
 
 <code>unread = true</code>
 
-<p>Matches all articles which mention Linux in the title:</p>
+<p><?php echo __("Matches all articles which mention Linux in the title:") ?></p>
 
 <code>ttrss_entries.title like '%Linux%'</code>
 
-<p>Matches all articles for the last week (PostgreSQL):</p>
+<p><?php echo __("Matches all articles for the last week (PostgreSQL):") ?></p>
 
 <code>updated &gt; NOW() - INTERVAL '7 days'</code>
 
-<p>Matches all articles with scores between 100 and 500:</p>
+<p><?php echo __("Matches all articles with scores between 100 and 500:") ?></p>
 
 <code>score &gt; 100 and score &lt; 500</code>
 
-<p>See the database schema <a target="_blank" href="http://tt-rss.org/trac/browser/schema/ttrss_schema_pgsql.sql">here</a> or included in the distribution package for gruesome details. The relevant tables are <b>ttrss_entries</b> and <b>ttrss_user_entries</b>.</p>
-
-<p class="insensitive">Feel free to post more clever examples of labels on Tiny 
-Tiny RSS <a target="_blank" href="http://tt-rss.org/forum">forums</a>.</p>
+<p>

diff --git a/help/2.php b/help/2.php
index 83cf5d4dfb6c22519cf0681d3211d5ef07b7f3cf..e14e927451a137fc03e1cd5199a969b92c62c611 100644 (file)
--- a/help/2.php
+++ b/help/2.php
@@ -1,10 +1,10 @@
-<h1>Content filters</h1>
+<h1><?php echo __("Content filtering") ?></h1>
 
-<p>TT-RSS has support for filtering (or processing) articles. Filtering is done once, when new article is imported to the database from the newsfeed, specified field is matched against regular expression and some action is taken. Regular expression matching is case-insensitive.</p>
+<p><?php echo __("Tiny Tiny RSS has support for filtering (or processing) articles. Filtering is done once, when new article is imported to the database from the newsfeed, specified field is matched against regular expression and some action is taken. Regular expression matching is case-insensitive.") ?></p>
 
-<p>Supported actions: filter (do not import) article, mark article as read, set starred, assign tag(s). Filters can be defined globally and for some specific feed.</p>
+<p><?php echo __("Supported actions are: filter (do not import) article, mark article as read, set starred, assign tag(s), and set score. Filters can be defined globally and for some specific feed.") ?></p>
 
-<p>Multiple and inverse matching are supported. All matching filters are considered when article is being imported and all actions executed in sequence. Inverse matching reverts matching result, e.g. filter matching XYZZY in title with inverse flag will match all articles, except those containing string XYZZY in title.</p>
+<p><?php echo __("Multiple and inverse matching are supported. All matching filters are considered when article is being imported and all actions executed in sequence. Inverse matching reverts matching result, e.g. filter matching XYZZY in title with inverse flag will match all articles, except those containing string XYZZY in title.") ?></p>
 
-<p>See <a target="_new" href="http://tt-rss.spb.ru/trac/wiki/ContentFilters">this page</a> for additional information on filtering.</p>
+<p><?php echo __("See also:")?> <a target="_new" href="http://tt-rss.spb.ru/trac/wiki/ContentFilters">ContentFilters (wiki)</a>
 

diff --git a/help/3.php b/help/3.php
index 8db60096512bcb85e910a2dac2307b064d624334..0644c214a0e40ef61d52bd7c844bbc348c8c9b2c 100644 (file)
--- a/help/3.php
+++ b/help/3.php
@@ -1,65 +1,58 @@
-       <h1>Keyboard Shortcuts</h1>
+       <h1><?php echo __("Keyboard Shortcuts") ?></h1>
 
        <table width='100%'><tr><td width='50%' valign='top'>
 
-       <h2>Navigation</h2>
+       <h2><?php echo __("Navigation") ?></h2>
 
        <table>
-               <tr><td class='n'>j/k</td><td>Move between feeds</td></tr>
-               <tr><td class='n'>n/p</td><td>Move between articles</td></tr>
-               <tr><td class='n'>/</td><td>Show search dialog</td></tr>
+               <tr><td class='n'>j/k</td><td><?php echo __("Move between feeds") ?></td></tr>
+               <tr><td class='n'>n/p</td><td><?php echo __("Move between articles") ?></td></tr>
+               <tr><td class='n'>/</td><td><?php echo __("Show search dialog") ?></td></tr>
        </table>
 
-       <h2>Active article actions</h2>
+       <h2><?php echo __("Active article actions") ?></h2>
 
        <table>
-               <tr><td class='n'>s</td><td>Toggle starred</td></tr>
-               <tr><td class='n'>shift-S</td><td>Toggle published</td></tr>
-               <tr><td class='n'>u</td><td>Toggle unread</td></tr>
-               <tr><td class='n'>t</td><td>Edit tags</td></tr>
-
-               <!-- <? if (get_pref($link, "COMBINED_DISPLAY_MODE")) { ?>
-                       <tr><td class='n'>t</td><td>Select article under mouse pointer</td></tr>
-               <? } else { ?>
-                       <tr><td class='n'>t</td><td class="insensitive">Select article under mouse pointer <span class="small"></span></td></tr>
-               <? } ?> -->
-
+               <tr><td class='n'>s</td><td><?php echo __("Toggle starred") ?></td></tr>
+               <tr><td class='n'>shift-S</td><td><?php echo __("Toggle published") ?></td></tr>
+               <tr><td class='n'>u</td><td><?php echo __("Toggle unread") ?></td></tr>
+               <tr><td class='n'>t</td><td><?php echo __("Edit tags") ?></td></tr>
                <!-- <tr><td class='n'>S</td><td>Edit score</td></tr> -->
        </table>
 
-       <h2>Other actions</h2>
+       <h2><?php echo __("Other actions") ?></h2>
 
        <table>
-               <tr><td class='n'>c f</td><td>Create filter</td></tr>
-               <tr><td class='n'>c s</td><td>Collapse sidebar</td></tr>
-               <tr><td class='n'>?</td><td>Display this help dialog</td></tr>
+               <tr><td class='n'>c f</td><td><?php echo __("Create filter") ?></td></tr>
+               <tr><td class='n'>c s</td><td><?php echo __("Collapse sidebar") ?></td></tr>
+               <tr><td class='n'>?</td><td><?php echo __("Display this help dialog") ?></td></tr>
        </table>
 
        </td><td valign='top'>
 
-       <h2>Feed actions</h2>
+       <h2><?php echo __("Feed actions") ?></h2>
 
        <table>
-               <tr><td class='n'>f a</td><td>(Un)hide read feeds</td></tr>
-               <tr><td class='n'>f s</td><td>Subscribe to feed</td></tr>
-               <tr><td class='n'>f u</td><td>Update feed</td></tr>
-               <tr><td class='n'>f U</td><td>Update all feeds</td></tr>
-               <tr><td class='n'>f e</td><td>Edit feed</td></tr>
-               <tr><td class='n'>f c</td><td>Mark feed as read</td></tr>
-               <tr><td class='n'>f C</td><td>Mark all feeds as read</td></tr>
+               <tr><td class='n'>f a</td><td><?php echo __("(Un)hide read feeds") ?></td></tr>
+               <tr><td class='n'>f s</td><td><?php echo __("Subscribe to feed") ?></td></tr>
+               <tr><td class='n'>f u</td><td><?php echo __("Update feed") ?></td></tr>
+               <tr><td class='n'>f U</td><td><?php echo __("Update all feeds") ?></td></tr>
+               <tr><td class='n'>f e</td><td><?php echo __("Edit feed") ?></td></tr>
+               <tr><td class='n'>f c</td><td><?php echo __("Mark feed as read") ?></td></tr>
+               <tr><td class='n'>f C</td><td><?php echo __("Mark all feeds as read") ?></td></tr>
        </table>
 
-       <h2>Go to...</h2>
+       <h2><?php echo __("Go to...") ?></h2>
 
        <table>
-               <tr><td class='n'>g s</td><td>Starred articles</td></tr>
-               <tr><td class='n'>g f</td><td>Fresh articles</td></tr>
-               <tr><td class='n'>g p</td><td>Published articles</td></tr>
-               <tr><td class='n'>g t</td><td>Tag cloud</td></tr>
-               <tr><td class='n'>g P</td><td>Preferences</td></tr>
+               <tr><td class='n'>g s</td><td><?php echo __("Starred articles") ?></td></tr>
+               <tr><td class='n'>g f</td><td><?php echo __("Fresh articles") ?></td></tr>
+               <tr><td class='n'>g p</td><td><?php echo __("Published articles") ?></td></tr>
+               <tr><td class='n'>g t</td><td><?php echo __("Tag cloud") ?></td></tr>
+               <tr><td class='n'>g P</td><td><?php echo __("Preferences") ?></td></tr>
        </table>
 
 
        </td></tr></table>
 
-       <p class="small">Press any key to close this window.</p>
+       <p class="small"><?php echo __("Press any key to close this window.") ?></p>

diff --git a/tt-rss.css b/tt-rss.css
index d6ecdd766574b0e8394b0b46f6b575524d413cfb..32ccfde3b14f18544f80a195d41ea5915ba6fe25 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1872,3 +1872,10 @@ div#hotkey_help_overlay table.hho td.bottom,
 div#hotkey_help_overlay table.hho td.content {
        background : url("images/shadow_dark.png");     
 }
+
+div#hotkey_help_overlay table.hho td.top,
+div#hotkey_help_overlay table.hho td.bottom {
+       text-align : center;
+       font-size : 11pt;
+}
+

diff --git a/tt-rss.php b/tt-rss.php
index 972aebb67f7f866c59c855e7bb7d9e3021735168..226117ff73d1492a2b6a8531f9374ab997991a1f 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -82,7 +82,7 @@
        </div>
 </div> 
 
-<div id="hotkey_help_overlay" style="display : block" onclick="Element.hide(this)">
+<div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)">
        <?php rounded_table_start("hho"); ?>
        <?php include "help/3.php" ?>
        <?php rounded_table_end(); ?>