r18n-rails 3.2.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f79ef5e04b9b51bfd8c698efa9d80aaee1236a845bc008827854c55da5143b0
-  data.tar.gz: 7f0d7aa7a517a72fb03b6f99b3627fd1fe2dcad6f5a5f5aa4bf7ae44aa304496
+  metadata.gz: bffe7c01c01781a342b1dd447c2bf438a307cc5a5c8113e7520af8d4de706787
+  data.tar.gz: e261678db0929a8ac27f39e6b91e7f954bde7c363a48e8fee5438d4b6060876e
 SHA512:
-  metadata.gz: a6acb6276e10eef4bb7086b1918dfb766278503624a1e3f1b6cb02021404abf06aff66bcac81b61926acad42a10ce721e73595091a2ad493fa5a60eb6ef36b4c
-  data.tar.gz: 2df93f4f7c9a34fc21dca3be1ca0666c4b32fad915310080b54412ca06f8cdb14286f48657c2a741bf23ad699c85ed899d3e31b1f10e713af976a02b2a42890f
+  metadata.gz: e100aec03ba69b888f04bf1bca45e8cd7d2e96b284d29478036e624e559bf9c663c0b1eeedec6dab8fd19fda2de3b45b7ced98d3b695972a2ed8613dbcab2802
+  data.tar.gz: 42f6d7bba9aad7561e312417f08c971840500587e2ab75e0a5299d786a89948d7f063891cd8cf523d37afe67040eaaa205ebc01a1c16ba22f7ac7f79bd1b55f9

data/README.md

@@ -7,16 +7,16 @@ documentation for more information.
 
 ## Features
 
-R18n for Rails is fully compatibile with Rails I18n, and add extra features:
+R18n for Rails is fully compatible with Rails I18n, and add extra features:
 
 * Nice Ruby-style syntax.
 * Filters.
 * Model Translation (or any Ruby object).
-* Autodetect user locales.
+* Auto-detect user locales.
 * Flexible locales.
 * Total flexibility.
 
