fastlane-plugin-google_sheet_localize 0.2.08 → 0.2.09

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d7de3c4d7121b4e4951eedee63a9e52be35327ee78ad9b21596ef94a1ba7e98
-  data.tar.gz: fbf9f07fc2ccb22cb88132473e353bdbd07d51b81bbd79f968b259fa0e33488e
+  metadata.gz: c02b39d49637a3b72336364ffd713da0ae15204ad348962f117c3f30b5422aad
+  data.tar.gz: dfd52c7a2444fce1704fcf33ff1f729857dad852b7246f56c793a6997ff3a404
 SHA512:
-  metadata.gz: 71ba498f21335ec969a77a330e3f99301fd07cfeb4255b13751253a900f02f03d357429288f28bb6167e96c75d9aedc2998df2ca284f51a1781aeb4a62f7d4ff
-  data.tar.gz: 96f8197af3ffb73bc768932f79251ae5a28e8eee4ee833f04a6f58e06ab66f913f4df7acdcd28596f29f732713bf85f96a6d093894f9eba00e5873878ea94be7
+  metadata.gz: 8d4c5a96a6d0361096db40551b990f6a8de1a72c028df16aa27cc15d8ef6c6e4e4520a4e460f949b2c632fad2e64ed5d0ed6fed03d5b4ee8e9b098fe6a47cf05
+  data.tar.gz: a07b2c145f2a54eebe98dba7b201c401416cc9a3bd3fa023733f2a5431559f0908a846735da4b64525679f702ddf59a484874e580ee6328f7706b54050e03aa4

data/README.md

@@ -24,6 +24,16 @@ Google Drive access token: [_Guide_](https://medium.com/@osanda.deshan/getting-g
 
 ## Sheet Language 
 
+#### Arguments: (Android + iOS + Web)  
+English: `Mario ate a %2s %1s`.   
+German: `Mario hat %1s einen %2s gegessen`.   
+  
+In this case `%2s` stands for __Apple__ and `%1s` for __Today__, the order is different in this example, so we need to take care of it.  
+
+Mapped iOS: `Mario ate a %2$@ %1$@`.   
+Mapped Android: `Mario ate a %2s %1s`.   
+Mapped Web: `Mario ate a {2} {1}`.   
+
 #### Plurals: (Android + iOS)
 one|%d artist  
 other|%d artists

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

@@ -33,46 +33,54 @@ module Fastlane
         end
 
         spreadsheet = session.spreadsheet_by_url(spreadsheet_id)
-        worksheet = spreadsheet.worksheets.first
 
-        result = []
+        filterdWorksheets = []
 
-        for i in 0..worksheet.max_cols
+        if tabs.count == 0
+          filterdWorksheets = spreadsheet.worksheets
+        else
+          filterdWorksheets = spreadsheet.worksheets.select { |item| tabs.include?(item.title) }
+        end
 
-          title = worksheet.rows[0][i]
+        result = []
+        
+        filterdWorksheets.each { |worksheet|
 
-          if language_titles.include?(title)
+          identifierIndex = 0
 
-            language = {
-              'language' => title,
-              'items' => []
-            }
+          for i in 0..worksheet.max_cols
+            if worksheet.rows[0][i] == identifier_name
+              identifierIndex = i
+            end
+          end
 
-            filterdWorksheets = []
+          for i in 0..worksheet.max_cols
 
-            if tabs.count == 0
-              filterdWorksheets = spreadsheet.worksheets
-            else
-              filterdWorksheets = spreadsheet.worksheets.select { |item| tabs.include?(item.title) }
-            end
+            title = worksheet.rows[0][i]
 
-            filterdWorksheets.each { |worksheet|
-              identifierIndex = 0
+            if language_titles.include?(title)
 
-              for index in 0..worksheet.max_cols
-                if worksheet.rows[0][index] == identifier_name
-                  identifierIndex = index
-                end
+              language = result.select { |item| item['language'] == title }.first
+
+              if language.nil?
+                language = {
+                  'language' => title,
+                  'items' => []
+                }
               end
 
               contentRows = worksheet.rows.drop(1)
-              language['items'].concat(self.generateJSONObject(contentRows, i, identifierIndex))
-            }
 
-            result.push(language)
+              items = language['items']
+              items = items + self.generateJSONObject(contentRows, i, identifierIndex)
+
+              language['items'] = items
+
+              result.push(language)
+            end
           end
-        end
-        self.createFiles(result, platform, path, default_language, base_language, code_generation_path)
+      }
+      self.createFiles(result, platform, path, default_language, base_language, code_generation_path)
       end
 
       def self.generateJSONObject(contentRows, index, identifierIndex)

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-google_sheet_localize
 version: !ruby/object:Gem::Version
-  version: 0.2.08
+  version: 0.2.09
 platform: ruby
 authors:
 - Mario Hahn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-20 00:00:00.000000000 Z
+date: 2019-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive