Merge lp:~robru/intltool/intltool into lp:intltool

[Robert Bruce Park]

Allows single-quotes like translatable='yes' in glade XML.

[Данило Шеган (danilo)]

Sorry for the late response. The change overall looks good, but it'd be even nicer if you can provide a test case in tests/ (look at cases/ and results/).

review: Needs Fixing

[lp:~robru/intltool/intltool]

736. By Robert Bruce Park on 2012-08-23

Add test case for single quotes, and fix the bug that I discovered
as a result of adding this test.

[Robert Bruce Park (robru)]

Thanks for insisting on the test, this has improved the quality of the patch beyond simply what meets my needs, into something that is generally applicable ;-)

[Robert Bruce Park (robru)]

Hey, can I get this merged now? The test I wrote is good ;-)

review: Approve

[Данило Шеган (danilo)]

Indeed, sorry, I somehow missed this. Should be merged now, and hopefully I can come up with a new intltool release soon as well.

review: Approve

=== modified file 'intltool-extract.in'
--- intltool-extract.in	2012-02-04 23:29:56 +0000
+++ intltool-extract.in	2012-08-23 03:41:22 +0000
@@ -847,7 +847,7 @@
     }
 
     ## handle new glade files
-    while ($input =~ /<(\w+)\s+[^>]*translatable\s*=\s*"yes"(?:\s+[^>]*context\s*=\s*"([^"]*)")?(?:\s+[^>]*comments\s*=\s*"([^"]*)")?[^>]*>([^<]+)<\/\1>/sg) {
+    while ($input =~ /<(\w+)\s+[^>]*translatable\s*=\s*["']yes["'](?:\s+[^>]*context\s*=\s*["']([^"']*)["'])?(?:\s+[^>]*comments\s*=\s*["']([^"']*)["'])?[^>]*>([^<]+)<\/\1>/sg) {
         if (!($4 =~ /^(window|label)[0-9]+$/)) {
             my $message = entity_decode($4);
             if (defined($2)) {

=== added file 'tests/cases/extract-gtkbuilder-single.ui'
--- tests/cases/extract-gtkbuilder-single.ui	1970-01-01 00:00:00 +0000
+++ tests/cases/extract-gtkbuilder-single.ui	2012-08-23 03:41:22 +0000
@@ -0,0 +1,29 @@
+<interface>
+  <object class='GtkDialog' id='dialog1'>
+    <child internal-child='vbox'>
+      <object class='GtkVBox' id='vbox1'>
+        <property name='border-width'>10</property>
+        <child internal-child='action_area'>
+          <object class='GtkHBox' id='hbox1'>
+            <property name='border-width'>20</property>
+            <child>
+              <object class='GtkLabel' id='help'>
+                <property name='label' translatable='yes'>help</property>
+              </object>
+            </child>
+            <child>
+              <object class='GtkLabel' id='user-help'>
+                <property name='label' translatable='yes' context='user'>help</property>
+              </object>
+            </child>
+            <child>
+              <object class='GtkLabel' id='developer-help'>
+                <property name='label' translatable='yes' context='developer'>help</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

=== added file 'tests/results/extract-gtkbuilder-single.ui.h'
--- tests/results/extract-gtkbuilder-single.ui.h	1970-01-01 00:00:00 +0000
+++ tests/results/extract-gtkbuilder-single.ui.h	2012-08-23 03:41:22 +0000
@@ -0,0 +1,3 @@
+char *s = N_("help");
+char *s = C_("user", "help");
+char *s = C_("developer", "help");

=== modified file 'tests/selftest.pl.in'
--- tests/selftest.pl.in	2011-10-08 18:08:58 +0000
+++ tests/selftest.pl.in	2012-08-23 03:41:22 +0000
@@ -289,6 +289,12 @@
 system("$INTLTOOL_EXTRACT --type=gettext/gsettings --quiet --update cases/$case") == 0 or $failed = 1;
 check_extract_result($case);
 
+print "39. Allow single quotes, like translatable='yes':                    ";
+$case = "extract-gtkbuilder-single.ui";
+system("$INTLTOOL_EXTRACT --type=gettext/glade --quiet --update cases/$case") == 0 or $failed = 1;
+check_extract_result($case);
+
+
 system("rm -f cases/*.*") if $srcdir ne ".";
 system("rm -rf C az extract9 fr fr_BE fr_FR merge6 schemasmerge1 schemasmerge2 spacepreserve test test-quoted merge6.xml");