-See full features in [main README](https://github.com/ai/r18n/blob/master/README.md).
+See full features in [main README](https://github.com/r18n/r18n/blob/master/README.md).
 
 ## How To
 
@@ -25,7 +25,7 @@ See full features in [main README](https://github.com/ai/r18n/blob/master/README
      ```
     gem 'r18n-rails'
      ```
-   Now R18n will autodetect user locales.
+   Now R18n will auto-detect user locales.
 2. Define your way to set locale manually. R18n will find it in
    `params[:locale]` or `session[:locale]`. Best way is a put optional
    locale prefix to URLs:
@@ -46,7 +46,7 @@ See full features in [main README](https://github.com/ai/r18n/blob/master/README
      ```
 
 4. Translations in I18n format are stored in
-   <tt>config/locales/<i>locale</i>.yml</tt>:
+   `config/locales/%{locale}.yml`:
 
      ```yaml
     en:
@@ -57,7 +57,7 @@ See full features in [main README](https://github.com/ai/r18n/blob/master/README
           one:  "One user"
           many: "%{count} users"
      ```
-   Translations in R18n format go to <tt>app/i18n/<i>locale</i>.yml</tt>:
+   Translations in R18n format go to `app/i18n/%{locale}.yml`:
 
      ```yaml
     user:
@@ -82,7 +82,7 @@ See full features in [main README](https://github.com/ai/r18n/blob/master/README
     t.user.count(5)
      ```
 
-6. Print dates and numbers in user’s tradition:
+6. Print dates and numbers in user's tradition:
 
      ```ruby
     l Date.today, :standard #=> "2009-12-20"
@@ -94,7 +94,7 @@ See full features in [main README](https://github.com/ai/r18n/blob/master/README
    not only for ActiveRecord models
 
    1. Add to migration columns for each of the supported locales, named as
-      <tt><i>name</i>_<i>locale</i></tt>:
+      `%{name}_%{locale}`:
 
          ```ruby
         t.string :title_en
@@ -121,8 +121,8 @@ See full features in [main README](https://github.com/ai/r18n/blob/master/README
       on current user locales.
 
 8. Download translations for Rails system messages (validation, etc) from
-   https://github.com/svenfuchs/rails-i18n/tree/master/rails/locale and
-   put them to `config/locales/` (because them use Rails I18n format).
+   [svenfuchs/rails-i18n](https://github.com/svenfuchs/rails-i18n/tree/master/rails/locale)
+   and put them to `config/locales/` (because them use Rails I18n format).
 9. Add your own translations filters to `app/i18n/filters.rb`:
 
      ```ruby
@@ -147,8 +147,8 @@ See full features in [main README](https://github.com/ai/r18n/blob/master/README
 ## License
 
 R18n is licensed under the GNU Lesser General Public License version 3.
-You can read it in LICENSE file or in http://www.gnu.org/licenses/lgpl.html.
+You can read it in LICENSE file or in [www.gnu.org/licenses/lgpl-3.0.html](https://www.gnu.org/licenses/lgpl-3.0.html).
 
 ## Author
 
-Andrey “A.I.” Sitnik <andrey@sitnik.ru>
+Andrey “A.I.” Sitnik [andrey@sitnik.ru](mailto:andrey@sitnik.ru)

data/lib/r18n-rails.rb

@@ -28,7 +28,7 @@ require_relative 'r18n-rails/filters'
 R18n.default_places { [Rails.root.join('app/i18n'), R18n::Loader::Rails.new] }
 
 ActionController::Base.helper(R18n::Rails::Helpers)
-ActionController::Base.send(:include, R18n::Rails::Controller)
+ActionController::Base.include R18n::Rails::Controller
 
 if ActionController::Base.respond_to? :before_action
   ActionController::Base.send(:before_action, :set_r18n)
@@ -52,7 +52,7 @@ ActiveSupport.on_load(:after_initialize) do
     i18n = R18n::I18n.new(
       locale, R18n.default_places,
       off_filters: :untranslated,
-      on_filters:  :untranslated_bash
+      on_filters: :untranslated_bash
     )
     R18n.set(i18n)
   else

data/lib/r18n-rails/filters.rb

@@ -29,6 +29,7 @@ module R18n
         attr_writer :path
         def path
           return @path if defined?(@path)
+
           ::Rails.root.join('app/i18n')
         end
 

data/lib/r18n-rails/helpers.rb

@@ -21,17 +21,17 @@ module R18n
   module Rails
     module Helpers
       # Return current R18n I18n object, to use R18n API:
-      # * <tt>r18n.available_locales</tt> – available application translations.
-      # * <tt>r18n.locales</tt> – List of user locales
-      # * <tt>r18n.reload!</tt> – Reload R18n translations
+      # * `r18n.available_locales` – available application translations.
+      # * `r18n.locales` – List of user locales
+      # * `r18n.reload!` – Reload R18n translations
       #
-      # You can get translations by <tt>r18n.user.name</tt>, but +t+ helper is
+      # You can get translations by `r18n.user.name`, but `t` helper is
       # more beautiful, short and also support R18n syntax.
       def r18n
         R18n.get
       end
 
-      # Extend +t+ helper to use also R18n syntax.
+      # Extend `t` helper to use also R18n syntax.
       #
       #   t 'user.name' # Rails I18n style
       #   t.user.name   # R18n style
@@ -44,7 +44,7 @@ module R18n
       end
       alias translate t
 
-      # Extend +l+ helper to use also R18n syntax.
+      # Extend `l` helper to use also R18n syntax.
       #
       #   l Time.now                 # Rails I18n default format
       #   l Time.now, format: :short # Rails I18n style

data/r18n-rails.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
 
   s.author   = 'Andrey Sitnik'
   s.email    = 'andrey@sitnik.ru'
-  s.homepage = 'https://github.com/ai/r18n/tree/master/r18n-rails'
+  s.homepage = 'https://github.com/r18n/r18n/tree/master/r18n-rails'
   s.license  = 'LGPL-3.0'
 
   s.add_dependency 'r18n-rails-api', "= #{R18n::VERSION}"

data/spec/app/app/controllers/test_controller.rb

@@ -32,8 +32,8 @@ class TestController < ApplicationController
   end
 
   def time
-    render plain: l(Time.at(0).utc) + "\n" +
-                  l(Time.at(0).utc, format: :short)
+    render plain:
+      l(Time.at(0).utc) + "\n" + l(Time.at(0).utc, format: :short)
   end
 
   def human_time

data/spec/app/config/initializers/r18n.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-# Fix R18n Rails require, because it doesn’t require in global Gemfile.
+# Fix R18n Rails require, because it doesn't require in global Gemfile.
 require 'r18n-rails'

data/spec/rails_spec.rb

@@ -21,11 +21,27 @@ describe TestController, type: :controller do
     expect(response.body).to eq 'ru, en'
   end
 
-  it 'gets locales from http' do
-    request.env['HTTP_ACCEPT_LANGUAGE'] = 'ru,fr;q=0.9'
-    get :locales
-    expect(response).to have_http_status(200)
-    expect(response.body).to eq 'ru, fr, en'
+  describe 'locales from http' do
+    it 'gets from regular locales' do
+      request.env['HTTP_ACCEPT_LANGUAGE'] = 'ru,fr;q=0.9'
+      get :locales
+      expect(response).to have_http_status(200)
+      expect(response.body).to eq 'ru, fr, en'
+    end
+
+    it 'gets from wildcard' do
+      request.env['HTTP_ACCEPT_LANGUAGE'] = '*'
+      get :locales
+      expect(response).to have_http_status(200)
+      expect(response.body).to eq 'ru'
+    end
+
+    it 'gets from regular locales with wildcard' do
+      request.env['HTTP_ACCEPT_LANGUAGE'] = 'ru, fr;q=0.9, *;q=0.5'
+      get :locales
+      expect(response).to have_http_status(200)
+      expect(response.body).to eq 'ru, fr, en'
+    end
   end
 
   it 'loads translations' do

data/spec/spec_helper.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-## https://github.com/stevekinney/pizza/issues/103#issuecomment-136052789
-## https://github.com/docker-library/ruby/issues/45
-Encoding.default_external = 'UTF-8'
-
 require 'pp'
 
 ENV['RAILS_ENV'] ||= 'test'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r18n-rails
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Andrey Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: r18n-rails-api
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
 description: |2
       Out-of-box R18n support for Ruby on Rails.
       It is just a wrapper for R18n Rails API and R18n core libraries.
@@ -73,7 +73,7 @@ files:
 - spec/app/db/schema.rb
 - spec/rails_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/ai/r18n/tree/master/r18n-rails
+homepage: https://github.com/r18n/r18n/tree/master/r18n-rails
 licenses:
 - LGPL-3.0
 metadata: {}
@@ -92,8 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: R18n for Rails