Merge lp:~angeloc/python-distutils-extra/fix_for_qt_translation into lp:python-distutils-extra

[Angelo Compagnucci]

Added support for QT translation files in qm folder.

If a qm folder is present and has qm files in it, this folder is chosen over po folder and QT translation files are packaged instead gettext ones.

[Martin Pitt (pitti)]

Thanks Angelo for working on this!

So the mere presence of an empty qm/ folder will trigger this, and then convert the .po files? That looks kind of strange. Also, I'm really not sure that we should promote the really sad idea of a parallel translation standard; gettext works everywhere, obviously also with Qt, and if you can automatically create qm files out of po files then there is nothing that this would give us?

If we really need this, at least the .pot file should be built even in the presence of qm/, as you need that for translators.

review: Needs Fixing

[Angelo Compagnucci (angeloc)]

Hi Martin,

Sorry for haven't explained well the rationale behind this this patch.
There 2 components in this patch:

1) Packaging qm folder. Pyside developers, and pyqt ones, generally prefer
use internal QT translation mechanism. Gettext it's not supported and using
it is somewhat tricky. So the idea is to have qm folder packaged if present
and I think there is nothing wrong.

2) Po -> qm is necessary in Quickly QT templates, because to exploit full
potential of launchpad, you have to produce a pot file and translate it in
po files. With quickly, po files are produced on Launchpad and synchronized
with local repository successively, so you have a completely filled and
synced po translation folder just before packaging. Just before packaging
also, if package has a qm folder, this folder should be filled in with qm
files generated by the po ones.
This part is really out of place here, I reworked the patch exclude it.

Angelo

2012/6/19 Martin Pitt <email address hidden>

> Review: Needs Fixing
>
> Thanks Angelo for working on this!
>
> So the mere presence of an empty qm/ folder will trigger this, and then
> convert the .po files? That looks kind of strange. Also, I'm really not
> sure that we should promote the really sad idea of a parallel translation
> standard; gettext works everywhere, obviously also with Qt, and if you can
> automatically create qm files out of po files then there is nothing that
> this would give us?
>
> If we really need this, at least the .pot file should be built even in the
> presence of qm/, as you need that for translators.
> --
>
> https://code.launchpad.net/~angeloc/python-distutils-extra/fix_for_qt_translation/+merge/110669
> You are the owner of
> lp:~angeloc/python-distutils-extra/fix_for_qt_translation.
>

--
Profile: http://it.linkedin.com/in/compagnucciangelo

[lp:~angeloc/python-distutils-extra/fix_for_qt_translation]

291. By Angelo Compagnucci on 2012-06-19

Patch reworked to exclude po to qm dinamic conversion.

292. By Angelo Compagnucci on 2012-06-19

Fixing a wrong debug print.

[Martin Pitt (pitti)]

OK, thanks. A change of this size needs a test case, similar to test_po() in test/auto.py. Do you want to write one yourself? If not, I can find some time to do it as well, but it might be a few days.

[Angelo Compagnucci (angeloc)]

Yes! I'll write one as soon as possible!

2012/6/21 Martin Pitt <email address hidden>

> OK, thanks. A change of this size needs a test case, similar to test_po()
> in test/auto.py. Do you want to write one yourself? If not, I can find some
> time to do it as well, but it might be a few days.
> --
>
> https://code.launchpad.net/~angeloc/python-distutils-extra/fix_for_qt_translation/+merge/110669
> You are the owner of
> lp:~angeloc/python-distutils-extra/fix_for_qt_translation.
>

--
Profile: http://it.linkedin.com/in/compagnucciangelo

Unmerged revisions

292. By Angelo Compagnucci on 2012-06-19

Fixing a wrong debug print.

291. By Angelo Compagnucci on 2012-06-19

Patch reworked to exclude po to qm dinamic conversion.

290. By Angelo Compagnucci on 2012-06-16

Added support for QT translation files in qm folder.

289. By Angelo Compagnucci on 2012-06-05

Initial fix for qm translation files support.

=== modified file 'DistUtilsExtra/command/build_i18n.py'
--- DistUtilsExtra/command/build_i18n.py	2010-06-23 18:47:30 +0000
+++ DistUtilsExtra/command/build_i18n.py	2012-06-19 06:41:22 +0000
@@ -44,12 +44,15 @@
         self.merge_po = False
         self.bug_contact = None
         self.po_dir = None
+        self.qm_dir = None
 
     def finalize_options(self):
         if self.domain is None:
             self.domain = self.distribution.metadata.name
         if self.po_dir is None:
             self.po_dir = "po"
