From 1ff354e423865772e734cf755d5aa50aa59f9a5f Mon Sep 17 00:00:00 2001
From: Ozh <ozh@ozh.org>
Date: Sat, 23 Mar 2013 20:43:53 +0000
Subject: [PATCH] Better translation strings & correct function used.

git-svn-id: http://yourls.googlecode.com/svn/trunk@897 12232710-3e20-11de-b438-597f59cd7555
---
 admin/index.php   | 8 ++++----
 admin/plugins.php | 2 +-
 yourls-infos.php  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/admin/index.php b/admin/index.php
index 31f0c3b..1ebfc23 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -48,7 +48,7 @@
 			$search_in      = 'ip';
 			break;
 	}
-	$search_sentence = yourls_s( 'Searching for <strong>%s</strong> in <strong>%s</strong>.', yourls_esc_html( $search ), yourls_esc_html( $search_in_text ) );
+	$search_sentence = yourls_s( 'Searching for <strong>%1$s</strong> in <strong>%2$s</strong>.', yourls_esc_html( $search ), yourls_esc_html( $search_in_text ) );
 	$search_url      = yourls_sanitize_url( "&amp;search=$search&amp;search_in=$search_in" );
 	$search_text     = $search;
 	$search          = str_replace( '*', '%', '*' . yourls_escape( $search ) . '*' );
@@ -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>%1$s</strong> to <strong class="increment">%2$s</strong> of <strong class="increment">%3$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_n( 'counting <strong>1</strong> click', 'counting <strong>%s</strong> clicks', $total_items_clicks ), yourls_number_format_i18n( $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">%1$s</strong> links, <strong>%2$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/plugins.php b/admin/plugins.php
index 5e3202b..8640d32 100644
--- a/admin/plugins.php
+++ b/admin/plugins.php
@@ -71,7 +71,7 @@
 	$count_active = yourls_has_active_plugins();
 	?>
 	
-	<p id="plugin_summary"><?php /* //translators: "you have '3 plugins' installed and '1' activated" */ yourls_se( 'You currently have <strong>%s</strong> installed, and <strong>%s</strong> activated', $plugins_count, $count_active ); ?></p>
+	<p id="plugin_summary"><?php /* //translators: "you have '3 plugins' installed and '1' activated" */ yourls_se( 'You currently have <strong>%1$s</strong> installed, and <strong>%2$s</strong> activated', $plugins_count, $count_active ); ?></p>
 
 	<table id="main_table" class="tblSorter" cellpadding="0" cellspacing="1">
 	<thead>
diff --git a/yourls-infos.php b/yourls-infos.php
index f778109..f52f28b 100644
--- a/yourls-infos.php
+++ b/yourls-infos.php
@@ -377,7 +377,7 @@
 				$best_time['month'] = date( "m", strtotime( $best['day'] ) );
 				$best_time['year']  = date( "Y", strtotime( $best['day'] ) );
 				?>
-				<p><strong><?php echo sprintf( /* //translators: eg. 43 hits on January 1, 1970 */ yourls_n( '<strong>%s</strong> hit on %s', '<strong>%s</strong> hits on %s', $best['max'] ), $best['max'],  yourls_date_i18n( "F j, Y", strtotime( $best['day'] ) ) ); ?>. 
+				<p><strong><?php echo sprintf( /* //translators: eg. 43 hits on January 1, 1970 */ yourls_n( '<strong>%1$s</strong> hit on %2$s', '<strong>%1$s</strong> hits on %2$s', $best['max'] ), $best['max'],  yourls_date_i18n( "F j, Y", strtotime( $best['day'] ) ) ); ?>. 
 				<a href="" class='details hide-if-no-js' id="more_clicks"><?php yourls_e( 'Click for more details' ); ?></a></p>
 				<ul id="details_clicks" style="display:none">
 					<?php
-- 
2.45.0