Skip to content

Commit 863b132

Browse files
Remove the leftover format placeholder from intword units
`intword` inserts the unit without any `%` substitution: return f"{negative_prefix}{number} {unit}" so a placeholder left in a translated unit is printed literally. The Bengali, Korean and Vietnamese catalogues still carry `%d` or `%(value)s` on the `thousand`..`googol` units, presumably from an older API: activate("bn_BD"); intword(1_500_000_000) -> '1.5 %d বিলিয়ন' activate("vi_VN"); intword(1_200_000) -> '1.2 %(value)s triệu' Strip the placeholder and the separator after it, leaving the translated words untouched. Only the `intword` power units are changed; placeholders in other messages are substituted normally and are left alone. After this, none of the 36 catalogues emits a placeholder for any of the 12 powers.
1 parent ce4147b commit 863b132

4 files changed

Lines changed: 69 additions & 58 deletions

File tree

‎src/humanize/locale/bn_BD/LC_MESSAGES/humanize.po‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -121,57 +121,57 @@ msgstr "তম"
121121
#: src/humanize/number.py:178
122122
msgid "thousand"
123123
msgid_plural "thousand"
124-
msgstr[0] "%d হাজার"
125-
msgstr[1] "%d হাজার"
124+
msgstr[0] "হাজার"
125+
msgstr[1] "হাজার"
126126

127127
#: src/humanize/number.py:179
128128
#, fuzzy
129129
msgid "million"
130130
msgid_plural "million"
131-
msgstr[0] "%d মিলিয়ন"
132-
msgstr[1] "%d মিলিয়ন"
131+
msgstr[0] "মিলিয়ন"
132+
msgstr[1] "মিলিয়ন"
133133

134134
#: src/humanize/number.py:180
135135
msgid "billion"
136136
msgid_plural "billion"
137-
msgstr[0] "%d বিলিয়ন"
138-
msgstr[1] "%d বিলিয়ন"
137+
msgstr[0] "বিলিয়ন"
138+
msgstr[1] "বিলিয়ন"
139139

140140
#: src/humanize/number.py:181
141141
msgid "trillion"
142142
msgid_plural "trillion"
143-
msgstr[0] "%d ট্রিলিয়ন"
144-
msgstr[1] "%d ট্রিলিয়ন"
143+
msgstr[0] "ট্রিলিয়ন"
144+
msgstr[1] "ট্রিলিয়ন"
145145

146146
#: src/humanize/number.py:182
147147
msgid "quadrillion"
148148
msgid_plural "quadrillion"
149-
msgstr[0] "%d কোয়াড্রিলিয়ন"
150-
msgstr[1] "%d কোয়াড্রিলিয়ন"
149+
msgstr[0] "কোয়াড্রিলিয়ন"
150+
msgstr[1] "কোয়াড্রিলিয়ন"
151151

152152
#: src/humanize/number.py:183
153153
msgid "quintillion"
154154
msgid_plural "quintillion"
155-
msgstr[0] "%d কুইন্টিলিয়ন"
156-
msgstr[1] "%d কুইন্টিলিয়ন"
155+
msgstr[0] "কুইন্টিলিয়ন"
156+
msgstr[1] "কুইন্টিলিয়ন"
157157

158158
#: src/humanize/number.py:184
159159
msgid "sextillion"
160160
msgid_plural "sextillion"
161-
msgstr[0] "%d সেক্সটিলিয়ন"
162-
msgstr[1] "%d সেক্সটিলিয়ন"
161+
msgstr[0] "সেক্সটিলিয়ন"
162+
msgstr[1] "সেক্সটিলিয়ন"
163163

164164
#: src/humanize/number.py:185
165165
msgid "septillion"
166166
msgid_plural "septillion"
167-
msgstr[0] "%d সেপটিলিয়ন"
168-
msgstr[1] "%d সেপটিলিয়ন"
167+
msgstr[0] "সেপটিলিয়ন"
168+
msgstr[1] "সেপটিলিয়ন"
169169

170170
#: src/humanize/number.py:186
171171
msgid "octillion"
172172
msgid_plural "octillion"
173-
msgstr[0] "%d ওকটিলিয়ন"
174-
msgstr[1] "%d ওকটিলিয়ন"
173+
msgstr[0] "ওকটিলিয়ন"
174+
msgstr[1] "ওকটিলিয়ন"
175175

