Skip to content

Commit 39e0abd

Browse files
jpmckinneyjpmckinney
committed
i18n: Fix translated strings that are partial sentences, and fix substitution variables to not contain periods
1 parent 845bbe8 commit 39e0abd

File tree

5 files changed

+42
-44
lines changed

5 files changed

+42
-44
lines changed

‎cove_ocds/locale/en/LC_MESSAGES/django.po‎

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2024-10-21 05:30+0000\n"
11+
"POT-Creation-Date: 2024-10-21 05:36+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -247,9 +247,8 @@ msgstr ""
247247
msgid ""
248248
"This error has been automatically reported to our development team. If you "
249249
"<a href=\"mailto:%(support_email)s?"
250-
"subject=Data%%20Review%%20Tool%%20error%%20%(request.sentry.id)s\">get in "
251-
"touch</a>, please reference this error as <strong>%(request.sentry.id)s</"
252-
"strong>."
250+
"subject=Data%%20Review%%20Tool%%20error%%20%(sentry)s\">get in touch</a>, "
251+
"please reference this error as <strong>%(sentry)s</strong>."
253252
msgstr ""
254253

255254
#: cove_ocds/templates/additional_codelist_values.html:7
@@ -280,18 +279,14 @@ msgstr ""
280279
msgid "Go"
281280
msgstr ""
282281

283-
#: cove_ocds/templates/error.html:13
282+
#: cove_ocds/templates/error.html:14
283+
#, python-format
284284
msgid ""
285285
"If you think this is a bug, you can <a href=\"https://github.com/open-"
286-
"contracting/cove-ocds/issues\">file an issue publicly on GitHub</a> or "
287-
msgstr ""
288-
289-
#: cove_ocds/templates/error.html:13
290-
msgid "get in touch via email"
291-
msgstr ""
292-
293-
#: cove_ocds/templates/error.html:13
294-
msgid "referencing this error as "
286+
"contracting/cove-ocds/issues\">file an issue publicly on GitHub</a> or <a "
287+
"href=\"mailto:%(support_email)s?"
288+
"subject=Data%%20Review%%20Tool%%20error%%20%(sentry)s\">get in touch via "
289+
"email</a>, referencing this error as <strong>%(sentry)s</strong>."
295290
msgstr ""
296291

297292
#: cove_ocds/templates/explore.html:6
@@ -612,11 +607,10 @@ msgid " What is the <code>ocid</code> field? %(description)s "
612607
msgstr ""
613608

614609
#: cove_ocds/templates/explore.html:357
615-
msgid "For more information see"
616-
msgstr ""
617-
618-
#: cove_ocds/templates/explore.html:357
619-
msgid "Open Contracting Identifier guidance"
610+
#, python-format
611+
msgid ""
612+
"For more information see <a href=\"%(url)s\">Open Contracting Identifier "
613+
"guidance"
620614
msgstr ""
621615

622616
#: cove_ocds/templates/explore.html:371

‎cove_ocds/locale/es/LC_MESSAGES/django.po‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ msgid ""
1515
msgstr ""
1616
"Project-Id-Version: PACKAGE VERSION\n"
1717
"Report-Msgid-Bugs-To: \n"
18-
"POT-Creation-Date: 2024-10-21 05:27+0000\n"
18+
"POT-Creation-Date: 2024-10-21 05:37+0000\n"
1919
"PO-Revision-Date: 2020-09-08 08:53+0000\n"
2020
"Last-Translator: James McKinney, 2024\n"
2121
"Language-Team: Spanish (https://app.transifex.com/open-contracting-"
@@ -281,15 +281,14 @@ msgstr ""
281281
msgid ""
282282
"This error has been automatically reported to our development team. If you "
283283
"<a href=\"mailto:%(support_email)s?"
284-
"subject=Data%%20Review%%20Tool%%20error%%20%(request.sentry.id)s\">get in "
285-
"touch</a>, please reference this error as <strong>%(request.sentry.id)s</"
286-
"strong>."
284+
"subject=Data%%20Review%%20Tool%%20error%%20%(sentry)s\">get in touch</a>, "
285+
"please reference this error as <strong>%(sentry)s</strong>."
287286
msgstr ""
288287
"Nuestro equipo de desarrollo ha sido informado de este error de forma "
289288
"automática. Si usted <a href=\"mailto:%(support_email)s?"
290-
"subject=Data%%20Review%%20Tool%%20error%%20%(request.sentry.id)s\">póngase "
289+
"subject=Data%%20Review%%20Tool%%20error%%20%(sentry)s\">póngase "
291290
"en contacto</a>,por favor haga referencia a este error como "
292-
"<strong>%(request.sentry.id)s</strong>."
291+
"<strong>%(sentry)s</strong>."
293292

294293
#: cove_ocds/templates/additional_codelist_values.html:7
295294
#: cove_ocds/templates/explore.html:401 cove_ocds/templates/explore.html:447
@@ -319,20 +318,16 @@ msgstr "Herramienta de <span> revisión </span> de datos"
319318
msgid "Go"
320319
msgstr "Ir"
321320

