bisu 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c20a1701ab5eb80ac795d51e1b1366b5ef2a69ba
-  data.tar.gz: 77b52f74cfff624fb03af1ff444220ef77b65c62
+SHA256:
+  metadata.gz: de4d41b8e81de051cee161b99f77b0e6e81fe7cdb878191beb46a9427db39db5
+  data.tar.gz: f840f4d92ebc448ad43e298dcb95f3223c323a81f9441a1967689b278a501282
 SHA512:
-  metadata.gz: 6f5959e04a70095f5307a23e0ea61819394c8cdad2f499698acb9285719eb71fc6d80d65bc92e5f62ee9170c4584b45f5733cb49cc21360504403247953e9a9b
-  data.tar.gz: c9d64bdd4c29f2facd4ca30c95dafd42a45142839116c9b591682d43c02829e4a676939bc8dd8cf4fa298fd2874ab245dfecc2165aa576e7ae1b0c76cf0a671b
+  metadata.gz: dc08b4b71b33d3db13a04302905d1846b190aa7e9febbf5eea69a97da4d2147be3ae97c270f2d658b9c2d7b1f598e8cdeb32daba762927cd508164b3a305d9c0
+  data.tar.gz: ad976c7db6db95a592d9306e90e9c9051276cb2bc3dab784e97bef92d947386445c7f0d315b589df29e60833ac665039c4445d3d178dc1b21a30da6acb59892b

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.5.0

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 All notable changes to this project will be documented in this file.
 `Bisu` adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.7.2](https://github.com/hole19/bisu/releases/tag/v1.7.2)
+Released on 2020/03/09
+
+#### Added
+- Correctly handles percentage sign on Android platform
+
 ## [1.7.1](https://github.com/hole19/bisu/releases/tag/v1.7.1)
 Released on 2019/03/04
 

data/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby '2.3.1'
+ruby '2.5.0'
 
 gem 'safe_yaml',  '~> 1.0'
 gem 'colorize',   '~> 0.7'

data/Gemfile.lock

@@ -1,30 +1,32 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     colorize (0.8.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    diff-lcs (1.2.5)
-    hashdiff (0.3.0)
-    rake (12.3.2)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    diff-lcs (1.3)
+    hashdiff (1.0.1)
+    public_suffix (4.0.3)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-its (1.2.0)
+      rspec-support (~> 3.9.0)
+    rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    safe_yaml (1.0.4)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    safe_yaml (1.0.5)
     webmock (1.24.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -44,7 +46,7 @@ DEPENDENCIES
   xml-simple (~> 1.1)
 
 RUBY VERSION
-   ruby 2.3.1p112
+   ruby 2.5.0p0
 
 BUNDLED WITH
    1.17.2

data/README.md

@@ -107,7 +107,7 @@ Create a \*.translatable version for your platform specific localization files:
   "klGeneral_Delete" = "$kDelete$";
   "klGeneral_Cancel" = "$kCancel$";
   "klGeneral_Close"  = "$kClose$";
-  "klRequestName"    = "$kRequestName%{user_name: %@}$";
+  "klRequestName"    = "$kRequestName{user_name: %@}$";
   ```
 
 ##### Android
@@ -124,7 +124,7 @@ Create a \*.translatable version for your platform specific localization files:
       <string name="delete">$kDelete$</string>
       <string name="cancel">$kCancel$</string>
       <string name="close">$kClose$</string>
-      <string name="request_name">$kRequestName%{user_name: %s}$</string>
+      <string name="request_name">$kRequestName{user_name: %s}$</string>
   </resources>
   ```
 

data/lib/bisu/localizer.rb

@@ -19,6 +19,8 @@ module Bisu
 
       to_localize(t).map do |l|
         if localized = @dict.localize(language, l[:key]) || @dict.localize(fallback_language, l[:key])
+          localized = process(localized)
+
           l[:params].each do |param, value|
             if localized.match("%{#{param}}")
               localized = localized.gsub("%{#{param}}", value)
@@ -27,7 +29,7 @@ module Bisu
             end
           end
 
-          unless t.gsub!(l[:match], process(localized))
+          unless t.gsub!(l[:match], localized)
             Logger.warn("Could not find translation for #{l[:match]} in #{language}")
           end
         else
@@ -69,6 +71,7 @@ module Bisu
         text = text.gsub("...", "…")
         text = text.gsub("& ", "& ")
         text = text.gsub("@", "\\\\@")
+        text = text.gsub(/%(?!{)/, "\\\\%%")
 
       elsif @type.eql?(:ios)
         text = text.gsub(/\"/, "\\\\\"")

data/lib/bisu/version.rb

@@ -1,4 +1,4 @@
 module Bisu
-  VERSION = '1.7.1'
-  VERSION_UPDATED_AT = '2019-03-04'
+  VERSION = '1.7.2'
+  VERSION_UPDATED_AT = '2020-03-09'
 end

data/spec/lib/bisu/localizer_spec.rb

@@ -16,7 +16,8 @@ describe Bisu::Localizer do
       "kSingleQuoted"    => "Não sabes nada 'João das Neves'",
       "kEllipsis"        => "Não sabes nada João das Neves...",
       "kAmpersand"       => "Não sabes nada João das Neves & Pícaros",
-      "kAtSign"          => "\@johnsnow sabes alguma coisa?"
+      "kAtSign"          => "\@johnsnow sabes alguma coisa?",
+      "kPercentage"      => "Sabes 0% João das Neves."
     },
     "English" => {
       "kMissingTransKey" => "You know little John Snow"
@@ -64,6 +65,7 @@ describe Bisu::Localizer do
     it { translates("$kEllipsis$",     to: expected[:ellipsis]) }
     it { translates("$kAmpersand$",    to: expected[:ampersand]) }
     it { translates("$kAtSign$",       to: expected[:at_sign]) }
+    it { translates("$kPercentage$",   to: expected[:percentage]) }
 
     # error handling
 
@@ -115,7 +117,8 @@ describe Bisu::Localizer do
     single_quoted: keys[language]["kSingleQuoted"],
     ellipsis:      keys[language]["kEllipsis"],
     ampersand:     keys[language]["kAmpersand"],
-    at_sign:       keys[language]["kAtSign"]
+    at_sign:       keys[language]["kAtSign"],
+    percentage:    keys[language]["kPercentage"]
   } }
 
   describe "of type iOS" do
@@ -135,7 +138,8 @@ describe Bisu::Localizer do
       single_quoted: "Não sabes nada \\'João das Neves\\'",
       ellipsis: "Não sabes nada João das Neves…",
       ampersand: "Não sabes nada João das Neves & Pícaros",
-      at_sign: "\\@johnsnow sabes alguma coisa?"
+      at_sign: "\\@johnsnow sabes alguma coisa?",
+      percentage: "Sabes 0\\%% João das Neves."
     ) }
 
     it_behaves_like "a localizer"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bisu
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - joaoffcosta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -131,8 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A localization automation service