176176
#: src/humanize/number.py:187
177177
msgid "nonillion"

‎src/humanize/locale/ko_KR/LC_MESSAGES/humanize.po‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ msgstr[1] ""
148148
#: src/humanize/number.py:179
149149
msgid "million"
150150
msgid_plural "million"
151-
msgstr[0] "%(value)s million"
152-
msgstr[1] "%(value)s million"
151+
msgstr[0] "million"
152+
msgstr[1] "million"
153153

154154
#: src/humanize/number.py:180
155155
msgid "billion"
@@ -161,64 +161,64 @@ msgstr[1] "milliard"
161161
#, fuzzy
162162
msgid "trillion"
163163
msgid_plural "trillion"
164-
msgstr[0] "%(value)s billion"
165-
msgstr[1] "%(value)s billion"
164+
msgstr[0] "billion"
165+
msgstr[1] "billion"
166166

167167
#: src/humanize/number.py:182
168168
#, fuzzy
169169
msgid "quadrillion"
170170
msgid_plural "quadrillion"
171-
msgstr[0] "%(value)s quadrillion"
172-
msgstr[1] "%(value)s quadrillion"
171+
msgstr[0] "quadrillion"
172+
msgstr[1] "quadrillion"
173173

174174
#: src/humanize/number.py:183
175175
#, fuzzy
176176
msgid "quintillion"
177177
msgid_plural "quintillion"
178-
msgstr[0] "%(value)s quintillion"
179-
msgstr[1] "%(value)s quintillion"
178+
msgstr[0] "quintillion"
179+
msgstr[1] "quintillion"
180180

181181
#: src/humanize/number.py:184
182182
#, fuzzy
183183
msgid "sextillion"
184184
msgid_plural "sextillion"
185-
msgstr[0] "%(value)s sextillion"
186-
msgstr[1] "%(value)s sextillion"
185+
msgstr[0] "sextillion"
186+
msgstr[1] "sextillion"
187187

188188
#: src/humanize/number.py:185
189189
#, fuzzy
190190
msgid "septillion"
191191
msgid_plural "septillion"
192-
msgstr[0] "%(value)s septillion"
193-
msgstr[1] "%(value)s septillion"
192+
msgstr[0] "septillion"
193+
msgstr[1] "septillion"
194194

195195
#: src/humanize/number.py:186
196196
#, fuzzy
197197
msgid "octillion"
198198
msgid_plural "octillion"
199-
msgstr[0] "%(value)s octillion"
200-
msgstr[1] "%(value)s octillion"
199+
msgstr[0] "octillion"
200+
msgstr[1] "octillion"
201201

202202
#: src/humanize/number.py:187
203203
#, fuzzy
204204
msgid "nonillion"
205205
msgid_plural "nonillion"
206-
msgstr[0] "%(value)s nonillion"
207-
msgstr[1] "%(value)s nonillion"
206+
msgstr[0] "nonillion"
207+
msgstr[1] "nonillion"
208208

209209
#: src/humanize/number.py:188
210210
#, fuzzy
211211
msgid "decillion"
212212
msgid_plural "decillion"
213-
msgstr[0] "%(value)s décillion"
214-
msgstr[1] "%(value)s décillion"
213+
msgstr[0] "décillion"
214+
msgstr[1] "décillion"
215215

216216
#: src/humanize/number.py:189
217217
#, fuzzy
218218
msgid "googol"
219219
msgid_plural "googol"
220-
msgstr[0] "%(value)s gogol"
221-
msgstr[1] "%(value)s gogol"
220+
msgstr[0] "gogol"
221+
msgstr[1] "gogol"
222222

223223
#: src/humanize/number.py:301
224224
msgid "zero"

‎src/humanize/locale/vi_VN/LC_MESSAGES/humanize.po‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ msgstr[1] "nghìn"
128128
#: src/humanize/number.py:179
129129
msgid "million"
130130
msgid_plural "million"
131-
msgstr[0] "%(value)s triệu"
132-
msgstr[1] "%(value)s triệu"
131+
msgstr[0] "triệu"
132+
msgstr[1] "triệu"
133133

