Fix localization.

git-svn-id: svn://svn.code.sf.net/p/xbmc-groove/code@55 2dec19e3-eb1d-4749-8193-008c8bba0994

diff --git a/default.py b/default.py
index f747929..cb8f31f 100644 (file)
--- a/default.py
+++ b/default.py
@@ -18,7 +18,7 @@
 
 import urllib, sys, os, shutil, re, pickle, time, tempfile, xbmcaddon, xbmcplugin, xbmcgui, xbmc
 
-__addon__     = xbmcaddon.Addon()
+__addon__     = xbmcaddon.Addon('plugin.audio.groove')
 __addonname__ = __addon__.getAddonInfo('name')
 __cwd__       = __addon__.getAddonInfo('path')
 __author__    = __addon__.getAddonInfo('author')
@@ -80,7 +80,7 @@ playlistUrl = baseModeUrl + '?mode=' + str(MODE_PLAYLIST)
 playlistsUrl = baseModeUrl + '?mode=' + str(MODE_PLAYLISTS)
 favoritesUrl = baseModeUrl + '?mode=' + str(MODE_FAVORITES)
 
-searchArtistsAlbumsName = xbmc.getLocalizedString(30006)
+searchArtistsAlbumsName = __language__(30006)
 
 thumbDef = os.path.join(imgDir, 'default.tbn')
 listBackground = os.path.join(imgDir, 'listbackground.png')
@@ -92,9 +92,9 @@ from threading import Event, Thread
 try:
     groovesharkApi = GrooveAPI()
     if groovesharkApi.pingService() != True:
-        raise StandardError(xbmc.getLocalizedString(30007))
+        raise StandardError(__language__(30007))
 except:
-    dialog = xbmcgui.Dialog(xbmc.getLocalizedString(30008),xbmc.getLocalizedString(30009),xbmc.getLocalizedString(30010))
+    dialog = xbmcgui.Dialog(__language__(30008),__language__(30009),__language__(30010))
     dialog.ok()
     sys.exit(-1)
   
@@ -144,7 +144,7 @@ class GroovesharkPlaylistSelect(xbmcgui.WindowDialog):
         listitems = []
         for playlist in items:
             listitems.append(xbmcgui.ListItem(playlist[0]))
-        listitems.append(xbmcgui.ListItem(xbmc.getLocalizedString(30011)))
+        listitems.append(xbmcgui.ListItem(__language__(30011)))
         self.playlistControl.addItems(listitems)
         self.setFocus(self.playlistControl)
         self.playlistControl.selectItem(0)
@@ -246,11 +246,11 @@ class Groveshark:
         self._handle = int(sys.argv[1])
         if os.path.isdir(cacheDir) == False:
             os.makedirs(cacheDir)
-            xbmc.log(xbmc.getLocalizedString(30012) + " " + cacheDir)
+            xbmc.log(__language__(30012) + " " + cacheDir)
         artDir = xbmc.translatePath(thumbDir)
         if os.path.isdir(artDir) == False:
             os.makedirs(artDir)
-            xbmc.log(xbmc.getLocalizedString(30012) + " " + artDir)
+            xbmc.log(__language__(30012) + " " + artDir)
             
     # Top-level menu
     def categories(self):
@@ -260,70 +260,70 @@ class Groveshark:
         # Setup
         xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg)
         
-        self._add_dir(xbmc.getLocalizedString(30013), '', MODE_SEARCH_SONGS, self.songImg, 0)
-        self._add_dir(xbmc.getLocalizedString(30014), '', MODE_SEARCH_ALBUMS, self.albumImg, 0)
-        self._add_dir(xbmc.getLocalizedString(30015), '', MODE_SEARCH_ARTISTS, self.artistImg, 0)
+        self._add_dir(__language__(30013), '', MODE_SEARCH_SONGS, self.songImg, 0)
+        self._add_dir(__language__(30014), '', MODE_SEARCH_ALBUMS, self.albumImg, 0)
+        self._add_dir(__language__(30015), '', MODE_SEARCH_ARTISTS, self.artistImg, 0)
         self._add_dir(searchArtistsAlbumsName, '', MODE_SEARCH_ARTISTS_ALBUMS, self.artistsAlbumsImg, 0)
         # Not supported by key
         #self._add_dir("Search for user's playlists...", '', MODE_SEARCH_PLAYLISTS, self.usersplaylistsImg, 0)
-        self._add_dir(xbmc.getLocalizedString(30016), '', MODE_ARTIST_POPULAR, self.popularSongsArtistImg, 0)
-        self._add_dir(xbmc.getLocalizedString(30017), '', MODE_POPULAR_SONGS, self.popularSongsImg, 0)
+        self._add_dir(__language__(30016), '', MODE_ARTIST_POPULAR, self.popularSongsArtistImg, 0)
+        self._add_dir(__language__(30017), '', MODE_POPULAR_SONGS, self.popularSongsImg, 0)
         if (self.userid != 0):
-            self._add_dir(xbmc.getLocalizedString(30018), '', MODE_FAVORITES, self.favoritesImg, 0)
-            self._add_dir(xbmc.getLocalizedString(30019), '', MODE_PLAYLISTS, self.playlistImg, 0)
+            self._add_dir(__language__(30018), '', MODE_FAVORITES, self.favoritesImg, 0)
+            self._add_dir(__language__(30019), '', MODE_PLAYLISTS, self.playlistImg, 0)
 
     # Search for songs            
     def searchSongs(self):
-        query = self._get_keyboard(default="", heading=xbmc.getLocalizedString(30020))
+        query = self._get_keyboard(default="", heading=__language__(30020))
         if (query != ''):
             songs = groovesharkApi.getSongSearchResults(query, limit = self.songsearchlimit)
             if (len(songs) > 0):
                 self._add_songs_directory(songs)
             else:
                 dialog = xbmcgui.Dialog()
-                dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30021))
+                dialog.ok(__language__(30008), __language__(30021))
                 self.categories()
         else:
             self.categories()
     
     # Search for albums
     def searchAlbums(self):
-        query = self._get_keyboard(default="", heading=xbmc.getLocalizedString(30022))
+        query = self._get_keyboard(default="", heading=__language__(30022))
         if (query != ''): 
             albums = groovesharkApi.getAlbumSearchResults(query, limit = self.albumsearchlimit)
             if (len(albums) > 0):
                 self._add_albums_directory(albums)
             else:
                 dialog = xbmcgui.Dialog()
-                dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30023))
+                dialog.ok(__language__(30008), __language__(30023))
                 self.categories()
         else:
             self.categories()
     
     # Search for artists
     def searchArtists(self):
-        query = self._get_keyboard(default="", heading=xbmc.getLocalizedString(30024))
+        query = self._get_keyboard(default="", heading=__language__(30024))
         if (query != ''): 
             artists = groovesharkApi.getArtistSearchResults(query, limit = self.artistsearchlimit)
             if (len(artists) > 0):
                 self._add_artists_directory(artists)
             else:
                 dialog = xbmcgui.Dialog()
-                dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30025))
+                dialog.ok(__language__(30008), __language__(30025))
                 self.categories()
         else:
             self.categories()
 
     # Search for playlists
     def searchPlaylists(self):
-        query = self._get_keyboard(default="", heading=xbmc.getLocalizedString(30026))
+        query = self._get_keyboard(default="", heading=__language__(30026))
         if (query != ''): 
             playlists = groovesharkApi.getUserPlaylistsByUsername(query)
             if (len(playlists) > 0):
                 self._add_playlists_directory(playlists)
             else:
                 dialog = xbmcgui.Dialog()
-                dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30027))
+                dialog.ok(__language__(30008), __language__(30027))
                 self.categories()
         else:
             self.categories()
@@ -331,7 +331,7 @@ class Groveshark:
     # Search for artists albums
     def searchArtistsAlbums(self, artistName = None):
         if artistName == None or artistName == searchArtistsAlbumsName:
-            query = self._get_keyboard(default="", heading=xbmc.getLocalizedString(30028))
+            query = self._get_keyboard(default="", heading=__language__(30028))
         else:
             query = artistName
         if (query != ''): 
@@ -345,11 +345,11 @@ class Groveshark:
                     self._add_albums_directory(albums, artistID)
                 else:
                     dialog = xbmcgui.Dialog()
-                    dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30029))
+                    dialog.ok(__language__(30008), __language__(30029))
                     self.categories()
             else:
                 dialog = xbmcgui.Dialog()
-                dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30030))
+                dialog.ok(__language__(30008), __language__(30030))
                 self.categories()
         else:
             self.categories()
