Skip to content

Commit

Permalink
translations, pluralization and transliteration rules can now be load…
Browse files Browse the repository at this point in the history
…ed into the database using I18n:Activerecord::Backend#load_translations
  • Loading branch information
David Debreczeni committed Oct 21, 2014
1 parent a8eed73 commit 2f0cd07
Show file tree
Hide file tree
Showing 17 changed files with 21 additions and 4 deletions.
1 change: 1 addition & 0 deletions lib/rails_i18n/common_pluralizations/east_slavic.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ module EastSlavic

def self.rule
lambda do |n|
n ||= 0
mod10 = n % 10
mod100 = n % 100

Expand Down
2 changes: 1 addition & 1 deletion lib/rails_i18n/common_pluralizations/one_upto_two_other.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module RailsI18n
module Pluralization
module OneUptoTwoOther
def self.rule
lambda { |n| n >= 0 && n < 2 ? :one : :other }
lambda { |n| n && n >= 0 && n < 2 ? :one : :other }
end

def self.with_locale(locale)
Expand Down
1 change: 1 addition & 0 deletions lib/rails_i18n/common_pluralizations/romanian.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ module Pluralization
module Romanian
def self.rule
lambda do |n|
n ||= 0
if n == 1
:one
elsif n == 0 || (1..19).to_a.include?(n % 100)
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/sv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,15 @@ sv:
number:
currency:
format:
delimiter:
delimiter: ''
format: ! '%n %u'
precision: 2
separator: ! ','
significant: false
strip_insignificant_zeros: false
unit: kr
format:
delimiter:  
delimiter: ''
precision: 2
separator: ! ','
significant: false
Expand Down
1 change: 1 addition & 0 deletions rails/pluralization/ar.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module Pluralization
module Arabic
def self.rule
lambda do |n|
n ||= 0
mod100 = n % 100

if n == 0
Expand Down
1 change: 1 addition & 0 deletions rails/pluralization/br.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module Pluralization
module Breton
def self.rule
lambda do |n|
n ||= 0
mod10 = n % 10
mod100 = n % 100

Expand Down
1 change: 1 addition & 0 deletions rails/pluralization/gv.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module Pluralization
module Manx
def self.rule
lambda do |n|
n ||= 0
if [1, 2].include?(n % 10) || n % 20 == 0
:one
else
Expand Down
1 change: 1 addition & 0 deletions rails/pluralization/hsb.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module Pluralization
module UpperSorbian
def self.rule
lambda do |n|
n ||= 0
mod100 = n % 100

if mod100 == 1
Expand Down
1 change: 1 addition & 0 deletions rails/pluralization/lag.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module Pluralization
module Langi
def self.rule
lambda do |n|
n ||= 0
if n == 0
:zero
elsif n > 0 && n < 2
Expand Down
1 change: 1 addition & 0 deletions rails/pluralization/lt.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module Pluralization
module Lithuanian
def self.rule
lambda do |n|
n ||= 0
mod10 = n % 10
mod100 = n % 100

Expand Down
1 change: 1 addition & 0 deletions rails/pluralization/lv.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module Pluralization
module Latvian
def self.rule
lambda do |n|
n ||= 0
if n % 10 == 1 && n % 100 != 11
:one
else
Expand Down
1 change: 1 addition & 0 deletions rails/pluralization/mk.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module Pluralization
module Macedonian
def self.rule
lambda do |n|
n ||= 0
if n % 10 == 1 && n != 11
:one
else
Expand Down
1 change: 1 addition & 0 deletions rails/pluralization/mt.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module Pluralization
module Maltese
def self.rule
lambda do |n|
n ||= 0
mod100 = n % 100

if n == 1
Expand Down
1 change: 1 addition & 0 deletions rails/pluralization/pl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module Pluralization
module Polish
def self.rule
lambda do |n|
n ||= 0
mod10 = n % 10
mod100 = n % 100

Expand Down
1 change: 1 addition & 0 deletions rails/pluralization/sl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module Pluralization
module Slovenian
def self.rule
lambda do |n|
n ||= 0
mod100 = n % 100

if mod100 == 1
Expand Down
2 changes: 2 additions & 0 deletions rails/transliteration/ru.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ module Russian
class << self
def rule
lambda do |string|
next '' unless string

chars = string.scan(%r{#{multi_keys.join '|'}|\w|.})

result = ""
Expand Down
4 changes: 3 additions & 1 deletion rails/transliteration/uk.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ module Ukrainian
class << self
def rule
lambda do |string|
next '' unless string

string.gsub(/./) do |char|
# Regexp.last_match is local to the thread and method scope
# of the method that did the pattern match.
Expand Down Expand Up @@ -91,7 +93,7 @@ def downcased?(symbol)
def downcased_regexp
@downcased_regexp ||= /[а-яґєії]/
end

# apostrophe can be inside a word
def letter?(symbol)
symbol =~ letter_regexp
Expand Down

0 comments on commit 2f0cd07

Please sign in to comment.