From 2d58f219ca9475010159ade1bc200a60ca6ea866 Mon Sep 17 00:00:00 2001 From: swprojects Date: Thu, 25 Jan 2018 16:23:22 +0000 Subject: [PATCH 1/5] Fix print statements --- docs/sphinx/_downloads/i18nwxapp/app_base.py | 2 +- docs/sphinx/_downloads/i18nwxapp/geni18n.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/sphinx/_downloads/i18nwxapp/app_base.py b/docs/sphinx/_downloads/i18nwxapp/app_base.py index 9599bb29..397d4344 100644 --- a/docs/sphinx/_downloads/i18nwxapp/app_base.py +++ b/docs/sphinx/_downloads/i18nwxapp/app_base.py @@ -19,7 +19,7 @@ import wx def _displayHook(obj): if obj is not None: - print repr(obj) + print (repr(obj)) # add translation macro to builtin similar to what gettext does import __builtin__ diff --git a/docs/sphinx/_downloads/i18nwxapp/geni18n.py b/docs/sphinx/_downloads/i18nwxapp/geni18n.py index 031de25e..e8de1bc5 100644 --- a/docs/sphinx/_downloads/i18nwxapp/geni18n.py +++ b/docs/sphinx/_downloads/i18nwxapp/geni18n.py @@ -48,18 +48,18 @@ tCmd = pyExe + ' ' + pyGettext + ' ' + (gtOptions % (appC.langDomain, appC.langDomain, outFolder, appFolder)) -print "Generating the .pot file" -print "cmd: %s" % tCmd +print ("Generating the .pot file") +print ("cmd: %s" % tCmd) rCode = subprocess.call(tCmd) -print "return code: %s\n\n" % rCode +print ("return code: %s\n\n" % rCode) for tLang in supportedLang: # build command for msgfmt langDir = os.path.join(appFolder, ('locale\%s\LC_MESSAGES' % tLang)) poFile = os.path.join(langDir, appC.langDomain + '.po') tCmd = pyExe + ' ' + pyMsgfmt + ' ' + poFile - - print "Generating the .mo file" - print "cmd: %s" % tCmd + + print ("Generating the .mo file") + print ("cmd: %s" % tCmd) rCode = subprocess.call(tCmd) - print "return code: %s\n\n" % rCode + print ("return code: %s\n\n" % rCode) From 50dd8e7ce493fa69dd7468352cd08a0375cfc500 Mon Sep 17 00:00:00 2001 From: swprojects Date: Thu, 25 Jan 2018 16:23:34 +0000 Subject: [PATCH 2/5] Fix builtins import --- docs/sphinx/_downloads/i18nwxapp/app_base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sphinx/_downloads/i18nwxapp/app_base.py b/docs/sphinx/_downloads/i18nwxapp/app_base.py index 397d4344..b077137b 100644 --- a/docs/sphinx/_downloads/i18nwxapp/app_base.py +++ b/docs/sphinx/_downloads/i18nwxapp/app_base.py @@ -22,8 +22,8 @@ def _displayHook(obj): print (repr(obj)) # add translation macro to builtin similar to what gettext does -import __builtin__ -__builtin__.__dict__['_'] = wx.GetTranslation +import builtins +builtins.__dict__['_'] = wx.GetTranslation import app_const as appC From 14dac242d2a1ce20df506360f986d81c8b5a8166 Mon Sep 17 00:00:00 2001 From: swprojects Date: Thu, 25 Jan 2018 16:24:08 +0000 Subject: [PATCH 3/5] Fix FileDialog flags --- docs/sphinx/_downloads/i18nwxapp/sampleapp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sphinx/_downloads/i18nwxapp/sampleapp.py b/docs/sphinx/_downloads/i18nwxapp/sampleapp.py index 8e7bc39f..567c026f 100644 --- a/docs/sphinx/_downloads/i18nwxapp/sampleapp.py +++ b/docs/sphinx/_downloads/i18nwxapp/sampleapp.py @@ -83,7 +83,7 @@ class AppI18N(sc.SizedFrame): defaultDir=os.getcwd(), defaultFile="", wildcard=wildcard, - style=wx.OPEN | wx.MULTIPLE | wx.CHANGE_DIR + style=wx.FD_OPEN | wx.FD_MULTIPLE | wx.FD_CHANGE_DIR ) as dlg: # Show the dialog and retrieve the user response. If it is the From b6e2b3a05e4e1ddf754895c21d25f367aa1c994a Mon Sep 17 00:00:00 2001 From: swprojects Date: Thu, 25 Jan 2018 16:24:42 +0000 Subject: [PATCH 4/5] Fix spelling --- .../rest_substitutions/overviews/internationalization.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sphinx/rest_substitutions/overviews/internationalization.rst b/docs/sphinx/rest_substitutions/overviews/internationalization.rst index be395a19..acf0b563 100644 --- a/docs/sphinx/rest_substitutions/overviews/internationalization.rst +++ b/docs/sphinx/rest_substitutions/overviews/internationalization.rst @@ -66,7 +66,7 @@ The ``.pot`` file is then provided to the translators and they use it to generate a ``.po`` file for the language they translate too or they can also use the ``.pot`` file to merge new/changed text strings to an existing ``.po`` file. -To do the actual translation we recomment `poEdit` [2]_ , it allows you to +To do the actual translation we recommend `poEdit` [2]_ , it allows you to create or update a translation catalog (``.po`` file) from the ``.pot`` file. From b7e08a2a96aec9c50ecbb474d5e7381b1670cc48 Mon Sep 17 00:00:00 2001 From: swprojects Date: Thu, 25 Jan 2018 16:25:31 +0000 Subject: [PATCH 5/5] Update zip file --- .../sphinx/_downloads/i18nwxapp/i18nwxapp.zip | Bin 9062 -> 9045 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/sphinx/_downloads/i18nwxapp/i18nwxapp.zip b/docs/sphinx/_downloads/i18nwxapp/i18nwxapp.zip index b3f210d67f2c8fea8f19b78b41c8da23762b6359..0fa97bfe1cb5e9c3060cb4b8bbb6a73f5d1f726e 100644 GIT binary patch delta 4249 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