fastlane-plugin-google_sheet_localize 0.1.51 → 0.1.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d17878398029568feb9ee6bd27af8636db4f8210f52c2a08dd07c90a4892586b
-  data.tar.gz: 1dc64c0e36953f70154bb5c191695ea2fafa918d45947ff3bafd57f28e575bbc
+  metadata.gz: 5ea42ee15d69f1ce5642d240fc69e752a4df45ff8534a3eb6955444efaa7f4f5
+  data.tar.gz: 80c038a3a483ed00dfd06493f285cec855cbc08331a67d4e7cda56950b0f7a5c
 SHA512:
-  metadata.gz: 4e683cd4c804e51b9b8617368afeeed0d2c19373d7c02fd7d659691d9193a11500632043b7e1077dd7b1ef4c6736262c58d996b35466cfd815c67e1410d22289
-  data.tar.gz: 616c2f44afe6521c56900e861594767e906965ed7e7cf676210ef5a57d03fc0e5b346494df3c1001f40dc422aceb85495bac686ef3f60ed88d996f2365d58f75
+  metadata.gz: 5e3a4e3689d6503a434c003cd131453107e7373e0bab708804aea0c7d806929a97de2bf5bf9a6f969febd38d125257ea86e399b5bff17513c199a26bfe8e5e4e
+  data.tar.gz: 456392ad5dfb062cb610c11d860101e0839f43b67e21b70376ad749393ebc23a8ef0bbc16cab14fc60a53b8f4b400f1a4afaf39a71cd10d7dd8f5e541b82bd8a

data/lib/fastlane/plugin/google_sheet_localize/actions/google_sheet_localize_action.rb

@@ -175,12 +175,35 @@ module Fastlane
         end
 
         if platform == "android"
-          FileUtils.mkdir_p "values-#{language['language']}"
-          File.open("values-#{language['language']}/strings.xml", "w") do |f|
+          languageDir = language['language']
+
+          if languageDir == "en"
+            languageDir = "values"
+          else
+            languageDir = "values-#{languageDir}"
+          end
+
+          FileUtils.mkdir_p "#{destinationPath}/#{languageDir}"
+          File.open("#{destinationPath}/#{languageDir}/strings.xml", "w") do |f|
             f.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
             f.write("<resources>\n")
             language["items"].each { |item|
-              f.write("\t<!--#{item['comment']}-->\n\t<string name=\"#{item['identifierAndroid']}\"><![CDATA[#{item['text']}]]></string>\n")
+
+              comment = item['comment']
+              identifier = item['identifierAndroid']
+              text = item['text']
+
+              if !identifier.to_s.empty? && identifier != "NR"
+                line = ""
+
+                if !comment.to_s.empty?
+                  line = line + "\t<!--#{comment}-->\n"
+                end
+
+                line = line + "\t<string name=\"#{identifier}\"><![CDATA[#{text}]]></string>\n"
+
+                f.write(line)
+              end
             }
             f.write("</resources>\n")
           end
@@ -245,7 +268,7 @@ module Fastlane
       end
 
       def self.mapInvalidPlaceholder(text)
-        filtered = text.gsub('%s', '%@')
+        filtered = text.gsub('%s', '%@').gsub('"', '\"')
         return filtered
       end
 

data/lib/fastlane/plugin/google_sheet_localize/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module GoogleSheetLocalize
-    VERSION = "0.1.51"
+    VERSION = "0.1.52"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-google_sheet_localize
 version: !ruby/object:Gem::Version
-  version: 0.1.51
+  version: 0.1.52
 platform: ruby
 authors:
 - Mario Hahn