fastlane-plugin-google_sheet_localize 0.1.54 → 0.1.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca0a7c8b39bcba4562285f0e04b78d18985d058b02fa3190906827ca08a05034
-  data.tar.gz: f542192380763fd64fdc22f4a7ec5e6f72e62aa396789814db2025824ab84cb6
+  metadata.gz: 53568c7a605fe89cbadbe04ce64d0f1cf1bd48d3324fadbdbcb017ca97c7e68d
+  data.tar.gz: 69a1415e7f0c7582ab390d0aef9690f93194a48cf877c50fa77a330cbbbf61c2
 SHA512:
-  metadata.gz: 414d513e932c344facd9321d59985ad186d101ced91709294694be4a5189b1c660493b04d3be7a81172c247bad8652705201d6ccc2dd60c3284506bdbf703721
-  data.tar.gz: fe0f35acc913ef7f3e3adb4848173d689a855cf51238d240ca45ec8ce52a902ce6ec832db448ee0d8f364bca8f5d537fba143611f80a20a729536e7709947040
+  metadata.gz: 039de61d11dd9fa3d0d27b65ee02b3044620a2981f493f47640d8392685061e3d4aa335cf3a1690bdb94f54e27f1e11c3b34dac2d9109f98f2f2bb9879951720
+  data.tar.gz: a05659f1896c2861f2a7c3ab21017b04427007462f3e647c24f023be947dca1e52443545bca15dc229464a24350162634d4e4bee3ec53117ea0693b706901c58

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

@@ -14,6 +14,7 @@ module Fastlane
         platform = params[:platform]
         path = params[:localization_path]
         language_titles = params[:language_titles]
+        default_language = params[:default_language]
 
         spreadsheet = session.spreadsheet_by_url(spreadsheet_id)
         worksheet = spreadsheet.worksheets.first
@@ -47,7 +48,7 @@ module Fastlane
             result.push(language)
           end
         end
-        self.createFiles(result, platform, path)
+        self.createFiles(result, platform, path, default_language)
       end
 
       def self.generateJSONObject(contentRows, index)
@@ -64,12 +65,6 @@ module Fastlane
 
       end
 
-      def self.writeToJSONFile(languages)
-        File.open("output.json","w") do |f|
-          f.write(JSON.pretty_generate(languages))
-        end
-      end
-
       def self.generateSingleObject(row, column)
         identifierIos = row[0]
         identifierAndroid = row[1]
@@ -87,8 +82,15 @@ module Fastlane
 
       end
 
-      def self.createFiles(languages, platform, destinationPath)
-          languages.each { |language| self.createFileForLanguage(language, platform, destinationPath) }
+      def filterUnusedRows(items, identifier)
+        return items.select { |item|
+            iosIdentifier = item[identifier]
+            iosIdentifier != "NR" && iosIdentifier != ""
+        }
+      end
+
+      def self.createFiles(languages, platform, destinationPath, defaultLanguage)
+          self.createFilesForLanguages(languages, platform, destinationPath, defaultLanguage)
 
           if platform == "ios"
 
@@ -135,29 +137,38 @@ module Fastlane
           end
       end
 
-      def self.createFileForLanguage(language, platform, destinationPath)
+      def self.createFilesForLanguages(languages, platform, destinationPath, defaultLanguage)
+
+        languages.each { |language|
+
         if platform == "ios"
 
-          filteredItems = language["items"].select { |item|
-              iosIdentifier = item['identifierIos']
-              iosIdentifier != "NR" && iosIdentifier != ""
-          }
+          filteredItems = self.filterUnusedRows(language["items"],'identifierIos')
 
           filename = "Localizable.strings"
           filepath = "#{destinationPath}/#{language['language']}.lproj/#{filename}"
           FileUtils.mkdir_p "#{destinationPath}/#{language['language']}.lproj"
           File.open(filepath, "w") do |f|
-            filteredItems.each { |item|
+            filteredItems.each_with_index { |item, index|
 
               text = self.mapInvalidPlaceholder(item['text'])
               comment = item['comment']
               identifier = item['identifierIos']
 
               line = ""
-
               if identifier.include?('//')
                 line = "\n\n#{identifier}\n"
               else
+
+                if text == "" || text == "TBD"
+                  default_language_object = languages.select { |languageItem| languageItem['language'] == defaultLanguage }.first["items"]
+                  default_language_object = self.filterUnusedRows(default_language_object,'identifierIos')
+
+                  defaultLanguageText = default_language_object[index]['text']
+                  puts "found empty text for identifier: #{identifier} for language:#{language['language']}, replaceing it with #{defaultLanguageText}"
+                  text = self.mapInvalidPlaceholder(defaultLanguageText)
+                end
+
                 line = "\"#{identifier}\" = \"#{text}\";"
               if !comment.to_s.empty?
                  line = line + " //#{comment}\n"
@@ -205,6 +216,7 @@ module Fastlane
             f.write("</resources>\n")
           end
         end
+        }
       end
 
       def self.createiOSFileEndString()
@@ -314,6 +326,11 @@ module Fastlane
                                description: "Alle language titles",
                                   optional: false,
                                       type: Array),
+          FastlaneCore::ConfigItem.new(key: :default_language,
+                                  env_name: "DEFAULT_LANGUAGE",
+                               description: "Default Language",
+                                  optional: false,
+                                      type: String),
           FastlaneCore::ConfigItem.new(key: :localization_path,
                                   env_name: "LOCALIZATION_PATH",
                                description: "Output path",

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

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