mini_i18n 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1535503921791b7c7660516aab9b224eda60883
-  data.tar.gz: 87d9b5f991ba9dca7da8310b2fc76d43b82a9100
+  metadata.gz: 748e42499af526adff60a56957acc33011de4885
+  data.tar.gz: 33139b385903ab20af789f9bd9ad03bc4a87b519
 SHA512:
-  metadata.gz: 58ba16e72dc2d6e2211999a89948490721f4ee23d7fc9781f913395bb2a44e80a21605ad0b8f7cb0c8be92d528ecf1fe0f46318a93935bfe23d67438904f2a3f
-  data.tar.gz: adf6f4cedaf7fc8b7c58179eb4e57a3b98a85cdc4269111b69411fcac45a0a9844d81cc4273ffff95e0b801cc035b9a6ea98fcb1e0a5c7862290636000b5d692
+  metadata.gz: 2cf99b8fb0fc6f67230c0a5fdcaa7742b23f1a0323afdeab870a090283ce193e060552a3b5f67d0c68dde7a5ede361a36b5f8f33d6cd267e5d3ae5c7497a2284
+  data.tar.gz: 6a4405281d8ec7086392d650b22a7c714fc906178419b4344850935065ebf07b04e14db7b66aa142df87eba8c3c71e54e24fa093ce7ad23d49d2ae60447cc5c8

data/lib/mini_i18n.rb

@@ -8,7 +8,7 @@ module MiniI18n
     include Localization
 
     DEFAULT_LOCALE = :en
-    SEPARATOR = '.'
+    DEFAULT_SEPARATOR = '.'
 
     attr_accessor :fallbacks
 
@@ -20,12 +20,8 @@ module MiniI18n
       @@default_locale = available_locale?(new_locale) || default_locale
     end
 
-    def default_available_locales
-      @@default_available_locales ||= translations.keys
-    end
-
     def available_locales
-      @@available_locales ||= default_available_locales
+      @@available_locales ||= translations.keys
     end
 
     def available_locales=(new_locales)
@@ -44,6 +40,14 @@ module MiniI18n
       set_locale(new_locale)
     end
 
+    def separator
+      @@separator ||= DEFAULT_SEPARATOR
+    end
+
+    def separator=(new_separator)
+      @@separator = new_separator || DEFAULT_SEPARATOR
+    end
+
     def configure
       yield(self) if block_given?
     end
@@ -63,8 +67,8 @@ module MiniI18n
       scope = options[:scope]
 
       keys = [_locale.to_s]
-      keys << scope.to_s.split(SEPARATOR) if scope
-      keys << key.to_s.split(SEPARATOR)
+      keys << scope.to_s.split(separator) if scope
+      keys << key.to_s.split(separator)
       keys = keys.flatten
 
       result = lookup(*keys)
@@ -81,9 +85,11 @@ module MiniI18n
 
     def set_locale(new_locale)
       new_locale = new_locale.to_s
+
       if available_locale?(new_locale)
         Thread.current[:mini_i18n_locale] = new_locale
       end
+
       locale
     end
 

data/lib/mini_i18n/version.rb

@@ -1,3 +1,3 @@
 module MiniI18n
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/mini_i18n_spec.rb

@@ -37,6 +37,16 @@ RSpec.describe MiniI18n do
     end
   end
 
+  describe 'separator' do
+    it 'allows to customize separator for nested keys' do
+      MiniI18n.separator = ' '
+      expect(MiniI18n.t('second_level hello')).to eq 'hello 2'
+
+      MiniI18n.separator = '::'
+      expect(MiniI18n.t('second_level::hello')).to eq 'hello 2'
+    end
+  end
+
   describe 'translate' do
     it "simple key" do
       expect(MiniI18n.t(:hello)).to eq 'hello'

data/spec/spec_helper.rb

@@ -10,6 +10,7 @@ RSpec.configure do |config|
 
   config.before(:each) do
     MiniI18n.locale = :en
+    MiniI18n.separator = '.'
     MiniI18n.fallbacks = false
     MiniI18n.available_locales = [:en, :es, :fr]
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_i18n
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - markets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler