Fix ampersand encoding

Fixes #17
PicnicSupermarket · Feb 27, 2020 · f5344d3 · f5344d3
1 parent a84834b
commit f5344d3
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 29 deletions.
diff --git a/templates/localizable_strings_file.hbs b/templates/localizable_strings_file.hbs
@@ -1,8 +1,8 @@
 {{# SINGULAR}}
-"{{ key }}" = "{{ value }}";
+"{{ key }}" = "{{{ value }}}";
 {{/ SINGULAR}}
 {{# PLURAL}}
 {{# value}}
-"{{ ../key }}.{{ quantity }}" = "{{ value }}";
+"{{ ../key }}.{{ quantity }}" = "{{{ value }}}";
 {{/ value}}
-{{/ PLURAL}}
+{{/ PLURAL}}
diff --git a/tests/actions/__snapshots__/normalize.test.js.snap b/tests/actions/__snapshots__/normalize.test.js.snap
@@ -161,7 +161,7 @@ Array [
   Object {
     "COPY": Object {
       "containsFormatting": false,
-      "translation": "This > is a special <<Character>>",
+      "translation": "This > is a special <<Character>> & there are more",
       "type": "SINGULAR",
     },
     "keyPath": Array [
@@ -175,7 +175,7 @@ Array [
   Object {
     "COPY": Object {
       "containsFormatting": false,
-      "translation": "Dit > is een speciaal <<Karakter>>",
+      "translation": "Dit > is een speciaal <<Karakter>> & zo zijn er meer",
       "type": "SINGULAR",
     },
     "keyPath": Array [
@@ -576,7 +576,7 @@ Array [
   Object {
     "COPY": Object {
       "containsFormatting": false,
-      "translation": "This > is a special <<Character>>",
+      "translation": "This > is a special <<Character>> & there are more",
       "type": "SINGULAR",
     },
     "keyPath": Array [
@@ -590,7 +590,7 @@ Array [
   Object {
     "COPY": Object {
       "containsFormatting": false,
-      "translation": "Dit > is een speciaal <<Karakter>>",
+      "translation": "Dit > is een speciaal <<Karakter>> & zo zijn er meer",
       "type": "SINGULAR",
     },
     "keyPath": Array [
@@ -935,7 +935,7 @@ Array [
   Object {
     "COPY": Object {
       "containsFormatting": false,
-      "translation": "This > is a special <<Character>>",
+      "translation": "This > is a special <<Character>> & there are more",
       "type": "SINGULAR",
     },
     "keyPath": Array [
@@ -949,7 +949,7 @@ Array [
   Object {
     "COPY": Object {
       "containsFormatting": false,
-      "translation": "Dit > is een speciaal <<Karakter>>",
+      "translation": "Dit > is een speciaal <<Karakter>> & zo zijn er meer",
       "type": "SINGULAR",
     },
     "keyPath": Array [

diff --git a/tests/actions/__snapshots__/render.test.js.snap b/tests/actions/__snapshots__/render.test.js.snap
@@ -8,8 +8,8 @@ Result {
 \\"Settings.PushPermissionsRequest.Subtitle.COPY\\" = \\"Stay up to date\\";
 \\"Something.With.An.Arbitrary.Amount.Of.Nesting.COPY\\" = \\"We support nesting as deep as you like\\";
 \\"Delivery.Widget.Title.COPY\\" = \\"Help: %1$@\\";
-\\"Delivery.Widget.SpecialCharacters.COPY\\" = \\"This &gt; is a special &lt;&lt;Character&gt;&gt;\\";
-\\"Delivery.Widget.MultilineStrings.COPY\\" = \\"This is a multiline string that may contain &lt;a href&#x3D;&quot;about:blank&quot;&gt;links&lt;/a&gt;
+\\"Delivery.Widget.SpecialCharacters.COPY\\" = \\"This > is a special <<Character>> & there are more\\";
+\\"Delivery.Widget.MultilineStrings.COPY\\" = \\"This is a multiline string that may contain <a href=\\"about:blank\\">links</a>
 You better watch out!
 
 It may also contain empty lines to break up text into paragraphs.\\";
@@ -38,7 +38,7 @@ It may also contain empty lines to break up text into paragraphs.\\";
   <string name=\\"Checkout_OrderOverview_Subtotal_COPY\\">Total price before taxes: %1$s</string>
   <string name=\\"Something_With_An_Arbitrary_Amount_Of_Nesting_COPY\\">We support nesting as deep as you like</string>
   <string name=\\"Delivery_Widget_Title_COPY\\">Help: %1$s</string>
-  <string name=\\"Delivery_Widget_SpecialCharacters_COPY\\">This &gt; is a special &lt;&lt;Character&gt;&gt;</string>
+  <string name=\\"Delivery_Widget_SpecialCharacters_COPY\\">This &gt; is a special &lt;&lt;Character&gt;&gt; &amp; there are more</string>
   <string name=\\"Delivery_Widget_MultilineStrings_COPY\\">This is a multiline string that may contain &lt;a href&#x3D;&quot;about:blank&quot;&gt;links&lt;/a&gt;\\\\nYou better watch out!\\\\n\\\\nIt may also contain empty lines to break up text into paragraphs.</string>
   <string name=\\"Accessible_RegularComponent_COPY\\">This is a component with accessiblity support</string>
   <string name=\\"Accessible_RegularComponent_ACCESSIBILITY_HINT\\">This is the hint</string>
@@ -297,7 +297,7 @@ Result {
   <string name=\\"Checkout_OrderOverview_Subtotal_COPY\\">Total price before taxes: %1$s</string>
   <string name=\\"Something_With_An_Arbitrary_Amount_Of_Nesting_COPY\\">We support nesting as deep as you like</string>
   <string name=\\"Delivery_Widget_Title_COPY\\">Help: %1$s</string>
-  <string name=\\"Delivery_Widget_SpecialCharacters_COPY\\">This &gt; is a special &lt;&lt;Character&gt;&gt;</string>
+  <string name=\\"Delivery_Widget_SpecialCharacters_COPY\\">This &gt; is a special &lt;&lt;Character&gt;&gt; &amp; there are more</string>
   <string name=\\"Delivery_Widget_MultilineStrings_COPY\\">This is a multiline string that may contain &lt;a href&#x3D;&quot;about:blank&quot;&gt;links&lt;/a&gt;\\\\nYou better watch out!\\\\n\\\\nIt may also contain empty lines to break up text into paragraphs.</string>
   <string name=\\"Accessible_RegularComponent_COPY\\">This is a component with accessiblity support</string>
   <string name=\\"Accessible_RegularComponent_ACCESSIBILITY_HINT\\">This is the hint</string>
@@ -340,8 +340,8 @@ Result {
 \\"Settings.PushPermissionsRequest.Subtitle.COPY\\" = \\"Stay up to date\\";
 \\"Something.With.An.Arbitrary.Amount.Of.Nesting.COPY\\" = \\"We support nesting as deep as you like\\";
 \\"Delivery.Widget.Title.COPY\\" = \\"Help: %1$@\\";
-\\"Delivery.Widget.SpecialCharacters.COPY\\" = \\"This &gt; is a special &lt;&lt;Character&gt;&gt;\\";
-\\"Delivery.Widget.MultilineStrings.COPY\\" = \\"This is a multiline string that may contain &lt;a href&#x3D;&quot;about:blank&quot;&gt;links&lt;/a&gt;
+\\"Delivery.Widget.SpecialCharacters.COPY\\" = \\"This > is a special <<Character>> & there are more\\";
+\\"Delivery.Widget.MultilineStrings.COPY\\" = \\"This is a multiline string that may contain <a href=\\"about:blank\\">links</a>
 You better watch out!
 
 It may also contain empty lines to break up text into paragraphs.\\";
@@ -567,7 +567,7 @@ Result {
   <string name=\\"Checkout_OrderOverview_Subtotal_COPY\\">Total price before taxes: %1$s</string>
   <string name=\\"Something_With_An_Arbitrary_Amount_Of_Nesting_COPY\\">We support nesting as deep as you like</string>
   <string name=\\"Delivery_Widget_Title_COPY\\">Help: %1$s</string>
-  <string name=\\"Delivery_Widget_SpecialCharacters_COPY\\">This &gt; is a special &lt;&lt;Character&gt;&gt;</string>
+  <string name=\\"Delivery_Widget_SpecialCharacters_COPY\\">This &gt; is a special &lt;&lt;Character&gt;&gt; &amp; there are more</string>
   <string name=\\"Delivery_Widget_MultilineStrings_COPY\\">This is a multiline string that may contain &lt;a href&#x3D;&quot;about:blank&quot;&gt;links&lt;/a&gt;\\\\nYou better watch out!\\\\n\\\\nIt may also contain empty lines to break up text into paragraphs.</string>
   <string name=\\"Accessible_RegularComponent_COPY\\">This is a component with accessiblity support</string>
   <string name=\\"Accessible_RegularComponent_ACCESSIBILITY_HINT\\">This is the hint</string>
@@ -603,8 +603,8 @@ Result {
 \\"Settings.PushPermissionsRequest.Subtitle.COPY\\" = \\"Stay up to date\\";
 \\"Something.With.An.Arbitrary.Amount.Of.Nesting.COPY\\" = \\"We support nesting as deep as you like\\";
 \\"Delivery.Widget.Title.COPY\\" = \\"Help: %1$@\\";
-\\"Delivery.Widget.SpecialCharacters.COPY\\" = \\"This &gt; is a special &lt;&lt;Character&gt;&gt;\\";
-\\"Delivery.Widget.MultilineStrings.COPY\\" = \\"This is a multiline string that may contain &lt;a href&#x3D;&quot;about:blank&quot;&gt;links&lt;/a&gt;
+\\"Delivery.Widget.SpecialCharacters.COPY\\" = \\"This > is a special <<Character>> & there are more\\";
+\\"Delivery.Widget.MultilineStrings.COPY\\" = \\"This is a multiline string that may contain <a href=\\"about:blank\\">links</a>
 You better watch out!
 
 It may also contain empty lines to break up text into paragraphs.\\";
@@ -633,7 +633,7 @@ It may also contain empty lines to break up text into paragraphs.\\";
   <string name=\\"Checkout_OrderOverview_Subtotal_COPY\\">Subtotaal: %1$s</string>
   <string name=\\"Something_With_An_Arbitrary_Amount_Of_Nesting_COPY\\">Je kan zo veel lagen maken als je zelf wil</string>
   <string name=\\"Delivery_Widget_Title_COPY\\">Help %1$s</string>
-  <string name=\\"Delivery_Widget_SpecialCharacters_COPY\\">Dit &gt; is een speciaal &lt;&lt;Karakter&gt;&gt;</string>
+  <string name=\\"Delivery_Widget_SpecialCharacters_COPY\\">Dit &gt; is een speciaal &lt;&lt;Karakter&gt;&gt; &amp; zo zijn er meer</string>
   <string name=\\"Delivery_Widget_MultilineStrings_COPY\\">Dit is een string van meerdere regels die &lt;a href&#x3D;&quot;about:blank&quot;&gt;links&lt;/a&gt; kan bevatten.\\\\nLet maar eens op!\\\\n\\\\nDe tekst kan zelfs witregels bevatten!</string>
   <string name=\\"Accessible_RegularComponent_COPY\\">Dit is een component met accessiblity support</string>
   <string name=\\"Accessible_RegularComponent_ACCESSIBILITY_HINT\\">Dit is de hint</string>
@@ -669,8 +669,8 @@ It may also contain empty lines to break up text into paragraphs.\\";
 \\"Settings.PushPermissionsRequest.Subtitle.COPY\\" = \\"Blijf op de hoogte\\";
 \\"Something.With.An.Arbitrary.Amount.Of.Nesting.COPY\\" = \\"Je kan zo veel lagen maken als je zelf wil\\";
 \\"Delivery.Widget.Title.COPY\\" = \\"Help %1$@\\";
-\\"Delivery.Widget.SpecialCharacters.COPY\\" = \\"Dit &gt; is een speciaal &lt;&lt;Karakter&gt;&gt;\\";
-\\"Delivery.Widget.MultilineStrings.COPY\\" = \\"Dit is een string van meerdere regels die &lt;a href&#x3D;&quot;about:blank&quot;&gt;links&lt;/a&gt; kan bevatten.
+\\"Delivery.Widget.SpecialCharacters.COPY\\" = \\"Dit > is een speciaal <<Karakter>> & zo zijn er meer\\";
+\\"Delivery.Widget.MultilineStrings.COPY\\" = \\"Dit is een string van meerdere regels die <a href=\\"about:blank\\">links</a> kan bevatten.
 Let maar eens op!
 
 De tekst kan zelfs witregels bevatten!\\";
@@ -918,7 +918,7 @@ Result {
 <resources>
   <string name=\\"Something_With_An_Arbitrary_Amount_Of_Nesting_COPY\\">We support nesting as deep as you like</string>
   <string name=\\"Delivery_Widget_Title_COPY\\">Help: %1$s</string>
-  <string name=\\"Delivery_Widget_SpecialCharacters_COPY\\">This &gt; is a special &lt;&lt;Character&gt;&gt;</string>
+  <string name=\\"Delivery_Widget_SpecialCharacters_COPY\\">This &gt; is a special &lt;&lt;Character&gt;&gt; &amp; there are more</string>
   <string name=\\"Delivery_Widget_MultilineStrings_COPY\\">This is a multiline string that may contain &lt;a href&#x3D;&quot;about:blank&quot;&gt;links&lt;/a&gt;\\\\nYou better watch out!\\\\n\\\\nIt may also contain empty lines to break up text into paragraphs.</string>
   <string name=\\"Accessible_RegularComponent_COPY\\">This is a component with accessiblity support</string>
   <string name=\\"Accessible_RegularComponent_ACCESSIBILITY_HINT\\">This is the hint</string>
@@ -952,8 +952,8 @@ Result {
     Object {
       "data": "\\"Something.With.An.Arbitrary.Amount.Of.Nesting.COPY\\" = \\"We support nesting as deep as you like\\";
 \\"Delivery.Widget.Title.COPY\\" = \\"Help: %1$@\\";
-\\"Delivery.Widget.SpecialCharacters.COPY\\" = \\"This &gt; is a special &lt;&lt;Character&gt;&gt;\\";
-\\"Delivery.Widget.MultilineStrings.COPY\\" = \\"This is a multiline string that may contain &lt;a href&#x3D;&quot;about:blank&quot;&gt;links&lt;/a&gt;
+\\"Delivery.Widget.SpecialCharacters.COPY\\" = \\"This > is a special <<Character>> & there are more\\";
+\\"Delivery.Widget.MultilineStrings.COPY\\" = \\"This is a multiline string that may contain <a href=\\"about:blank\\">links</a>
 You better watch out!
 
 It may also contain empty lines to break up text into paragraphs.\\";
@@ -980,7 +980,7 @@ It may also contain empty lines to break up text into paragraphs.\\";
 <resources>
   <string name=\\"Something_With_An_Arbitrary_Amount_Of_Nesting_COPY\\">Je kan zo veel lagen maken als je zelf wil</string>
   <string name=\\"Delivery_Widget_Title_COPY\\">Help %1$s</string>
-  <string name=\\"Delivery_Widget_SpecialCharacters_COPY\\">Dit &gt; is een speciaal &lt;&lt;Karakter&gt;&gt;</string>
+  <string name=\\"Delivery_Widget_SpecialCharacters_COPY\\">Dit &gt; is een speciaal &lt;&lt;Karakter&gt;&gt; &amp; zo zijn er meer</string>
   <string name=\\"Delivery_Widget_MultilineStrings_COPY\\">Dit is een string van meerdere regels die &lt;a href&#x3D;&quot;about:blank&quot;&gt;links&lt;/a&gt; kan bevatten.\\\\nLet maar eens op!\\\\n\\\\nDe tekst kan zelfs witregels bevatten!</string>
   <string name=\\"Accessible_RegularComponent_COPY\\">Dit is een component met accessiblity support</string>
   <string name=\\"Accessible_RegularComponent_ACCESSIBILITY_HINT\\">Dit is de hint</string>
@@ -1014,8 +1014,8 @@ It may also contain empty lines to break up text into paragraphs.\\";
     Object {
       "data": "\\"Something.With.An.Arbitrary.Amount.Of.Nesting.COPY\\" = \\"Je kan zo veel lagen maken als je zelf wil\\";
 \\"Delivery.Widget.Title.COPY\\" = \\"Help %1$@\\";
-\\"Delivery.Widget.SpecialCharacters.COPY\\" = \\"Dit &gt; is een speciaal &lt;&lt;Karakter&gt;&gt;\\";
-\\"Delivery.Widget.MultilineStrings.COPY\\" = \\"Dit is een string van meerdere regels die &lt;a href&#x3D;&quot;about:blank&quot;&gt;links&lt;/a&gt; kan bevatten.
+\\"Delivery.Widget.SpecialCharacters.COPY\\" = \\"Dit > is een speciaal <<Karakter>> & zo zijn er meer\\";
+\\"Delivery.Widget.MultilineStrings.COPY\\" = \\"Dit is een string van meerdere regels die <a href=\\"about:blank\\">links</a> kan bevatten.
 Let maar eens op!
 
 De tekst kan zelfs witregels bevatten!\\";

diff --git a/tests/input/localicipe.yaml b/tests/input/localicipe.yaml
@@ -54,8 +54,8 @@ SHARED:
             nl: '%1{{d}} Lopende bestellingen'
       SpecialCharacters:
         COPY:
-          en: "This > is a special <<Character>>"
-          nl: "Dit > is een speciaal <<Karakter>>"
+          en: "This > is a special <<Character>> & there are more"
+          nl: "Dit > is een speciaal <<Karakter>> & zo zijn er meer"
       MultilineStrings:
         COPY:
           en: |-