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

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

diff --git a/wxPython/config.py b/wxPython/config.py
index 47d330fb4471334ecb2e0a8c24512c5a5d6b5a62..e06fe6139112e69bde1e0de0b19dd4bc0e9d7e6a 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -503,7 +503,8 @@ def build_locale_dir(destdir, verbose=1):
     moFiles = glob.glob(opj(WXDIR, 'locale', '*.mo'))
     for src in moFiles:
         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)
         copy_file(src, opj(dest, 'wxstd.mo'), update=1, verbose=verbose)
         CLEANUP.append(opj(dest, 'wxstd.mo'))

diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index 48568ea4e4d2e58a8283baaf6ec7aaffd135c82f..85d7ee91a96b4b6c307487048bb00410d0519a33 100644 (file)
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -33,7 +33,7 @@ ISS_Template = r'''
 AppName = wxPython%(SHORTVER)s-%(CHARTYPE)s-%(PYVER)s
 AppVerName = wxPython %(VERSION)s (%(CHARTYPE)s) for Python %(PYTHONVER)s
 OutputBaseFilename = wxPython%(SHORTVER)s-win32-%(CHARTYPE)s-%(VERSION)s-%(PYVER)s
-AppCopyright = Copyright © 2004 Total Control Software
+AppCopyright = Copyright © 2006 Total Control Software
 DefaultDirName = {code:GetInstallDir|c:\DoNotInstallHere}
 DefaultGroupName = wxPython %(VERSION)s (%(CHARTYPE)s) for Python %(PYTHONVER)s
 AlwaysCreateUninstallIcon = no
@@ -336,7 +336,7 @@ ISS_DocDemo_Template = r'''
 AppName = wxPython%(SHORTVER)s-docs-demos
 AppVerName = wxPython Docs and Demos %(VERSION)s
 OutputBaseFilename = wxPython%(SHORTVER)s-win32-docs-demos-%(VERSION)s
-AppCopyright = Copyright © 2004 Total Control Software
+AppCopyright = Copyright © 2006 Total Control Software
 DefaultDirName = {pf}\wxPython%(SHORTVER)s Docs and Demos
 DefaultGroupName = wxPython%(SHORTVER)s Docs Demos and Tools
 AlwaysCreateUninstallIcon = yes
@@ -579,7 +579,7 @@ def build_locale_string(pkgdir):
             if not os.path.isdir(filename):
                 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)
 
 

diff --git a/wxPython/distrib/make_installer_inno4.py b/wxPython/distrib/make_installer_inno4.py
index 02b1bd28532ac82f5875e35f63efc8d75430e2c7..a1ed9ffda682e5eff5a64aa96b72f27a2c550cf2 100755 (executable)
--- a/wxPython/distrib/make_installer_inno4.py
+++ b/wxPython/distrib/make_installer_inno4.py
@@ -38,7 +38,7 @@ ISS_Template = r'''
 AppName = wxPython%(SHORTVER)s-%(CHARTYPE)s-%(PYVER)s
 AppVerName = wxPython %(VERSION)s (%(CHARTYPE)s) for Python %(PYTHONVER)s
 OutputBaseFilename = wxPython%(SHORTVER)s-win32-%(CHARTYPE)s-%(VERSION)s-%(PYVER)s
-AppCopyright = Copyright © 2004 Total Control Software
+AppCopyright = Copyright © 2006 Total Control Software
 DefaultDirName = {code:GetInstallDir|c:\DoNotInstallHere}
 DefaultGroupName = wxPython %(VERSION)s (%(CHARTYPE)s) for Python %(PYTHONVER)s
 AdminPrivilegesRequired = no
@@ -340,7 +340,7 @@ ISS_DocDemo_Template = r'''
 AppName = wxPython%(SHORTVER)s-docs-demos
 AppVerName = wxPython Docs and Demos %(VERSION)s
 OutputBaseFilename = wxPython%(SHORTVER)s-win32-docs-demos-%(VERSION)s
-AppCopyright = Copyright © 2004 Total Control Software
+AppCopyright = Copyright © 2006 Total Control Software
 DefaultDirName = {pf}\wxPython%(SHORTVER)s Docs and Demos
 DefaultGroupName = wxPython%(SHORTVER)s Docs Demos and Tools
 ;AlwaysCreateUninstallIcon = yes
@@ -582,7 +582,7 @@ def build_locale_string(pkgdir):
             if not os.path.isdir(filename):
                 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)
 
 

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 34b0b5dacc50ebb6c25f0636130d6661cd5ae87f..d910f2a7ac7a26c3080b051f3c077ed4a63ab34f 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -156,8 +156,8 @@ CLEANUP.append('licence')
 
 
 if os.name == 'nt':
-    build_locale_dir(opj(PKGDIR, 'i18n'))
-    DATA_FILES += build_locale_list(opj(PKGDIR, 'i18n'))
+    build_locale_dir(opj(PKGDIR, 'locale'))
+    DATA_FILES += build_locale_list(opj(PKGDIR, 'locale'))
 
 
 if os.name == 'nt':

diff --git a/wxPython/src/_intl_ex.py b/wxPython/src/_intl_ex.py
index bc0ae4b947ccdd3a894d9ee065e68fded5a0f21b..f572dd25494490560b048b7a2b00cbaa2311ff9b 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
-    _localedir = os.path.join(os.path.split(__file__)[0], "i18n")
+    _localedir = os.path.join(os.path.split(__file__)[0], "locale")
     Locale.AddCatalogLookupPathPrefix(_localedir)
     del os