@@ -363,7 +363,7 @@ class Groveshark:
                 self._add_songs_directory(favorites, isFavorites=True)
             else:
                 dialog = xbmcgui.Dialog()
-                dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30031))
+                dialog.ok(__language__(30008), __language__(30031))
                 self.categories()
     
     # Get popular songs
@@ -373,7 +373,7 @@ class Groveshark:
             self._add_songs_directory(popular)
         else:
             dialog = xbmcgui.Dialog()
-            dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30032))
+            dialog.ok(__language__(30008), __language__(30032))
             self.categories()
 
     # Get my playlists             
@@ -385,11 +385,11 @@ class Groveshark:
                 self._add_playlists_directory(playlists)
             else:
                 dialog = xbmcgui.Dialog()
-                dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30033))
+                dialog.ok(__language__(30008), __language__(30033))
                 self.categories()
         else:
             dialog = xbmcgui.Dialog()
-            dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30034), xbmc.getLocalizedString(30035))
+            dialog.ok(__language__(30008), __language__(30034), __language__(30035))
                 
     # Make songs a favorite 
     def favorite(self, songid):
@@ -397,10 +397,10 @@ class Groveshark:
         if (userid != 0):
             xbmc.log("Favorite song: " + str(songid))
             groovesharkApi.addUserFavoriteSong(songID = songid)
-            xbmc.executebuiltin('XBMC.Notification(' + xbmc.getLocalizedString(30008) + ', ' + xbmc.getLocalizedString(30036) + ', 1000, ' + thumbDef + ')')
+            xbmc.executebuiltin('XBMC.Notification(' + __language__(30008) + ', ' + __language__(30036) + ', 1000, ' + thumbDef + ')')
         else:
             dialog = xbmcgui.Dialog()
-            dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30034), xbmc.getLocalizedString(30037))
+            dialog.ok(__language__(30008), __language__(30034), __language__(30037))
             
     # Remove song from favorites
     def unfavorite(self, songid, prevMode=0):
@@ -408,13 +408,13 @@ class Groveshark:
         if (userid != 0):
             xbmc.log("Unfavorite song: " + str(songid) + ', previous mode was ' + str(prevMode))
             groovesharkApi.removeUserFavoriteSongs(songIDs = songid)
-            xbmc.executebuiltin('XBMC.Notification(' + xbmc.getLocalizedString(30008) + ', ' + xbmc.getLocalizedString(30038) + ', 1000, ' + thumbDef + ')')
+            xbmc.executebuiltin('XBMC.Notification(' + __language__(30008) + ', ' + __language__(30038) + ', 1000, ' + thumbDef + ')')
             # Refresh to remove item from directory
             if (int(prevMode) == MODE_FAVORITES):
                 xbmc.executebuiltin("Container.Refresh(" + favoritesUrl + ")")
         else:
             dialog = xbmcgui.Dialog()
-            dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30034), xbmc.getLocalizedString(30039))
+            dialog.ok(__language__(30008), __language__(30034), __language__(30039))
             
 
     # Show selected album
@@ -435,11 +435,11 @@ class Groveshark:
             self._add_songs_directory(songs, trackLabelFormat=NAME_ALBUM_ARTIST_LABEL, playlistid=playlistid, playlistname=playlistname)
         else:
             dialog = xbmcgui.Dialog()
-            dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30034), xbmc.getLocalizedString(30040))
+            dialog.ok(__language__(30008), __language__(30034), __language__(30040))
             
     # Show popular songs of the artist
     def artistPopularSongs(self):
-        query = self._get_keyboard(default="", heading=xbmc.getLocalizedString(30041))
+        query = self._get_keyboard(default="", heading=__language__(30041))
         if (query != ''): 
             artists = groovesharkApi.getArtistSearchResults(query, limit = self.artistsearchlimit)
             if (len(artists) > 0):
@@ -451,11 +451,11 @@ class Groveshark:
                     self._add_songs_directory(songs, trackLabelFormat=NAME_ALBUM_ARTIST_LABEL)
                 else:
                     dialog = xbmcgui.Dialog()
-                    dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30042))
+                    dialog.ok(__language__(30008), __language__(30042))
                     self.categories()
             else:
                 dialog = xbmcgui.Dialog()
-                dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30043))
+                dialog.ok(__language__(30008), __language__(30043))
                 self.categories()
         else:
             self.categories()
