[Slim-Checkins] r33861 - in /7.7/trunk/server/Slim/Plugin/RhapsodyDirect: Plugin.pm strings.txt

Author: mherger
Date: Thu Feb 23 06:33:17 2012
New Revision: 33861

URL: http://svn.slimdevices.com/slim?rev=33861&view=rev
Log:
Bug: n/a
Description: Napster is now Rhapsody, will be Napster in the EU.

Modified:
    7.7/trunk/server/Slim/Plugin/RhapsodyDirect/Plugin.pm
    7.7/trunk/server/Slim/Plugin/RhapsodyDirect/strings.txt

Modified: 7.7/trunk/server/Slim/Plugin/RhapsodyDirect/Plugin.pm
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Slim/Plugin/RhapsodyDirect/Plugin.pm?rev=33861&r1=33860&r2=33861&view=diff
==============================================================================
--- 7.7/trunk/server/Slim/Plugin/RhapsodyDirect/Plugin.pm (original)
+++ 7.7/trunk/server/Slim/Plugin/RhapsodyDirect/Plugin.pm Thu Feb 23 06:33:17 2012
@@ -161,6 +161,9 @@
 
 	# use INPUT.Choice to display the list of feeds
 	my $name = 'PLUGIN_RHAPSODY_DIRECT_MY_RHAPSODY_LIBRARY';
+	if ($client->isAppEnabled('rhapsodyeu')) {
+		$name = 'PLUGIN_RHAPSODY_EU_MY_RHAPSODY_LIBRARY';
+	}
 	
 	my %params = (
 		header   => $name,
@@ -275,8 +278,16 @@
 	
 	return unless $client;
 	
+	my $label;
+	if ($client->isAppEnabled('rhapsodydirect')) {
+		$label = 'PLUGIN_RHAPSODY_DIRECT_ON_RHAPSODY';
+	}
+	elsif ($client->isAppEnabled('rhapsodyeu')) {
+		$label = 'PLUGIN_RHAPSODY_DIRECT_ON_RHAPSODY_EU';
+	}
+	
 	# Only show if in the app list
-	return unless $client->isAppEnabled('rhapsodydirect');
+	return unless $label;
 	
 	my $artist = $track->remote ? $remoteMeta->{artist} : $track->artistName;
 	my $album  = $track->remote ? $remoteMeta->{album}  : ( $track->album ? $track->album->name : undef );
@@ -294,7 +305,7 @@
 	if ( $artist && ( $album || $title ) ) {
 		return {
 			type      => 'link',
-			name      => $client->string('PLUGIN_RHAPSODY_DIRECT_ON_RHAPSODY'),
+			name      => $client->string($label),
 			url       => $snURL,
 			favorites => 0,
 		};

Modified: 7.7/trunk/server/Slim/Plugin/RhapsodyDirect/strings.txt
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Slim/Plugin/RhapsodyDirect/strings.txt?rev=33861&r1=33860&r2=33861&view=diff
==============================================================================
--- 7.7/trunk/server/Slim/Plugin/RhapsodyDirect/strings.txt (original)
+++ 7.7/trunk/server/Slim/Plugin/RhapsodyDirect/strings.txt Thu Feb 23 06:33:17 2012
@@ -43,6 +43,21 @@
 	RU	Медиатека Rhapsody
 	SV	Rhapsody-bibliotek
 
+PLUGIN_RHAPSODY_EU_MY_RHAPSODY_LIBRARY
+	CS	Knihovna Napster
+	DA	Napster-bibliotek
+	DE	Napster-Bibliothek
+	EN	Napster Library
+	ES	Biblioteca Napster
+	FI	Napster-kirjasto
+	FR	Bibliothèque Napster
+	IT	Libreria Napster
+	NL	Napster-collectie
+	NO	Napster-bibliotek
+	PL	Biblioteka usługi Napster
+	RU	Медиатека Napster
+	SV	Napster-bibliotek
+
 PLUGIN_RHAPSODY_DIRECT_ERROR
 	CS	Chyba Rhapsody
 	DA	Rhapsody-fejl
@@ -283,6 +298,21 @@
 	RU	На Rhapsody
 	SV	PÃ¥ Rhapsody
 
+PLUGIN_RHAPSODY_DIRECT_ON_RHAPSODY_EU
+	CS	Na Napster
+	DA	PÃ¥ Napster
+	DE	Auf Napster
+	EN	On Napster
+	ES	En Napster
+	FI	Napsterissa
+	FR	Sur Napster
+	IT	Su Napster
+	NL	Op Napster
+	NO	PÃ¥ Napster
+	PL	W usłudze Napster
+	RU	На Napster
+	SV	PÃ¥ Napster
+
 PLUGIN_RHAPSODY_DIRECT_DNS_ERROR
 	CS	Není možné najít adresu pro Rhapsody.
 	DA	Adressen til Rhapsody blev ikke fundet.

_______________________________________________
checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/checkins