Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change the name of the dir where the message catalogs are installed on

Browse Source 
MSW back to 'locale' and also change back to the full directory
structure including the LC_MESSAGES dir.  The reasons these changes
were orginally made no longer apply


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-10-02 20:03:01 +00:00
parent f30589a9ea
commit 7cae647a44
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wxPython/config.py
View File

@@ -503,7 +503,8 @@ def build_locale_dir(destdir, verbose=1):
moFiles = glob.glob(opj(WXDIR, 'locale', '*.mo')) moFiles = glob.glob(opj(WXDIR, 'locale', '*.mo'))
for src in moFiles: for src in moFiles:
lang = os.path.splitext(os.path.basename(src))[0] lang = os.path.splitext(os.path.basename(src))[0]
dest = opj(destdir, lang) #dest = opj(destdir, lang)
dest = opj(destdir, lang, 'LC_MESSAGES')
mkpath(dest, verbose=verbose) mkpath(dest, verbose=verbose)
copy_file(src, opj(dest, 'wxstd.mo'), update=1, verbose=verbose) copy_file(src, opj(dest, 'wxstd.mo'), update=1, verbose=verbose)
CLEANUP.append(opj(dest, 'wxstd.mo')) CLEANUP.append(opj(dest, 'wxstd.mo'))

6
wxPython/distrib/make_installer.py
View File

@@ -33,7 +33,7 @@ ISS_Template = r'''
AppName = wxPython%(SHORTVER)s-%(CHARTYPE)s-%(PYVER)s AppName = wxPython%(SHORTVER)s-%(CHARTYPE)s-%(PYVER)s
AppVerName = wxPython %(VERSION)s (%(CHARTYPE)s) for Python %(PYTHONVER)s AppVerName = wxPython %(VERSION)s (%(CHARTYPE)s) for Python %(PYTHONVER)s
OutputBaseFilename = wxPython%(SHORTVER)s-win32-%(CHARTYPE)s-%(VERSION)s-%(PYVER)s OutputBaseFilename = wxPython%(SHORTVER)s-win32-%(CHARTYPE)s-%(VERSION)s-%(PYVER)s
AppCopyright = Copyright <20> 2004 Total Control Software AppCopyright = Copyright <20> 2006 Total Control Software
DefaultDirName = {code:GetInstallDir|c:\DoNotInstallHere} DefaultDirName = {code:GetInstallDir|c:\DoNotInstallHere}
DefaultGroupName = wxPython %(VERSION)s (%(CHARTYPE)s) for Python %(PYTHONVER)s DefaultGroupName = wxPython %(VERSION)s (%(CHARTYPE)s) for Python %(PYTHONVER)s
AlwaysCreateUninstallIcon = no AlwaysCreateUninstallIcon = no
@@ -336,7 +336,7 @@ ISS_DocDemo_Template = r'''
AppName = wxPython%(SHORTVER)s-docs-demos AppName = wxPython%(SHORTVER)s-docs-demos
AppVerName = wxPython Docs and Demos %(VERSION)s AppVerName = wxPython Docs and Demos %(VERSION)s
OutputBaseFilename = wxPython%(SHORTVER)s-win32-docs-demos-%(VERSION)s OutputBaseFilename = wxPython%(SHORTVER)s-win32-docs-demos-%(VERSION)s
AppCopyright = Copyright <20> 2004 Total Control Software AppCopyright = Copyright <20> 2006 Total Control Software
DefaultDirName = {pf}\wxPython%(SHORTVER)s Docs and Demos DefaultDirName = {pf}\wxPython%(SHORTVER)s Docs and Demos
DefaultGroupName = wxPython%(SHORTVER)s Docs Demos and Tools DefaultGroupName = wxPython%(SHORTVER)s Docs Demos and Tools
AlwaysCreateUninstallIcon = yes AlwaysCreateUninstallIcon = yes
@@ -579,7 +579,7 @@ def build_locale_string(pkgdir):
if not os.path.isdir(filename): if not os.path.isdir(filename):
lst.append( locale_template % (filename, pkgdir, dirname) ) lst.append( locale_template % (filename, pkgdir, dirname) )
os.path.walk('wx\\i18n', walk_helper, stringlst) os.path.walk('wx\\locale', walk_helper, stringlst)
return '\n'.join(stringlst) return '\n'.join(stringlst)

