tweak subtoolbar (2)

This commit is contained in:
Andrew Dolgov 2007-05-16 05:36:13 +01:00
parent d420f2ee0c
commit b36e002f76
1 changed files with 7 additions and 7 deletions

View File

@ -2429,9 +2429,9 @@
$feed_title = ""; $feed_title = "";
if ($search && $search_mode == "all_feeds") { if ($search && $search_mode == "all_feeds") {
$feed_title = __("Global search results")." ($search)"; $feed_title = __("Search results")." ($search)";
} else if ($search && preg_match('/^-?[0-9][0-9]*$/', $feed) == false) { } else if ($search && preg_match('/^-?[0-9][0-9]*$/', $feed) == false) {
$feed_title = __("Tag search results")." ($search, $feed)"; $feed_title = __("Search results")." ($search, $feed)";
} else if (preg_match('/^-?[0-9][0-9]*$/', $feed) == false) { } else if (preg_match('/^-?[0-9][0-9]*$/', $feed) == false) {
$feed_title = $feed; $feed_title = $feed;
} else if (preg_match('/^-?[0-9][0-9]*$/', $feed) != false && $feed >= 0) { } else if (preg_match('/^-?[0-9][0-9]*$/', $feed) != false && $feed >= 0) {
@ -2447,7 +2447,7 @@
} }
if ($search) { if ($search) {
$feed_title = __("Category search results")." ($search, $feed_title)"; $feed_title = __("Searched for")." $search ($feed_title)";
} }
} else { } else {
@ -2460,7 +2460,7 @@
$last_error = db_fetch_result($result, 0, "last_error"); $last_error = db_fetch_result($result, 0, "last_error");
if ($search) { if ($search) {
$feed_title = __("Feed search results") . " ($search, $feed_title)"; $feed_title = __("Searched for") . " $search ($feed_title)";
} }
} }
@ -2473,7 +2473,7 @@
$feed_title = db_fetch_result($result, 0, "description"); $feed_title = db_fetch_result($result, 0, "description");
if ($search) { if ($search) {
$feed_title = __("Label search results") . " ($search, $feed_title)"; $feed_title = __("Searched for") . " $search ($feed_title)";
} }
} else { } else {
$feed_title = "?"; $feed_title = "?";
@ -2923,7 +2923,7 @@
print "<li class=\"top3\"> print "<li class=\"top3\">
<a href=\"javascript:labelFromSearch('$search', '$search_mode', <a href=\"javascript:labelFromSearch('$search', '$search_mode',
'$match_on', '$feed_id', '$is_cat');\"> '$match_on', '$feed_id', '$is_cat');\">
".__('Convert to Label')."</a></td>"; ".__('Convert to label')."</a></td>";
} }
print " print "
</td>"; </td>";
@ -2949,7 +2949,7 @@
print "&nbsp;&nbsp; print "&nbsp;&nbsp;
<a href=\"javascript:labelFromSearch('$search', '$search_mode', <a href=\"javascript:labelFromSearch('$search', '$search_mode',
'$match_on', '$feed_id', '$is_cat');\"> '$match_on', '$feed_id', '$is_cat');\">
".__('Convert to Label')."</a>"; ".__('Convert to label')."</a>";
} }
print "</td>"; print "</td>";