poeditor-pull 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 541147dfd209df96724b219ddaad87e709f72761c4f22810e3fb3e6d8d2dc3c2
-  data.tar.gz: 8d6373131f7af400e7775f6cbdd03bdb6eccc70a2cce64d416326bda51426573
+SHA1:
+  metadata.gz: f119b411e825228e445bf82f10dc89618d852dd7
+  data.tar.gz: db30beee41758a4b77d1c7d370e5bf90191b33d8
 SHA512:
-  metadata.gz: 34df5117bc1be2f7bbee7fc8341c4c3be5733c08211113455c35a16bdab9cd2dcb358354f7bf21f17bab6d1049bcb3d5da689e5352ffcc7da9af88c8a2e42bbb
-  data.tar.gz: db0ff9efba09e3f5273b319b1f9ea7118746e2264dd6d79baaa16a7609bc5f647a6d100e60bf8ca4ceadb4c45b9ec35db68bd5067e06a66e17cf545d18da214f
+  metadata.gz: 148be41e4e961aee83ecfb98d165f0788105673a8301227631553df252ed5c77bc149be46f045d6ea48243b258ff4f95f9e8042c037dbea4c13c0645468b7728
+  data.tar.gz: '0157686d65a35a74e76872fdda899b4576f003b80bc7537ce0ff0c1e2133a199329ce0ebb0c97bc1339470e3d26f589ceaa2b6f421a3b4979d58c88cde1a50da'

data/CHANGELOG

@@ -9,4 +9,5 @@ List of changes introduced to source codebase:
 5. Added: formatting paths with target/flavor name based on {TARGET_NAME} as parameter.
 6. Implemented language-region combination support [Android] and Chinese language coding support
 7. Implemented additional `path_copy` (next to default `path_replace`) strategy to support having both Base and source-base language `.strings` files project simultaneously [since 1.0.4, iOS specific].
-8. Change '...' into elipsis symbol '…' to conform with Android Lint.
+8. Change '...' into elipsis symbol '…' to conform with Android Lint.
+9. Added: support for BCP-47 tags on Android translations as described here: https://developer.android.com/guide/topics/resources/providing-resources.html#LocaleQualifier.

data/lib/Configuration.rb

@@ -47,7 +47,11 @@ module POEditor
       @path_replace = path_replace || {}
       @path_copy = path_copy || {}
       if @path_replace.any? and @path_copy.any?
-        raise POEditor::Exception.new "'path_replace' and 'path_copy' are different strategies of one functionality and thus cannot be in use simultaneously."
+        @path_replace.each { |language_key, v|
+          if @path_copy.key?(language_key)
+            raise POEditor::Exception.new "'path_replace' and 'path_copy' are different strategies of one functionality and thus cannot be in use simultaneously for same language."
+          end
+        }
       end
     end
 

data/lib/Core.rb

@@ -127,10 +127,12 @@ module POEditor
 
     def paths_for_language(language)
       if @configuration.path_copy[language]
+        language = convert_to_android_bcp_47(@configuration.path_copy[language], language)
         [@configuration.path_copy[language], @configuration.path.gsub("{LANGUAGE}", language)]
       elsif @configuration.path_replace[language]
         [@configuration.path_replace[language]]
       else
+        language = convert_to_android_bcp_47(@configuration.path, language)
         [@configuration.path.gsub("{LANGUAGE}", language)]
       end
     end
@@ -146,5 +148,14 @@ module POEditor
       File.write(path, content)
       UI.puts "      #{"\xe2\x9c\x93".green} Saved at '#{path}'"
     end
+
+    def convert_to_android_bcp_47(translation_path, language)
+        # added to follow b+ convention of BCP-47 on Android
+        if translation_path.include? "b+"
+          return language.gsub("-", "+")
+        end
+        return language
+    end
+
   end
 end

data/lib/Version.rb

@@ -1,3 +1,3 @@
 module POEditor
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: poeditor-pull
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Suyeol Jeon
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2019-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -62,7 +62,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: POEditor Pull CLI