Skip to content

Commit 2f0cd07

Browse files
author
David Debreczeni
committedOct 21, 2014
translations, pluralization and transliteration rules can now be loaded into the database using I18n:Activerecord::Backend#load_translations
1 parent a8eed73 commit 2f0cd07

File tree

17 files changed

+21
-4
lines changed

17 files changed

+21
-4
lines changed
 

‎lib/rails_i18n/common_pluralizations/east_slavic.rb

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ module EastSlavic
1414

1515
def self.rule
1616
lambda do |n|
17+
n ||= 0
1718
mod10 = n % 10
1819
mod100 = n % 100
1920

‎lib/rails_i18n/common_pluralizations/one_upto_two_other.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module RailsI18n
44
module Pluralization
55
module OneUptoTwoOther
66
def self.rule
7-
lambda { |n| n >= 0 && n < 2 ? :one : :other }
7+
lambda { |n| n && n >= 0 && n < 2 ? :one : :other }
88
end
99

1010
def self.with_locale(locale)

‎lib/rails_i18n/common_pluralizations/romanian.rb

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ module Pluralization
55
module Romanian
66
def self.rule
77
lambda do |n|
8+
n ||= 0
89
if n == 1
910
:one
1011
elsif n == 0 || (1..19).to_a.include?(n % 100)

‎rails/locale/sv.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,15 @@ sv:
134134
number:
135135
currency:
136136
format:
137-
delimiter:
137+
delimiter: ''
138138
format: ! '%n %u'
139139
precision: 2
140140
separator: ! ','
141141
significant: false
142142
strip_insignificant_zeros: false
143143
unit: kr
144144
format:
145-
delimiter:  
145+
delimiter: ''
146146
precision: 2
147147
separator: ! ','
148148
significant: false

‎rails/pluralization/ar.rb

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module Pluralization
33
module Arabic
44
def self.rule
55
lambda do |n|
6+
n ||= 0
67
mod100 = n % 100
78

89
if n == 0

‎rails/pluralization/br.rb

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module Pluralization
33
module Breton
44
def self.rule
55
lambda do |n|
6+
n ||= 0
67
mod10 = n % 10
78
mod100 = n % 100
89

‎rails/pluralization/gv.rb

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module Pluralization
33
module Manx
44
def self.rule
55
lambda do |n|
6+
n ||= 0
67
if [1, 2].include?(n % 10) || n % 20 == 0
78
:one
89
else

‎rails/pluralization/hsb.rb

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module Pluralization
33
module UpperSorbian
44
def self.rule
55
lambda do |n|
6+
n ||= 0
67
mod100 = n % 100
78

89
if mod100 == 1

‎rails/pluralization/lag.rb

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module Pluralization
33
module Langi
44
def self.rule
55
lambda do |n|
6+
n ||= 0
67
if n == 0
78
:zero
89
elsif n > 0 && n < 2

‎rails/pluralization/lt.rb

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module Pluralization
33
module Lithuanian
44
def self.rule
55
lambda do |n|
6+
n ||= 0
67
mod10 = n % 10
78
mod100 = n % 100
89

‎rails/pluralization/lv.rb

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module Pluralization
33
module Latvian
44
def self.rule
55
lambda do |n|
6+
n ||= 0
67
if n % 10 == 1 && n % 100 != 11
78
:one
89
else

‎rails/pluralization/mk.rb

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module Pluralization
33
module Macedonian
44
def self.rule
55
lambda do |n|
6+
n ||= 0
67
if n % 10 == 1 && n != 11
78
:one
89
else

‎rails/pluralization/mt.rb

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module Pluralization
33
module Maltese
44
def self.rule
55
lambda do |n|
6+
n ||= 0
67
mod100 = n % 100
78

89
if n == 1

‎rails/pluralization/pl.rb

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module Pluralization
33
module Polish
44
def self.rule
55
lambda do |n|
6+
n ||= 0
67
mod10 = n % 10
78
mod100 = n % 100
89

‎rails/pluralization/sl.rb

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module Pluralization
33
module Slovenian
44
def self.rule
55
lambda do |n|
6+
n ||= 0
67
mod100 = n % 100
78

89
if mod100 == 1

‎rails/transliteration/ru.rb

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ module Russian
99
class << self
1010
def rule
1111
lambda do |string|
12+
next '' unless string
13+
1214
chars = string.scan(%r{#{multi_keys.join '|'}|\w|.})
1315

1416
result = ""

‎rails/transliteration/uk.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ module Ukrainian
66
class << self
77
def rule
88
lambda do |string|
9+
next '' unless string
10+
911
string.gsub(/./) do |char|
1012
# Regexp.last_match is local to the thread and method scope
1113
# of the method that did the pattern match.
@@ -91,7 +93,7 @@ def downcased?(symbol)
9193
def downcased_regexp
9294
@downcased_regexp ||= /[а-яґєії]/
9395
end
94-
96+
9597
# apostrophe can be inside a word
9698
def letter?(symbol)
9799
symbol =~ letter_regexp

0 commit comments

Comments
 (0)
Please sign in to comment.