r18n-core 4.0.0 → 5.0.1

data/lib/r18n-core/locales/es.rb

@@ -7,6 +7,8 @@ module R18n
       set(
         title: 'Español',
 
+        sublocales: %w[es-US es-CL],
+
         wday_names: %w[domingo lunes martes miércoles jueves viernes sábado],
         wday_abbrs: %w[dom lun mar mie jue vie sab],
 

data/lib/r18n-core/locales/fi.rb

@@ -31,8 +31,8 @@ module R18n
         number_group: ''
       )
 
-      def format_time_full(time, *_params)
-        format_time(format_date_full(time) + ' kello', time)
+      def format_time_full(time)
+        format_time "#{format_date_full(time)} kello", time
       end
     end
   end

data/lib/r18n-core/locales/fr.rb

@@ -26,10 +26,10 @@ module R18n
         number_group: ' '
       )
 
-      def format_date_full(date, year = true, *_params)
-        full = super(date, year)
+      def format_date_full(date, year: true, **_kwargs)
+        full = super(date, year: year)
         if full[0..1] == '1 '
-          '1er' + full[1..-1]
+          "1er#{full[1..-1]}"
         else
           full
         end

data/lib/r18n-core/locales/it.rb

@@ -24,10 +24,10 @@ module R18n
         number_group: ' '
       )
 
-      def format_date_full(date, year = true, *_params)
-        full = super(date, year)
+      def format_date_full(date, year: true, **_kwargs)
+        full = super(date, year: year)
         if full[0..1] == '1 '
-          '1º' + full[1..-1]
+          "1º#{full[1..-1]}"
         else
           full
         end

data/lib/r18n-core/locales/pt.rb

