summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Arthur <flowerysong00@yahoo.com>2012-03-31 18:08:56 -0400
committerPaul Arthur <paul.arthur@flowerysong.com>2012-04-12 21:13:29 -0400
commit774e53db7d9abdba72a0b7c49829dcdbdb2e0e1a (patch)
tree2d938b4c7d3dd2252e43cbc68b4739d9e15c854d
parentf65076b93d91fe9718cf9bef37638d64290b9f28 (diff)
downloadampache-774e53db7d9abdba72a0b7c49829dcdbdb2e0e1a.tar.gz
ampache-774e53db7d9abdba72a0b7c49829dcdbdb2e0e1a.tar.bz2
ampache-774e53db7d9abdba72a0b7c49829dcdbdb2e0e1a.zip
Switch from ngettext() to T_ngettext()
-rw-r--r--admin/catalog.php4
-rw-r--r--lib/class/catalog.class.php10
-rw-r--r--templates/show_random.inc.php14
-rw-r--r--templates/show_verify_catalog.inc.php2
4 files changed, 15 insertions, 15 deletions
diff --git a/admin/catalog.php b/admin/catalog.php
index 62c8657b..6ba47060 100644
--- a/admin/catalog.php
+++ b/admin/catalog.php
@@ -135,13 +135,13 @@ switch ($_REQUEST['action']) {
if (count($song)) {
$catalog->remove_songs($song);
- $body = ngettext('Song Removed', 'Songs Removed', count($song));
+ $body = T_ngettext('Song Removed', 'Songs Removed', count($song));
}
else {
$body = T_('No Songs Removed');
}
$url = Config::get('web_path') . '/admin/catalog.php';
- $title = ngettext('Disabled Song Processed','Disabled Songs Processed',count($song));
+ $title = T_ngettext('Disabled Song Processed','Disabled Songs Processed',count($song));
show_confirmation($title,$body,$url);
break;
case 'clean_all_catalogs':
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index 0de562d2..753f7477 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -234,9 +234,9 @@ class Catalog extends database_object {
$hours = $hours % 24;
$time_text = "$days ";
- $time_text .= ngettext('day','days',$days);
+ $time_text .= T_ngettext('day','days',$days);
$time_text .= ", $hours ";
- $time_text .= ngettext('hour','hours',$hours);
+ $time_text .= T_ngettext('hour','hours',$hours);
$results['time_text'] = $time_text;
@@ -1426,7 +1426,7 @@ class Catalog extends database_object {
show_box_top();
echo "<strong>";
- printf (ngettext('Catalog Clean Done. %d file removed.', 'Catalog Clean Done. %d files removed.', $dead_total), $dead_total);
+ printf (T_ngettext('Catalog Clean Done. %d file removed.', 'Catalog Clean Done. %d files removed.', $dead_total), $dead_total);
echo "</strong><br />\n";
show_box_bottom();
ob_flush();
@@ -2321,13 +2321,13 @@ class Catalog extends database_object {
/* Recreate the Playlist */
$playlist = new Playlist($playlist_id);
$playlist->add_songs($songs);
- $reason = sprintf(ngettext('Playlist Import and Recreate Successful. Total: %d Song',
+ $reason = sprintf(T_ngettext('Playlist Import and Recreate Successful. Total: %d Song',
'Playlist Import and Recreate Successful. Total: %d Songs',
count($songs)), count($songs));
return true;
}
/* HINT: filename */
- $reason = sprintf(ngettext('Parsing %s - Not Found: %d Song. Please check your m3u file.',
+ $reason = sprintf(T_ngettext('Parsing %s - Not Found: %d Song. Please check your m3u file.',
'Parsing %s - Not Found: %d Songs. Please check your m3u file.',
count($songs)), $filename, count($songs));
return false;
diff --git a/templates/show_random.inc.php b/templates/show_random.inc.php
index dcd0bd76..f3512e79 100644
--- a/templates/show_random.inc.php
+++ b/templates/show_random.inc.php
@@ -69,13 +69,13 @@
<?php $name = 'length_' . intval($_POST['length']); ${$name} = ' selected="selected"'; ?>
<select name="length">
<option value="0"<?php echo $length_0; ?>><?php echo T_('Unlimited'); ?></option>
- <option value="15"<?php echo $length_15; ?>><?php printf(ngettext('%d minute','%d minutes',15), "15"); ?></option>
- <option value="30"<?php echo $length_30; ?>><?php printf(ngettext('%d minute','%d minutes',30), "30"); ?></option>
- <option value="60"<?php echo $length_60; ?>><?php printf(ngettext('%d hour','%d hours',1), "1"); ?></option>
- <option value="120"<?php echo $length_120; ?>><?php printf(ngettext('%d hour','%d hours',2), "2"); ?></option>
- <option value="240"<?php echo $length_240; ?>><?php printf(ngettext('%d hour','%d hours',4), "4"); ?></option>
- <option value="480"<?php echo $length_480; ?>><?php printf(ngettext('%d hour','%d hours',8), "8"); ?></option>
- <option value="960"<?php echo $length_960; ?>><?php printf(ngettext('%d hour','%d hours',16), "16"); ?></option>
+ <option value="15"<?php echo $length_15; ?>><?php printf(T_ngettext('%d minute','%d minutes',15), "15"); ?></option>
+ <option value="30"<?php echo $length_30; ?>><?php printf(T_ngettext('%d minute','%d minutes',30), "30"); ?></option>
+ <option value="60"<?php echo $length_60; ?>><?php printf(T_ngettext('%d hour','%d hours',1), "1"); ?></option>
+ <option value="120"<?php echo $length_120; ?>><?php printf(T_ngettext('%d hour','%d hours',2), "2"); ?></option>
+ <option value="240"<?php echo $length_240; ?>><?php printf(T_ngettext('%d hour','%d hours',4), "4"); ?></option>
+ <option value="480"<?php echo $length_480; ?>><?php printf(T_ngettext('%d hour','%d hours',8), "8"); ?></option>
+ <option value="960"<?php echo $length_960; ?>><?php printf(T_ngettext('%d hour','%d hours',16), "16"); ?></option>
</select>
</td>
</tr>
diff --git a/templates/show_verify_catalog.inc.php b/templates/show_verify_catalog.inc.php
index a9004b5e..9afbd16c 100644
--- a/templates/show_verify_catalog.inc.php
+++ b/templates/show_verify_catalog.inc.php
@@ -30,7 +30,7 @@ show_box_top(T_('Verify Catalog'), 'box box_verify_catalog');
/* HINT: Catalog Name */
printf(T_('Updating the %s catalog'), "<strong>[ $this->name ]</strong>");
echo "<br />\n";
-printf(ngettext('%d item found checking tag information', '%d items found checking tag information', $number), $number);
+printf(T_ngettext('%d item found checking tag information', '%d items found checking tag information', $number), $number);
echo "<br />\n\n";
echo T_('Verified') . ': <span id="verify_count_' . $this->id . '">' . $catalog_verify_found . '</span><br />';
echo T_('Reading') . ': <span id="verify_dir_' . $this->id . '">' . $catalog_verify_directory . '</span><br />';