twine 0.3.1 → 0.3.2

data/lib/twine/formatters/android.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-
+require 'CGI'
 require 'rexml/document'
 
 module Twine
@@ -67,6 +67,8 @@ module Twine
                 value_match = value_regex.match(line)
                 if value_match
                   value = value_match[1]
+                  value = CGI.unescapeHTML(value)
+                  value.gsub!('\\\'', '\'')
                   value.gsub!('\\"', '"')
                   value = iosify_substitutions(value)
                 else
@@ -76,7 +78,7 @@ module Twine
                   set_tags_for_key(key, @options[:tags])
                 end
                 set_translation_for_key(key, lang, value)
-                if comment and comment.length > 0
+                if comment and comment.length > 0 and !comment.start_with?("SECTION:")
                   set_comment_for_key(key, comment)
                 end
                 comment = nil
@@ -107,7 +109,7 @@ module Twine
                   f.puts ''
                   if section.name && section.name.length > 0
                     section_name = section.name.gsub('--', '—')
-                    f.puts "\t<!-- #{section_name} -->"
+                    f.puts "\t<!-- SECTION: #{section_name} -->"
                   end
                   printed_section = true
                 end
@@ -126,9 +128,8 @@ module Twine
                   #  1) apostrophes and quotes must be escaped with a backslash
                   value.gsub!('\'', '\\\\\'')
                   value.gsub!('"', '\\\\"')
-                  #  2) ampersand and less-than must be in XML-escaped form
-                  value.gsub!('&', '&amp;')
-                  value.gsub!('<', '&lt;')
+                  #  2) HTML escape the string
+                  value = CGI.escapeHTML(value)
                   #  3) fix substitutions (e.g. %s/%@)
                   value = androidify_substitutions(value)
 

data/lib/twine/version.rb

@@ -1,3 +1,3 @@
 module Twine
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/test/fixtures/test-output-1.txt

@@ -3,7 +3,7 @@
 <!-- Generated by Twine <%= Twine::VERSION %> -->
 <!-- Language: fr -->
 <resources>
-	<!-- My Strings -->
+	<!-- SECTION: My Strings -->
 	<!-- This is a comment -->
 	<string name="key1">key1-french</string>
 	<string name="key2">key2-french</string>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twine
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip