From 0284ef6ae090707be952e04d9a1342fd7c57ccb5 Mon Sep 17 00:00:00 2001
From: azaozz <azaozz@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 4 Dec 2008 12:01:02 +0000
Subject: [PATCH] Easier translation for search strings in H2s

git-svn-id: http://svn.automattic.com/wordpress/trunk@10035 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/categories.php           | 6 ++++--
 wp-admin/edit-comments.php        | 6 ++++--
 wp-admin/edit-link-categories.php | 6 ++++--
 wp-admin/edit-pages.php           | 6 ++++--
 wp-admin/edit-tags.php            | 6 ++++--
 wp-admin/edit.php                 | 6 ++++--
 wp-admin/link-manager.php         | 6 ++++--
 wp-admin/upload.php               | 6 ++++--
 wp-admin/users.php                | 6 ++++--
 wp-admin/wp-admin.css             | 6 ++++++
 10 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index 7bdc77eb2..fb4015415 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -131,8 +131,10 @@ $messages[5] = __('Category not updated.');
 
 <div class="wrap nosubsub">
 <?php screen_icon(); ?>
-<?php $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( stripslashes($_GET['s']) ) ) : ''; ?>
-<h2><?php echo wp_specialchars( $title ) . $h2_search; ?></h2>
+<h2><?php echo wp_specialchars( $title );
+if ( isset($_GET['s']) && $_GET['s'] )
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', wp_specialchars( stripslashes($_GET['s']) ) ); ?>
+</h2>
 
 <?php
 if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 43445e4e6..46923c6e0 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -86,8 +86,10 @@ $search = attribute_escape( $search_dirty ); ?>
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<?php $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( stripslashes($_GET['s']) ) ) : ''; ?>
-<h2><?php echo wp_specialchars( $title ) . $h2_search; ?></h2>
+<h2><?php echo wp_specialchars( $title );
+if ( isset($_GET['s']) && $_GET['s'] )
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', wp_specialchars( stripslashes($_GET['s']) ) ); ?>
+</h2>
 
 <?php
 if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['spam'] ) ) {
diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
index b42b7d0aa..08cba42ad 100644
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -61,8 +61,10 @@ $messages[6] = __('Categories deleted.'); ?>
 
 <div class="wrap nosubsub">
 <?php screen_icon(); ?>
-<?php $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( stripslashes($_GET['s']) ) ) : ''; ?>
-<h2><?php echo wp_specialchars( $title ) . $h2_search; ?></h2>
+<h2><?php echo wp_specialchars( $title );
+if ( isset($_GET['s']) && $_GET['s'] )
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', wp_specialchars( stripslashes($_GET['s']) ) ); ?>
+</h2>
 
 <?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
 <div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php
index 384d08bfd..2639816bb 100644
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -104,8 +104,10 @@ require_once('admin-header.php'); ?>
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<?php $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( get_search_query() ) ) : ''; ?>
-<h2><?php echo wp_specialchars( $title ) . $h2_search; ?></h2>
+<h2><?php echo wp_specialchars( $title );
+if ( isset($_GET['s']) && $_GET['s'] )
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', wp_specialchars( get_search_query() ) ); ?>
+</h2>
 
 <?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) || isset($_GET['deleted']) ) { ?>
 <div id="message" class="updated fade"><p>
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index d1a807259..6d1c96685 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -130,8 +130,10 @@ $messages[6] = __('Tags deleted.'); ?>
 
 <div class="wrap nosubsub">
 <?php screen_icon(); ?>
-<?php $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( stripslashes($_GET['s']) ) ) : ''; ?>
-<h2><?php echo wp_specialchars( $title ) . $h2_search; ?></h2>
+<h2><?php echo wp_specialchars( $title );
+if ( isset($_GET['s']) && $_GET['s'] )
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', wp_specialchars( stripslashes($_GET['s']) ) ); ?>
+</h2>
 
 <?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
 <div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 2f6424dc6..73fb48529 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -96,8 +96,10 @@ else
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<?php $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( get_search_query() ) ) : ''; ?>
-<h2><?php echo wp_specialchars( $title ) . $h2_search; ?></h2>
+<h2><?php echo wp_specialchars( $title );
+if ( isset($_GET['s']) && $_GET['s'] )
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', wp_specialchars( get_search_query() ) ); ?>
+</h2>
 
 <?php
 if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index 7bc92a304..f93cbce2d 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -71,8 +71,10 @@ switch ($order_by) {
 
 <div class="wrap nosubsub">
 <?php screen_icon(); ?>
-<?php $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( stripslashes($_GET['s']) ) ) : ''; ?>
-<h2><?php echo wp_specialchars( $title ) . $h2_search; ?></h2>
+<h2><?php echo wp_specialchars( $title );
+if ( isset($_GET['s']) && $_GET['s'] )
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', wp_specialchars( stripslashes($_GET['s']) ) ); ?>
+</h2>
 
 <?php
 if ( isset($_GET['deleted']) ) {
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index e4a107bed..3142ec0cd 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -164,8 +164,10 @@ if ( isset($_GET['message']) && (int) $_GET['message'] ) {
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<?php $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( get_search_query() ) ) : ''; ?>
-<h2><?php echo wp_specialchars( $title ) . $h2_search; ?></h2>
+<h2><?php echo wp_specialchars( $title );
+<?php if ( isset($_GET['s']) && $_GET['s'] )
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', wp_specialchars( get_search_query() ) ); ?>
+</h2>
 
 <?php
 if ( isset($message) ) { ?>
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 754da1c8f..674d156d7 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -239,8 +239,10 @@ if ( ! empty($messages) ) {
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<?php $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( get_search_query() ) ) : ''; ?>
-<h2><?php echo wp_specialchars( $title ) . $h2_search; ?></h2>
+<h2><?php echo wp_specialchars( $title );
+<?php if ( isset($_GET['s']) && $_GET['s'] )
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', wp_specialchars( get_search_query() ) ); ?>
+<h2>
 
 <div class="filter">
 <form id="list-filter" action="" method="get">
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index bacaaf884..745e320de 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -2917,3 +2917,9 @@ table.fixed {
 .key-labels label {
 	line-height: 24px;
 }
+
+.subtitle {
+	font-size: 0.75em;
+	line-height: 1;
+	padding-left: 25px;
+}