bisu 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1e467bb3e10dd72e8da7301cc9583734b348a63
-  data.tar.gz: 7f298eadab69a48278eb7826e20234df360cf5d4
+  metadata.gz: 3653a0a2945c287e0d77426b0701596ecbc626e7
+  data.tar.gz: c1c4ea04cedda5020ffd836589e885a482ddeef5
 SHA512:
-  metadata.gz: 0f348d63e4ce0adb25b24c0b120d86e2cb425573e1f649fcc2b17fbf02a5f623b106e5a6dc1b733ba3a246346f5ee3505b6e2d64785ae357aa70a389cd63af26
-  data.tar.gz: f129554415e9d19853d4a6bd4ffda0080311d5bb67998e778458d200639656242779e0638b80df0264e36507ac9d566c6a07437df5197b28e7f534960c3b5748
+  metadata.gz: a9e3bf46581c3d02f52e1ba3820680be3dfb07190c1171ecd29d66e4ec4f3725d8b39caca86f4379e8427e8801d622577d1ec4a98a2d69a8862bcb2691820f9f
+  data.tar.gz: ecb9703fd7ef9c39b9fbaf537824554fee0acb9ada737ae0bcc3002fd76fff61cc420e29641cbbb5b40fd55d6b24512f213c033b4f1e27b5f5cefdf043ac3584

data/README.md

@@ -60,6 +60,8 @@ Configuration
   "klGeneral_Delete" = "$kDelete$";
   "klGeneral_Cancel" = "$kCancel$";
   "klGeneral_Close"  = "$kClose$";
+
+  "klRequestName"  = "$kRequestName%{user_name: %@}$";
   ```
 
 1. Create a \*.translatable version for your **Android** localization files:
@@ -75,6 +77,7 @@ Configuration
       <string name="delete">$kDelete$</string>
       <string name="cancel">$kCancel$</string>
       <string name="close">$kClose$</string>
+      <string name="request_name">$kRequestName%{user_name: %s}$</string>
   </resources>
   ```
   
@@ -86,4 +89,6 @@ Configuration
       delete: $kDelete$
       cancel: $kCancel$
       close: $kClose$