322-
#: cove_ocds/templates/error.html:13
321+
#: cove_ocds/templates/error.html:14
322+
#, python-format
323323
msgid ""
324324
"If you think this is a bug, you can <a href=\"https://github.com/open-"
325-
"contracting/cove-ocds/issues\">file an issue publicly on GitHub</a> or "
325+
"contracting/cove-ocds/issues\">file an issue publicly on GitHub</a> or <a "
326+
"href=\"mailto:%(support_email)s?"
327+
"subject=Data%%20Review%%20Tool%%20error%%20%(sentry)s\">get in touch via "
328+
"email</a>, referencing this error as <strong>%(sentry)s</strong>."
326329
msgstr ""
327330

328-
#: cove_ocds/templates/error.html:13
329-
msgid "get in touch via email"
330-
msgstr "póngase en contacto a través de correo electrónico "
331-
332-
#: cove_ocds/templates/error.html:13
333-
msgid "referencing this error as "
334-
msgstr "haciendo referencia a este error como "
335-
336331
#: cove_ocds/templates/explore.html:6
337332
msgid "Load New File"
338333
msgstr "Cargar archivo nuevo"
@@ -717,12 +712,13 @@ msgid " What is the <code>ocid</code> field? %(description)s "
717712
msgstr "Cuál es el campo de (ocid)? %(description)s"
718713

719714
#: cove_ocds/templates/explore.html:357
720-
msgid "For more information see"
721-
msgstr "Para mas información vea"
722-
723-
#: cove_ocds/templates/explore.html:357
724-
msgid "Open Contracting Identifier guidance"
725-
msgstr "Guía para indentificadores de Contratos Abiertos "
715+
#, python-format
716+
msgid ""
717+
"For more information see <a href=\"%(url)s\">Open Contracting Identifier "
718+
"guidance"
719+
msgstr ""
720+
"Para mas información vea <a href=\"%(url)s\">Guía para indentificadores de "
721+
"Contratos Abiertos</a>"
726722

727723
#: cove_ocds/templates/explore.html:371
728724
msgid "Codelist Errors"
@@ -1364,3 +1360,9 @@ msgstr ""
13641360
#: cove_ocds/views.py:317
13651361
msgid "JSON reference error"
13661362
msgstr "Error de referencia en JSON"
1363+
1364+
#~ msgid "get in touch via email"
1365+
#~ msgstr "póngase en contacto a través de correo electrónico "
1366+
1367+
#~ msgid "referencing this error as "
1368+
#~ msgstr "haciendo referencia a este error como "

‎cove_ocds/templates/500.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ <h4 class="panel-title">
99
</div>
1010
<div class="panel-body">
1111
<p>{% blocktrans %}Something went wrong with your request. This could be due to a bug in the application and/or the data you supplied.{% endblocktrans %}</p>
12-
<p>{% blocktrans %}This error has been automatically reported to our development team. If you <a href="mailto:{{ support_email }}?subject=Data%20Review%20Tool%20error%20{{ request.sentry.id }}">get in touch</a>, please reference this error as <strong>{{ request.sentry.id }}</strong>.{% endblocktrans %}</p>
12+
<p>{% blocktrans sentry=request.sentry.id %}This error has been automatically reported to our development team. If you <a href="mailto:{{ support_email }}?subject=Data%20Review%20Tool%20error%20{{ sentry }}">get in touch</a>, please reference this error as <strong>{{ sentry }}</strong>.{% endblocktrans %}</p>
1313
</div>
1414
</div>
1515
{% endblock %}

‎cove_ocds/templates/error.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
<div class="panel-body">
1111
{{ message | linebreaks }}
1212

13-
<p>{% blocktrans %}If you think this is a bug, you can <a href="https://github.com/open-contracting/cove-ocds/issues">file an issue publicly on GitHub</a> or {% endblocktrans %}<a href="mailto:{{support_email}}">{% trans "get in touch via email" %}</a>{% if request.sentry.id %}, {% blocktrans %}referencing this error as {% endblocktrans %}<strong>{{ request.sentry.id }}</strong>{% endif %}.
13+
<p>
14+
{% blocktrans sentry=request.sentry.id %}If you think this is a bug, you can <a href="https://github.com/open-contracting/cove-ocds/issues">file an issue publicly on GitHub</a> or <a href="mailto:{{support_email}}?subject=Data%20Review%20Tool%20error%20{{ sentry }}">get in touch via email</a>, referencing this error as <strong>{{ sentry }}</strong>.{% endblocktrans %}
15+
</p>
1416
</div>
1517
</div>
1618

‎cove_ocds/templates/explore.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ <h4 class="panel-title">
354354
</tbody>
355355
</table>
356356
</div>
357-
<p class="font-weight-light small">{% blocktrans with description=conformance_errors.ocid_description %} What is the <code>ocid</code> field? {{description}} {% endblocktrans %}<br>{% trans "For more information see" %} <a href="{{conformance_errors.ocid_info_url}}">{% trans "Open Contracting Identifier guidance" %}</a></p>
357+
<p class="font-weight-light small">{% blocktrans with description=conformance_errors.ocid_description %} What is the <code>ocid</code> field? {{description}} {% endblocktrans %}<br>{% blocktrans with url=conformance_errors.ocid_info_url %}For more information see <a href="{{url}}">Open Contracting Identifier guidance{% endblocktrans %}</a></p>
358358

359359
{% endif %}
360360
{% endwith %}

0 commit comments

Comments
 (0)