@@ -7,6 +7,8 @@ module R18n
       set(
         title: 'Português',
 
+        sublocales: %w[pt-BR],
+
         wday_names: %w[
           domingo segunda-feira terça-feira quarta-feira quinta-feira
           sexta-feira sábado

data/lib/r18n-core/locales/zh-cn.rb

@@ -8,7 +8,7 @@ module R18n
     class ZhCN < Zh
       set(
         title: '简体中文',
-        sublocales: %w[zh en]
+        sublocales: %w[zh zh-TW en]
       )
     end
   end

data/lib/r18n-core/locales/zh-tw.rb

@@ -8,7 +8,7 @@ module R18n
     class ZhTW < Zh
       set(
         title: '繁體中文',
-        sublocales: %w[zh en],
+        sublocales: %w[zh zh-CN en],
 
         wday_names: %w[星期日 星期壹 星期二 星期三 星期四 星期五 星期六],
         wday_abbrs: %w[周日 周壹 周二 周三 周四 周五 周六],

data/lib/r18n-core/locales/zh.rb

@@ -7,6 +7,8 @@ module R18n
       set(
         title: '中文',
 
+        sublocales: %w[zh-CN zh-TW],
+
         wday_names: %w[星期日 星期一 星期二 星期三 星期四 星期五 星期六],
         wday_abbrs: %w[周日 周一 周二 周三 周四 周五 周六],
 

data/lib/r18n-core/translated.rb

@@ -108,14 +108,14 @@ module R18n
       # Add proxy-method `name`. See `R18n::Translated` for description.
       # It's more useful to set options.
       #
-      #   translation :desciption, type: 'markdown'
+      #   translation :description, type: 'markdown'
       def translation(name, options = {})
         if options[:methods]
           @unlocalized_getters[name] =
             options[:methods].map { |l, i| [l.to_s, i.to_s] }.to_h
           unless options[:no_write]
             @unlocalized_setters[name] =
-              options[:methods].map { |l, i| [l.to_s, i.to_s + '='] }.to_h
+              options[:methods].map { |l, i| [l.to_s, "#{i}="] }.to_h
           end
         end
 
@@ -176,7 +176,7 @@ module R18n
       # didn't set map in `translation` option `methods`, it will be detect
       # automatically.
       def unlocalized_getters(method)
-        matcher = Regexp.new('^' + Regexp.escape(method.to_s) + '_(\w+)$')
+        matcher = Regexp.new("^#{Regexp.escape(method.to_s)}_(\\w+)$")
         unless @unlocalized_getters.key? method
           @unlocalized_getters[method] = {}
           unlocalized_methods.select { |i| i =~ matcher }.each do |i|
@@ -190,7 +190,7 @@ module R18n
       # didn't set map in `translation` option `methods`, it will be detect
       # automatically.
       def unlocalized_setters(method)
-        matcher = Regexp.new('^' + Regexp.escape(method.to_s) + '_(\w+)=$')
+        matcher = Regexp.new("^#{Regexp.escape(method.to_s)}_(\\w+)=$")
         unless @unlocalized_setters.key? method
           @unlocalized_setters[method] = {}
           unlocalized_methods.select { |i| i =~ matcher }.each do |i|

data/lib/r18n-core/translated_string.rb

@@ -47,14 +47,9 @@ module R18n
       true
     end
 
-    # Return true if `html_safe` method is defined, otherwise false.
-    def html_safe?
-      respond_to? :html_safe
-    end
-
     # Override to_s to make string html safe if `html_safe` method is defined.
     def to_s
-      if html_safe?
+      if respond_to?(:html_safe)
         super.html_safe
       else
         String.new(super)

data/lib/r18n-core/translation.rb

@@ -168,7 +168,7 @@ module R18n
     # Return translation located at `keys`.
     # @see Hash#dig
     def dig(*keys)
-      keys.reduce(self) { |result, key| result[key] }
+      keys.reduce(self, :[])
     end
 
     # I think we don't need in the Ruby core method,

data/lib/r18n-core/unsupported_locale.rb

@@ -62,6 +62,8 @@ module R18n
     end
 
     def respond_to_missing?(name, *args)
+      return super unless @base
+
       @base.send __method__, name, *args
     end
   end

data/lib/r18n-core/utils.rb

@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Common methods for another R18n code.
 module R18n
+  # Common methods for another R18n code.
   module Utils
     # Escape HTML entries (<, >, &). Copy from HAML helper.
     def self.escape_html(content)

data/lib/r18n-core/version.rb

@@ -2,5 +2,5 @@
 
 # Version of R18n Core
 module R18n
-  VERSION = '4.0.0' unless defined? R18n::VERSION
+  VERSION = '5.0.1'
 end

metadata

@@ -1,32 +1,208 @@
 --- !ruby/object:Gem::Specification
 name: r18n-core
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Andrey Sitnik
-autorequire: 
+- Alexander Popov
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
-dependencies: []
+date: 2021-03-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
+- !ruby/object:Gem::Dependency
+  name: kramdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: RedCloth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+- !ruby/object:Gem::Dependency
+  name: gem_toys
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: toys
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
 description: |2
       R18n is a i18n tool to translate your Ruby application.
       It has nice Ruby-style syntax, filters, flexible locales, custom loaders,
       translation support for any classes, time and number localization, several
       user language support, agnostic core package with out-of-box support for
       Rails, Sinatra and desktop applications.
-email: andrey@sitnik.ru
+email:
+- andrey@sitnik.ru
+- alex.wayfer@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- ".rspec"
+- ChangeLog.md
 - LICENSE
 - README.md
-- Rakefile
 - base/af.yml
 - base/az.yml
 - base/bg.yml
@@ -125,49 +301,16 @@ files:
 - lib/r18n-core/version.rb
 - lib/r18n-core/yaml_loader.rb
 - lib/r18n-core/yaml_methods.rb
-- r18n-core.gemspec
-- spec/filters_spec.rb
-- spec/i18n_spec.rb
-- spec/locale_spec.rb
-- spec/locales/af_spec.rb
-- spec/locales/cs_spec.rb
-- spec/locales/en-us_spec.rb
-- spec/locales/en_spec.rb
-- spec/locales/es-us_spec.rb
-- spec/locales/fa_spec.rb
-- spec/locales/fi_spec.rb
-- spec/locales/fr_spec.rb
-- spec/locales/hu_spec.rb
-- spec/locales/id_spec.rb
-- spec/locales/it_spec.rb
-- spec/locales/no_spec.rb
-- spec/locales/pl_spec.rb
-- spec/locales/ru_spec.rb
-- spec/locales/sk_spec.rb
-- spec/locales/th_spec.rb
-- spec/locales/vi_spec.rb
-- spec/r18n_spec.rb
-- spec/spec_helper.rb
-- spec/translated_spec.rb
-- spec/translation_spec.rb
-- spec/translations/extension/deep/en.yml
-- spec/translations/extension/en.yml
-- spec/translations/extension/notransl.yml
-- spec/translations/general/en.yml
-- spec/translations/general/nolocale.yml
-- spec/translations/general/ru.yml
-- spec/translations/two/en.yml
-- spec/translations/two/fr.yml
-- spec/translations/with_regions/en-US.yml
-- spec/translations/yaml/en-GB.yml
-- spec/translations/yaml/en-us.yml
-- spec/translations/yaml/en.yaml
-- spec/yaml_loader_spec.rb
-homepage: https://github.com/r18n/r18n
+homepage: https://github.com/r18n/r18n-core
 licenses:
 - LGPL-3.0
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/r18n/r18n-core/issues
+  changelog_uri: https://github.com/r18n/r18n-core/blob/5.0.1/ChangeLog.md
+  documentation_uri: http://www.rubydoc.info/gems/r18n-core/5.0.1
+  homepage_uri: https://github.com/r18n/r18n-core
+  source_code_uri: https://github.com/r18n/r18n-core
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -175,52 +318,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: I18n tool to translate your Ruby application.
-test_files:
-- spec/filters_spec.rb
-- spec/i18n_spec.rb
-- spec/locale_spec.rb
-- spec/locales/af_spec.rb
-- spec/locales/cs_spec.rb
-- spec/locales/en-us_spec.rb
-- spec/locales/en_spec.rb
-- spec/locales/es-us_spec.rb
-- spec/locales/fa_spec.rb
-- spec/locales/fi_spec.rb
-- spec/locales/fr_spec.rb
-- spec/locales/hu_spec.rb
-- spec/locales/id_spec.rb
-- spec/locales/it_spec.rb
-- spec/locales/no_spec.rb
-- spec/locales/pl_spec.rb
-- spec/locales/ru_spec.rb
-- spec/locales/sk_spec.rb
-- spec/locales/th_spec.rb
-- spec/locales/vi_spec.rb
-- spec/r18n_spec.rb
-- spec/spec_helper.rb
-- spec/translated_spec.rb
-- spec/translation_spec.rb
-- spec/translations/extension/deep/en.yml
-- spec/translations/extension/en.yml
-- spec/translations/extension/notransl.yml
-- spec/translations/general/en.yml
-- spec/translations/general/nolocale.yml
-- spec/translations/general/ru.yml
-- spec/translations/two/en.yml
-- spec/translations/two/fr.yml
-- spec/translations/with_regions/en-US.yml
-- spec/translations/yaml/en-GB.yml
-- spec/translations/yaml/en-us.yml
-- spec/translations/yaml/en.yaml
-- spec/yaml_loader_spec.rb
+test_files: []