reassign 571262 intltool-debian
found 571262 0.35.0+20060710.1
tag 571262 patch
thanks

There are some corner cases, consider this example:

  Template: partman-xfs/text/xfs
  Type: text
  Description: xfs
  Description-pt.UTF-8: XFS
  Description-pt_BR.UTF-8: xfs

pt_BR translation must not be dropped, otherwise XFS will be displayed
instead of xfs.
Here is a patch, translation is removed only if language does not
contain locale modifiers (i.e. _ or @ characters).

Here is also a slightly updated tarball, in case Nicolas or someone
else want to update intltool-debian.

Denis
--- /usr/share/intltool-debian/intltool-merge
+++ /usr/share/intltool-debian/intltool-merge
@@ -1340,8 +1340,12 @@
                 next unless $is_translated;
 
                 $str_translated =~ s/\s+$//;
-                $str_translated = ' '.$str_translated if length ($str_translated) && $str_translated !~ /^\n/s;
 
+                # To save space, do not print translation if it is identical to
+                # original text and if translation cannot be found in another language
+                next if ($str_translated eq $stripped && $lang !~ m/[...@]/);
+
+                $str_translated = ' '.$str_translated if length ($str_translated) && $str_translated !~ /^\n/s;
                 $_ = $non_translated_line;
                 s/^(\w+):\s*.*/$newline${1}-$lang.$encodings{$lang}:$str_translated/s;
                 print OUTPUT;

Attachment: intltool-debian_0.35.1+1.tar.gz
Description: GNU Zip compressed data

Reply via email to