+    messages:
+      request_name: $kRequestName$
   ```

data/bisu.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'bisu'
-  s.version     = '1.1.1'
+  s.version     = '1.2.0'
   s.date        = '2015-07-01'
   s.summary     = 'A localization automation service'
   s.description = 'Bisu manages your app iOS and Android localization files for you. No more copy+paste induced errors!'

data/lib/bisu/translator.rb

@@ -56,11 +56,12 @@ module Bisu
       t = t.gsub("$specialKComment1$", "This file was automatically generated based on a translation template.")
       t = t.gsub("$specialKComment2$", "Remember to CHANGE THE TEMPLATE and not this file!")
 
-      t = t.gsub(/\$(k[^\$]+)\$/) do |match|
-        if localized = @kb.localize("#{$1}", language)
-          process(localized)
-        else
-          match
+      if l = localization_params(t)
+        if localized = @kb.localize(l[:loc_key], language)
+          l[:loc_vars].each do |param, value|
+            localized = localized.gsub("%{#{param}}", value)
+          end
+          t = t.gsub(l[:match], process(localized))
         end
       end
 
@@ -69,9 +70,26 @@ module Bisu
       t
     end
 
+    def localization_params(text)
+      return nil unless matches = text.match(/\$(k[^\$\{]+)(?:\{(.+)\})?\$/)
+
+      loc_vars = if matches[2]
+        vars = matches[2].split(",").map(&:strip)
+        vars = vars.map do |var|
+          key, value = var.split(":", 2).map(&:strip)
+          [key.to_sym, value]
+        end
+        Hash[vars]
+      end
+
+      { match:    matches[0],
+        loc_key:  matches[1],
+        loc_vars: loc_vars || {} }
+    end
+
     def process(text)
       if @type.eql?(:android)
-        text = text.gsub(/[']/, "\\\\'")
+        text = text.gsub(/[']/, "\\\\\\\\'")
         text = text.gsub("...", "…")
         text = text.gsub("& ", "& ")
       

data/test/test_bisu_translator.rb

@@ -10,11 +10,13 @@ class BisuTranslatorTest < Minitest::Test
     kb = Bisu::KnowledgeBase.new({
       languages: [@lang],
       keys: {
-        "kRegularKey"  => { @lang => "Não sabes nada João das Neves" },
-        "kIOSKey"      => { @lang => "Não sabes nada \"João das Neves\"" },
-        "kAndroidKey1" => { @lang => "Não sabes nada 'João das Neves'" },
-        "kAndroidKey2" => { @lang => "Não sabes nada João das Neves..." },
-        "kAndroidKey3" => { @lang => "Não sabes nada João das Neves & Pícaros" },
+        "kRegularKey"     => { @lang => "Não sabes nada João das Neves" },
+        "kIOSKey"         => { @lang => "Não sabes nada \"João das Neves\"" },
+        "kAndroidKey1"    => { @lang => "Não sabes nada 'João das Neves'" },
+        "kAndroidKey2"    => { @lang => "Não sabes nada João das Neves..." },
+        "kAndroidKey3"    => { @lang => "Não sabes nada João das Neves & Pícaros" },
+        "k1ParameterKey"  => { @lang => "Não sabes nada %{name}" },
+        "k2ParametersKey" => { @lang => "Sabes %{percentage} por cento %{name}." },
       }
     })
 
@@ -29,19 +31,34 @@ class BisuTranslatorTest < Minitest::Test
     orig3 = "3: $specialKLanguage$"
     orig4 = "4: $specialKLocale$"
     orig5 = "5: $kRegularKey$"
+    orig6_1 = "6.1: $k1ParameterKey$"
+    orig6_2 = "6.2: $k1ParameterKey{name:%1$s}$"
+    orig7_1 = "7.1: $k2ParametersKey$"
+    orig7_2 = "7.2: $k2ParametersKey{percentage:%2$d, name:%1$s}$"
+    orig7_3 = "7.3: $k2ParametersKey{name:%1$s, percentage:%2$d}$"
 
     loc1 = "1: This file was automatically generated based on a translation template."
     loc2 = "2: Remember to CHANGE THE TEMPLATE and not this file!"
     loc3 = "3: #{@lang}"
     loc4 = "4: #{@locale}"
     loc5 = "5: Não sabes nada João das Neves"
+    loc6_1 = "6.1: Não sabes nada %{name}"
+    loc6_2 = "6.2: Não sabes nada %1$s"
+    loc7_1 = "7.1: Sabes %{percentage} por cento %{name}."
+    loc7_2 = "7.2: Sabes %2$d por cento %1$s."
+    loc7_3 = "7.3: Sabes %2$d por cento %1$s."
 
     [@tios, @tand, @tror].each do |translator|
-      assert_equal translator.send(:localize, orig1, @lang, @locale), loc1
-      assert_equal translator.send(:localize, orig2, @lang, @locale), loc2
-      assert_equal translator.send(:localize, orig3, @lang, @locale), loc3
-      assert_equal translator.send(:localize, orig4, @lang, @locale), loc4
-      assert_equal translator.send(:localize, orig5, @lang, @locale), loc5
+      assert_equal translator.send(:localize, orig1,   @lang, @locale), loc1
+      assert_equal translator.send(:localize, orig2,   @lang, @locale), loc2
+      assert_equal translator.send(:localize, orig3,   @lang, @locale), loc3
+      assert_equal translator.send(:localize, orig4,   @lang, @locale), loc4
+      assert_equal translator.send(:localize, orig5,   @lang, @locale), loc5
+      assert_equal translator.send(:localize, orig6_1, @lang, @locale), loc6_1
+      assert_equal translator.send(:localize, orig6_2, @lang, @locale), loc6_2
+      assert_equal translator.send(:localize, orig7_1, @lang, @locale), loc7_1
+      assert_equal translator.send(:localize, orig7_2, @lang, @locale), loc7_2
+      assert_equal translator.send(:localize, orig7_3, @lang, @locale), loc7_3
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bisu
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - joaoffcosta