i18n: installing .mo files properly.

mmaker · mmaker · commit 1a58bbb31b42 · 2010-07-19T16:23:53.000+02:00
diff --git a/setup.py b/setup.py
@@ -10,7 +10,6 @@
 import sys
 
 from distutils import cmd
-from distutils.command.install_data import install_data as _install_data
 from distutils.command.build import build
 
 from bpython import __version__
@@ -60,7 +59,8 @@ def run(self):
                 continue
 
             lang = filename[:-3]
-            dest_path = os.path.join('build', 'locale', lang, 'LC_MESSAGES')
+            dest_path = os.path.join('build', 'share', 'locale',
+                                     lang, 'LC_MESSAGES')
 
             src = os.path.join(src_path, filename)
             dest = os.path.join(dest_path, 'bpython.mo')
@@ -72,24 +72,24 @@ def run(self):
                 print ('Adding translation: %s' % lang)
                 msgfmt.make(src, dest)
 
-build.sub_commands.append(('build_translation', None))
+build.sub_commands.insert(0, ('build_translation', None))
 
 
-class install_data(_install_data):
-    """Append to data_files l10n .mo files. Then continue with normal install."""
-
-    def run(self):
-        for lang in os.listdir('po'):
-            if not lang.endswith('.mo'):
-                continue
-
-            lang_dir = os.path.join('share', 'locale', lang[:-3], 'LC_MESSAGES')
-            lang_file = os.path.join('po', lang)
-            self.data_files.append((lang_dir, [lang_file]))
-
-        _install_data.run(self)
+data_files = [
+        # man pages
+        (os.path.join(man_dir, 'man1'), ['doc/bpython.1']),
+        (os.path.join(man_dir, 'man5'), ['doc/bpython-config.5']),
+        # desktop shorcut
+        (os.path.join('share', 'applications'), ['data/bpython.desktop']),
+]
+# localization
+l10n_dir = os.path.join('share', 'locale')
+for langfile in os.listdir('po'):
+    if not os.path.isfile(langfile) or not langfile.endswith('.po'):
+        continue
 
-build.sub_commands.append(('install_data', None))
+    lang_path = os.path.join(l10n_dir, langfile[:-3], 'LC_MESSAGES')
+    data_files.append((lang_path, ['build/%s/bpython.mo' % lang_path]))
 
 
 setup(
@@ -106,13 +106,7 @@ def run(self):
         'pygments'
     ],
     packages = ["bpython"],
-    data_files = [
-        # man pages
-        (os.path.join(man_dir, 'man1'), ['doc/bpython.1']),
-        (os.path.join(man_dir, 'man5'), ['doc/bpython-config.5']),
-        # desktop shorcut
-        (os.path.join('share', 'applications'), ['data/bpython.desktop'])
-    ],
+    data_files = data_files,
     package_data = {'bpython': ['logo.png']},
     entry_points = {
         'console_scripts': [
@@ -124,8 +118,7 @@ def run(self):
                                             'data/bpython-gtk']),
     cmdclass=dict(build_py=build_py,
                   build = build,
-                  build_translation = build_translation,
-                  install_data = install_data)
+                  build_translation = build_translation)
 )
 
 # vim: encoding=utf-8 sw=4 ts=4 sts=4 ai et sta
