Skip to content

Commit

Permalink
Merge branch 'svenfuchs:master' into add-missing-key-storage-units-ko
Browse files Browse the repository at this point in the history
  • Loading branch information
kimdj2 authored Jun 18, 2024
2 parents bb77a5d + 3ed8f44 commit cbba364
Show file tree
Hide file tree
Showing 44 changed files with 237 additions and 88 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,16 @@ jobs:
- '3.0'
- '3.1'
- '3.2'
- '3.3'
rubyopt: [""]
include:
- ruby-version: '3.3'
rubyopt: "--enable-frozen-string-literal --debug-frozen-string-literal"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: "${{ matrix.ruby-version }}"
bundler-cache: true
- run: bundle exec rake
- run: bundle exec rake RUBYOPT="${{ matrix.rubyopt }}"
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
## unreleased
- Update following locales:
- Portuguese (pt): Fixed `number.currency.format.format` and `helpers.submit.update` #1122
- Fix compatibility with frozen string literals. #1120

## 7.0.9 (2024-03-13)

- Add following locales:
- Welsh (cy)
Expand All @@ -17,6 +22,10 @@
- Portuguese (pt-BR): am/pm
- Romanian (ro): am/pm
- Swedish (sv sv-FI sv-SE): am/pm
- Welsh (cy): Move the keys to right place and add missing keys
- Danish (da): Remove title case for storage and human decimal units #1108
- 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
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
rails-i18n (7.0.8)
rails-i18n (7.0.9)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)

Expand Down
2 changes: 1 addition & 1 deletion rails-i18n.gemspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = "rails-i18n"
s.version = '7.0.8'
s.version = '7.0.9'
s.authors = ["Rails I18n Group"]
s.email = "rails-i18n@googlegroups.com"
s.homepage = "https://github.com/svenfuchs/rails-i18n"
Expand Down
20 changes: 11 additions & 9 deletions rails/locale/cy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,6 @@ cy:
restrict_dependent_destroy:
has_many: Methu dileu cofnod oherwydd bod %{record} yn bodoli
has_one: Methu dileu cofnod oherwydd bod %{record} yn bodoli
model_invalid: 'Methodd y dilysu: %{errors}'
other_than: rhaid bod yn wahanol na %{count}
present: rhaid bod yn wag
required: rhaid bodoli
in: rhaid bod mewn %{count}
template:
header:
one: "Mae gwall %{count} wedi gwahardd y %{ model} hwn rhag cael ei gadw"
other: "Mae gwall %{count} wedi gwahardd y %{ model} hwn rhag cael ei gadw"
date:
abbr_day_names:
- Sul
Expand Down Expand Up @@ -150,7 +141,11 @@ cy:
many: "%{count} mis"
other: "%{count} mis"
x_years:
zero: "%{count} blwyddyn"
one: 1 flwyddyn
two: "%{count} blwyddyn"
few: "%{count} blwyddyn"
many: "%{count} blwyddyn"
other: "%{count} blwyddyn"
prompts:
second: Eiliad
Expand All @@ -171,22 +166,29 @@ cy:
exclusion: wedi cadw
greater_than: angen bod yn fwy na %{count}
greater_than_or_equal_to: angen bod yr un maint neu fwy na %{count}
in: rhaid bod mewn %{count}
inclusion: heb fod yn y rhestr
invalid: heb fod yn nheilwng
less_than: angen bod yn llai na %{count}
less_than_or_equal_to: angen bod yr un maint neu lai na %{count}
model_invalid: 'Methodd y dilysu: %{errors}'
not_a_number: heb fod yn rhif
not_an_integer: heb fod yn rhif llawn
odd: rhaid bod yn odrif
other_than: rhaid bod yn wahanol na %{count}
present: rhaid bod yn wag
required: rhaid bodoli
taken: wedi'i gymryd yn barod
too_long: yn rhy hir (cewch %{count} llythyren ar y fwyaf)
too_short: yn rhy fyr (rhaid am o leiaf %{count} llythyren)
wrong_length: gyda maint anghywir o lythrennau (dylai fod yn %{count} llythyren)
template:
body: 'Cafwyd broblemau gyda''r meysydd canlynol:'
header:
zero: Atalwyd y %{model} hwn rhag ei gadw gan 0 nam
one: Atalwyd y %{model} hwn rhag ei gadw gan 1 nam
two: Atalwyd y %{model} hwn rhag ei gadw gan %{count} nam
few: Atalwyd y %{model} hwn rhag ei gadw gan %{count} nam
many: Atalwyd y %{model} hwn rhag ei gadw gan %{count} nam
other: Atalwyd y %{model} hwn rhag ei gadw gan %{count} nam
helpers:
Expand Down
21 changes: 11 additions & 10 deletions rails/locale/da.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,18 +172,18 @@ da:
format: "%n %u"
units:
billion:
one: Milliard
other: Milliarder
one: milliard
other: milliarder
million:
one: Million
other: Millioner
one: million
other: millioner
quadrillion:
one: Billiard
other: Billiarder
thousand: Tusind
thousand: tusind
trillion:
one: Billion
other: Billioner
one: billion
other: billioner
unit: ''
format:
delimiter: ''
Expand All @@ -194,11 +194,12 @@ da:
format: "%n %u"
units:
byte:
one: Byte
other: Bytes
one: byte
other: bytes
gb: GB
kb: KB
kb: kB
mb: MB
pb: PB
tb: TB
percentage:
format:
Expand Down
4 changes: 2 additions & 2 deletions rails/locale/pt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,12 @@ pt:
submit:
create: Criar %{model}
submit: Gravar %{model}
update: Actualizar %{model}
update: Atualizar %{model}
number:
currency:
format:
delimiter: "."
format: "%u %n"
format: "%n %u"
precision: 2
separator: ","
significant: false
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}."
Loading

0 comments on commit cbba364

Please sign in to comment.