fastlane-plugin-google_sheet_localize 0.2.07 → 0.2.08

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a52b64aade6414fcadefc0531632010a1d9b8f704815883020fa76ebd53444c1
-  data.tar.gz: 496bcfe26b1720da5a550565d5eb129b4f48bc0084705eca842f57b12ff29c9b
+  metadata.gz: 4d7de3c4d7121b4e4951eedee63a9e52be35327ee78ad9b21596ef94a1ba7e98
+  data.tar.gz: fbf9f07fc2ccb22cb88132473e353bdbd07d51b81bbd79f968b259fa0e33488e
 SHA512:
-  metadata.gz: a27daa868decf15d291a3258f27cee24ab67dfe075ebefc0cff398b9c6e7cb88d5a7da2c91c189341639fac4b4c659e3cb4c543e70164f8dff8f0cd4805ab71a
-  data.tar.gz: 5322c1dc7cb45a0148122e38b8147cc5c712b2ba3ce2ccf3bae04ad0302bd3e46332c19432822d849e983e8d79999693c089913456216bc130f344da948e9ea1
+  metadata.gz: 71ba498f21335ec969a77a330e3f99301fd07cfeb4255b13751253a900f02f03d357429288f28bb6167e96c75d9aedc2998df2ca284f51a1781aeb4a62f7d4ff
+  data.tar.gz: 96f8197af3ffb73bc768932f79251ae5a28e8eee4ee833f04a6f58e06ab66f913f4df7acdcd28596f29f732713bf85f96a6d093894f9eba00e5873878ea94be7

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

@@ -18,6 +18,19 @@ module Fastlane
         default_language = params[:default_language]
         base_language = params[:base_language]
         code_generation_path = params[:code_generation_path]
+        identifier_name = params[:identifier_name]
+
+        if identifier_name.to_s.empty?
+          if platform == "ios"
+            identifier_name = "Identifier iOS"
+          end
+          if platform == "android"
+            identifier_name = "Identifier Android"
+          end
+          if platform == "web"
+            identifier_name = "Identifier Web"
+          end
+        end
 
         spreadsheet = session.spreadsheet_by_url(spreadsheet_id)
         worksheet = spreadsheet.worksheets.first
@@ -44,8 +57,16 @@ module Fastlane
             end
 
             filterdWorksheets.each { |worksheet|
+              identifierIndex = 0
+
+              for index in 0..worksheet.max_cols
+                if worksheet.rows[0][index] == identifier_name
+                  identifierIndex = index
+                end
+              end
+
               contentRows = worksheet.rows.drop(1)
-              language['items'].concat(self.generateJSONObject(contentRows, i))
+              language['items'].concat(self.generateJSONObject(contentRows, i, identifierIndex))
             }
 
             result.push(language)
@@ -54,12 +75,12 @@ module Fastlane
         self.createFiles(result, platform, path, default_language, base_language, code_generation_path)
       end
 
-      def self.generateJSONObject(contentRows, index)
+      def self.generateJSONObject(contentRows, index, identifierIndex)
           result = Array.new
           for i in 0..contentRows.count - 1
-              item = self.generateSingleObject(contentRows[i], index)
+              item = self.generateSingleObject(contentRows[i], index, identifierIndex)
 
-              if item[:identifierIos] != "" && item[:identifierAndroid] != ""
+              if item[:identifier] != ""
                 result.push(item)
               end
           end
@@ -68,33 +89,74 @@ module Fastlane
 
       end
 
-      def self.generateSingleObject(row, column)
-        identifierIos = row[0]
-        identifierAndroid = row[1]
+      def self.generateSingleObject(row, column, identifierIndex)
+        identifier = row[identifierIndex]
 
         text = row[column]
         comment = row.last
 
