Merge branch 'develop'

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.plex"
        name="Plex"
-       version="0.1.5"
+       version="0.1.6"
        provider-name="Plex">
     <requires>
         <import addon="xbmc.python" version="2.25.0"/>

changelog.txt

@@ -1,3 +1,7 @@
+[- 0.1.6 -]
+
+Fix issues when selecting subtitles for users of certain languages (Issue #188)
+
 [- 0.1.5 -]
 
 Allow direct playback of episodes and movies using the play button on hub screen (thanks to pannal)

lib/_included_packages/plexnet/plexstream.py

@@ -47,9 +47,9 @@ def getTitle(self, translate_func=util.dummyTranslate):
             channels = self.getChannels(translate_func)
 
             if codec != "" and channels != "":
-                title += " ({0} {1})".format(codec, channels)
+                title += u" ({0} {1})".format(codec, channels)
             elif codec != "" or channels != "":
-                title += " ({0}{1})".format(codec, channels)
+                title += u" ({0}{1})".format(codec, channels)
         elif streamType == self.TYPE_SUBTITLE:
             extras = []
 
@@ -64,11 +64,11 @@ def getTitle(self, translate_func=util.dummyTranslate):
                 extras.append(translate_func("Forced"))
 
             if len(extras) > 0:
-                title += " ({0})".format('/'.join(extras))
+                title += u" ({0})".format('/'.join(extras))
         elif streamType == self.TYPE_LYRICS:
             title = translate_func("Lyrics")
             if self.format:
-                title += " ({0})".format(self.format)
+                title += u" ({0})".format(self.format)
 
         return title