Merge lp:~michihenning/intltool/fix-ini-spaces into lp:intltool

[Michi Henning]

Fixed incorrect handling of spaces around = in .ini files.

Fixed incorrect handling of spaces around = in .ini files.

[dobey (dobey)]

A regression test (or few) needs to be added for this. I realize the test framework is a bit of a hack right now, so if you need help understanding what to do here, just ask.

review: Needs Fixing

[lp:~michihenning/intltool/fix-ini-spaces]

746. By Michi Henning on 2014-12-03

Added test cases for spaces around = in desktop files.

[Michi Henning (michihenning)]

OK, cool, I've added test cases for space before and after =, before = only, and after = only.

[dobey (dobey)]

review: Approve

[Michi Henning (michihenning)]

Thanks for that. How is the fix going to make its way upstream? Can you help with that?

=== modified file 'intltool-extract.in'
--- intltool-extract.in	2013-05-10 01:58:40 +0000
+++ intltool-extract.in	2014-12-03 23:13:54 +0000
@@ -276,7 +276,7 @@
 
 sub type_ini {
     ### For generic translatable desktop files ###
-    while ($input =~ /^(#(.+)\n)?^_.*=(.*)$/mg) {
+    while ($input =~ /^(#(.+)\n)?^_[A-Za-z0-9\-]+\s*=\s*(.*)$/mg) {
         if (defined($2))  {
             $comments{$3} = $2;
         }

=== modified file 'intltool-merge.in'
--- intltool-merge.in	2011-10-08 14:54:41 +0000
+++ intltool-merge.in	2014-12-03 23:13:54 +0000
@@ -1186,7 +1186,7 @@
 
     while (<INPUT>) 
     {
-        if (s/^(\s*)_([A-Za-z0-9\-]+=(.*))/$1$2/)  
+        if (s/^(\s*)_([A-Za-z0-9\-]+\s*=\s*(.*))/$1$2/)  
         {
 	    my $string = $3;
 
@@ -1200,7 +1200,7 @@
                 next if !$translation;
 
                 $_ = $non_translated_line;
-                s/(\w+)=.*/${1}[$lang]=$translation/;
+                s/(\w+)\s*=\s*.*/${1}[$lang]=$translation/;
                 print OUTPUT;
             }
 	} 

=== modified file 'tests/cases/extract13.desktop.in'
--- tests/cases/extract13.desktop.in	2008-08-25 03:06:45 +0000
+++ tests/cases/extract13.desktop.in	2014-12-03 23:13:54 +0000
@@ -24,3 +24,6 @@
 X-GNOME-Bugzilla-Product=gnome-utils
 X-GNOME-Bugzilla-Component=gsearchtool
 _X-Color=Blue
+_X-Color2 = Red
+_X-Color3= Green
+_X-Color4 =Yellow

=== modified file 'tests/results/extract13.desktop'
--- tests/results/extract13.desktop	2008-08-25 03:06:45 +0000
+++ tests/results/extract13.desktop	2014-12-03 23:13:54 +0000
@@ -24,3 +24,6 @@
 X-GNOME-Bugzilla-Product=gnome-utils
 X-GNOME-Bugzilla-Component=gsearchtool
 X-Color=Blue
+X-Color2 = Red
+X-Color3= Green
+X-Color4 =Yellow

=== modified file 'tests/results/extract13.desktop.in.h'
--- tests/results/extract13.desktop.in.h	2011-10-08 13:49:14 +0000
+++ tests/results/extract13.desktop.in.h	2014-12-03 23:13:54 +0000
@@ -3,3 +3,6 @@
 /*  4. This comment also should be extracted. */
 char *s = N_("Locate documents and folders on this computer by name or content");
 char *s = N_("Blue");
+char *s = N_("Red");
+char *s = N_("Green");
+char *s = N_("Yellow");