The branch, frodo has been updated
via d47eb81d11631e573f8f7865d143813d9dde0da9 (commit)
from 9fae5e47626cad2646d20e69817e1d058d289946 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=d47eb81d11631e573f8f7865d143813d9dde0da9
commit d47eb81d11631e573f8f7865d143813d9dde0da9
Author: Martijn Kaijser <[email protected]>
Date: Fri Oct 25 15:14:02 2013 +0200
[service.xbmc.versioncheck] 0.1.12
diff --git a/service.xbmc.versioncheck/addon.xml
b/service.xbmc.versioncheck/addon.xml
index 84438f7..8d70e17 100644
--- a/service.xbmc.versioncheck/addon.xml
+++ b/service.xbmc.versioncheck/addon.xml
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="service.xbmc.versioncheck"
name="XBMC Version Check"
- version="0.1.11"
+ version="0.1.12"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.addon" version="12.0.0"/>
<import addon="xbmc.python" version="2.1.0"/>
- <import addon="script.module.simplejson" version="2.0.10"/>
</requires>
<extension point="xbmc.service" library="service.py" start="login"/>
<extension point="xbmc.addon.metadata">
diff --git a/service.xbmc.versioncheck/changelog.txt
b/service.xbmc.versioncheck/changelog.txt
index 0148104..b6fe21a 100644
--- a/service.xbmc.versioncheck/changelog.txt
+++ b/service.xbmc.versioncheck/changelog.txt
@@ -1,3 +1,7 @@
+v0.1.12
+- Fix encoding text encoding error for some languages
+- Update language files
+
v0.1.11
- Updated language files from Transifex
- Fix problems with python2.7.5
diff --git a/service.xbmc.versioncheck/lib/common.py
b/service.xbmc.versioncheck/lib/common.py
index 5579e6f..b3b5750 100644
--- a/service.xbmc.versioncheck/lib/common.py
+++ b/service.xbmc.versioncheck/lib/common.py
@@ -26,7 +26,10 @@ __addonversion__ = __addon__.getAddonInfo('version')
__addonname__ = __addon__.getAddonInfo('name')
__addonpath__ = __addon__.getAddonInfo('path').decode('utf-8')
__icon__ = __addon__.getAddonInfo('icon')
-__localize__ = __addon__.getLocalizedString
+
+def localise(id):
+ string = __addon__.getLocalizedString(id).encode( 'utf-8', 'ignore' )
+ return string
def log(txt):
if isinstance (txt,str):
@@ -35,7 +38,7 @@ def log(txt):
xbmc.log(msg=message.encode("utf-8"), level=xbmc.LOGDEBUG)
def get_password_from_user():
- keyboard = xbmc.Keyboard("", __addonname__ + "," +__localize__(32022),
True)
+ keyboard = xbmc.Keyboard("", __addonname__ + "," +localise(32022), True)
keyboard.doModal()
if (keyboard.isConfirmed()):
pwd = keyboard.getText()
@@ -43,7 +46,7 @@ def get_password_from_user():
def message_upgrade_success():
xbmc.executebuiltin("XBMC.Notification(%s, %s, %d, %s)" %(__addonname__,
-
__localize__(32013),
+ localise(32013),
15000,
__icon__))
@@ -53,8 +56,8 @@ def message_restart():
def dialog_yesno(line1 = 0, line2 = 0):
return xbmcgui.Dialog().yesno(__addonname__,
- __localize__(line1),
- __localize__(line2))
+ localise(line1),
+ localise(line2))
def upgrade_message(msg, upgrade):
# Don't show while watching a video
@@ -68,9 +71,9 @@ def upgrade_message(msg, upgrade):
firstrun = __addon__.getSetting("versioncheck_firstrun") != 'false'
if firstrun and not xbmc.abortRequested:
xbmcgui.Dialog().ok(__addonname__,
- __localize__(msg),
- __localize__(32001),
- __localize__(32002))
+ localise(msg),
+ localise(32001),
+ localise(32002))
# sets check to false which is checked on startup
if dialog_yesno(32009, 32010):
__addon__.setSetting("versioncheck_enable", 'false')
@@ -82,7 +85,7 @@ def upgrade_message(msg, upgrade):
return dialog_yesno(msg)
else:
xbmc.executebuiltin("XBMC.Notification(%s, %s, %d, %s)"
%(__addonname__,
-
__localize__(32001) + '' + __localize__(32002),
+
localise(32001) + '' + localise(32002),
15000,
__icon__))
else:
diff --git a/service.xbmc.versioncheck/lib/jsoninterface.py
b/service.xbmc.versioncheck/lib/jsoninterface.py
index 6c11442..c6ab4f6 100644
--- a/service.xbmc.versioncheck/lib/jsoninterface.py
+++ b/service.xbmc.versioncheck/lib/jsoninterface.py
@@ -26,10 +26,7 @@ from lib.common import log
__addonpath__ = lib.common.__addonpath__
-if sys.version_info < (2, 7):
- import simplejson as jsoninterface
-else:
- import json as jsoninterface
+import json as jsoninterface
def get_installedversion():
# retrieve current installed version
diff --git a/service.xbmc.versioncheck/service.py
b/service.xbmc.versioncheck/service.py
index eeac151..ea34b2b 100644
--- a/service.xbmc.versioncheck/service.py
+++ b/service.xbmc.versioncheck/service.py
@@ -29,8 +29,6 @@ __addonversion__ = lib.common.__addonversion__
__addonname__ = lib.common.__addonname__
__addonpath__ = lib.common.__addonpath__
__icon__ = lib.common.__icon__
-__localize__ = lib.common.__localize__
-
class Main:
def __init__(self):
-----------------------------------------------------------------------
Summary of changes:
service.xbmc.versioncheck/addon.xml | 3 +-
service.xbmc.versioncheck/changelog.txt | 4 +++
service.xbmc.versioncheck/lib/common.py | 21 +++++++++++--------
service.xbmc.versioncheck/lib/jsoninterface.py | 5 +---
.../strings.po | 4 +-
service.xbmc.versioncheck/service.py | 2 -
6 files changed, 20 insertions(+), 19 deletions(-)
copy service.xbmc.versioncheck/resources/language/{Vietnamese => Vietnamese
(Viet Nam)}/strings.po (81%)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60135991&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