@@ -487,7 +487,7 @@ class Groveshark:
                 time.sleep(1)
                 seconds = seconds + 1
         else:
-            xbmc.executebuiltin('XBMC.Notification(' + xbmc.getLocalizedString(30008) + ', ' + xbmc.getLocalizedString(30044) + ', 1000, ' + thumbDef + ')')
+            xbmc.executebuiltin('XBMC.Notification(' + __language__(30008) + ', ' + __language__(30044) + ', 1000, ' + thumbDef + ')')
         
     # Make a song directory item
     def songItem(self, songid, name, album, artist, coverart, trackLabelFormat=ARTIST_ALBUM_NAME_LABEL):
@@ -520,7 +520,7 @@ class Groveshark:
         if (userid != 0):
             re.split(' - ',name,1)
             nameTokens = re.split(' - ',name,1) # suggested name
-            name = self._get_keyboard(default=nameTokens[0], heading=xbmc.getLocalizedString(30045))
+            name = self._get_keyboard(default=nameTokens[0], heading=__language__(30045))
             if name != '':
                 album = groovesharkApi.getAlbumSongs(albumid, limit = self.songsearchlimit)
                 songids = []
@@ -528,45 +528,45 @@ class Groveshark:
                     songids.append(song[1])
                 if groovesharkApi.createPlaylist(name, songids) == 0:
                     dialog = xbmcgui.Dialog()
-                    dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30046), name)
+                    dialog.ok(__language__(30008), __language__(30046), name)
                 else:
-                    xbmc.executebuiltin('XBMC.Notification(' + xbmc.getLocalizedString(30008) + ',' + xbmc.getLocalizedString(30047)+ ', 1000, ' + thumbDef + ')')
+                    xbmc.executebuiltin('XBMC.Notification(' + __language__(30008) + ',' + __language__(30047)+ ', 1000, ' + thumbDef + ')')
         else:
             dialog = xbmcgui.Dialog()
-            dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30034), xbmc.getLocalizedString(30048))
+            dialog.ok(__language__(30008), __language__(30034), __language__(30048))
     
     # Rename a playlist
     def renamePlaylist(self, playlistid, name):
         userid = self._get_login()
         if (userid != 0):
-            newname = self._get_keyboard(default=name, heading=xbmc.getLocalizedString(30049))
+            newname = self._get_keyboard(default=name, heading=__language__(30049))
             if newname == '':
                 return
             elif groovesharkApi.playlistRename(playlistid, newname) == 0:
                 dialog = xbmcgui.Dialog()
-                dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30050), name)
+                dialog.ok(__language__(30008), __language__(30050), name)
             else:
                 # Refresh to show new item name
                 xbmc.executebuiltin("Container.Refresh")
         else:
             dialog = xbmcgui.Dialog()
-            dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30034), xbmc.getLocalizedString(30051))
+            dialog.ok(__language__(30008), __language__(30034), __language__(30051))
         
     # Remove a playlist
     def removePlaylist(self, playlistid, name):
         dialog = xbmcgui.Dialog()
-        if dialog.yesno(xbmc.getLocalizedString(30008), name, xbmc.getLocalizedString(30052)) == True:
+        if dialog.yesno(__language__(30008), name, __language__(30052)) == True:
             userid = self._get_login()
             if (userid != 0):
                 if groovesharkApi.playlistDelete(playlistid) == 0:
                     dialog = xbmcgui.Dialog()
-                    dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30053), name)
+                    dialog.ok(__language__(30008), __language__(30053), name)
                 else:
                     # Refresh to remove item from directory
                     xbmc.executebuiltin("Container.Refresh(" + playlistsUrl + ")")
             else:
                 dialog = xbmcgui.Dialog()
-                dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30034), xbmc.getLocalizedString(30054))
+                dialog.ok(__language__(30008), __language__(30034), __language__(30054))
 
     # Add song to playlist
     def addPlaylistSong(self, songid):
@@ -584,15 +584,15 @@ class Groveshark:
                 if i > -1:
                     # Add a new playlist
                     if i >= len(playlists):
-                        name = self._get_keyboard(default='', heading=xbmc.getLocalizedString(30055))
+                        name = self._get_keyboard(default='', heading=__language__(30055))
                         if name != '':
                             songIds = []
                             songIds.append(songid)
                             if groovesharkApi.createPlaylist(name, songIds) == 0:
                                 dialog = xbmcgui.Dialog()
