Modified: More translatable templates.

24 files changed, 57 insertions, 51 deletions

diff --git a/templates/footer.inc.php b/templates/footer.inc.php
index 38090bfb..678779b3 100644
--- a/templates/footer.inc.php
+++ b/templates/footer.inc.php
@@ -29,7 +29,7 @@
 <div id="footer">
 	<a href="http://www.ampache.org/index.php">Ampache v.<?php echo Config::get('version'); ?></a><br />
 	Copyright (c) 2001 - 2008 Ampache.org 
-	Queries:<?php echo Dba::$stats['query']; ?> Cache Hits:<?php echo database_object::$cache_hit; ?>
+	<?php echo _('Queries:'); ?><?php echo Dba::$stats['query']; ?> <?php echo _('Cache Hits:'); ?><?php echo database_object::$cache_hit; ?>
 </div>
 </body>
 </html>
diff --git a/templates/header.inc.php b/templates/header.inc.php
index 7442b132..2bc6d190 100644
--- a/templates/header.inc.php
+++ b/templates/header.inc.php
@@ -33,12 +33,12 @@ $location = get_location();
 <?php
 if (Config::get('use_rss')) { ?>
 <link rel="alternate" type="application/rss+xml" title="<?php echo Config::get('rss_main_title'); ?>" href="<?php echo $web_path; ?>/rss.php" />
-<link rel="alternate" type="application/rss+xml" title="Ampache Latest Artists Additions" href="<?php echo $web_path; ?>/rss.php?type=latestartist" />
-<link rel="alternate" type="application/rss+xml" title="Ampache Latest Albums Additions" href="<?php echo $web_path; ?>/rss.php?type=latestalbum" />
-<link rel="alternate" type="application/rss+xml" title="Ampache Most Popular Albums" href="<?php echo $web_path; ?>/rss.php?type=popularalbum" />
-<link rel="alternate" type="application/rss+xml" title="Ampache Most Popular Artists" href="<?php echo $web_path; ?>/rss.php?type=popularalbum" />
-<link rel="alternate" type="application/rss+xml" title="Ampache Most Popular Songs" href="<?php echo $web_path; ?>/rss.php?type=popularsong" />
-<link rel="alternate" type="application/rss+xml" title="Ampache Recently Played" href="<?php echo $web_path; ?>/rss.php?type=recentlyplayed" />
+<link rel="alternate" type="application/rss+xml" title="<?php echo _('Ampache Latest Artists Additions'); ?>" href="<?php echo $web_path; ?>/rss.php?type=latestartist" />
+<link rel="alternate" type="application/rss+xml" title="<?php echo _('Ampache Latest Albums Additions'); ?>" href="<?php echo $web_path; ?>/rss.php?type=latestalbum" />
+<link rel="alternate" type="application/rss+xml" title="<?php echo _('Ampache Most Popular Albums'); ?>" href="<?php echo $web_path; ?>/rss.php?type=popularalbum" />
+<link rel="alternate" type="application/rss+xml" title="<?php echo _('Ampache Most Popular Artists'); ?>" href="<?php echo $web_path; ?>/rss.php?type=popularalbum" />
+<link rel="alternate" type="application/rss+xml" title="<?php echo _('Ampache Most Popular Songs'); ?>" href="<?php echo $web_path; ?>/rss.php?type=popularsong" />
+<link rel="alternate" type="application/rss+xml" title="<?php echo _('Ampache Recently Played'); ?>" href="<?php echo $web_path; ?>/rss.php?type=recentlyplayed" />
 <?php } ?>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=<?php echo Config::get('site_charset'); ?>" />
 <title><?php echo scrub_out(Config::get('site_title')); ?> - <?php echo $location['title']; ?></title>
diff --git a/templates/show_access_list.inc.php b/templates/show_access_list.inc.php
index 0fdae8c4..3f7eea29 100644
--- a/templates/show_access_list.inc.php
+++ b/templates/show_access_list.inc.php
@@ -27,12 +27,14 @@
 $web_path = Config::get('web_path');
 ?>
 <?php show_box_top(_('Ampache Access Control')); ?>
-<p>Since your catalog can be accessed remotely you may want to limit the access from
-remote sources so you are not in violation of copyright laws.  By default your
-server will allow anyone with an account to stream music. It will not allow any
-other Ampache servers to connect to it to share catalog information.  Use tool below 
-to add any server's IP address that you want to access your Ampache catalog or be able to 
-stream from this server.</p>
+<p>
+<?php
+echo _('Since your catalog can be accessed remotely you may want to limit the access from remote sources so you are not in violation of copyright laws.');
+echo _('By default your server will allow anyone with an account to stream music.');
+echo _('It will not allow any other Ampache servers to connect to it to share catalog information.');
+echo _('Use tool below to add any server's IP address that you want to access your Ampache catalog or be able to stream from this server.');
+?>
+</p>
 
 <p>
 <a class="button" href="<?php echo $web_path; ?>/admin/access.php?action=show_add_host"><?php echo _('Add Entry'); ?></a>
diff --git a/templates/show_add_shout.inc.php b/templates/show_add_shout.inc.php
index c52565f2..05e27cf5 100644
--- a/templates/show_add_shout.inc.php
+++ b/templates/show_add_shout.inc.php
@@ -24,7 +24,7 @@
 <form method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/shout.php?action=add_shout">
 <table class="tabledata" cellpadding="0" cellspacing="0">
 <tr>
-	<td><strong>Comment:</strong>
+	<td><strong><?php echo _('Comment:'); ?></strong>
 </tr>
 <tr>
 	<td><textarea rows="5" cols="70" name="comment"></textarea></td>
diff --git a/templates/show_album_art.inc.php b/templates/show_album_art.inc.php
index 71148b88..1bfced78 100644
--- a/templates/show_album_art.inc.php
+++ b/templates/show_album_art.inc.php
@@ -38,13 +38,13 @@ while ($i <= $rows) {
 		else { 
 ?>
 			<td align="center">
-				<a href="<?php echo $image_url; ?>" target="_blank"><img src="<?php echo $image_url; ?>" alt="Album Art" border="0" height="175" width="175" /></a>
+				<a href="<?php echo $image_url; ?>" target="_blank"><img src="<?php echo $image_url; ?>" alt="<?php echo _('Album Art'); ?>" border="0" height="175" width="175" /></a>
 				<br />
 				<p align="center">
 				<?php if (is_array($dimensions)) { ?>
 				[<?php echo intval($dimensions['width']); ?>x<?php echo intval($dimensions['heigh']); ?>] 
-				<?php } ?>	
-				[<a href="<?php echo Config::get('web_path'); ?>/albums.php?action=select_art&amp;image=<?php echo $key; ?>&amp;album_id=<?php echo intval($_REQUEST['album_id']); ?>">Select</a>]
+				<?php } ?>
+				[<a href="<?php echo Config::get('web_path'); ?>/albums.php?action=select_art&amp;image=<?php echo $key; ?>&amp;album_id=<?php echo intval($_REQUEST['album_id']); ?>"><?php echo _('Select'); ?></a>]
 				</p>
 			</td>
 <?php 
diff --git a/templates/show_clean_catalog.inc.php b/templates/show_clean_catalog.inc.php
index 9df88355..ba364ca6 100644
--- a/templates/show_clean_catalog.inc.php
+++ b/templates/show_clean_catalog.inc.php
@@ -20,7 +20,6 @@
 */
 
 show_box_top();
-//echo "\n" . _('Cleaning the') . " <b>[" . $this->name . "]</b> " . _('Catalog') . "...<br />\n";
 printf(_('Cleaning the %s Catalog'), "<strong>[" . $this->name . "]</strong>");
 echo "...<br />"; 
 echo _('Checking') . ": <span id=\"clean_count_" . $this->id . "\"></span>\n<br />";
diff --git a/templates/show_democratic.inc.php b/templates/show_democratic.inc.php
index 07e7afb0..fa746385 100644
--- a/templates/show_democratic.inc.php
+++ b/templates/show_democratic.inc.php
@@ -19,7 +19,7 @@
 
 */
 
-show_box_top($democratic->name . ' ' . _('Playlist')); 
+show_box_top(sprintf(_('Playlist %s') ,$democratic->name)); 
 ?>
 <div id="democratic_playlist">
 <?php require_once Config::get('prefix') . '/templates/show_democratic_playlist.inc.php'; ?>
diff --git a/templates/show_denied.inc.php b/templates/show_denied.inc.php
index fbd4bbab..19b1507d 100644
--- a/templates/show_denied.inc.php
+++ b/templates/show_denied.inc.php
@@ -34,11 +34,16 @@
 </div>
 <p class="error">
 <?php if (!Config::get('demo_mode')) { ?>
-You've been redirected to this page because you do not have access to this function. If you believe this is an error please 
-contact an Ampache administrator. This event has been logged
+<?php
+echo _("You've been redirected to this page because you do not have access to this function.");
+echo _("If you believe this is an error please contact an Ampache administrator.");
+echo _("This event has been logged");
+?>
 <?php } else { ?>
-You've been redirected to this page because you've attempted to access a function that is disabled in the demo. 
-Functions are disabled in the demo because previous users of the demo have used the functionality to post inappropriate materials 
+<?php
+echo _("You've been redirected to this page because you've attempted to access a function that is disabled in the demo.");
+echo _("Functions are disabled in the demo because previous users of the demo have used the functionality to post inappropriate materials");
+?>
 <?php } ?>
 </p>
 <div id="bottom">
diff --git a/templates/show_edit_catalog.inc.php b/templates/show_edit_catalog.inc.php
index d62d7afb..a8d029ba 100644
--- a/templates/show_edit_catalog.inc.php
+++ b/templates/show_edit_catalog.inc.php
@@ -44,7 +44,7 @@
 <tr>
 	<td><?php echo _('XML-RPC Key'); ?>:</td>
 	<td>
-		<input size="30" type="text" name="key" value="<?php echo scrub_out($catalog->key); ?>" />*<span class="error">Required for Remote Catalogs</span>
+		<input size="30" type="text" name="key" value="<?php echo scrub_out($catalog->key); ?>" />*<span class="error"><?php echo _('Required for Remote Catalogs'); ?></span>
 	</td>
 </tr>
 <tr>
diff --git a/templates/show_edit_shout.inc.php b/templates/show_edit_shout.inc.php
index 2709b90d..5f8c0a16 100644
--- a/templates/show_edit_shout.inc.php
+++ b/templates/show_edit_shout.inc.php
@@ -25,10 +25,10 @@
 <input type="hidden" name="shout_id" value="<?php echo $shout->id; ?>" />
 <table class="tabledata" cellpadding="0" cellspacing="0">
 <tr>
-	<td><strong>Created by: <?php echo $client->f_link; ?> for <?php echo $object->f_link; ?></strong>
+	<td><strong><?php printf(_('Created by: %s for %s'), $client->f_link, $object->f_link); ?></strong>
 <tr>
 <tr>
-	<td><strong>Comment:</strong>
+	<td><strong><?php echo _('Comment:'); ?></strong>
 </tr>
 <tr>
 	<td><textarea rows="5" cols="70" name="comment"><?php echo $shout->text; ?></textarea></td>
diff --git a/templates/show_embed_xspf.inc.php b/templates/show_embed_xspf.inc.php
index ba855513..f29ae959 100644
--- a/templates/show_embed_xspf.inc.php
+++ b/templates/show_embed_xspf.inc.php
@@ -70,4 +70,4 @@ $player_url = sprintf("%s/modules/flash/xspf_jukebox.swf?autoplay=true&repeat_pl
 </object>
 <?php
 show_box_bottom();
-?>
\ No newline at end of file
+?>
diff --git a/templates/show_genre.inc.php b/templates/show_genre.inc.php
index 1eb1cc14..630aab61 100644
--- a/templates/show_genre.inc.php
+++ b/templates/show_genre.inc.php
@@ -26,7 +26,7 @@
 */
 $web_path = Config::get('web_path');
 ?>
-<?php show_box_top(_('Viewing') . " " . $genre->name . " " . _('Genre')); ?>
+<?php show_box_top(sprintf(_('Viewing %s Genre') $genre->name)); ?>
 		[<?php echo $genre->get_album_count(); ?>] 
 		<a href="<?php echo $web_path; ?>/genre.php?action=show_albums&amp;genre_id=<?php echo $genre->id; ?>">
 			<?php echo _('Albums'); ?></a><br />
diff --git a/templates/show_ip_history.inc.php b/templates/show_ip_history.inc.php
index 801d51cd..c6bdf4f5 100644
--- a/templates/show_ip_history.inc.php
+++ b/templates/show_ip_history.inc.php
@@ -20,7 +20,7 @@
 
 */
 ?>
-<?php show_box_top($working_user->fullname . ' ' . _('IP History')); ?>
+<?php show_box_top(sprintf(_('%s IP History'), $working_user->fullname)); ?>
 <div>
 <?php if (isset($_REQUEST['all'])){ ?>
 	<a class="button" href="<?php echo Config::get('web_path')?>/admin/users.php?action=show_ip_history&user_id=<?php echo $working_user->id?>"><?php echo _('Show Unique'); ?>...</a>
diff --git a/templates/show_object_rating.inc.php b/templates/show_object_rating.inc.php
index 82ae5047..cba5d713 100644
--- a/templates/show_object_rating.inc.php
+++ b/templates/show_object_rating.inc.php
@@ -31,11 +31,11 @@ $base_url = '?action=set_rating&rating_type=' . $rating->type . '&object_id=' .
     if ($width < 0) $width = 0;
     
     //set the current rating background 
-    echo "<li class=\"current-rating\" style=\"width:${width}%\" >Current rating: ";
+    echo "<li class=\"current-rating\" style=\"width:${width}%\" >" . _('Current rating: ');
     if ($rating->rating <= 0) {
-    	echo "not rated yet </li>\n";
+    	echo _('not rated yet') . "</li>\n";
     }
-    else echo "$rating->preciserating of 5</li>\n";
+    else printf(_('%s of 5', $rating->preciserating)); echo "</li>\n";
     
     for ($i=1; $i<6; $i++)
     {
diff --git a/templates/show_object_rating_static.inc.php b/templates/show_object_rating_static.inc.php
index a8359f5b..2c65ae54 100644
--- a/templates/show_object_rating_static.inc.php
+++ b/templates/show_object_rating_static.inc.php
@@ -31,11 +31,11 @@ $base_url = Config::get('ajax_url') . '?action=set_rating&amp;rating_type=' . $r
     if ($width < 0) $width = 0;
     
     //set the current rating background
-    echo "<li class=\"current-rating\" style=\"width:${width}%\" >Current rating: ";
+    echo "<li class=\"current-rating\" style=\"width:${width}%\" >" . _('Current rating: ');
     if ($rating->rating <= 0) {
-        echo "not rated yet </li>\n";
+        echo _('not rated yet') . "</li>\n";
     }
-    else echo "$rating->preciserating of 5</li>\n";
+    else printf(_('%s of 5') ,$rating->preciserating); echo "</li>\n";
     
     for ($i=1; $i<6; $i++)
     {
diff --git a/templates/show_playlist.inc.php b/templates/show_playlist.inc.php
index 607f83b7..05d30d7f 100644
--- a/templates/show_playlist.inc.php
+++ b/templates/show_playlist.inc.php
@@ -23,7 +23,7 @@
  * It changes depending on where it is 
  */
 ?>
-<?php show_box_top($playlist->f_type . ' ' . $playlist->name . ' ' . _('Playlist')); ?>
+<?php show_box_top(sprintf(_('%s %s Playlist'), $playlist->f_type, $playlist->name)); ?>
 <div id="information_actions">
 <ul>
 	<li><a href="<?php echo Config::get('web_path'); ?>/playlist.php?action=normalize_tracks&amp;playlist_id=<?php echo $playlist->id; ?>"><?php echo _('Normalize Tracks'); ?></a></li>
diff --git a/templates/show_random.inc.php b/templates/show_random.inc.php
index 92c47049..3169717d 100644
--- a/templates/show_random.inc.php
+++ b/templates/show_random.inc.php
@@ -48,13 +48,13 @@
 	<td>
 		<select name="length">
 			<option value="0"><?php echo _('Unlimited'); ?></option>
-			<option value="15">15 <?php echo ngettext('minute','minutes',15); ?></option>
-			<option value="30">30 <?php echo ngettext('minute','minutes',30); ?></option>
-			<option value="60">1 <?php echo ngettext('hour','hours',1); ?></option>
-			<option value="120">2 <?php echo ngettext('hour','hours',2); ?></option>
-			<option value="240">4 <?php echo ngettext('hour','hours',4); ?></option>
-			<option value="480">8 <?php echo ngettext('hour','hours',8); ?></option>
-			<option value="960">16 <?php echo ngettext('hour','hours',16); ?></option>
+			<option value="15"><?php printf(ngettext('%s minute','%s minutes',15), "15"); ?></option>
+			<option value="30"><?php printf(ngettext('%s minute','%s minutes',30), "30"); ?></option>
+			<option value="60"><?php printf(ngettext('%s hour','%s hours',1), "1"); ?></option>
+			<option value="120"><?php printf(ngettext('%s hour','%s hours',2), "2"); ?></option>
+			<option value="240"><?php printf(ngettext('%s hour','%s hours',4), "4"); ?></option>
+			<option value="480"><?php printf(ngettext('%s hour','%s hours',8), "8"); ?></option>
+			<option value="960"><?php printf(ngettext('%s hour','%s hours',16), "16"); ?></option>
 		</select>
 	</td>
 </tr>
diff --git a/templates/show_rename_artist.inc.php b/templates/show_rename_artist.inc.php
index 20acae77..eb034966 100644
--- a/templates/show_rename_artist.inc.php
+++ b/templates/show_rename_artist.inc.php
@@ -26,7 +26,7 @@ function insert()
 	document.getElementById('artist_name').value = '<?php echo $artist->name; ?>';
 }
 </script>
-<?php show_box_top(_('Rename') . " " . $artist->name); ?>
+<?php show_box_top(sprintf(_('Rename %s'), $artist->name)); ?>
 <form name="rename_artist" method="post" action="<?php echo conf('web_path'); ?>/artists.php?action=rename&amp;artist=<?php echo $artist->id; ?>" style="Display:inline;">
         <?php show_artist_pulldown($artist->id, "artist_id", 4); ?>
 	<br />
diff --git a/templates/show_similar_artists.inc.php b/templates/show_similar_artists.inc.php
index ccf54374..48d3a18c 100644
--- a/templates/show_similar_artists.inc.php
+++ b/templates/show_similar_artists.inc.php
@@ -55,7 +55,7 @@ if (count($similar_artists) > 0) {
 			&nbsp;
 		</td>
 		<td>
-			No Similar Artists found
+			<?php echo _('No Similar Artists found'); ?>
 		</td>
 	</tr>
 	<tr class="<?php echo flip_class(); ?>">
diff --git a/templates/show_tagcloud.inc.php b/templates/show_tagcloud.inc.php
index a35ed387..882246db 100644
--- a/templates/show_tagcloud.inc.php
+++ b/templates/show_tagcloud.inc.php
@@ -34,7 +34,7 @@ $filter=0;
 foreach ($_SESSION['browse']['filter']['tag'] as $t) {
     if (!$filter) {
       $filter = 1;
-      echo 'Filters(remove): ';
+      echo _('Filters(remove): ');
     }
     $ctags = $currentTags;
     unset($ctags[$t]);
@@ -56,7 +56,7 @@ foreach ($tagcloudList as $f) {
    if (!$currentTags[$id]) {
      if (!$filter) {
        $filter = 1;
-       echo 'Matching tags: ';
+       echo _('Matching tags: ');
      }
      $ctags = $currentTags;
      $ctags[$id] = 1;
diff --git a/templates/show_user_activate.inc.php b/templates/show_user_activate.inc.php
index 9a8fc15c..da9bae91 100644
--- a/templates/show_user_activate.inc.php
+++ b/templates/show_user_activate.inc.php
@@ -48,7 +48,7 @@ $web_path = Config::get('web_path');
 ?>
 <h3><?php echo _('User Activated'); ?></h3>
 <p>
-	<?php echo _('This User ID is activated and can be used'); ?>. <a href="<?php echo Config::get('web_path'); ?>/login.php"><?php echo _('Login'); ?></a>
+	<?php printf(_('This User ID is activated and can be used %sLogin%s'), '<a href="' . Config::get('web_path'). '/login.php">', '</a>'); ?></a>
 </p>
 <?php } else { ?>
 <h3><?php echo _('Validation Failed'); ?></h3>
diff --git a/templates/show_user_preferences.inc.php b/templates/show_user_preferences.inc.php
index 23670067..8ef67376 100644
--- a/templates/show_user_preferences.inc.php
+++ b/templates/show_user_preferences.inc.php
@@ -25,7 +25,7 @@
  */
 
 ?>
-<?php show_box_top(_('Editing') . ' ' . $client->fullname . ' ' . _('preferences'),'box box_preferences'); ?>
+<?php show_box_top(sprintf(_('Editing %s preferences'), $client->fullname),'box box_preferences'); ?>
 <form method="post" name="preferences" action="<?php echo Config::get('web_path'); ?>/preferences.php?action=admin_update_preferences" enctype="multipart/form-data">
 <table class="tabledata" cellspacing="0">
 <colgroup>
diff --git a/templates/show_user_recommendations.inc.php b/templates/show_user_recommendations.inc.php
index 51d40c8c..76494e20 100644
--- a/templates/show_user_recommendations.inc.php
+++ b/templates/show_user_recommendations.inc.php
@@ -19,7 +19,7 @@
 
 */
 ?>
-<?php show_box_top($working_user->fullname . ' ' . _('Recommendations')); ?>
+<?php show_box_top(sprintf('%s Recommendations'), $working_user->fullname); ?>
 <table class="tabledata">
 <tr>
 	<td valign="top">
diff --git a/templates/show_user_stats.inc.php b/templates/show_user_stats.inc.php
index b9a9fd23..f07bb5e7 100644
--- a/templates/show_user_stats.inc.php
+++ b/templates/show_user_stats.inc.php
@@ -19,7 +19,7 @@
 
 */
 ?>
-<?php show_box_top($working_user->fullname . ' ' . _('Favorites')); ?>
+<?php show_box_top(sprintf('%s Favorites'), $working_user->fullname); ?>
 <table class="tabledata">
 <tr>
 	<td valign="top">