Merge 079167d into 80430f2

Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'bundler'
 
-require File.expand_path('../lib/numbers_and_words/version', __FILE__)
+require File.expand_path('lib/numbers_and_words/version', __dir__)
 
 begin
   Bundler.setup :default, :development

lib/numbers_and_words/i18n/plurals/cs.rb

@@ -4,28 +4,31 @@ module Plurals
       module Cs
         module_function
 
-        RULE = lambda do |n|
-          if one_conditions(n)
+        RULE = lambda do |number|
+          if one_conditions(number)
             :one
-          elsif few_conditions(n)
+          elsif few_conditions(number)
             :few
-          elsif many_conditions(n)
+          elsif many_conditions(number)
             :many
           else
             :other
           end
         end
 
-        def one_conditions(n)
-          n % 10 == 1 && n % 100 != 11
+        def one_conditions(number)
+          number % 10 == 1 && number % 100 != 11
         end
 
-        def few_conditions(n)
-          [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100)
+        def few_conditions(number)
+          [2, 3, 4].include?(number % 10) &&
+            ![12, 13, 14].include?(number % 100)
         end
 
-        def many_conditions(n)
-          (n % 10).zero? || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100)
+        def many_conditions(number)
+          (number % 10).zero? ||
+            [5, 6, 7, 8, 9].include?(number % 10) ||
+            [11, 12, 13, 14].include?(number % 100)
         end
       end
     end

lib/numbers_and_words/i18n/plurals/fr.rb

@@ -4,10 +4,10 @@ module Plurals
       module Fr
         module_function
 
-        RULE = ->(n) { one_conditions(n) ? :one : :other }
+        RULE = ->(number) { one_conditions(number) ? :one : :other }
 
-        def one_conditions(n)
-          n % 10 == 1 && n % 100 != 11
+        def one_conditions(number)
+          number % 10 == 1 && number % 100 != 11
         end
       end
     end

lib/numbers_and_words/i18n/plurals/lt.rb

@@ -4,22 +4,23 @@ module Plurals
       module Lt
         module_function
 
-        RULE = lambda do |n|
-          if one_conditions(n)
+        RULE = lambda do |number|
+          if one_conditions(number)
             :one
-          elsif ones_conditions(n)
+          elsif ones_conditions(number)
             :ones
           else
             :other
           end
         end
 
-        def one_conditions(n)
-          n % 10 == 1 && n % 100 != 11
+        def one_conditions(number)
+          number % 10 == 1 && number % 100 != 11
         end
 
-        def ones_conditions(n)
-          [2, 3, 4, 5, 6, 7, 8, 9].include?(n % 10) && ![12, 13, 14, 15, 16, 17, 18, 19].include?(n % 100)
+        def ones_conditions(number)
+          [2, 3, 4, 5, 6, 7, 8, 9].include?(number % 10) &&
+            ![12, 13, 14, 15, 16, 17, 18, 19].include?(number % 100)
         end
       end
     end

lib/numbers_and_words/i18n/plurals/lv.rb

@@ -4,10 +4,10 @@ module Plurals
       module Lv
         module_function
 
-        RULE = ->(n) { one_conditions(n) ? :one : :other }
+        RULE = ->(number) { one_conditions(number) ? :one : :other }
 
-        def one_conditions(n)
-          n % 10 == 1 && n % 100 != 11
+        def one_conditions(number)
+          number % 10 == 1 && number % 100 != 11
         end
       end
     end

lib/numbers_and_words/i18n/plurals/ru.rb

@@ -4,28 +4,31 @@ module Plurals
       module Ru
         module_function
 
-        RULE = lambda do |n|
-          if one_conditions(n)
+        RULE = lambda do |number|
+          if one_conditions(number)
             :one
-          elsif few_conditions(n)
+          elsif few_conditions(number)
             :few
-          elsif many_conditions(n)
+          elsif many_conditions(number)
             :many
           else
             :other
           end
         end
 
-        def one_conditions(n)
-          n % 10 == 1 && n % 100 != 11
+        def one_conditions(number)
+          number % 10 == 1 && number % 100 != 11
         end
 
-        def few_conditions(n)
-          [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100)
+        def few_conditions(number)
+          [2, 3, 4].include?(number % 10) &&
+            ![12, 13, 14].include?(number % 100)
         end
 
-        def many_conditions(n)
-          (n % 10).zero? || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100)
+        def many_conditions(number)
+          (number % 10).zero? ||
+            [5, 6, 7, 8, 9].include?(number % 10) ||
+            [11, 12, 13, 14].include?(number % 100)
         end
       end
     end

lib/numbers_and_words/strategies/figures_converter/options.rb

@@ -22,7 +22,7 @@ def initialize(strategy, options)
           def method_missing(method_name, *args, &block)
             Object.const_get(proxy_class_name(method_name)).new self, args, block
           rescue NameError
-            return nil
+            nil
           end
 
           private