+        if self.qm_dir is None:
+            self.qm_dir = "qm"
 
     def run(self):
         """
@@ -85,65 +88,74 @@
             selected_languages = open(linguas_file).read().split()
         if "LINGUAS" in os.environ:
             selected_languages = os.environ["LINGUAS"].split()
-
-        # Update po(t) files and print a report
-        # We have to change the working dir to the po dir for intltool
-        cmd = ["intltool-update", (self.merge_po and "-r" or "-p"), "-g", self.domain]
-        wd = os.getcwd()
-        os.chdir(self.po_dir)
-        self.spawn(cmd)
-        os.chdir(wd)
-        max_po_mtime = 0
-        for po_file in glob.glob("%s/*.po" % self.po_dir):
-            lang = os.path.basename(po_file[:-3])
-            if selected_languages and not lang in selected_languages:
-                continue
-            mo_dir =  os.path.join("build", "mo", lang, "LC_MESSAGES")
-            mo_file = os.path.join(mo_dir, "%s.mo" % self.domain)
-            if not os.path.exists(mo_dir):
-                os.makedirs(mo_dir)
-            cmd = ["msgfmt", po_file, "-o", mo_file]
-            po_mtime = os.path.getmtime(po_file)
-            mo_mtime = os.path.exists(mo_file) and os.path.getmtime(mo_file) or 0
-            if po_mtime > max_po_mtime:
-                max_po_mtime = po_mtime
-            if po_mtime > mo_mtime:
-                self.spawn(cmd)
-
-            targetpath = os.path.join("share/locale", lang, "LC_MESSAGES")
-            data_files.append((targetpath, (mo_file,)))
-
-        # merge .in with translation
-        for (option, switch) in ((self.xml_files, "-x"),
-                                 (self.desktop_files, "-d"),
-                                 (self.schemas_files, "-s"),
-                                 (self.rfc822deb_files, "-r"),
-                                 (self.ba_files, "-b"),
-                                 (self.key_files, "-k"),):
-            try:
-                file_set = eval(option)
-            except:
-                continue
-            for (target, files) in file_set:
-                build_target = os.path.join("build", target)
-                if not os.path.exists(build_target): 
-                    os.makedirs(build_target)
-                files_merged = []
-                for file in files:
-                    if file.endswith(".in"):
-                        file_merged = os.path.basename(file[:-3])
-                    else:
-                        file_merged = os.path.basename(file)
-                    file_merged = os.path.join(build_target, file_merged)
-                    cmd = ["intltool-merge", switch, self.po_dir, file, 
-                           file_merged]
-                    mtime_merged = os.path.exists(file_merged) and \
-                                   os.path.getmtime(file_merged) or 0
-                    mtime_file = os.path.getmtime(file)
-                    if mtime_merged < max_po_mtime or mtime_merged < mtime_file:
-                        # Only build if output is older than input (.po,.in) 
-                        self.spawn(cmd)
-                    files_merged.append(file_merged)
-                data_files.append((target, files_merged))
+            
+        if os.path.isdir(self.qm_dir):
+            wd = os.getcwd()
+            os.chdir(self.qm_dir)
+            for qm_file in glob.glob("*.qm"):
+                data_files.append((os.path.join('share', self.distribution.get_name(), 'qm'),
+                                    [os.path.join('qm', qm_file)]))
+            os.chdir(wd)
+                
+        else:
+            # Update po(t) files and print a report
+            # We have to change the working dir to the po dir for intltool
+            cmd = ["intltool-update", (self.merge_po and "-r" or "-p"), "-g", self.domain]
+            wd = os.getcwd()
+            os.chdir(self.po_dir)
+            self.spawn(cmd)
+            os.chdir(wd)
+            max_po_mtime = 0
+            for po_file in glob.glob("%s/*.po" % self.po_dir):
+                lang = os.path.basename(po_file[:-3])
+                if selected_languages and not lang in selected_languages:
+                    continue
+                mo_dir =  os.path.join("build", "mo", lang, "LC_MESSAGES")
+                mo_file = os.path.join(mo_dir, "%s.mo" % self.domain)
+                if not os.path.exists(mo_dir):
+                    os.makedirs(mo_dir)
+                cmd = ["msgfmt", po_file, "-o", mo_file]
+                po_mtime = os.path.getmtime(po_file)
+                mo_mtime = os.path.exists(mo_file) and os.path.getmtime(mo_file) or 0
+                if po_mtime > max_po_mtime:
+                    max_po_mtime = po_mtime
+                if po_mtime > mo_mtime:
+                    self.spawn(cmd)
+
+                targetpath = os.path.join("share/locale", lang, "LC_MESSAGES")
+                data_files.append((targetpath, (mo_file,)))
+
+            # merge .in with translation
+            for (option, switch) in ((self.xml_files, "-x"),
+                                     (self.desktop_files, "-d"),
+                                     (self.schemas_files, "-s"),
+                                     (self.rfc822deb_files, "-r"),
+                                     (self.ba_files, "-b"),
+                                     (self.key_files, "-k"),):
+                try:
+                    file_set = eval(option)
+                except:
+                    continue
+                for (target, files) in file_set:
+                    build_target = os.path.join("build", target)
+                    if not os.path.exists(build_target): 
+                        os.makedirs(build_target)
+                    files_merged = []
+                    for file in files:
+                        if file.endswith(".in"):
+                            file_merged = os.path.basename(file[:-3])
+                        else:
+                            file_merged = os.path.basename(file)
+                        file_merged = os.path.join(build_target, file_merged)
+                        cmd = ["intltool-merge", switch, self.po_dir, file, 
+                               file_merged]
+                        mtime_merged = os.path.exists(file_merged) and \
+                                       os.path.getmtime(file_merged) or 0
+                        mtime_file = os.path.getmtime(file)
+                        if mtime_merged < max_po_mtime or mtime_merged < mtime_file:
+                            # Only build if output is older than input (.po,.in) 
+                            self.spawn(cmd)
+                        files_merged.append(file_merged)
+                    data_files.append((target, files_merged))
 
 # class build