fastlane-plugin-google_sheet_localize 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49eed9cc0e4f96365e6d529f49e7b6a6b5a6271283d665cb57352e422e1ac2c6
-  data.tar.gz: 79bf7132bcb483b6a6d807b8d304a917e437afd3eade322fa71f05765ebc217c
+  metadata.gz: 714e70705a464315aecdc814d690b1e5d2f926d9c7ff51c87270a6e7b1314441
+  data.tar.gz: d84410222307f26d577c3e8998dc97bb2bc2f6495585d3106c65b01cf32f24ed
 SHA512:
-  metadata.gz: ab721931067e164440a3d5564c1c1e564a9087814342d8729f2c0d83669e32ecf30b3a7947894696616be130a6d144e0eed6d9d6eb9e6bdd50b0c2de238ad4e0
-  data.tar.gz: 6ce7baf4d52d2705c5bc8718a5c833a8b58949c5be11e9a0fd7185423059cd4bf070adfd7aead1c648c7448e1405db1f36aa35140e087d3d3b7482b0de76ae95
+  metadata.gz: 7927ff4ab444a083e5d770214c6d65d5d2a99602279c08b3f1f7ff34d23b1976f6e028c16b86e670574f9a84d2dae3268ead22e8adebb3c8021777c295abd99c
+  data.tar.gz: f92f4e8907c7043f7fecf7f65d45002a619f425e9be73413dd8548c521023d10a5d43270725672d267aed47d103ba6ae56efebd710cee51d944e55b6fd50d1ea

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

@@ -95,8 +95,10 @@ module Fastlane
             swiftFilename = "Localization.swift"
             swiftFilepath = "#{destinationPath}/#{swiftFilename}"
 
-            #removes all identififiers with the label Not Required
-            filteredItems = languages[0]["items"].select { |item| item['identifierIos'] != "NR" }
+            filteredItems = languages[0]["items"].select { |item|
+                iosIdentifier = item['identifierIos']
+                iosIdentifier != "NR" && iosIdentifier != "" && !iosIdentifier.include?('//')
+            }
 
             File.open(swiftFilepath, "w") do |f|
               f.write("import Foundation\n\n\npublic struct Localization {\n")
@@ -139,8 +141,10 @@ module Fastlane
           swiftFilename = "Localization.swift"
           swiftFilepath = "#{destinationPath}/#{swiftFilename}"
 
-          #removes all identififiers with the label Not Required
-          filteredItems = language["items"].select { |item| item['identifierIos'] != "NR" }
+          filteredItems = language["items"].select { |item|
+              iosIdentifier = item['identifierIos']
+              iosIdentifier != "NR" && iosIdentifier != ""
+          }
 
           filename = "Localizable.strings"
           filepath = "#{destinationPath}/#{language['language']}.lproj/#{filename}"
@@ -149,8 +153,21 @@ module Fastlane
             filteredItems.each { |item|
 
               text = self.mapInvalidPlaceholder(item['text'])
+              comment = item['comment']
+              identifier = item['identifierIos']
+
+              line = ""
+
+              if identifier.include?('//')
+                line = "\n\n#{identifier}\n"
+              else
+                line = "\"#{identifier}\" = \"#{text}\";"
+              if !comment.to_s.empty?
+                 line = line + " //#{comment}\n"
+              end
+              end
 
-              f.write("//#{item['comment']}\n\"#{item['identifierIos']}\" = \"#{text}\";\n")
+              f.write(line)
             }
           end
         end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module GoogleSheetLocalize
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   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.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Mario Hahn