[Slim-Checkins] r12627 - in /trunk/server: Slim/Control/Commands.pm strings.txt

[adrian at svn.slimdevices.com]

Author: adrian
Date: Mon Aug 20 15:41:11 2007
New Revision: 12627

URL: http://svn.slimdevices.com?rev=12627&view=rev
Log:
Bug: N/A
Description: localise jive popup strings for add/play, add popup for delete

Modified:
    trunk/server/Slim/Control/Commands.pm
    trunk/server/strings.txt

Modified: trunk/server/Slim/Control/Commands.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Control/Commands.pm?rev=12627&r1=12626&r2=12627&view=diff
==============================================================================
--- trunk/server/Slim/Control/Commands.pm (original)
+++ trunk/server/Slim/Control/Commands.pm Mon Aug 20 15:41:11 2007
@@ -504,6 +504,19 @@
 		$request->setStatusBadParams();
 		return;
 	}
+
+	my $song = Slim::Player::Playlist::song($client, $index);
+
+	# FIXME - make this conditional on client being jive?
+	$client->showBriefly({
+		'jiv' => { 
+			'type'    => 'song',
+			'text'    => [ Slim::Utils::Strings::string('JIVE_POPUP_REMOVING'),
+						   $song->title,
+						   Slim::Utils::Strings::string('JIVE_POPUP_FROM_PLAYLIST') ],
+			'icon-id' => $song->remote ? 0 : $song->album->artwork || 0,
+		}
+	});
 
 	Slim::Player::Playlist::removeTrack($client, $index);
 
@@ -1461,7 +1474,10 @@
 			$client->showBriefly({ 
 				'jiv' => { 
 					'type'    => 'song',
-					'text'    => $add ? [ 'Adding', $tracks[0]->title, 'to Playlist...' ] : [ 'Playing', $tracks[0]->title ],
+					'text'    => $add
+						? [ Slim::Utils::Strings::string('JIVE_POPUP_ADDING'), $tracks[0]->title,
+							Slim::Utils::Strings::string('JIVE_POPUP_TO_PLAYLIST') ]
+						: [ Slim::Utils::Strings::string('JIVE_POPUP_NOW_PLAYING'), $tracks[0]->title ],
 					'icon-id' => $tracks[0]->album->artwork,
 				}
 			});

Modified: trunk/server/strings.txt
URL: http://svn.slimdevices.com/trunk/server/strings.txt?rev=12627&r1=12626&r2=12627&view=diff
==============================================================================
--- trunk/server/strings.txt (original)
+++ trunk/server/strings.txt Mon Aug 20 15:41:11 2007
@@ -13921,3 +13921,18 @@
 JIVE_SEARCHFOR_HELP
 	EN	Use the scroll wheel to change letters, then press the center button to select that letter. Press the center button again to start your search.
 	FR	Utiliser le bidule pour choisir une lettre, plus appuyer sur le bouton central afin de la sélectionner. Appuyer à nouveau sur le bouton central pour démarrer la recherche.
+
+JIVE_POPUP_ADDING
+	EN	Adding
+
+JIVE_POPUP_REMOVING
+	EN	Removing
+
+JIVE_POPUP_TO_PLAYLIST
+	EN	to Playlist...
+
+JIVE_POPUP_FROM_PLAYLIST
+	EN	from Playlist...
+
+JIVE_POPUP_NOW_PLAYING
+	EN	Now Playing