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

'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

diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index 8dcd68359c03de3e9747831b1eead79a11ef2489..58015de8936a10a7202f002a41f813de6b6a7bbd 100644 (file)
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -579,7 +579,7 @@ def build_locale_string(pkgdir):
             if not os.path.isdir(filename):
                 lst.append( locale_template % (filename, pkgdir, dirname) )
 
             if not os.path.isdir(filename):
                 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)
 
 

diff --git a/wxPython/distrib/make_installer_inno4.py b/wxPython/distrib/make_installer_inno4.py
index cee7c888a09acc56ac0d21ae5a94c81438733c2b..b3cc96dbd6e05e2a3576821882bcd0e8db92e900 100755 (executable)
--- a/wxPython/distrib/make_installer_inno4.py
+++ b/wxPython/distrib/make_installer_inno4.py
@@ -582,7 +582,7 @@ def build_locale_string(pkgdir):
             if not os.path.isdir(filename):
                 lst.append( locale_template % (filename, pkgdir, dirname) )
 
             if not os.path.isdir(filename):
                 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)
 
 

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 7710b73271f9be78ef264ee16ff0463ce9dd7b18..951b307e1d91fc305457ecea03b1ded784f76138 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -156,8 +156,8 @@ CLEANUP.append('licence')
 
 
 if os.name == 'nt':
 
 
 if os.name == 'nt':

-    build_locale_dir(opj(PKGDIR, 'locale'))
-    DATA_FILES += build_locale_list(opj(PKGDIR, 'locale'))
+    build_locale_dir(opj(PKGDIR, 'i18n'))
+    DATA_FILES += build_locale_list(opj(PKGDIR, 'i18n'))

 
 
 if os.name == 'nt':
 
 
 if os.name == 'nt':

diff --git a/wxPython/src/_intl_ex.py b/wxPython/src/_intl_ex.py
index f572dd25494490560b048b7a2b00cbaa2311ff9b..bc0ae4b947ccdd3a894d9ee065e68fded5a0f21b 100644 (file)
--- a/wxPython/src/_intl_ex.py
+++ b/wxPython/src/_intl_ex.py
@@ -3,7 +3,7 @@
 # to the default catalog path.
 if wx.Platform == "__WXMSW__":
     import os
 # to the default catalog path.
 if wx.Platform == "__WXMSW__":
     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)
     del os
 
     Locale.AddCatalogLookupPathPrefix(_localedir)
     del os