Skip to content

Commit a64ec7d

Browse files
pamapama
authored
Merge branch 'master' into capitalization-hr
2 parents 3efd969 + e03dfd4 commit a64ec7d

File tree

10 files changed

+358
-10
lines changed

10 files changed

+358
-10
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,15 @@
88
- Japanese (ja): Add `in` and `round_mode` keys #1059
99
- Korean (ko): Fix typo in `equal_to` keys #1061
1010
- Portuguese (pt, pt-BR): add translation for `errors.messages.in` #1071
11+
- Scottish Gaelic (gd): Add locale
1112
- Russian (ru): fix some errors in 'datetime' section, add `errors.messages.in` and `number.format.round_mode` keys #1077
1213
- Spanish (es): add translation for `errors.messages.in` #1071
1314
- French (fr, fr-CA, fr-CH, fr-FR): fix typo on 'almost_x_years: one' #1074
15+
- Indonesian (id): Remove duplicate spaces in `id.datetime.distance_in_words.less_than_x_minutes.other` #1079
16+
- Romanian (ro): Correction of Saturday in Romanian #1078
1417
- Croatian (hr): use lowercase for month and weekday names #1081
1518
- Add ordinalization for German (de, de-AT, de-CH, de-DE)
19+
- Remove keys that are present twice from Latvian (lv), Albanian (sq) #1080
1620

1721
## 7.0.6 (2022-11-08)
1822

‎rails/locale/gd.yml‎

