Skip to content

Commit

Permalink
Replace all substitutions, not just the first
Browse files Browse the repository at this point in the history
  • Loading branch information
@johankool
johankool committed Feb 27, 2020
1 parent 7ba94d3 commit a84834b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 19 deletions.
2 changes: 1 addition & 1 deletion src/actions/render.js
View file
Expand Up @@ -141,7 +141,7 @@ const keyDelimiterForPlatform = platform => {

const substitute = (value, valueSubstitutions) => {
Object.keys(valueSubstitutions).forEach(search => {
value = value.replace(`${search}`, valueSubstitutions[search]);
value = value.split(`${search}`).join(valueSubstitutions[search]);
});
return value;
};
Expand Down
24 changes: 6 additions & 18 deletions tests/actions/__snapshots__/render.test.js.snap
View file
Expand Up @@ -39,9 +39,7 @@ It may also contain empty lines to break up text into paragraphs.\\";
<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_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!
It may also contain empty lines to break up text into paragraphs.</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>
<string name=\\"Accessible_RegularComponent_ACCESSIBILITY_LABEL\\">This is the label</string>
Expand Down Expand Up @@ -300,9 +298,7 @@ Result {
<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_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!
It may also contain empty lines to break up text into paragraphs.</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>
<string name=\\"Accessible_RegularComponent_ACCESSIBILITY_LABEL\\">This is the label</string>
Expand Down Expand Up @@ -572,9 +568,7 @@ Result {
<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_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!
It may also contain empty lines to break up text into paragraphs.</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>
<string name=\\"Accessible_RegularComponent_ACCESSIBILITY_LABEL\\">This is the label</string>
Expand Down Expand Up @@ -640,9 +634,7 @@ It may also contain empty lines to break up text into paragraphs.\\";
<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_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!
De tekst kan zelfs witregels bevatten!</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>
<string name=\\"Accessible_RegularComponent_ACCESSIBILITY_LABEL\\">Dit is de label</string>
Expand Down Expand Up @@ -927,9 +919,7 @@ Result {
<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_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!
It may also contain empty lines to break up text into paragraphs.</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>
<string name=\\"Accessible_RegularComponent_ACCESSIBILITY_LABEL\\">This is the label</string>
Expand Down Expand Up @@ -991,9 +981,7 @@ It may also contain empty lines to break up text into paragraphs.\\";
<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_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!
De tekst kan zelfs witregels bevatten!</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>
<string name=\\"Accessible_RegularComponent_ACCESSIBILITY_LABEL\\">Dit is de label</string>
Expand Down

0 comments on commit a84834b

Please sign in to comment.