[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] master f53ca9a 09/21: FIXED conversion to
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] master f53ca9a 09/21: FIXED conversion to unicode string (again) |
Date: |
Mon, 25 Jul 2016 18:16:38 +0000 (UTC) |
branch: master
commit f53ca9af5e2b8c1e6ca406435bde717495296fdf
Author: Kai Sterker <address@hidden>
Commit: Kai Sterker <address@hidden>
FIXED conversion to unicode string (again)
---
scripts/modules/option_screen.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/scripts/modules/option_screen.py b/scripts/modules/option_screen.py
index 6a26114..0e27168 100644
--- a/scripts/modules/option_screen.py
+++ b/scripts/modules/option_screen.py
@@ -16,7 +16,11 @@ import adonthell
import codecs
# -- properly encode unicode strings across python versions
-def u(x): return codecs.utf_8_encode(codecs.unicode_escape_decode(x)[0])[0]
+def u(x):
+ result = codecs.unicode_escape_decode(x)[0]
+ if not isinstance(result, str):
+ result = codecs.utf_8_encode(result)[0]
+ return result
# -- pygettext support
def _(message): return adonthell.nls_translate (message)
- [adonthell-wastesedge-commits] master 20eb806 04/21: FIXED launcher script inside bundle needs to determine correct path at runtime, (continued)
- [adonthell-wastesedge-commits] master 20eb806 04/21: FIXED launcher script inside bundle needs to determine correct path at runtime, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master 2b7e807 07/21: FIXED garbage showing up in first frame of intro, due to uninitialized label, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master 17ad166 05/21: FIXED replacing of bundle executable, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master 8267c01 08/21: FIXED compatibility with Python 2.3, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master 2120713 19/21: REMOVED Debian specific files; those are taken care of by the package maintainer, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master d1164d8 21/21: UPDATED windows package and installer scripts, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master 88062ca 14/21: UPDATE text position during Redwyne Inn part of intro, so it is better readable, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master 428cd53 20/21: CHANGED font from avatar.ttf (whose license was unclear) with Aclonica, which is licensed under the Apache 2.0 License, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master 5b8b830 18/21: UPDATED order of icons from largest to smallest, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master 6e4708e 11/21: UPDATED with high res icons from OSX, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master f53ca9a 09/21: FIXED conversion to unicode string (again),
Kai Sterker <=
- [adonthell-wastesedge-commits] master 82bbef1 13/21: UPDATED Danish translation, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master 73a131a 16/21: ADDED script to create .msi installer using the WIX toolset, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] master 50af4dd 12/21: ADDED script to create a distributable Windows binary package, Kai Sterker, 2016/07/25