diff options
author | Andrew Dolgov <[email protected]> | 2007-03-05 09:45:38 +0100 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2007-03-05 09:45:38 +0100 |
commit | d1db26aa1c18130accf6e536a063efadbab65a1d (patch) | |
tree | e55523801fa34dd4a0884af099e8641da33d1e63 | |
parent | 659468ebf0197e682cc70629c3b538e793e765a2 (diff) |
change _() to __() (use php-gettext)
-rw-r--r-- | backend.php | 46 | ||||
-rw-r--r-- | errors.php | 24 | ||||
-rw-r--r-- | functions.php | 52 | ||||
-rw-r--r-- | opml.php | 2 | ||||
-rw-r--r-- | prefs.php | 20 | ||||
-rw-r--r-- | sanity_check.php | 24 | ||||
-rw-r--r-- | tt-rss.php | 50 | ||||
-rw-r--r-- | update-translations.sh | 2 |
8 files changed, 110 insertions, 110 deletions
diff --git a/backend.php b/backend.php index d2f3d356b..1f0cf2e81 100644 --- a/backend.php +++ b/backend.php @@ -79,28 +79,28 @@ } $purge_intervals = array( - 0 => _("Use default"), - -1 => _("Never purge"), - 5 => _("1 week old"), - 14 => _("2 weeks old"), - 31 => _("1 month old"), - 60 => _("2 months old"), - 90 => _("3 months old")); + 0 => __("Use default"), + -1 => __("Never purge"), + 5 => __("1 week old"), + 14 => __("2 weeks old"), + 31 => __("1 month old"), + 60 => __("2 months old"), + 90 => __("3 months old")); $update_intervals = array( - 0 => _("Use default"), - -1 => _("Disable updates"), - 30 => _("Each 30 minutes"), - 60 => _("Hourly"), - 240 => _("Each 4 hours"), - 720 => _("Each 12 hours"), - 1440 => _("Daily"), - 10080 => _("Weekly")); + 0 => __("Use default"), + -1 => __("Disable updates"), + 30 => __("Each 30 minutes"), + 60 => __("Hourly"), + 240 => __("Each 4 hours"), + 720 => __("Each 12 hours"), + 1440 => __("Daily"), + 10080 => __("Weekly")); $access_level_names = array( - 0 => _("User"), - 10 => _("Administrator")); + 0 => __("User"), + 10 => __("Administrator")); require_once "modules/pref-prefs.php"; require_once "modules/popup-dialog.php"; @@ -221,7 +221,7 @@ $entry_author = $line["author"]; if ($entry_author) { - $entry_author = _(" - by ") . $entry_author; + $entry_author = __(" - by ") . $entry_author; } $parsed_updated = date(get_pref($link, 'LONG_DATE_FORMAT'), @@ -263,7 +263,7 @@ if (!$entry_comments) $entry_comments = " "; # placeholder - if (!$tags_str) $tags_str = '<span class="tagList">'._('no tags').'</span>'; + if (!$tags_str) $tags_str = '<span class="tagList">'.__('no tags').'</span>'; print "<div style='float : right'>$tags_str <a title=\"Edit tags for this article\" @@ -276,7 +276,7 @@ print "<div class=\"postContent\">"; if (db_num_rows($tmp_result) > 0) { - print "<div id=\"allEntryTags\">"._('Tags:')."$f_tags_str</div>"; + print "<div id=\"allEntryTags\">".__('Tags:')."$f_tags_str</div>"; } if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW')) { @@ -332,7 +332,7 @@ "SELECT id FROM ttrss_feeds WHERE id = '$feed' LIMIT 1"); if (db_num_rows($result) == 0) { - print "<div align='center'>"._('Feed not found.')."</div>"; + print "<div align='center'>".__('Feed not found.')."</div>"; return; } } @@ -401,7 +401,7 @@ print "<div id=\"headlinesContainer\" $rtl_tag>"; if (!$result) { - print "<div align='center'>"._("Could not display feed (query failed). Please check label match syntax or local configuration.")."</div>"; + print "<div align='center'>".__("Could not display feed (query failed). Please check label match syntax or local configuration.")."</div>"; return; } @@ -599,7 +599,7 @@ } else { - print "<div class='whiteBox'>"._('No articles found.')."</div>"; + print "<div class='whiteBox'>".__('No articles found.')."</div>"; } print "</div>"; diff --git a/errors.php b/errors.php index bab8647d0..16efd09a9 100644 --- a/errors.php +++ b/errors.php @@ -1,28 +1,28 @@ <?php - $ERRORS[0] = _("Unknown error"); + $ERRORS[0] = __("Unknown error"); - $ERRORS[1] = _("This program requires XmlHttpRequest " . + $ERRORS[1] = __("This program requires XmlHttpRequest " . "to function properly. Your browser doesn't seem to support it."); - $ERRORS[2] = _("This program requires cookies " . + $ERRORS[2] = __("This program requires cookies " . "to function properly. Your browser doesn't seem to support them."); - $ERRORS[3] = _("Backend sanity check failed"); + $ERRORS[3] = __("Backend sanity check failed"); - $ERRORS[4] = _("Frontend sanity check failed."); + $ERRORS[4] = __("Frontend sanity check failed."); - $ERRORS[5] = _("Incorrect database schema version. <a href='update.php'>Please update</a>."); + $ERRORS[5] = __("Incorrect database schema version. <a href='update.php'>Please update</a>."); - $ERRORS[6] = _("Request not authorized."); + $ERRORS[6] = __("Request not authorized."); - $ERRORS[7] = _("No operation to perform."); + $ERRORS[7] = __("No operation to perform."); - $ERRORS[8] = _("Could not display feed: query failed. Please check label match syntax or local configuration."); + $ERRORS[8] = __("Could not display feed: query failed. Please check label match syntax or local configuration."); - $ERRORS[8] = _("Denied. Your access level is insufficient to access this page."); + $ERRORS[8] = __("Denied. Your access level is insufficient to access this page."); - $ERRORS[9] = _("Configuration check failed"); + $ERRORS[9] = __("Configuration check failed"); - $ERRORS[10] = _("Your version of MySQL is not currently supported. Please see + $ERRORS[10] = __("Your version of MySQL is not currently supported. Please see official site for more information."); ?> diff --git a/functions.php b/functions.php index 2e97ddb2c..a90eed185 100644 --- a/functions.php +++ b/functions.php @@ -2001,7 +2001,7 @@ print "<select id=\"$id\" name=\"$id\" $attributes>"; if ($include_all_cats) { - print "<option value=\"0\">"._('Uncategorized')."</option>"; + print "<option value=\"0\">".__('Uncategorized')."</option>"; } $result = db_query($link, "SELECT id,title FROM ttrss_feed_categories @@ -2030,9 +2030,9 @@ function getFeedCatTitle($link, $id) { if ($id == -1) { - return _("Special"); + return __("Special"); } else if ($id < -10) { - return _("Labels"); + return __("Labels"); } else if ($id > 0) { $result = db_query($link, "SELECT ttrss_feed_categories.title FROM ttrss_feeds, ttrss_feed_categories WHERE ttrss_feeds.id = '$id' AND @@ -2040,7 +2040,7 @@ if (db_num_rows($result) == 1) { return db_fetch_result($result, 0, "title"); } else { - return _("Uncategorized"); + return __("Uncategorized"); } } else { return "getFeedCatTitle($id) failed"; @@ -2050,7 +2050,7 @@ function getFeedTitle($link, $id) { if ($id == -1) { - return _("Starred articles"); + return __("Starred articles"); } else if ($id < -10) { $label_id = -10 - $id; $result = db_query($link, "SELECT description FROM ttrss_labels WHERE id = '$label_id'"); @@ -2300,9 +2300,9 @@ $feed_title = ""; if ($search && $search_mode == "all_feeds") { - $feed_title = _("Global search results")." ($search)"; + $feed_title = __("Global search results")." ($search)"; } else if ($search && preg_match('/^-?[0-9][0-9]*$/', $feed) == false) { - $feed_title = _("Tag search results")." ($search, $feed)"; + $feed_title = __("Tag search results")." ($search, $feed)"; } else if (preg_match('/^-?[0-9][0-9]*$/', $feed) == false) { $feed_title = $feed; } else if (preg_match('/^-?[0-9][0-9]*$/', $feed) != false && $feed >= 0) { @@ -2314,11 +2314,11 @@ WHERE id = '$feed' AND owner_uid = " . $_SESSION["uid"]); $feed_title = db_fetch_result($result, 0, "title"); } else { - $feed_title = _("Uncategorized"); + $feed_title = __("Uncategorized"); } if ($search) { - $feed_title = _("Category search results")." ($search, $feed_title)"; + $feed_title = __("Category search results")." ($search, $feed_title)"; } } else { @@ -2331,12 +2331,12 @@ $last_error = db_fetch_result($result, 0, "last_error"); if ($search) { - $feed_title = _("Feed search results") . " ($search, $feed_title)"; + $feed_title = __("Feed search results") . " ($search, $feed_title)"; } } } else if ($feed == -1) { - $feed_title = _("Starred articles"); + $feed_title = __("Starred articles"); } else if ($feed < -10) { $label_id = -$feed - 11; $result = db_query($link, "SELECT description FROM ttrss_labels @@ -2344,7 +2344,7 @@ $feed_title = db_fetch_result($result, 0, "description"); if ($search) { - $feed_title = _("Label search results") . " ($search, $feed_title)"; + $feed_title = __("Label search results") . " ($search, $feed_title)"; } } else { $feed_title = "?"; @@ -2539,7 +2539,7 @@ } function prepare_headlines_digest($link, $user_id, $days = 1, $limit = 100) { - $tmp = _("New headlines for last 24 hours, as of ") . date("Y/m/d H:m") . "\n"; + $tmp = __("New headlines for last 24 hours, as of ") . date("Y/m/d H:m") . "\n"; $tmp .= "=======================================================\n\n"; if (DB_TYPE == "pgsql") { @@ -2583,9 +2583,9 @@ } $tmp .= "--- \n"; - $tmp .= _("You have been sent this email because you have enabled daily digests in Tiny Tiny RSS at ") . + $tmp .= __("You have been sent this email because you have enabled daily digests in Tiny Tiny RSS at ") . DIGEST_HOSTNAME . "\n". - _("To unsubscribe, visit your configuration options or contact instance owner.\n"); + __("To unsubscribe, visit your configuration options or contact instance owner.\n"); return array($tmp, $headlines_count); @@ -2784,15 +2784,15 @@ // old style subtoolbar: print "<td class=\"headlineActions$rtl_cpart\">". - _('Select:')." + __('Select:')." <a href=\"$sel_all_link\">All</a>, <a href=\"$sel_unread_link\">Unread</a>, <a href=\"$sel_none_link\">None</a> ". - _('Toggle:')." <a href=\"$tog_unread_link\">Unread</a>, + __('Toggle:')." <a href=\"$tog_unread_link\">Unread</a>, <a href=\"$tog_marked_link\">Starred</a> ". - _('Mark as read:')." + __('Mark as read:')." <a href=\"#\" onclick=\"$catchup_page_link\">Page</a>, <a href=\"#\" onclick=\"$catchup_feed_link\">Feed</a>"; print "</td>"; @@ -2803,7 +2803,7 @@ print "<td class=\"headlineActions$rtl_cpart\"> <a href=\"javascript:labelFromSearch('$search', '$search_mode', '$match_on', '$feed_id', '$is_cat');\"> - "._('Convert to Label')."</a></td>"; + ".__('Convert to Label')."</a></td>"; } print "<td class=\"headlineTitle$rtl_cpart\">"; @@ -2848,7 +2848,7 @@ /* virtual feeds */ if (get_pref($link, 'ENABLE_FEED_CATS')) { - print "<li class=\"feedCat\">"._('Special')."</li>"; + print "<li class=\"feedCat\">".__('Special')."</li>"; print "<li id=\"feedCatHolder\"><ul class=\"feedCatList\">"; } @@ -2858,7 +2858,7 @@ if ($num_starred > 0) $class .= "Unread"; - printFeedEntry(-1, $class, _("Starred articles"), $num_starred, + printFeedEntry(-1, $class, __("Starred articles"), $num_starred, "images/mark_set.png", $link); if (get_pref($link, 'ENABLE_FEED_CATS')) { @@ -2874,7 +2874,7 @@ if (db_num_rows($result) > 0) { if (get_pref($link, 'ENABLE_FEED_CATS')) { - print "<li class=\"feedCat\">"._('Labels')."</li>"; + print "<li class=\"feedCat\">".__('Labels')."</li>"; print "<li id=\"feedCatHolder\"><ul class=\"feedCatList\">"; } else { print "<li><hr></li>"; @@ -2997,7 +2997,7 @@ $tmp_category = $line["category"]; if (!$tmp_category) { - $tmp_category = _("Uncategorized"); + $tmp_category = __("Uncategorized"); } // $class = ($lnum % 2) ? "even" : "odd"; @@ -3027,7 +3027,7 @@ $collapsed = $line["collapsed"]; // workaround for NULL category - if ($category == _("Uncategorized")) { + if ($category == __("Uncategorized")) { if ($_COOKIE["ttrss_vf_uclps"] == 1) { $collapsed = "t"; } @@ -3067,7 +3067,7 @@ } if (db_num_rows($result) == 0) { - print "<li>"._('No feeds to display.')."</li>"; + print "<li>".__('No feeds to display.')."</li>"; } } else { @@ -3084,7 +3084,7 @@ ORDER BY tag_name"); */ if (get_pref($link, 'ENABLE_FEED_CATS')) { - print "<li class=\"feedCat\">"._('Tags')."</li>"; + print "<li class=\"feedCat\">".__('Tags')."</li>"; print "<li id=\"feedCatHolder\"><ul class=\"feedCatList\">"; } @@ -104,7 +104,7 @@ </head> <body> <div class=\"floatingLogo\"><img src=\"images/ttrss_logo.png\"></div> - <h1>"._('OPML Utility')."</h1>"; + <h1>".__('OPML Utility')."</h1>"; if (function_exists('domxml_open_file')) { print "<p>Importing OPML (using DOMXML extension)...</p>"; @@ -83,13 +83,13 @@ window.onload = init; <div id="fatal_error"><div id="fatal_error_inner"> <h1>Fatal Error</h1> - <div id="fatal_error_msg"><?php echo _('Unknown Error') ?></div> + <div id="fatal_error_msg"><?php echo __('Unknown Error') ?></div> </div></div> <div id="prefHeader"> <?php if (!SINGLE_USER_MODE) { ?> <div style="float : right"> - <?php echo _('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> + <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> (<a href="logout.php">Logout</a>) </div> <?php } ?> @@ -103,29 +103,29 @@ window.onload = init; <div class="firstTab"> </div> <div id="genConfigTab" class="prefsTab" - onclick="selectTab('genConfig')"><?php echo _('Preferences') ?></div> + onclick="selectTab('genConfig')"><?php echo __('Preferences') ?></div> <div id="feedConfigTab" class="prefsTab" - onclick="selectTab('feedConfig')"><?php echo _('My Feeds') ?></div> + onclick="selectTab('feedConfig')"><?php echo __('My Feeds') ?></div> <?php if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) { ?> <div id="feedBrowserTab" class="prefsTab" - onclick="selectTab('feedBrowser')"><?php echo _('Other Feeds') ?></div> + onclick="selectTab('feedBrowser')"><?php echo __('Other Feeds') ?></div> <?php } ?> <div id="filterConfigTab" class="prefsTab" - onclick="selectTab('filterConfig')"><?php echo _('Content Filtering') ?></div> + onclick="selectTab('filterConfig')"><?php echo __('Content Filtering') ?></div> <?php if (get_pref($link, 'ENABLE_LABELS')) { ?> <div id="labelConfigTab" class="prefsTab" - onclick="selectTab('labelConfig')"><?php echo _('Label Editor') ?></div> + onclick="selectTab('labelConfig')"><?php echo __('Label Editor') ?></div> <?php } ?> <?php if ($_SESSION["access_level"] >= 10) { ?> <div id="userConfigTab" class="prefsTab" - onclick="selectTab('userConfig')"><?php echo _('User Manager') ?></div> + onclick="selectTab('userConfig')"><?php echo __('User Manager') ?></div> <?php } ?> <div id="prefContent"> - <p><?php echo _('Loading, please wait...') ?></p> + <p><?php echo __('Loading, please wait...') ?></p> <noscript> <div class="error"> - <?php echo _("Your browser doesn't support Javascript, which is required + <?php echo __("Your browser doesn't support Javascript, which is required for this application to function properly. Please check your browser settings.") ?></div> </noscript> diff --git a/sanity_check.php b/sanity_check.php index b77c9797e..f7514b65c 100644 --- a/sanity_check.php +++ b/sanity_check.php @@ -2,7 +2,7 @@ define('EXPECTED_CONFIG_VERSION', 5); if (!file_exists("config.php")) { - print _("<b>Fatal Error</b>: You forgot to copy + print __("<b>Fatal Error</b>: You forgot to copy <b>config.php-dist</b> to <b>config.php</b> and edit it.\n"); exit; } @@ -10,44 +10,44 @@ require_once "config.php"; if (CONFIG_VERSION != EXPECTED_CONFIG_VERSION) { - return _("config: your config file version is incorrect. See config.php-dist.\n"); + return __("config: your config file version is incorrect. See config.php-dist.\n"); } if (defined('RSS_BACKEND_TYPE')) { - print _("<b>Fatal error</b>: RSS_BACKEND_TYPE is deprecated. Please remove this + print __("<b>Fatal error</b>: RSS_BACKEND_TYPE is deprecated. Please remove this option from config.php\n"); exit; } if (file_exists("xml-export.php") || file_exists("xml-import.php")) { - print _("<b>Fatal Error</b>: XML Import/Export tools (<b>xml-export.php</b> + print __("<b>Fatal Error</b>: XML Import/Export tools (<b>xml-export.php</b> and <b>xml-import.php</b>) could be used maliciously. Please remove them from your TT-RSS instance.\n"); exit; } if (SINGLE_USER_MODE && DAEMON_UPDATE_LOGIN_LIMIT > 0) { - print _("<b>Fatal Error</b>: Please set DAEMON_UPDATE_LOGIN_LIMIT + print __("<b>Fatal Error</b>: Please set DAEMON_UPDATE_LOGIN_LIMIT to 0 in single user mode.\n"); exit; } if (USE_CURL_FOR_ICONS && ! function_exists("curl_init")) { - print _("<b>Fatal Error</b>: You have enabled USE_CURL_FOR_ICONS, but your PHP + print __("<b>Fatal Error</b>: You have enabled USE_CURL_FOR_ICONS, but your PHP doesn't seem to support CURL functions."); exit; } if (!defined('SESSION_EXPIRE_TIME')) { - $err_msg = _("config: SESSION_EXPIRE_TIME is undefined"); + $err_msg = __("config: SESSION_EXPIRE_TIME is undefined"); } if (SESSION_EXPIRE_TIME < 60) { - $err_msg = _("config: SESSION_EXPIRE_TIME is too low (less than 60)"); + $err_msg = __("config: SESSION_EXPIRE_TIME is too low (less than 60)"); } if (SESSION_EXPIRE_TIME < SESSION_COOKIE_LIFETIME) { - $err_msg = _("config: SESSION_EXPIRE_TIME should be greater or equal to" . + $err_msg = __("config: SESSION_EXPIRE_TIME should be greater or equal to" . "SESSION_COOKIE_LIFETIME"); } @@ -56,15 +56,15 @@ } */ if (DATABASE_BACKED_SESSIONS && SINGLE_USER_MODE) { - $err_msg = _("config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE"); + $err_msg = __("config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE"); } if (DATABASE_BACKED_SESSIONS && DB_TYPE == "mysql") { - $err_msg = _("config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"); + $err_msg = __("config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"); } if ($err_msg) { - print "<b>"._("Fatal Error")."</b>: $err_msg\n"; + print "<b>".__("Fatal Error")."</b>: $err_msg\n"; exit; } diff --git a/tt-rss.php b/tt-rss.php index 052a52523..d93531375 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -76,10 +76,10 @@ <div id="overlay"> <div id="overlay_inner"> - <p><?php echo _("Loading, please wait...") ?></p> + <p><?php echo __("Loading, please wait...") ?></p> <noscript> <div class="error"><?php echo - _("Your browser doesn't support Javascript, which is required + __("Your browser doesn't support Javascript, which is required for this application to function properly. Please check your browser settings.") ?></div> </noscript> @@ -128,44 +128,44 @@ window.onload = init; <div style="float : right"> <select id="quickMenuChooser" onchange="quickMenuChange()"> - <option value="qmcDefault" selected><?php echo _('Actions...') ?></option> - <option value="qmcSearch"><?php echo _('Search') ?></option> - <option value="qmcPrefs"><?php echo _('Preferences') ?></option> + <option value="qmcDefault" selected><?php echo __('Actions...') ?></option> + <option value="qmcSearch"><?php echo __('Search') ?></option> + <option value="qmcPrefs"><?php echo __('Preferences') ?></option> <option disabled>--------</option> - <option style="color : #5050aa" disabled><?php echo _('Feed actions:') ?></option> - <option value="qmcAddFeed"><?php echo _(' Subscribe to feed') ?></option> - <option value="qmcEditFeed"><?php echo _(' Edit this feed') ?></option> - <option value="qmcRemoveFeed"><?php echo _(' Unsubscribe') ?></option> + <option style="color : #5050aa" disabled><?php echo __('Feed actions:') ?></option> + <option value="qmcAddFeed"><?php echo __(' Subscribe to feed') ?></option> + <option value="qmcEditFeed"><?php echo __(' Edit this feed') ?></option> + <option value="qmcRemoveFeed"><?php echo __(' Unsubscribe') ?></option> <!-- <option>Edit this feed</option> --> <option disabled>--------</option> - <option style="color : #5050aa" disabled><?php echo _('All feeds:') ?></option> + <option style="color : #5050aa" disabled><?php echo __('All feeds:') ?></option> <?php if (!ENABLE_UPDATE_DAEMON && !DAEMON_REFRESH_ONLY) { ?> - <option value="qmcUpdateFeeds"><?php echo _(' Update') ?></option> + <option value="qmcUpdateFeeds"><?php echo __(' Update') ?></option> <?php } ?> - <option value="qmcCatchupAll"><?php echo _(' Mark as read') ?></option> - <option value="qmcShowOnlyUnread"><?php echo _(' (Un)hide read feeds') ?></option> + <option value="qmcCatchupAll"><?php echo __(' Mark as read') ?></option> + <option value="qmcShowOnlyUnread"><?php echo __(' (Un)hide read feeds') ?></option> <option disabled>--------</option> - <option style="color : #5050aa" disabled><?php echo _('Other actions:') ?></option> - <option value="qmcAddFilter"><?php echo _(' Create filter') ?></option> + <option style="color : #5050aa" disabled><?php echo __('Other actions:') ?></option> + <option value="qmcAddFilter"><?php echo __(' Create filter') ?></option> </select> </div> <form id="main_toolbar_form" onsubmit='return false'> - <?php echo _('Search:') ?> + <?php echo __('Search:') ?> <input name="query" onKeyPress="return filterCR(event, viewCurrentFeed)" onblur="javascript:enableHotkeys();" onfocus="javascript:disableHotkeys();"> - <?php echo _('View:') ?> + <?php echo __('View:') ?> <select name="view_mode" onchange="viewCurrentFeed(0, '')"> - <option selected value="adaptive"><?php echo _('Adaptive') ?></option> - <option value="all_articles"><?php echo _('All Articles') ?></option> - <option value="marked"><?php echo _('Starred') ?></option> - <option value="unread"><?php echo _('Unread') ?></option> + <option selected value="adaptive"><?php echo __('Adaptive') ?></option> + <option value="all_articles"><?php echo __('All Articles') ?></option> + <option value="marked"><?php echo __('Starred') ?></option> + <option value="unread"><?php echo __('Unread') ?></option> </select> - <?php echo _('Limit:') ?> + <?php echo __('Limit:') ?> <?php $limits = array(15 => 15, 30 => 30, 60 => 60, 0 => "All"); @@ -190,7 +190,7 @@ window.onload = init; <input class="button" type="submit" onclick="return viewCurrentFeed('ForceUpdate')" - value="<?php echo _('Update') ?>"> + value="<?php echo __('Update') ?>"> </form> @@ -204,11 +204,11 @@ window.onload = init; <?php if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) { ?> <div id="headlines-frame" class="headlines_normal"> - <div class="whiteBox"><?php echo _('No feed selected.') ?></div></div> + <div class="whiteBox"><?php echo __('No feed selected.') ?></div></div> <div id="content-frame"><div class="whiteBox"> </div></div> <?php } else { ?> <div id="headlines-frame" class="headlines_cdm"> - <div class="whiteBox"><?php echo _('No feed selected.') ?></div></div> + <div class="whiteBox"><?php echo __('No feed selected.') ?></div></div> <?php } ?> <div id="footer"> diff --git a/update-translations.sh b/update-translations.sh index 53f0493bd..860d6c294 100644 --- a/update-translations.sh +++ b/update-translations.sh @@ -1,7 +1,7 @@ #!/bin/sh TEMPLATE=messages.pot -xgettext -kT_ngettext:1,2 -kT_ -k_ -L PHP -o $TEMPLATE *.php modules/*.php +xgettext -kT_ngettext:1,2 -kT_ -k_ -k__ -L PHP -o $TEMPLATE *.php modules/*.php if [ "$1" = "-p" ]; then msgfmt --statistics $TEMPLATE |