6
wxPython/distrib/make_installer_inno4.py
View File

@@ -38,7 +38,7 @@ ISS_Template = r'''
AppName = wxPython%(SHORTVER)s-%(CHARTYPE)s-%(PYVER)s AppName = wxPython%(SHORTVER)s-%(CHARTYPE)s-%(PYVER)s
AppVerName = wxPython %(VERSION)s (%(CHARTYPE)s) for Python %(PYTHONVER)s AppVerName = wxPython %(VERSION)s (%(CHARTYPE)s) for Python %(PYTHONVER)s
OutputBaseFilename = wxPython%(SHORTVER)s-win32-%(CHARTYPE)s-%(VERSION)s-%(PYVER)s OutputBaseFilename = wxPython%(SHORTVER)s-win32-%(CHARTYPE)s-%(VERSION)s-%(PYVER)s
AppCopyright = Copyright <20> 2004 Total Control Software AppCopyright = Copyright <20> 2006 Total Control Software
DefaultDirName = {code:GetInstallDir|c:\DoNotInstallHere} DefaultDirName = {code:GetInstallDir|c:\DoNotInstallHere}
DefaultGroupName = wxPython %(VERSION)s (%(CHARTYPE)s) for Python %(PYTHONVER)s DefaultGroupName = wxPython %(VERSION)s (%(CHARTYPE)s) for Python %(PYTHONVER)s
AdminPrivilegesRequired = no AdminPrivilegesRequired = no
@@ -340,7 +340,7 @@ ISS_DocDemo_Template = r'''
AppName = wxPython%(SHORTVER)s-docs-demos AppName = wxPython%(SHORTVER)s-docs-demos
AppVerName = wxPython Docs and Demos %(VERSION)s AppVerName = wxPython Docs and Demos %(VERSION)s
OutputBaseFilename = wxPython%(SHORTVER)s-win32-docs-demos-%(VERSION)s OutputBaseFilename = wxPython%(SHORTVER)s-win32-docs-demos-%(VERSION)s
AppCopyright = Copyright <20> 2004 Total Control Software AppCopyright = Copyright <20> 2006 Total Control Software
DefaultDirName = {pf}\wxPython%(SHORTVER)s Docs and Demos DefaultDirName = {pf}\wxPython%(SHORTVER)s Docs and Demos
DefaultGroupName = wxPython%(SHORTVER)s Docs Demos and Tools DefaultGroupName = wxPython%(SHORTVER)s Docs Demos and Tools
;AlwaysCreateUninstallIcon = yes ;AlwaysCreateUninstallIcon = yes
@@ -582,7 +582,7 @@ def build_locale_string(pkgdir):
if not os.path.isdir(filename): if not os.path.isdir(filename):
lst.append( locale_template % (filename, pkgdir, dirname) ) lst.append( locale_template % (filename, pkgdir, dirname) )
os.path.walk('wx\\i18n', walk_helper, stringlst) os.path.walk('wx\\locale', walk_helper, stringlst)
return '\n'.join(stringlst) return '\n'.join(stringlst)

4
wxPython/setup.py
View File

@@ -156,8 +156,8 @@ CLEANUP.append('licence')
if os.name == 'nt': if os.name == 'nt':
build_locale_dir(opj(PKGDIR, 'i18n')) build_locale_dir(opj(PKGDIR, 'locale'))
DATA_FILES += build_locale_list(opj(PKGDIR, 'i18n')) DATA_FILES += build_locale_list(opj(PKGDIR, 'locale'))
if os.name == 'nt': if os.name == 'nt':

2
wxPython/src/_intl_ex.py
View File

@@ -3,7 +3,7 @@
# to the default catalog path. # to the default catalog path.
if wx.Platform == "__WXMSW__": if wx.Platform == "__WXMSW__":
import os import os
_localedir = os.path.join(os.path.split(__file__)[0], "i18n") _localedir = os.path.join(os.path.split(__file__)[0], "locale")
Locale.AddCatalogLookupPathPrefix(_localedir) Locale.AddCatalogLookupPathPrefix(_localedir)
del os del os