-                                dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30056), name)
+                                dialog.ok(__language__(30008), __language__(30056), name)
                             else:
-                                xbmc.executebuiltin('XBMC.Notification(' + xbmc.getLocalizedString(30008) + ',' + xbmc.getLocalizedString(30057) + ', 1000, ' + thumbDef + ')')
+                                xbmc.executebuiltin('XBMC.Notification(' + __language__(30008) + ',' + __language__(30057) + ', 1000, ' + thumbDef + ')')
                     # Existing playlist
                     else:
                         playlist = playlists[i]
@@ -606,21 +606,21 @@ class Groveshark:
                         ret = groovesharkApi.setPlaylistSongs(playlistid, songIDs)
                         if ret == False:
                             dialog = xbmcgui.Dialog()
-                            dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30058))
+                            dialog.ok(__language__(30008), __language__(30058))
                         else:    
-                            xbmc.executebuiltin('XBMC.Notification(' + xbmc.getLocalizedString(30008) + ',' + xbmc.getLocalizedString(30059) + ', 1000, ' + thumbDef + ')')
+                            xbmc.executebuiltin('XBMC.Notification(' + __language__(30008) + ',' + __language__(30059) + ', 1000, ' + thumbDef + ')')
             else:
                 dialog = xbmcgui.Dialog()
-                dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30060))
+                dialog.ok(__language__(30008), __language__(30060))
                 self.categories()
         else:
             dialog = xbmcgui.Dialog()
-            dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30034), xbmc.getLocalizedString(30061))
+            dialog.ok(__language__(30008), __language__(30034), __language__(30061))
 
     # Remove song from playlist
     def removePlaylistSong(self, playlistid, playlistname, songid):
         dialog = xbmcgui.Dialog()
-        if dialog.yesno(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30062), xbmc.getLocalizedString(30063)) == True:
+        if dialog.yesno(__language__(30008), __language__(30062), __language__(30063)) == True:
             userid = self._get_login()
             if (userid != 0):
                 songs = groovesharkApi.getPlaylistSongs(playlistID)
@@ -631,14 +631,14 @@ class Groveshark:
                 ret = groovesharkApi.setPlaylistSongs(playlistID, songIDs)
                 if ret == False:
                     dialog = xbmcgui.Dialog()
-                    dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30064), xbmc.getLocalizedString(30065))
+                    dialog.ok(__language__(30008), __language__(30064), __language__(30065))
                 else:
                     # Refresh to remove item from directory
-                    xbmc.executebuiltin('XBMC.Notification(' + xbmc.getLocalizedString(30008) + ',' + xbmc.getLocalizedString(30066)+ ', 1000, ' + thumbDef + ')')
+                    xbmc.executebuiltin('XBMC.Notification(' + __language__(30008) + ',' + __language__(30066)+ ', 1000, ' + thumbDef + ')')
                     xbmc.executebuiltin("Container.Update(" + playlistUrl + "&id="+str(playlistid) + "&name=" + playlistname + ")")
             else:
                 dialog = xbmcgui.Dialog()
-                dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30034), xbmc.getLocalizedString(30067))
+                dialog.ok(__language__(30008), __language__(30034), __language__(30067))
       
     # Find similar artists to searched artist
     def similarArtists(self, artistId):
@@ -647,7 +647,7 @@ class Groveshark:
             self._add_artists_directory(similar)
         else:
             dialog = xbmcgui.Dialog()
-            dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30068))
+            dialog.ok(__language__(30008), __language__(30068))
             self.categories()
         
     # Get keyboard input
@@ -662,7 +662,7 @@ class Groveshark:
     def _get_login(self):
         if (self.username == "" or self.password == ""):
             dialog = xbmcgui.Dialog()
-            dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30069), xbmc.getLocalizedString(30070))
+            dialog.ok(__language__(30008), __language__(30069), __language__(30070))
             return 0
         else:
             if self.userid == 0:
@@ -671,7 +671,7 @@ class Groveshark:
                 return uid
             else:
                 dialog = xbmcgui.Dialog()
-                dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30069), xbmc.getLocalizedString(30070))
+                dialog.ok(__language__(30008), __language__(30069), __language__(30070))
                 return 0
     
     # Get a song directory item
@@ -740,14 +740,14 @@ class Groveshark:
             if isFavorites == True:
                 unfav = unfav +str(MODE_FAVORITES)
             else:
-                menuItems.append((xbmc.getLocalizedString(30071), "XBMC.RunPlugin("+fav+")"))
-            menuItems.append((xbmc.getLocalizedString(30072), "XBMC.RunPlugin("+unfav+")"))
+                menuItems.append((__language__(30071), "XBMC.RunPlugin("+fav+")"))
+            menuItems.append((__language__(30072), "XBMC.RunPlugin("+unfav+")"))
             if playlistid > 0:
                 rmplaylstsong=sys.argv[0]+"?playlistid="+str(playlistid)+"&id="+str(songid)+"&mode="+str(MODE_REMOVE_PLAYLIST_SONG)+"&name="+playlistname
-                menuItems.append((xbmc.getLocalizedString(30073), "XBMC.RunPlugin("+rmplaylstsong+")"))
+                menuItems.append((__language__(30073), "XBMC.RunPlugin("+rmplaylstsong+")"))
             else:
                 addplaylstsong=sys.argv[0]+"?id="+str(songid)+"&mode="+str(MODE_ADD_PLAYLIST_SONG)
-                menuItems.append((xbmc.getLocalizedString(30074), "XBMC.RunPlugin("+addplaylstsong+")"))
+                menuItems.append((__language__(30074), "XBMC.RunPlugin("+addplaylstsong+")"))
             item.addContextMenuItems(menuItems, replaceItems=False)
             xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=item,isFolder=False, totalItems=len(songs))
             id = id + 1
@@ -755,7 +755,7 @@ class Groveshark:
         page = page + 1
         if totalSongs > page * self.songspagelimit:
             u=sys.argv[0]+"?mode="+str(MODE_SONG_PAGE)+"&id=playlistid"+"&page="+str(page)+"&label="+str(trackLabelFormat)+"&name="+playlistname
-            self._add_dir(xbmc.getLocalizedString(30075) + '...', u, MODE_SONG_PAGE, self.songImg, 0, totalSongs - (page * self.songspagelimit))
+            self._add_dir(__language__(30075) + '...', u, MODE_SONG_PAGE, self.songImg, 0, totalSongs - (page * self.songspagelimit))
 
         xbmcplugin.setContent(self._handle, 'songs')
         xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg)
@@ -824,13 +824,13 @@ class Groveshark:
         menuItems = []
         if mode == MODE_ALBUM:
             mkplaylst=sys.argv[0]+"?mode="+str(MODE_MAKE_PLAYLIST)+"&name="+name+"&id="+str(id)
-            menuItems.append((xbmc.getLocalizedString(30076), "XBMC.RunPlugin("+mkplaylst+")"))
+            menuItems.append((__language__(30076), "XBMC.RunPlugin("+mkplaylst+")"))
         # Broken rename/delete are broken in API
         if mode == MODE_PLAYLIST:
             rmplaylst=sys.argv[0]+"?mode="+str(MODE_REMOVE_PLAYLIST)+"&name="+urllib.quote_plus(name)+"&id="+str(id)
-            menuItems.append((xbmc.getLocalizedString(30077), "XBMC.RunPlugin("+rmplaylst+")"))
+            menuItems.append((__language__(30077), "XBMC.RunPlugin("+rmplaylst+")"))
             mvplaylst=sys.argv[0]+"?mode="+str(MODE_RENAME_PLAYLIST)+"&name="+urllib.quote_plus(name)+"&id="+str(id)
-            menuItems.append((xbmc.getLocalizedString(30078), "XBMC.RunPlugin("+mvplaylst+")"))
+            menuItems.append((__language__(30078), "XBMC.RunPlugin("+mvplaylst+")"))
         dir.addContextMenuItems(menuItems, replaceItems=False)
         
         return xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=dir,isFolder=True, totalItems=items)

diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index 957a646..f671827 100644 (file)
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -70,7 +70,7 @@
        <string id="30067">to delete a song from a Grooveshark playlist.</string>               
        <string id="30068">No similar artists.</string>
        <string id="30069">Unable to login.</string>
-       <string id="30070">Check username and password in settings</string>
+       <string id="30070">Check username and password in settings.</string>
        <string id="30071">Grooveshark favorite</string>                
        <string id="30072">Not Grooveshark favorite</string>
        <string id="30073">Remove from Grooveshark playlist</string>