Skip to content

Commit

Permalink
Merge pull request #1109 from c960657/ordinals
Browse files Browse the repository at this point in the history
Add ordinalization for locales with simple pattern
  • Loading branch information
pama authored Feb 28, 2024
2 parents 3fbb72c + cf00b79 commit fb81390
Show file tree
Hide file tree
Showing 36 changed files with 195 additions and 61 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
- Romanian (ro): am/pm
- Swedish (sv sv-FI sv-SE): am/pm
- Welsh (cy): Move the keys to right place and add missing keys
- Add ordinalization for many locales (be, bs, cs, da, de-AT, de-CH, de-DE, eo, et, fa, fi, hr, hu, is, ka,
lb, lt, lv, mk, nb, ne, nn, pl, sk, sl, sq, sr, sw, tr) #1109

## 7.0.8 (2023-08-15)

Expand Down
6 changes: 6 additions & 0 deletions rails/ordinals/be.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
be:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/bs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
bs:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/cs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
cs:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/da.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
da:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
15 changes: 0 additions & 15 deletions rails/ordinals/de-AT.rb

This file was deleted.

6 changes: 6 additions & 0 deletions rails/ordinals/de-AT.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
de-AT:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
15 changes: 0 additions & 15 deletions rails/ordinals/de-CH.rb

This file was deleted.

6 changes: 6 additions & 0 deletions rails/ordinals/de-CH.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
de-CH:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
15 changes: 0 additions & 15 deletions rails/ordinals/de-DE.rb

This file was deleted.

6 changes: 6 additions & 0 deletions rails/ordinals/de-DE.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
de-DE:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
15 changes: 0 additions & 15 deletions rails/ordinals/de.rb

This file was deleted.

6 changes: 6 additions & 0 deletions rails/ordinals/de.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
de:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/eo.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
eo:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/et.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
et:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/fa.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
fa:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/fi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
fi:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/hr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
hr:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/hu.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
hu:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/is.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
is:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/ka.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
ka:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/lb.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
lb:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/lt.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
lt:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/lv.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
lv:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/mk.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
mk:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/nb.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
nb:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/ne.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
ne:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/nn.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
nn:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/pl.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
pl:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/sk.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
sk:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/sl.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
sl:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/sq.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
sq:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/sr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
sr:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/sw.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
sw:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
6 changes: 6 additions & 0 deletions rails/ordinals/tr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
tr:
number:
nth:
ordinals: "."
ordinalized: "%{number}."
14 changes: 13 additions & 1 deletion spec/unit/ordinals_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
# Mock Rails app in order to trigger the Railtie
let(:app) { double :app, config: config }
let(:config) { double :config, eager_load_namespaces: [], i18n: I18n, rails_i18n: RailsI18n }
let(:period_locales) { %w[be bs cs da de de-AT de-CH de-DE eo et fa fi hr hu is ka lb lt lv mk nb ne nn pl sk sl sq sr sw tr] }

before do
I18n.available_locales = %w[fr en fr-CA fr-CH fr-FR gd]
I18n.available_locales = %w[fr en fr-CA fr-CH fr-FR gd] + period_locales

RailsI18n::Railtie.initializers.each { |init| init.run(app) }
I18n.backend.reload!
Expand Down Expand Up @@ -45,4 +46,15 @@
end
end
end

describe 'locales with period-suffix' do
it 'uses the custom rule' do
period_locales.each do |locale|
I18n.with_locale(locale) do
ActiveSupport::Inflector.ordinalize(1).should == "1."
ActiveSupport::Inflector.ordinalize(2).should == "2."
end
end
end
end
end

0 comments on commit fb81390

Please sign in to comment.