From 1147f887db36e3d90d753637282daef6535f1e9e Mon Sep 17 00:00:00 2001
From: Ozh <ozh@ozh.org>
Date: Fri, 15 Feb 2013 13:53:50 +0000
Subject: [PATCH] Nitpicking so text & translations display well.

git-svn-id: http://yourls.googlecode.com/svn/trunk@882 12232710-3e20-11de-b438-597f59cd7555
---
 admin/index.php             | 6 +++---
 admin/tools.php             | 4 +++-
 includes/functions-html.php | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/admin/index.php b/admin/index.php
index fb7789c..31f0c3b 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -218,12 +218,12 @@
 if ( !$is_bookmark ) { ?>
 	<p><?php echo $search_sentence; ?></p>
 	<p><?php
-		printf( yourls__('Display <strong>%s</strong> to <strong class="increment">%s</strong> of <strong class="increment">%s</strong> URLs' ), $display_on_page, $max_on_page, $total_items );
+		printf( yourls__( 'Display <strong>%s</strong> to <strong class="increment">%s</strong> of <strong class="increment">%s</strong> URLs' ), $display_on_page, $max_on_page, $total_items );
 		if( $total_items_clicks !== false )
-			echo ", " . sprintf( yourls__('counting <strong>1</strong> click', 'counting <strong>%s</strong> clicks', $total_items_clicks ), $total_items_clicks );
+			echo ", " . sprintf( yourls__( 'counting <strong>1</strong> click', 'counting <strong>%s</strong> clicks', $total_items_clicks ), $total_items_clicks );
 	?>.</p>
 <?php } ?>
-<p><?php printf( yourls__('Overall, tracking <strong class="increment">%s</strong> links, <strong>%s</strong> clicks, and counting!' ), yourls_number_format_i18n( $total_urls ), yourls_number_format_i18n( $total_clicks ) ); ?></p>
+<p><?php printf( yourls__( 'Overall, tracking <strong class="increment">%s</strong> links, <strong>%s</strong> clicks, and counting!' ), yourls_number_format_i18n( $total_urls ), yourls_number_format_i18n( $total_clicks ) ); ?></p>
 <?php yourls_do_action( 'admin_page_before_form' ); ?>
 
 <?php yourls_html_addnew(); ?>
diff --git a/admin/tools.php b/admin/tools.php
index e2d07e3..d891997 100644
--- a/admin/tools.php
+++ b/admin/tools.php
@@ -27,7 +27,8 @@
 		</ul>
 		
 		<p><?php
-		yourls_e( 'With the Standard Bookmarklets you will also get a <span>Quick Share</span> tool box to make posting to Twitter, Facebook or Friendfeed a snap.' );
+		yourls_e( "With the Standard Bookmarklets you will also get a <span>Quick Share</span> tool box to make posting to Twitter, Facebook or Friendfeed a snap." );
+		echo "\n";
 		yourls_e( "If you want to share a description along with the link you're shortening, simply <span>select text</span> on the page you're viewing before clicking on your bookmarklet link" );
 		?></p>
 		
@@ -74,6 +75,7 @@
 	
 		<p><?php
 		yourls_e( 'YOURLS allows API calls the old fashioned way, using <tt>username</tt> and <tt>password</tt> parameters.' );
+		echo "\n";
 		yourls_e( "If you're worried about sending your credentials into the wild, you can also make API calls without using your login or your password, using a secret signature token." );
 		?></p>
 
diff --git a/includes/functions-html.php b/includes/functions-html.php
index e1c1a85..799581c 100644
--- a/includes/functions-html.php
+++ b/includes/functions-html.php
@@ -238,7 +238,7 @@ function yourls_html_tfooter( $params = array() ) {
 							<option value="between"<?php if($date_filter === 'between') { echo ' selected="selected"'; } ?>><?php yourls_e( 'between' ); ?></option>
 						</select>
 						<input type="text" name="date_first" id="date_first" class="text" size="12" value="<?php echo $date_first; ?>" />
-						<span id="date_and" <?php if($date_filter === 'between') { echo ' style="display:inline"'; } ?>> and </span>
+						<span id="date_and" <?php if($date_filter === 'between') { echo ' style="display:inline"'; } ?>> &amp; </span>
 						<input type="text" name="date_second" id="date_second" class="text" size="12" value="<?php echo $date_second; ?>" <?php if($date_filter === 'between') { echo ' style="display:inline"'; } ?>/>
 						
 						<div id="filter_buttons">
-- 
2.45.0