[GRASS-SVN] r65530 - grass/branches/releasebranch_7_0/lib/python/script

[svn_grass at osgeo.org]

Author: annakrat
Date: 2015-07-01 15:03:53 -0700 (Wed, 01 Jul 2015)
New Revision: 65530

Modified:
   grass/branches/releasebranch_7_0/lib/python/script/core.py
   grass/branches/releasebranch_7_0/lib/python/script/task.py
Log:
wxGUI: fix #2634 by bringing back r64834 and removing unnecessary decode() (merge from trunk, r65529)

Modified: grass/branches/releasebranch_7_0/lib/python/script/core.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/script/core.py	2015-07-01 22:00:42 UTC (rev 65529)
+++ grass/branches/releasebranch_7_0/lib/python/script/core.py	2015-07-01 22:03:53 UTC (rev 65530)
@@ -34,6 +34,8 @@
 # i18N
 import gettext
 gettext.install('grasslibs', os.path.join(os.getenv("GISBASE"), 'locale'))
+import __builtin__
+__builtin__.__dict__['_'] = __builtin__.__dict__['_'].im_self.lgettext
 
 # subprocess wrapper that uses shell on Windows
 

Modified: grass/branches/releasebranch_7_0/lib/python/script/task.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/script/task.py	2015-07-01 22:00:42 UTC (rev 65529)
+++ grass/branches/releasebranch_7_0/lib/python/script/task.py	2015-07-01 22:03:53 UTC (rev 65530)
@@ -225,7 +225,7 @@
                 if p.get('default', '') != '':
                     cmd += ['%s=%s' % (p['name'], p['default'])]
                 elif ignoreErrors and not suppress_required and not ignoreRequired:
-                    cmd += [('%s=%s' % (p['name'], _('<required>'))).decode('utf-8')]
+                    cmd += ['%s=%s' % (p['name'], _('<required>'))]
             elif p.get('value', '') == '' and p.get('default', '') != '' and not ignoreDefault:
                 cmd += ['%s=%s' % (p['name'], p['default'])]
             elif p.get('value', '') != '' and \