i18n, fixes

diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 256bbbd1fc5ddeddb6aadc0c2cf2aea96c551974..5a3f84517d0fd3e978e526ef183e720732933d10 100644 (file)
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -443,9 +443,9 @@
                                }
 
                                if (subscribe_to_feed($link, $feed_url, $cat_id)) {
-                                       print format_notice(printf(__("Subscribed to <b>%s</b>."), $feed_url));
+                                       print format_notice(sprintf(__("Subscribed to <b>%s</b>."), $feed_url));
                                } else {
-                                       print format_warning(printf(__("Already subscribed to <b>%s</b>."), $feed_url));
+                                       print format_warning(sprintf(__("Already subscribed to <b>%s</b>."), $feed_url));
                                }
 
                                if ($p_from != 'tt-rss') {
@@ -547,7 +547,7 @@
        
                                        } else {
        
-                                               print format_warning(printf(__("Category <b>$%s</b> already exists in the database."), $feed_cat));
+                                               print format_warning(sprintf(__("Category <b>$%s</b> already exists in the database."), $feed_cat));
                                        }
 
                                }

diff --git a/modules/pref-users.php b/modules/pref-users.php
index 46c7ad4744bf0e1f177edad059094cd1b973e1f5..4022316096c4441c88bb097e7010f94fbcc3cf7b 100644 (file)
--- a/modules/pref-users.php
+++ b/modules/pref-users.php
@@ -9,7 +9,7 @@
 
                        $id = db_escape_string($_GET["id"]);
 
-                       print "<div id=\"infoBoxTitle\">User editor</div>";
+                       print "<div id=\"infoBoxTitle\">".__('User editor')."</div>";
                        
                        print "<div class=\"infoBoxContents\">";
 
@@ -26,7 +26,7 @@
                        $email = db_fetch_result($result, 0, "email");
 
                        print "<table width='100%'>";
-                       print "<tr><td>Login:</td><td>
+                       print "<tr><td>".__('Login:')."</td><td>
                                <input class=\"iedit\" onkeypress=\"return filterCR(event)\"
                                name=\"login\" value=\"$login\"></td></tr>";
 
@@ -34,13 +34,13 @@
                                <input class=\"iedit\" onkeypress=\"return filterCR(event)\"
                                name=\"password\"></td></tr>";
 
-                       print "<tr><td>E-mail:</td><td>
+                       print "<tr><td>".__('E-mail:')."</td><td>
                                <input class=\"iedit\" name=\"email\" onkeypress=\"return filterCR(event)\"
                                value=\"$email\"></td></tr>";
 
                        $sel_disabled = ($id == $_SESSION["uid"]) ? "disabled" : "";
                                
-                       print "<tr><td>Access level:</td><td>";
+                       print "<tr><td>".__('Access level:')."</td><td>";
                        print_select_hash("access_level", $access_level, $access_level_names, 
                                $sel_disabled);
                        print "</td></tr>";
@@ -52,10 +52,10 @@
                        print "<div align='right'>
                                <input class=\"button\"
                                        type=\"submit\" onclick=\"return userEditSave()\" 
-                                       value=\"Save\">
+                                       value=\"".__('Save')."\">
                                <input class=\"button\"
                                        type=\"submit\" onclick=\"return userEditCancel()\" 
-                                       value=\"Cancel\"></div>";
+                                       value=\"".__('Cancel')."\"></div>";
 
                        print "</div>";
 
@@ -75,7 +75,7 @@
                                if ($password) {
                                        $pwd_hash = 'SHA1:' . sha1($password);
                                        $pass_query_part = "pwd_hash = '$pwd_hash', ";                                  
-                                       print "<div class='notice'>Changed password for user <b>$login</b>.</div>";
+                                       print format_notice(sprintf(__('Changed password for user <b>%s</b>.'), $login));
                                } else {
                                        $pass_query_part = "";
                                }