By default, do not extract bare text nodes if they contain PHP tags

Author: iafan

CHANGES

@@ -21,8 +21,8 @@ Revision history
           (like XML parser already does)
 
         - PHP/XHTML parser now treats bare HTML strings (with no wrapper tag)
-          as translatable by default. This is useful when parsing nested
-          HTML snippets inside XML or JSON
+          as translatable by default, except when they contain PHP tags.
+          This is useful when parsing nested HTML snippets inside XML or JSON
 
         - Parsing errors in nested HTML values inside JSON or XML are now
           exposed to the parent parser for proper error reporting

lib/Serge/Engine/Plugin/parse_php_xhtml.pm

@@ -419,9 +419,10 @@ sub analyze_tag_recursively {
                 $str =~ s/^[\r\n\t ]+//sg;
                 $str =~ s/[\r\n\t ]+$//sg;
 
-                # Only non-empty strings (which are not php blocks) can be translated
+                # Only non-empty strings which do not contain php blocks can be translated by default
 
-                $contains_translatables = 1 if ($str ne '') && ($str !~ m/^__PHP__BLOCK__(\d+)__$/);
+                $contains_translatables = 1 if $str ne '';
+                $prohibit_translation = 1 if $str =~ m/\b__PHP__BLOCK__(\d+)__\b/;
 
                 #print "** [$name: can=$can_translate, ctr=$contains_translatables] [$str]\n" if $self->{parent}->{debug};
             }

t/data/engine/parse_php_xhtml/00/reference-output/database/items

@@ -1,24 +1,12 @@
 items
 {
-    0     1 6 4 1 `Page title` NO 0
-    1     2 8 4 2 NO NO 0
-    2     3 10 4 3 NO NO 0
-    3     4 12 4 4 `alt attribute` NO 0
-    4     5 14 4 5 `title attribute` NO 0
-    5     6 16 4 6 NO NO 0
-    6     7 18 4 7 NO NO 0
-    7     8 20 4 8 NO NO 0
-    8     9 22 4 9 NO NO 0
-    9     10 24 4 10 NO NO 0
-    10    11 26 4 11 NO NO 0
-    11    12 28 4 12 NO NO 0
-    12    13 30 4 13 NO NO 0
-    13    14 32 4 14 NO NO 0
-    14    15 34 4 15 NO NO 0
-    15    16 36 4 16 NO NO 0
-    16    17 38 4 17 NO NO 0
-    17    18 40 4 18 NO NO 0
-    18    19 42 4 19 NO NO 0
-    19    20 44 4 20 NO NO 0
-    20    21 46 4 21 NO NO 0
+    0    1 6 4 1 `Page title` NO 0
+    1    2 8 4 2 NO NO 0
+    2    3 10 4 3 NO NO 0
+    3    4 12 4 4 NO NO 0
+    4    5 14 4 5 NO NO 0
+    5    6 16 4 6 NO NO 0
+    6    7 18 4 7 NO NO 0
+    7    8 20 4 8 NO NO 0
+    8    9 22 4 9 NO NO 0
 }

t/data/engine/parse_php_xhtml/00/reference-output/database/properties

@@ -3,16 +3,15 @@ properties
     0     1 source:4 7b5e59f8bb7ad3023335abd269b539b1
     1     2 hash:4 7b5e59f8bb7ad3023335abd269b539b1
     2     3 size:4 2601
-    3     4 items:4
-          1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21
-    4     5 ts:4:test:count 21
-    5     6 usn:4:test 67
-    6     7 ts:4:test 3125bc9a2ee5df3a41ba85068093ce13
-    7     8 target:4:test_job:test 83ee5768900a2bfa7312cbd8bbb08b89
+    3     4 items:4 1,2,3,4,5,6,7,8,9
+    4     5 ts:4:test:count 9
+    5     6 usn:4:test 31
+    6     7 ts:4:test 1ca0dbb8935e90306222cb5c53aca882
+    7     8 target:4:test_job:test 89d070812a1ab3e363a09753d35ee0f5
     8     9 target:mtime:4:test_job:test 12345678
     9     10 source:4:test_job:test 7b5e59f8bb7ad3023335abd269b539b1
     10    11 source:ts:4:test_job:test
-          3125bc9a2ee5df3a41ba85068093ce13
+          1ca0dbb8935e90306222cb5c53aca882
     11    12 job-hash:test_namespace:test_job
           80c52c3ab8cfc898775493c6842093a7
     12    13 job-plugin:test_namespace:test_job parse_php_xhtml.

t/data/engine/parse_php_xhtml/00/reference-output/database/strings

@@ -1,24 +1,12 @@
 strings
 {
-    0     1 5 `Sample Page` NO 0
-    1     2 7 `<img src="x.png" alt="<? echo $pageTitle; ?>" />` NO 0
-    2     3 9 `<img src="x.png" alt="baz" />` NO 0
-    3     4 11 `localizable alt attribute text` NO 0
-    4     5 13 `localizable title attribute text` NO 0
-    5     6 15 `<img src="x.png" alt="localizable image" />` NO 0
-    6     7 17 `localizable string 2` NO 0
-    7     8 19 `Table of Contents` NO 0
-    8     9 21 `Topic 1` NO 0
-    9     10 23 `Topic 2` NO 0
-    10    11 25 `<a href="#topic3">Topic 3</a>` NO 0
-    11    12 27 `Topic 1` context.1 0
-    12    13 29 `Paragraph 1` NO 0
-    13    14 31 `Topic 2` context.1 0
-    14    15 33 `Paragraph 2` NO 0
-    15    16 35 `Topic 3` NO 0
-    16    17 37 `Paragraph 3, Sentence 1.` NO 0
-    17    18 39 `Paragraph 3, Sentence 2.` NO 0
-    18    19 41 `Item 1` NO 0
-    19    20 43 `Item 2` NO 0
-    20    21 45 `Item 3` NO 0
+    0    1 5 `Sample Page` NO 0
+    1    2 7 `<img src="x.png" alt="<? echo $pageTitle; ?>" />` NO 0
+    2    3 9 `<img src="x.png" alt="baz" />` NO 0
+    3    4 11 `<img src="x.png" alt="localizable image" />` NO 0
+    4    5 13 `localizable string 2` NO 0
+    5    6 15 `Topic 1` NO 0
+    6    7 17 `Topic 2` NO 0
+    7    8 19 `Paragraph 3, Sentence 1.` NO 0
+    8    9 21 `Paragraph 3, Sentence 2.` NO 0
 }

t/data/engine/parse_php_xhtml/00/reference-output/database/translations

@@ -1,26 +1,14 @@
 translations
 {
-    0     1 47 1 test `Šáḿṕļē Ṕáğē` NO 0 0
-    1     2 48 2 test
-          `<img src="x.png" alt="<? echo $pageTitle; ?>" />` NO 0 0
-    2     3 49 3 test `<img src="x.png" alt="baz" />` NO 0 0
-    3     4 50 4 test `ļőçáļĩžáḃļē áļţ áţţŕĩḃũţē ţēҳţ` NO 0 0
-    4     5 51 5 test `ļőçáļĩžáḃļē ţĩţļē áţţŕĩḃũţē ţēҳţ` NO 0 0
-    5     6 52 6 test `<img src="x.png" alt="localizable image" />` NO
-          0 0
-    6     7 53 7 test `ļőçáļĩžáḃļē šţŕĩŋğ 2` NO 0 0
-    7     8 54 8 test `Ŧáḃļē őḟ Ćőŋţēŋţš` NO 0 0
-    8     9 55 9 test `Ŧőṕĩç 1` NO 0 0
-    9     10 56 10 test `Ŧőṕĩç 2` NO 0 0
-    10    11 57 11 test `<a href="#topic3">Ŧőṕĩç 3</a>` NO 0 0
-    11    12 58 12 test `Ŧőṕĩç 1` NO 0 0
-    12    13 59 13 test `Ṕáŕáğŕáṕĥ 1` NO 0 0
-    13    14 60 14 test `Ŧőṕĩç 2` NO 0 0
-    14    15 61 15 test `Ṕáŕáğŕáṕĥ 2` NO 0 0
-    15    16 62 16 test `Ŧőṕĩç 3` NO 0 0
-    16    17 63 17 test `Ṕáŕáğŕáṕĥ 3, Šēŋţēŋçē 1.` NO 0 0
-    17    18 64 18 test `Ṕáŕáğŕáṕĥ 3, Šēŋţēŋçē 2.` NO 0 0
-    18    19 65 19 test `Ĩţēḿ 1` NO 0 0
-    19    20 66 20 test `Ĩţēḿ 2` NO 0 0
-    20    21 67 21 test `Ĩţēḿ 3` NO 0 0
+    0    1 23 1 test `Šáḿṕļē Ṕáğē` NO 0 0
+    1    2 24 2 test
+         `<img src="x.png" alt="<? echo $pageTitle; ?>" />` NO 0 0
+    2    3 25 3 test `<img src="x.png" alt="baz" />` NO 0 0
+    3    4 26 4 test `<img src="x.png" alt="localizable image" />` NO
+         0 0
+    4    5 27 5 test `ļőçáļĩžáḃļē šţŕĩŋğ 2` NO 0 0
+    5    6 28 6 test `Ŧőṕĩç 1` NO 0 0
+    6    7 29 7 test `Ŧőṕĩç 2` NO 0 0
+    7    8 30 8 test `Ṕáŕáğŕáṕĥ 3, Šēŋţēŋçē 1.` NO 0 0
+    8    9 31 9 test `Ṕáŕáğŕáṕĥ 3, Šēŋţēŋçē 2.` NO 0 0
 }

t/data/engine/parse_php_xhtml/00/reference-output/localized-resources/test/index.php

@@ -14,7 +14,7 @@
     <p>&copy; 2012 ACME Corporation</p>
 
     <!-- in the following image, 'alt' and 'title' attributes will be extracted -->
-    <img src="x" alt="ļőçáļĩžáḃļē áļţ áţţŕĩḃũţē ţēҳţ" title="ļőçáļĩžáḃļē ţĩţļē áţţŕĩḃũţē ţēҳţ" />
+    <img src="x" alt="localizable alt attribute text" title="localizable title attribute text" />
 
     <!-- the following image will be extracted as a whole -->
     <img src="x.png" alt="localizable image" />
@@ -34,31 +34,31 @@
 <div id="content">
     <!-- <h1>..<h7>, <p> and <li> will be translated by default unless the lang="" attribute is set on them -->
 
-    <h2>Ŧáḃļē őḟ Ćőŋţēŋţš</h2>
+    <h2>Table of Contents</h2>
     <ul>
         <!-- in the following two lines, the <li> will not be translated as it contains
         the only <a> tag that is explicitly told to be the translation item -->
         <li><a href="#topic1">Ŧőṕĩç 1</a></li>
         <li><a href="#topic2">Ŧőṕĩç 2</a></li>
 
         <!-- in the subsequent lines, the <li> item will be the default translation item (default behavior) -->
-        <li><a href="#topic3">Ŧőṕĩç 3</a></li>
+        <li><a href="#topic3">Topic 3</a></li>
     </ul>
 
-    <h2 id="topic1">Ŧőṕĩç 1</h2>
-    <p>Ṕáŕáğŕáṕĥ 1</p>
+    <h2 id="topic1">Topic 1</h2>
+    <p>Paragraph 1</p>
 
-    <h2 id="topic2">Ŧőṕĩç 2</h2>
-    <p>Ṕáŕáğŕáṕĥ 2</p>
+    <h2 id="topic2">Topic 2</h2>
+    <p>Paragraph 2</p>
 
-    <h2 id="topic2">Ŧőṕĩç 3</h2>
+    <h2 id="topic2">Topic 3</h2>
     <!-- One can manually segment large paragraphs (split them into separate translatable sentences) -->
     <p><span>Ṕáŕáğŕáṕĥ 3, Šēŋţēŋçē 1.</span> <span>Ṕáŕáğŕáṕĥ 3, Šēŋţēŋçē 2.</span></p>
 
     <ul>
-        <li>Ĩţēḿ 1</li>
-        <li>Ĩţēḿ 2</li>
-        <li>Ĩţēḿ 3</li>
+        <li>Item 1</li>
+        <li>Item 2</li>
+        <li>Item 3</li>
     </ul>
 </div><!-- /content -->
 

t/data/engine/parse_php_xhtml/00/reference-output/po/test/index.php.po

@@ -21,18 +21,6 @@ msgstr "<img src=\"x.png\" alt=\"<? echo $pageTitle; ?>\" />"
 msgid "<img src=\"x.png\" alt=\"baz\" />"
 msgstr "<img src=\"x.png\" alt=\"baz\" />"
 
-#. alt attribute
-#: File: index.php
-#: ID: 34425ef5fe06102e2de17ce406e1c917
-msgid "localizable alt attribute text"
-msgstr "ļőçáļĩžáḃļē áļţ áţţŕĩḃũţē ţēҳţ"
-
-#. title attribute
-#: File: index.php
-#: ID: 9f0e7bee1fbb5eec8cddb8ebb7d10355
-msgid "localizable title attribute text"
-msgstr "ļőçáļĩžáḃļē ţĩţļē áţţŕĩḃũţē ţēҳţ"
-
 #: File: index.php
 #: ID: e93e6d67a5e03712e87f2d8d93d4fdc4
 msgid "<img src=\"x.png\" alt=\"localizable image\" />"
@@ -43,11 +31,6 @@ msgstr "<img src=\"x.png\" alt=\"localizable image\" />"
 msgid "localizable string 2"
 msgstr "ļőçáļĩžáḃļē šţŕĩŋğ 2"
 
-#: File: index.php
-#: ID: 3b31defc07678f0de737043d90f33f00
-msgid "Table of Contents"
-msgstr "Ŧáḃļē őḟ Ćőŋţēŋţš"
-
 #: File: index.php
 #: ID: 40d504f7798cda942b7bd59900e763f4
 msgid "Topic 1"
@@ -58,38 +41,6 @@ msgstr "Ŧőṕĩç 1"
 msgid "Topic 2"
 msgstr "Ŧőṕĩç 2"
 
-#: File: index.php
-#: ID: 8ade6d1ffe6fd5970597c73b600252d1
-msgid "<a href=\"#topic3\">Topic 3</a>"
-msgstr "<a href=\"#topic3\">Ŧőṕĩç 3</a>"
-
-#: File: index.php
-#: ID: 996846f8670ab376b53f5ca443e286df
-msgctxt "context.1"
-msgid "Topic 1"
-msgstr "Ŧőṕĩç 1"
-
-#: File: index.php
-#: ID: 96bc27974e4e82a218a4d1502938d02d
-msgid "Paragraph 1"
-msgstr "Ṕáŕáğŕáṕĥ 1"
-
-#: File: index.php
-#: ID: 054c21a2169e4b8a80ab5f79dde097d6
-msgctxt "context.1"
-msgid "Topic 2"
-msgstr "Ŧőṕĩç 2"
-
-#: File: index.php
-#: ID: bfbc8f478c954b6c5765d5285b655500
-msgid "Paragraph 2"
-msgstr "Ṕáŕáğŕáṕĥ 2"
-
-#: File: index.php
-#: ID: 0cd9b7e2b1d0a17927da40a7a5be599c
-msgid "Topic 3"
-msgstr "Ŧőṕĩç 3"
-
 #: File: index.php
 #: ID: 8f97e74768d7b55d7e02f9195f0c846e
 msgid "Paragraph 3, Sentence 1."
@@ -99,18 +50,3 @@ msgstr "Ṕáŕáğŕáṕĥ 3, Šēŋţēŋçē 1."
 #: ID: 54988f57cc86c6ed3c64bd520e18d6f2
 msgid "Paragraph 3, Sentence 2."
 msgstr "Ṕáŕáğŕáṕĥ 3, Šēŋţēŋçē 2."
-
-#: File: index.php
-#: ID: bc36b3a53f73f49726402745eea839d2
-msgid "Item 1"
-msgstr "Ĩţēḿ 1"
-
-#: File: index.php
-#: ID: 9d66bb5198c158d5c883d21e77b4d00a
-msgid "Item 2"
-msgstr "Ĩţēḿ 2"
-
-#: File: index.php
-#: ID: 0f0f255d5c9c92533d5bd889681bf21b
-msgid "Item 3"
-msgstr "Ĩţēḿ 3"

t/data/engine/parse_php_xhtml/05/README.md

@@ -0,0 +1 @@
+Test for bare HTML without enclosing tags + PHP

t/data/engine/parse_php_xhtml/05/reference-output/database/files

@@ -0,0 +1,8 @@
+files
+{
+    0    1 1 test_job test_namespace 1.php 0
+    1    2 2 test_job test_namespace 2.php 0
+    2    3 3 test_job test_namespace 3.php 0
+    3    4 10 test_job test_namespace 4.php 0
+    4    5 13 test_job test_namespace 5.php 0
+}