-        object = { 'identifierIos' => identifierIos,
-                   'identifierAndroid' => identifierAndroid,
+        object = { 'identifier' => identifier,
                    'text' => text,
                    'comment' => comment
         }
-
         return object
 
       end
 
-      def self.filterUnusedRows(items, identifier)
-        return items.select { |item|
+      def self.filterUnusedRows(items, identifier, filterComment)
+        filtered = items.select { |item|
             currentIdentifier = item[identifier]
             currentIdentifier != "NR" && currentIdentifier != "" && currentIdentifier != "TBD"
         }
+        
+        if filterComment == "false" 
+           return filtered
+        end
+
+        return filtered.select { |item|
+            !item[identifier].include?('//')
+        }
       end
 
       def self.createFiles(languages, platform, destinationPath, defaultLanguage, base_language, codeGenerationPath)
           self.createFilesForLanguages(languages, platform, destinationPath, defaultLanguage, base_language)
 
+          if platform == "web"
+            jsonFileName = "Localization.json"
+
+            jsonFilepath = "#{destinationPath}/#{jsonFileName}"
+
+            File.open(jsonFilepath, "w") do |f|
+
+              jsonItem = {}
+
+              languages.each { |language|
+                filteredItems = self.filterUnusedRows(language["items"],'identifier', "true")
+
+                allKeys = {}
+
+                filteredItems.each { |item|
+                  identifier = item['identifier']
+
+                  text = item['text']
+
+                  matches = text.scan(/%[0-9][sdf]/)
+                  matches.each { |match|
+                    text = text.gsub(match, "{#{match[1]}}")
+                  }
+
+                  if !identifier.include?('//')
+                    allKeys[identifier] = text
+                  end
+                }
+                jsonItem[language["language"]] = allKeys
+              }
+
+              jsonString = JSON.pretty_generate(jsonItem)
+              f.write(jsonString)
+            end
+          end
+
           if platform == "ios"
 
             swiftFilename = "Localization.swift"
@@ -105,18 +167,15 @@ module Fastlane
               swiftPath = destinationPath
             end
 
-            swiftFilepath = "#{swiftPath}/#{swiftFilename}"
+            filteredItems = self.filterUnusedRows(languages[0]["items"],'identifier', "true")
 
-            filteredItems = languages[0]["items"].select { |item|
-                iosIdentifier = item['identifierIos']
-                iosIdentifier != "NR" && iosIdentifier != "" && !iosIdentifier.include?('//') && iosIdentifier != "TBD"
-            }
+            swiftFilepath = "#{swiftPath}/#{swiftFilename}"
 
             File.open(swiftFilepath, "w") do |f|
               f.write("import Foundation\n\n// swiftlint:disable all\npublic struct Localization {\n")
               filteredItems.each { |item|
 
-                identifier = item['identifierIos']
+                identifier = item['identifier']
 
                 values = identifier.dup.split(".")
 
@@ -163,7 +222,7 @@ module Fastlane
 
         if platform == "ios"
 
-          filteredItems = self.filterUnusedRows(language["items"],'identifierIos')
+          filteredItems = self.filterUnusedRows(language["items"],'identifier', "false")
 
           stringFileName = "Localizable.strings"
           pluralsFileName = "Localizable.stringsdict"
@@ -183,7 +242,7 @@ module Fastlane
 
               text = self.mapInvalidPlaceholder(item['text'])
               comment = item['comment']
-              identifier = item['identifierIos']
+              identifier = item['identifier']
 
               line = ""
               if identifier.include?('//')
@@ -194,13 +253,19 @@ module Fastlane
 
                   if (text == "" || text == "TBD") && !defaultLanguage.to_s.empty?
                     default_language_object = languages.select { |languageItem| languageItem['language'] == defaultLanguage }.first["items"]
-                    default_language_object = self.filterUnusedRows(default_language_object,'identifierIos')
+                    default_language_object = self.filterUnusedRows(default_language_object,'identifier', "false")
 
                     defaultLanguageText = default_language_object[index]['text']
                     puts "found empty text for:\n\tidentifier: #{identifier}\n\tlanguage:#{language['language']}\n\treplacing it with: #{defaultLanguageText}"
                     text = self.mapInvalidPlaceholder(defaultLanguageText)
                   end
 
+                  matches = text.scan(/%[0-9][sdf]/)
+
+                  matches.each { |match|
+                    text = text.gsub(match, "%#{match[1]}$#{match[2].gsub("s","@")}")
+                  }
+
                   line = "\"#{identifier}\" = \"#{text}\";"
                   if !comment.to_s.empty?
                     line = line + " //#{comment}\n"
@@ -223,12 +288,12 @@ module Fastlane
             filteredItems.each_with_index { |item, index|
 
               text = self.mapInvalidPlaceholder(item['text'])
-              identifier = item['identifierIos']
+              identifier = item['identifier']
 
               if !identifier.include?('//') && text.include?("one|")
                 if (text == "" || text == "TBD") && !defaultLanguage.to_s.empty?
                   default_language_object = languages.select { |languageItem| languageItem['language'] == defaultLanguage }.first["items"]
-                  default_language_object = self.filterUnusedRows(default_language_object,'identifierIos')
+                  default_language_object = self.filterUnusedRows(default_language_object,'identifier', "false")
 
                   defaultLanguageText = default_language_object[index]['text']
                   puts "found empty text for:\n\tidentifier: #{identifier}\n\tlanguage:#{language['language']}\n\treplacing it with: #{defaultLanguageText}"
@@ -280,12 +345,12 @@ module Fastlane
             f.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
             f.write("<resources>\n")
 
-            filteredItems = self.filterUnusedRows(language["items"],'identifierAndroid')
+            filteredItems = self.filterUnusedRows(language["items"],'identifier', "false")
 
             filteredItems.each_with_index { |item, index|
 
               comment = item['comment']
-              identifier = item['identifierAndroid']
+              identifier = item['identifier']
               text = item['text']
 
               line = ""
@@ -296,7 +361,7 @@ module Fastlane
 
               if (text == "" || text == "TBD") && !defaultLanguage.to_s.empty?
                 default_language_object = languages.select { |languageItem| languageItem['language'] == defaultLanguage }.first["items"]
-                default_language_object = self.filterUnusedRows(default_language_object,'identifierAndroid')
+                default_language_object = self.filterUnusedRows(default_language_object,'identifier', "false")
 
                 defaultLanguageText = default_language_object[index]['text']
                 puts "found empty text for:\n\tidentifier: #{identifier}\n\tlanguage:#{language['language']}\n\treplacing it with: #{defaultLanguageText}"
@@ -380,10 +445,10 @@ module Fastlane
         result = Array.new
         filtered = self.mapInvalidPlaceholder(text)
 
-        stringIndexes = (0 ... filtered.length).find_all { |i| filtered[i,2] == '%@' }
-        intIndexes = (0 ... filtered.length).find_all { |i| filtered[i,2] == '%d' }
-        floatIndexes = (0 ... filtered.length).find_all { |i| filtered[i,2] == '%f' }
-        doubleIndexes = (0 ... filtered.length).find_all { |i| filtered[i,3] == '%ld' }
+        stringIndexes = filtered.scan(/%[0-9]?[s@]/)
+        intIndexes = filtered.scan(/%[0-9]?[d]/)
+        floatIndexes = filtered.scan(/%[0-9]?[f]/)
+        doubleIndexes = filtered.scan(/%[0-9]?[ld]/)
 
         if stringIndexes.count > 0
           result = result.concat(stringIndexes.map { |e| { "index": e, "type": "String" }})
@@ -440,7 +505,7 @@ module Fastlane
                                        type: String),
           FastlaneCore::ConfigItem.new(key: :platform,
                                   env_name: "PLATFORM",
-                               description: "Plaform, ios or android",
+                               description: "Platform, ios or android",
                                   optional: true,
                              default_value: Actions.lane_context[Actions::SharedValues::PLATFORM_NAME].to_s,
                      default_value_dynamic: true,
@@ -471,6 +536,11 @@ module Fastlane
                                description: "Output path",
                                   optional: false,
                                       type: String),
+          FastlaneCore::ConfigItem.new(key: :identifier_name,
+                                  env_name: "IDENTIFIER_NAME",
+                               description: "Identifier for Platform",
+                                  optional: true,
+                                      type: String),
           FastlaneCore::ConfigItem.new(key: :code_generation_path,
                                   env_name: "CODEGENERATIONPATH",
                                description: "Code generation path for the Swift file",

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

@@ -1,5 +1,5 @@
 module Fastlane
   module GoogleSheetLocalize
-    VERSION = "0.2.07"
+    VERSION = "0.2.08"
   end
 end

metadata

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