134134
#: src/humanize/number.py:180
135135
msgid "billion"
@@ -140,63 +140,63 @@ msgstr[1] "tỷ"
140140
#: src/humanize/number.py:181
141141
msgid "trillion"
142142
msgid_plural "trillion"
143-
msgstr[0] "%(value)s nghìn tỷ"
144-
msgstr[1] "%(value)s nghìn tỷ"
143+
msgstr[0] "nghìn tỷ"
144+
msgstr[1] "nghìn tỷ"
145145

146146
#: src/humanize/number.py:182
147147
msgid "quadrillion"
148148
msgid_plural "quadrillion"
149-
msgstr[0] "%(value)s triệu tỷ"
150-
msgstr[1] "%(value)s triệu tỷ"
149+
msgstr[0] "triệu tỷ"
150+
msgstr[1] "triệu tỷ"
151151

152152
#: src/humanize/number.py:183
153153
#, fuzzy
154154
msgid "quintillion"
155155
msgid_plural "quintillion"
156-
msgstr[0] "%(value)s tỷ tỷ"
157-
msgstr[1] "%(value)s tỷ tỷ"
156+
msgstr[0] "tỷ tỷ"
157+
msgstr[1] "tỷ tỷ"
158158

159159
#: src/humanize/number.py:184
160160
#, fuzzy
161161
msgid "sextillion"
162162
msgid_plural "sextillion"
163-
msgstr[0] "%(value)s sextillion"
164-
msgstr[1] "%(value)s sextillion"
163+
msgstr[0] "sextillion"
164+
msgstr[1] "sextillion"
165165

166166
#: src/humanize/number.py:185
167167
#, fuzzy
168168
msgid "septillion"
169169
msgid_plural "septillion"
170-
msgstr[0] "%(value)s septillion"
171-
msgstr[1] "%(value)s septillion"
170+
msgstr[0] "septillion"
171+
msgstr[1] "septillion"
172172

173173
#: src/humanize/number.py:186
174174
#, fuzzy
175175
msgid "octillion"
176176
msgid_plural "octillion"
177-
msgstr[0] "%(value)s octillion"
178-
msgstr[1] "%(value)s octillion"
177+
msgstr[0] "octillion"
178+
msgstr[1] "octillion"
179179

180180
#: src/humanize/number.py:187
181181
#, fuzzy
182182
msgid "nonillion"
183183
msgid_plural "nonillion"
184-
msgstr[0] "%(value)s nonillion"
185-
msgstr[1] "%(value)s nonillion"
184+
msgstr[0] "nonillion"
185+
msgstr[1] "nonillion"
186186

187187
#: src/humanize/number.py:188
188188
#, fuzzy
189189
msgid "decillion"
190190
msgid_plural "decillion"
191-
msgstr[0] "%(value)s décillion"
192-
msgstr[1] "%(value)s décillion"
191+
msgstr[0] "décillion"
192+
msgstr[1] "décillion"
193193

194194
#: src/humanize/number.py:189
195195
#, fuzzy
196196
msgid "googol"
197197
msgid_plural "googol"
198-
msgstr[0] "%(value)s gogol"
199-
msgstr[1] "%(value)s gogol"
198+
msgstr[0] "gogol"
199+
msgstr[1] "gogol"
200200

201201
#: src/humanize/number.py:301
202202
msgid "zero"

‎tests/test_i18n.py‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,3 +334,14 @@ def test_none_locale(self) -> None:
334334
humanize.i18n.deactivate()
335335

336336
assert test_str == humanize.naturaltime(three_seconds)
337+
338+
339+
@pytest.mark.parametrize("locale", ["bn_BD", "ko_KR", "vi_VN"])
340+
def test_intword_unit_has_no_format_placeholder(locale: str) -> None:
341+
"""`intword` interpolates the unit verbatim, so it must carry no placeholder."""
342+
try:
343+
humanize.i18n.activate(locale)
344+
for value in (1_000, 1_000_000, 1_000_000_000, 10**12, 10**15, 10**100):
345+
assert "%" not in humanize.intword(value)
346+
finally:
347+
humanize.i18n.deactivate()

0 commit comments

Comments
 (0)