dry_i18n 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 263e01040f7128266abfcb48fcdd1de095e3b318
-  data.tar.gz: 647d72d0ed3fb7537148bc66b742798678b8e3e4
+  metadata.gz: 90852497bd40badcdab82478e563cb84ccd3ea54
+  data.tar.gz: df1aecd0821dc3edfbfc21cf611809c5adebe9de
 SHA512:
-  metadata.gz: cfcf5e5596169fd5a1a46875cf3a127478a6a5f814154fa1169a6531b881ae2f99d6ac91c046f0ab5d4c11d2cbee4b31fcb5bcc44040ee20499f37557b4a3b30
-  data.tar.gz: 0ee980fab1d019731f5de4158674882d515ca17f9250fae83ff17517a864c52fb3f8943fb30133948ec6930f04e2041f349a22e095e045d221101e65bba3a8a2
+  metadata.gz: 984f5c7339a70553fb449d594635d4bc13a14fb298086fa762a31994d1e2a6ff0953fb033b37d7f10db17111325b80a7e694fc5fe2c6c287e3de4ccc88ac7e80
+  data.tar.gz: f3d9f483f9ee783505ef042d42ac8adf5c20a076a7592dcb1bfe6dc25d606b1db75c334d68328fdf08d06d850d948372e3b41af9bdefaf6c7b38e22976c52533

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# Change Log
+
+## [v1.0.1](https://github.com/stympy/dry_i18n/tree/v1.0.1) (30-4-2018)
+[Full Changelog](https://github.com/stympy/dry_i18n/compare/v1.0.0...v1.0.1)
+
+**Fixes**
+
+- Error in 'scan' method when used gem Faker [\#3](https://github.com/NachoPal/dry_i18n/issues/3)
+- Error when use I18n.transliterate [\#1](https://github.com/NachoPal/dry_i18n/issues/1)

data/README.md

@@ -1,9 +1,5 @@
 # DryI18n
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/dry_i18n`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -24,38 +20,44 @@ Or install it yourself as:
 
 With this Gem you'll be able tu reuse i18n key translations, avoiding in this way to repeat yourself.
 
-###Some examples of use:
+Basically you just need to wrap the key you want to reuse with the markup **@[key]**
+
+If the key you are reusing has interpolations, you just need to add a coma and pass a hash with the interpolation values **@[key,{foo: 'foo', bar: 'bar'}]**
+
+You don't have to worry about the order you declare the keys on the yml files
+
+###Some examples of usage:
 
 1.- Basic reuse
 ```
 en:
     secondary_key: "secondary key"
-    main_key: "I am a main key which reuse a @[secondary_hey]"
+    main_key: "I am a main key which reuse a @[secondary_key]"
 ```
 ```
-I18n.t("main_key") = "I am a main key which reuse a secondary_key"
+I18n.t("main_key") = "I am a main key which reuse a secondary key"
 ```
 
 2.- Reusing with interpolation
 ```
 en:
     secondary_key: "secondary key with %{interpolation}"
-    main_key: "I am a main key which reuse a @[secondary_hey,{interpolation: 'interpolation'}]"
+    main_key: "I am a main key which reuse a @[secondary_key,{interpolation: 'interpolation'}]"
 ```
 ```
-I18n.t("main_key") = "I am a main key which reuse a secondary_key with interpolation"
+I18n.t("main_key") = "I am a main key which reuse a secondary key with interpolation"
 ```
 
 3.- Reusing with nested keys with or without interpolation
 ```
 en:
     nth_key: "nested key with %{interpolation}"
-    secondary_key: "secondary key with %{interpolation} and a @[nth_key,{interpolation: 'interpolation']"
-    main_key: "I am a main key which reuse a @[secondary_hey,{interpolation: 'interpolation'}], and it's own %{interpolation}"
+    secondary_key: "secondary key with %{interpolation} and a @[nth_key,{interpolation: 'interpolation'}]"
+    main_key: "I am a main key which reuse a @[secondary_key,{interpolation: 'interpolation'}], and it's own %{interpolation}"
 ```
 ```
 I18n.t("main_key",{interpolation: 'interpolation'}) =
-"I am a main key which reuse a secondary_key with interpolation and a nested key with interpolaton, and it's own interpolation"
+"I am a main key which reuse a secondary key with interpolation and a nested key with interpolation, and its own interpolation"
 ```
 
 ## Contributing

data/lib/dry_i18n.rb

@@ -7,21 +7,37 @@ module DryI18n
 
     def translate(locale, key, options = {})
       translation = original_translate(locale, key, options)
+
+      if translation.is_a? Array
+        translation.each_with_index do |translation_subpart, i|
+          translation[i] = replace_variable_in_translation(translation_subpart) if translation_subpart.is_a? String
+        end
+      elsif translation.is_a? String
+        translation = replace_variable_in_translation(translation)
+      end
+
+      translation
+    end
+
+    def replace_variable_in_translation(translation)
       variables = variables?(translation)
 
       if variables
         variables.each do |variable|
           key = variable[/@\[(.*?)\]/m, 1]
           options = key.scan(/\{.*?\}/)
+
           if options.any?
             options = eval(options.first)
             key = key.split(',').first
           else
             options = {}
           end
+
           translation = translation.sub(variable, I18n.translate(key, options))
         end
       end
+
       translation
     end
 

data/lib/dry_i18n/version.rb

@@ -1,3 +1,3 @@
 module DryI18n
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry_i18n
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Nacho
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-12 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,6 +78,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -108,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Avoid repeating word translations for I18n ruby gem