Lines changed: 252 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,252 @@
1+
---
2+
gd:
3+
activerecord:
4+
errors:
5+
messages:
6+
record_invalid: 'Dh’fhàillig leis an dearbhadh: %{errors}'
7+
restrict_dependent_destroy:
8+
has_one: Cha b’ urrainn dhuinn an reacord a sguabadh às on a tha %{record} ann a tha an eisimeil air
9+
has_many: Cha b’ urrainn dhuinn an reacord a sguabadh às on a tha %{record} ann a tha an eisimeil air
10+
date:
11+
abbr_day_names:
12+
- DiD
13+
- DiL
14+
- DiM
15+
- DiC
16+
- Dia
17+
- Dih
18+
- DiS
19+
abbr_month_names:
20+
-
21+
- Faoi
22+
- Gearr
23+
- Màrt
24+
- Gibl
25+
- Cèit
26+
- Ògmh
27+
- Iuch
28+
- Lùna
29+
- Sult
30+
- Dàmh
31+
- Samh
32+
- Dùbh
33+
day_names:
34+
- DiDòmhnaich
35+
- DiLuain
36+
- DiMàirt
37+
- DiCiadain
38+
- DiarDaoin
39+
- DihAoine
40+
- DiSathairne
41+
formats:
42+
default: "%Y-%m-%d"
43+
long: "%d %B %Y"
44+
short: "%d %b"
45+
month_names:
46+
-
47+
- Am Faoilleach
48+
- An Gearran
49+
- Am Màrt
50+
- An Giblean
51+
- An Cèitean
52+
- An t-Ògmhios
53+
- An t-Iuchar
54+
- An Lùnastal
55+
- An t-Sultain
56+
- An Dàmhair
57+
- An t-Samhain
58+
- An Dùbhlachd
59+
order:
60+
- :day
61+
- :month
62+
- :year
63+
datetime:
64+
distance_in_words:
65+
about_x_hours:
66+
one: mu %{count} uair a thìde
67+
two: mu %{count} uair a thìde
68+
few: mu %{count} uairean a thìde
69+
other: mu %{count} uair a thìde
70+
about_x_months:
71+
one: mu %{count} mhìos
72+
two: mu %{count} mhìos
73+
few: mu %{count} mìosan
74+
other: mu %{count} mìos
75+
about_x_years:
76+
one: mu %{count} bhliadhna
77+
two: mu %{count} bhliadhna
78+
few: mu %{count} bliadhnaichean
79+
other: mu %{count} bliadhna
80+
almost_x_years:
81+
one: cha mhòr %{count} bhliadhna
82+
two: cha mhòr %{count} bhliadhna
83+
few: cha mhòr %{count} bliadhnaichean
84+
other: cha mhòr %{count} bliadhna
85+
half_a_minute: leth-mhionaid
86+
less_than_x_seconds:
87+
one: nas lugha na %{count} diog
88+
two: nas lugha na %{count} dhiog
89+
few: nas lugha na %{count} diogan
90+
other: nas lugha na %{count} diog
91+
less_than_x_minutes:
92+
one: nas lugha na %{count} mhionaid
93+
two: nas lugha na %{count} mhionaid
94+
few: nas lugha na %{count} mionaidean
95+
other: nas lugha na %{count} mionaid
96+
one: nas lugha na mionaid
97+
over_x_years:
98+
one: còrr is %{count} bhliadhna
99+
two: còrr is %{count} bhliadhna
100+
few: còrr is %{count} bliadhnaichean
101+
other: còrr is %{count} bliadhna
102+
x_seconds:
103+
one: "%{count} diog"
104+
two: "%{count} dhiog"
105+
few: "%{count} diogan"
106+
other: "%{count} diog"
107+
x_minutes:
108+
one: "%{count} mhionaid"
109+
two: "%{count} mhionaid"
110+
few: "%{count} mionaidean"
111+
other: "%{count} mionaid"
112+
x_days:
113+
one: "%{count} latha"
114+
two: "%{count} latha"
115+
few: "%{count} làithean"
116+
other: "%{count} latha"
117+
x_months:
118+
one: "%{count} mhìos"
119+
two: "%{count} mhìos"
120+
few: "%{count} mìosan"
121+
other: "%{count} mìos"
122+
x_years:
123+
one: "%{count} bhliadhna"
124+
two: "%{count} bhliadhna"
125+
few: "%{count} bliadhnaichean"
126+
other: "%{count} bliadhna"
127+
prompts:
128+
second: Diog
129+
minute: Mionaid
130+
hour: Uair a thìde
131+
day: Latha
132+
month: Mìos
133+
year: Bliadhna
134+
errors:
135+
format: "%{attribute}: %{message}"
136+
messages:
137+
accepted: feumach air aontachadh
138+
blank: chan fhaod seo a bhith bàn
139+
confirmation: chan eil e ’na mhaids dha %{attribute}
140+
empty: chan fhaod seo a bhith falamh
141+
equal_to: feumaidh seo a bhith co-ionnan ri %{count}
142+
even: feumaidh seo a bhith ’na àireamh chothrom
143+
exclusion: tha seo glèidhte
144+
greater_than: feumaidh seo a bhith nas motha na %{count}
145+
greater_than_or_equal_to: feumaidh seo a bhith nas motha na no co-ionann ri %{count}
146+
in: feumaidh seo a bhith am broinn %{count}
147+
inclusion: chan eil seo am broinn na liosta
148+
invalid: chan eil seo dligheach
149+
less_than: feumaidh seo a bhith nas lugha na %{count}
150+
less_than_or_equal_to: feumaidh seo a bhith nas lugha na no co-ionann ri %{count}
151+
model_invalid: 'Dh’fhàillig leis an dearbhadh: %{errors}'
152+
not_a_number: chan eil seo ’na àireamh
153+
not_an_integer: feumaidh seo a bhith ’na àireamh shlàn
154+
odd: feumaidh seo a bhith ’na àireamh chòrr
155+
other_than: chan fhaod seo a bhith %{count}
156+
present: feumaidh seo a bhith bàn
157+
required: feumaidh seo a bhith ann
158+
taken: tha seo aig rud eile mu thràth
159+
too_long:
160+
one: tha seo ro fhada (tha %{count} charactar ceadaichte air a char as motha)
161+
two: tha seo ro fhada (tha %{count} charactar ceadaichte air a char as motha)
162+
few: tha seo ro fhada (tha %{count} caractaran ceadaichte air a char as motha)
163+
other: tha seo ro fhada (tha %{count} caractar ceadaichte air a char as motha)
164+
too_short:
165+
one: tha seo ro ghoirid (tha %{count} charactar ceadaichte air a char as lugha)
166+
two: tha seo ro ghoirid (tha %{count} charactar ceadaichte air a char as lugha)
167+
few: tha seo ro ghoirid (tha %{count} caractaran ceadaichte air a char as lugha)
168+
other: tha seo ro ghoirid (tha %{count} caractar ceadaichte air a char as lugha)
169+
wrong_length:
170+
one: chan eil an fhaide mar bu chòir (bu chòir dha a bhith %{count} charactar)
171+
two: chan eil an fhaide mar bu chòir (bu chòir dha a bhith %{count} charactar)
172+
few: chan eil an fhaide mar bu chòir (bu chòir dha a bhith %{count} caractaran)
173+
other: chan eil an fhaide mar bu chòir (bu chòir dha a bhith %{count} caractar)
174+
template:
175+
body: 'Bha duilgheadasan ann leis na raointean seo:'
176+
header:
177+
one: "Dh’adhbharaich %{count} mhearachd nach gabh a’ %{model} seo a shàbhaladh"
178+
two: "Dh’adhbharaich %{count} mhearachd nach gabh a’ %{model} seo a shàbhaladh"
179+
few: "Dh’adhbharaich %{count} mearachdan nach gabh a’ %{model} seo a shàbhaladh"
180+
other: "Dh’adhbharaich %{count} mearachd nach gabh a’ %{model} seo a shàbhaladh"
181+
helpers:
182+
select:
183+
prompt: Tagh
184+
submit:
185+
create: Cruthaich %{model}
186+
submit: Sàbhail %{model}
187+
update: Ùraich %{model}
188+
number:
189+
currency:
190+
format:
191+
delimiter: ","
192+
format: "%u%n"
193+
precision: 2
194+
separator: "."
195+
significant: false
196+
strip_insignificant_zeros: false
197+
unit: "£"
198+
format:
199+
delimiter: ","
200+
precision: 3
201+
round_mode: default
202+
separator: "."
203+
significant: false
204+
strip_insignificant_zeros: false
205+
human:
206+
decimal_units:
207+
format: "%n %u"
208+
units:
209+
billion: billean
210+
million: millean
211+
quadrillion: quadrillean
212+
thousand: mìle
213+
trillion: trillean
214+
unit: ''
215+
format:
216+
delimiter: ''
217+
precision: 3
218+
significant: true
219+
strip_insignificant_zeros: true
220+
storage_units:
221+
format: "%n %u"
222+
units:
223+
byte:
224+
one: bhaidht
225+
two: bhaidht
226+
few: baidhtean
227+
other: baidht
228+
eb: EB
229+
gb: GB
230+
kb: KB
231+
mb: MB
232+
pb: PB
233+
tb: TB
234+
percentage:
235+
format:
236+
delimiter: ''
237+
format: "%n%"
238+
precision:
239+
format:
240+
delimiter: ''
241+
support:
242+
array:
243+
last_word_connector: " agus "
244+
two_words_connector: " agus "
245+
words_connector: ", "
246+
time:
247+
am: m
248+
formats:
249+
default: "%a, %d %b %Y %H:%M:%S %z"
250+
long: "%d %b %Y, %H:%M"
251+
short: "%d %b %H:%M"
252+
pm: f

