From f1953ad106ab55e1f4fb20c85e1b9b955469b709 Mon Sep 17 00:00:00 2001
From: Ozh <ozh@ozh.org>
Date: Sun, 10 Feb 2013 22:03:02 +0000
Subject: [PATCH] Translation plural forms + deprecate function yourls_plural()

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

diff --git a/admin/index.php b/admin/index.php
index a8d6a17..6290009 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -220,7 +220,7 @@
 	<p><?php
 		printf( yourls__('Display <strong>%d</strong> to <strong class="increment">%d</strong> of <strong class="increment">%d</strong> URLs' ), $display_on_page, $max_on_page, $total_items );
 		if( $total_items_clicks !== false )
-			echo ", " . yourls__('counting') . " <strong>$total_items_clicks</strong> " . yourls_plural(yourls__('click'), $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">%d</strong> links, <strong>%d</strong> clicks, and counting!' ), number_format( $total_urls ), number_format( $total_clicks ) ); ?></p>
diff --git a/admin/plugins.php b/admin/plugins.php
index febca0e..5e3202b 100644
--- a/admin/plugins.php
+++ b/admin/plugins.php
@@ -67,11 +67,11 @@
 	uasort( $plugins, 'yourls_plugins_sort_callback' );
 	
 	$count = count( $plugins );
+    $plugins_count = sprintf( yourls_n( '%s plugin', '%s plugins', $count ), $count );
 	$count_active = yourls_has_active_plugins();
-    $plugins_count = $count.' '.yourls_plural( yourls__('plugin'), $count );
 	?>
 	
-	<p id="plugin_summary"><?php yourls_se( 'You currently have <strong>%d</strong> installed, and <strong>%d</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>%s</strong> installed, and <strong>%s</strong> activated', $plugins_count, $count_active ); ?></p>
 
 	<table id="main_table" class="tblSorter" cellpadding="0" cellspacing="1">
 	<thead>
diff --git a/includes/functions-formatting.php b/includes/functions-formatting.php
index ea662fc..f2edb74 100644
--- a/includes/functions-formatting.php
+++ b/includes/functions-formatting.php
@@ -126,6 +126,7 @@ function yourls_sanitize_date_for_sql( $date ) {
 
 // Return word or words if more than one
 function yourls_plural( $word, $count=1 ) {
+	yourls_deprecated_function( __FUNCTION__, '1.6', 'yourls_n' );
 	return $word . ($count > 1 ? 's' : '');
 }
 
diff --git a/includes/functions-html.php b/includes/functions-html.php
index 148c4e6..dafb6e5 100644
--- a/includes/functions-html.php
+++ b/includes/functions-html.php
@@ -264,7 +264,7 @@ function yourls_html_tfooter( $params = array() ) {
 			<div id="pagination">
 				<span class="navigation">
 				<?php if( $total_pages > 1 ) { ?>
-					<span class="nav_total"><?php echo $total_pages .' '. yourls_plural( yourls__('page'), $total_pages ); ?></span>
+					<span class="nav_total"><?php echo sprintf( yourls_n( '1 page', '%s pages', $total_pages ), $total_pages ); ?></span>
 					<?php
 					$base_page = yourls_admin_url( 'index.php' );
 					// Pagination offsets: min( max ( zomg! ) );
diff --git a/includes/functions.php b/includes/functions.php
index bb5b91a..34a0e6b 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -1753,8 +1753,8 @@ function yourls_deprecated_function( $function, $version, $replacement = null )
 	yourls_do_action( 'deprecated_function', $function, $replacement, $version );
 
 	// Allow plugin to filter the output error trigger
-	if ( WP_DEBUG && yourls_apply_filters( 'deprecated_function_trigger_error', true ) ) {
-		if ( ! is_null($replacement) )
+	if ( YOURLS_DEBUG && yourls_apply_filters( 'deprecated_function_trigger_error', true ) ) {
+		if ( ! is_null( $replacement ) )
 			trigger_error( sprintf( yourls__('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
 		else
 			trigger_error( sprintf( yourls__('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
diff --git a/yourls-infos.php b/yourls-infos.php
index 27fd632..f778109 100644
--- a/yourls-infos.php
+++ b/yourls-infos.php
@@ -444,7 +444,7 @@
 					<ul id="details_countries" style="display:none" class="no_bullet">
 					<?php
 					foreach( $countries as $code=>$count ) {
-						echo "<li><img src='".yourls_geo_get_flag( $code )."' /> $code (".yourls_geo_countrycode_to_countryname( $code ).") : $count ".yourls_plural('hit', $count)."</li>\n";
+						echo "<li><img src='".yourls_geo_get_flag( $code )."' /> $code (".yourls_geo_countrycode_to_countryname( $code ) . ') : ' . sprintf( yourls_n( '1 hit', '%s hits', $count ), $count ) . "</li>\n";
 					}		
 					?>
 					</ul>
-- 
2.45.0