fastlane-plugin-google_sheet_localize 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 714e70705a464315aecdc814d690b1e5d2f926d9c7ff51c87270a6e7b1314441
-  data.tar.gz: d84410222307f26d577c3e8998dc97bb2bc2f6495585d3106c65b01cf32f24ed
+  metadata.gz: 87a4897b4267a2b1ec85e0decd035d4bbcaeec53b481a9c9d672476aad6065b6
+  data.tar.gz: ea0718e1d745c797e1ccf9c79d08dd299f8848381521652f4a524ad5f2a2ff47
 SHA512:
-  metadata.gz: 7927ff4ab444a083e5d770214c6d65d5d2a99602279c08b3f1f7ff34d23b1976f6e028c16b86e670574f9a84d2dae3268ead22e8adebb3c8021777c295abd99c
-  data.tar.gz: f92f4e8907c7043f7fecf7f65d45002a619f425e9be73413dd8548c521023d10a5d43270725672d267aed47d103ba6ae56efebd710cee51d944e55b6fd50d1ea
+  metadata.gz: e252a54b79b9728660ad3307d99caaec6500219fd11dbd4ffbf437340a9ae791be4e2879278c2f77fadfb1ecc5c787eac168883f0db2ced044ffeca68d67e031
+  data.tar.gz: 06e2fbf3ab587f03d94fd915abd7268daabaeef07a3a4bc9738aaf78eb87a48bb940de0ecfc3524ac9a123138cc64f01d8696d592bd2ee915660ec8361a023c8

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

@@ -13,41 +13,42 @@ module Fastlane
         tabs = params[:tabs]
         platform = params[:platform]
         path = params[:localization_path]
+        language_titles = params[:language_titles]
+        default_language = params[:default_language]
 
         spreadsheet = session.spreadsheet_by_url(spreadsheet_id)
-
-        # Get the first worksheet
         worksheet = spreadsheet.worksheets.first
 
-        languages = self.numberOfLanguages(worksheet)
-
         result = []
 
-        for i in 2..1+languages
+        for i in 0..worksheet.max_cols
+
           title = worksheet.rows[0][i]
 
-          language = {
-            'language' => title,
-            'items' => []
-          }
+          if language_titles.include?(title)
 
-          filterdWorksheets = []
+            language = {
+              'language' => title,
+              'items' => []
+            }
 
-          if tabs.count == 0
-            filterdWorksheets = spreadsheet.worksheets
-          else
-            filterdWorksheets = spreadsheet.worksheets.select { |item| tabs.include?(item.title) }
-          end
+            filterdWorksheets = []
 
-          filterdWorksheets.each { |worksheet|
-            contentRows = worksheet.rows.drop(1)
-            language['items'].concat(self.generateJSONObject(contentRows, i))
-          }
+            if tabs.count == 0
+              filterdWorksheets = spreadsheet.worksheets
+            else
+              filterdWorksheets = spreadsheet.worksheets.select { |item| tabs.include?(item.title) }
+            end
 
-          result.push(language)
+            filterdWorksheets.each { |worksheet|
+              contentRows = worksheet.rows.drop(1)
+              language['items'].concat(self.generateJSONObject(contentRows, i))
+            }
 
+            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,35 +137,43 @@ module Fastlane
           end
       end
 
-      def self.createFileForLanguage(language, platform, destinationPath)
-        if platform == "ios"
+      def self.createFilesForLanguages(languages, platform, destinationPath, defaultLanguage)
 
-          swiftFilename = "Localization.swift"
-          swiftFilepath = "#{destinationPath}/#{swiftFilename}"
+        languages.each { |language|
 
-          filteredItems = language["items"].select { |item|
-              iosIdentifier = item['identifierIos']
-              iosIdentifier != "NR" && iosIdentifier != ""
-          }
+        if platform == "ios"
+
+          filteredItems = self.filterUnusedRows(language["items"],'identifierIos')
 
           filename = "Localizable.strings"
           filepath = "#{destinationPath}/#{language['language']}.lproj/#{filename}"
-          FileUtils.mkdir_p language['language']
+          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"
+               else
+                 line = line + "\n"
               end
               end
 
@@ -173,16 +183,40 @@ 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
         end
+        }
       end
 
       def self.createiOSFileEndString()
@@ -243,15 +277,10 @@ module Fastlane
       end
 
       def self.mapInvalidPlaceholder(text)
-        filtered = text.gsub('%s', '%@')
+        filtered = text.gsub('%s', '%@').gsub('"', '\"')
         return filtered
       end
 
-      def self.numberOfLanguages(worksheet)
-        i = worksheet.num_cols
-        return i - 3
-      end
-
       def self.description
         "Creates .strings files for iOS and strings.xml files for Android"
       end
@@ -292,6 +321,16 @@ module Fastlane
                                description: "Array of all Google Sheet Tabs",
                                   optional: false,
                                       type: Array),
+          FastlaneCore::ConfigItem.new(key: :language_titles,
+                                  env_name: "LANGUAGE_TITLES",
+                               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.5"
+    VERSION = "0.1.6"
   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.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Mario Hahn