Merge pull request #180 from sebastianludwig/fix-179-android-string-placeholder

Fixed #179 by converting placeholders before escaping @ signs.

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/twine/formatters/android.rb b/lib/twine/formatters/android.rb
index 3575505..7996304 100644
--- a/lib/twine/formatters/android.rb
+++ b/lib/twine/formatters/android.rb
@@ -116,6 +116,9 @@ module Twine
       def format_value(value)
         value = value.dup
 
+        # convert placeholders (e.g. %@ -> %s)
+        value = convert_placeholders_from_twine_to_android(value)
+
         # capture xliff tags and replace them with a placeholder
         xliff_tags = []
         value.gsub! /<xliff:g.+?<\/xliff:g>/ do
@@ -133,9 +136,6 @@ module Twine
           value.sub! 'TWINE_XLIFF_TAG_PLACEHOLDER', xliff_tag
         end
         
-        # convert placeholders (e.g. %@ -> %s)
-        value = convert_placeholders_from_twine_to_android(value)
-        
         # replace beginning and end spaces with \u0020. Otherwise Android strips them.
         value.gsub(/\A *| *\z/) { |spaces| '\u0020' * spaces.length }
       end