Merge pull request #400 from anxdpanic/pr-1

6.3.1
anxdpanic · Sep 12, 2018 · b7c29b9 · b7c29b9
2 parents fd9aec2 + 5f4f9ee
commit b7c29b9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/addon.xml b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8' standalone='yes'?>
-<addon id='plugin.video.twitch' version='2.3.0' name='Twitch' provider-name='A Talented Community'>
+<addon id='plugin.video.twitch' version='2.3.1' name='Twitch' provider-name='A Talented Community'>
     <requires>
         <import addon='xbmc.python' version='2.20.0'/>
         <import addon='script.module.six' version='1.11.0'/>
@@ -13,6 +13,9 @@
     <extension point='xbmc.addon.metadata'>
         <platform>all</platform>
         <news>
+2.3.1
+[fix] i18n UnicodeEncodeError
+
 2.3.0
 [chg] refactor complex entry points
 [upd] Python 3 compat.

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,6 @@
+2.3.1
+[fix] i18n UnicodeEncodeError
+
 2.3.0
 [chg] refactor complex entry points
 [upd] Python 3 compat.

diff --git a/resources/lib/twitch_addon/addon/common/kodi.py b/resources/lib/twitch_addon/addon/common/kodi.py
@@ -366,7 +366,7 @@ def i18n(self, string_id):
             if PY3:
                 return addon.getLocalizedString(self.strings[string_id])
             else:
-                return addon.getLocalizedString(self.strings[string_id]).encode('utf-8', 'ignore').decode('utf-8')
+                return addon.getLocalizedString(self.strings[string_id]).encode('utf-8', 'ignore')
         except Exception as e:
             xbmc.log('%s: Failed String Lookup: %s (%s)' % (get_name(), string_id, e), xbmc.LOGWARNING)
             return string_id