‎rails/locale/id.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ id:
8383
less_than_x_minutes:
8484
zero: kurang dari 1 menit
8585
one: kurang dari %{count} menit
86-
other: kurang dari %{count} menit
86+
other: kurang dari %{count} menit
8787
over_x_years:
8888
one: lebih dari setahun
8989
other: lebih dari %{count} tahun

‎rails/locale/lv.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ lv:
1717
- Pk.
1818
- S.
1919
abbr_month_names:
20-
-
20+
-
2121
- Janv
2222
- Febr
2323
- Marts
@@ -107,7 +107,6 @@ lv:
107107
zero: "%{count} mēneši"
108108
one: "%{count} mēnesis"
109109
other: "%{count} mēneši"
110-
zero: 0 gadi
111110
prompts:
112111
second: sekunde
113112
minute: minūte

‎rails/locale/ro.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ro:
3434
- miercuri
3535
- joi
3636
- vineri
37-
- sâmbată
37+
- sâmbătă
3838
formats:
3939
default: "%d-%m-%Y"
4040
long: "%d %B %Y"

‎rails/locale/sq.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ sq:
4343
long: "%d %B, %Y"
4444
short: "%d %b"
4545
month_names:
46-
-
46+
-
4747
- Janar
4848
- Shkurt
4949
- Mars
@@ -84,9 +84,6 @@ sq:
8484
over_x_years:
8585
one: mbi %{count} vit
8686
other: mbi %{count} vjet
87-
x_days:
88-
one: "%{count} ditë"
89-
other: "%{count} ditë"
9087
x_minutes:
9188
one: "%{count} minutë"
9289
other: "%{count} minuta"
@@ -111,7 +108,6 @@ sq:
111108
messages:
112109
accepted: duhet pranuar
113110
blank: s’mund të jetë i zbrazët
114-
present: duhet të jetë i zbrazët
115111
confirmation: s’përputhet me %{attribute}
116112
empty: s’mund të jetë i zbrazët
117113
equal_to: duhet të jetë baras me %{count}

‎rails/ordinals/gd.rb‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
gd: {
3+
number: {
4+
nth: {
5+
ordinals: -> (_key, number:, **_options) {
6+
case number.to_i.abs
7+
when 1
8+
'ᵈ'
9+
when 2
10+
'ⁿᵃ'
11+
when 3
12+
'ˢ'
13+
else
14+
'ᵐʰ'
15+
end
16+
},
17+
18+
ordinalized: -> (_key, number:, **_options) {
19+
"#{number}#{ActiveSupport::Inflector.ordinal(number)}"
20+
}
21+
}
22+
}
23+
}
24+
}

‎rails/pluralization/gd.rb‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
module RailsI18n
2+
module Pluralization
3+
module ScottishGaelic
4+
def self.rule
5+
lambda do |n|
6+
return :other unless n.is_a?(Numeric)
7+
8+
floorn = n.floor
9+
10+
if floorn == 1 || floorn == 11
11+
:one
12+
elsif floorn == 2 || floorn == 12
13+
:two
14+
elsif (3..19).member?(floorn)
15+
:few
16+
else
17+
:other
18+
end
19+
end
20+
end
21+
end
22+
end
23+
end
24+
25+
{ :gd => {
26+
:'i18n' => {
27+
:plural => {
28+
:keys => [:one, :two, :few, :other],
29+
:rule => RailsI18n::Pluralization::ScottishGaelic.rule }}}}

0 commit comments

Comments
 (0)