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

Move the language catalogs install directory on MSW from 'locale' to

Browse Source 
'i18n' to avoid conflict (and an import warning) with the standard
locale.py module.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-09-02 17:43:00 +00:00
parent e87f080a88
commit b5c5355ba3
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/distrib/make_installer.py
View File

@@ -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\\locale', walk_helper, stringlst) os.path.walk('wx\\i18n', walk_helper, stringlst)
return '\n'.join(stringlst) return '\n'.join(stringlst)

2
wxPython/distrib/make_installer_inno4.py
View File

@@ -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\\locale', walk_helper, stringlst) os.path.walk('wx\\i18n', 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, 'locale')) build_locale_dir(opj(PKGDIR, 'i18n'))
DATA_FILES += build_locale_list(opj(PKGDIR, 'locale')) DATA_FILES += build_locale_list(opj(PKGDIR, 'i18n'))
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], "locale") _localedir = os.path.join(os.path.split(__file__)[0], "i18n")
Locale.AddCatalogLookupPathPrefix(_localedir) Locale.AddCatalogLookupPathPrefix(_localedir)
del os del os