Skip to content

Commit

Permalink
Merge pull request #60 from OpenDataServices/string-not-translated
Browse files Browse the repository at this point in the history
cove_tags: Add a missing string to the translation
  • Loading branch information
Bjwebb authored Nov 5, 2020
2 parents e753b52 + ae95645 commit c242d50
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 55 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [0.18.2] - 2020-11-05

## Fixed

- Add a missing string to the translation https://github.com/OpenDataServices/lib-cove-web/pull/60

## [0.18.1] - 2020-10-22

## Fixed
Expand Down
54 changes: 29 additions & 25 deletions cove/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-10-15 16:42+0000\n"
"POT-Creation-Date: 2020-11-05 13:13+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -34,7 +34,7 @@ msgid "Sorry we got a ConnectionError whilst trying to download that file"
msgstr ""

#: cove/input/views.py:74 cove/input/views.py:82 cove/views.py:28
#: cove/views.py:39 cove/views.py:48
#: cove/views.py:39 cove/views.py:49
msgid "Try Again"
msgstr ""

Expand Down Expand Up @@ -356,87 +356,91 @@ msgstr ""
msgid "Column:"
msgstr ""

#: cove/templatetags/cove_tags.py:71
#: cove/templatetags/cove_tags.py:73
msgid "Date is not in the correct format"
msgstr ""

#: cove/templatetags/cove_tags.py:72
#: cove/templatetags/cove_tags.py:74
msgid "Invalid 'uri' found"
msgstr ""

#: cove/templatetags/cove_tags.py:73
#: cove/templatetags/cove_tags.py:75
msgid ""
"{}<code>{}</code> is not a string. Check that the value {} has quotes at the "
"start and end. Escape any quotes in the value with <code>\\</code>"
msgstr ""

#: cove/templatetags/cove_tags.py:74
#: cove/templatetags/cove_tags.py:76
msgid ""
"{}<code>{}</code> is not a integer. Check that the value {} doesn’t contain "
"decimal points or any characters other than 0-9. Integer values should not "
"be in quotes. "
msgstr ""

#: cove/templatetags/cove_tags.py:75
#: cove/templatetags/cove_tags.py:77
msgid ""
"{}<code>{}</code> is not a number. Check that the value {} doesn’t contain "
"any characters other than 0-9 and dot (<code>.</code>). Number values should "
"not be in quotes. "
msgstr ""

#: cove/templatetags/cove_tags.py:76
#: cove/templatetags/cove_tags.py:78
msgid "{}<code>{}</code> is not a JSON object"
msgstr ""

#: cove/templatetags/cove_tags.py:77
#: cove/templatetags/cove_tags.py:79
msgid "{}<code>{}</code> is not a JSON array"
msgstr ""

#: cove/templatetags/cove_tags.py:91
#: cove/templatetags/cove_tags.py:101
msgid "Array Element "
msgstr ""

#: cove/templatetags/cove_tags.py:117
#: cove/templatetags/cove_tags.py:109 cove/templatetags/cove_tags.py:111
msgid "is not null, and"
msgstr ""

#: cove/templatetags/cove_tags.py:127
msgid "<code>{}</code> is missing but required within <code>{}</code>"
msgstr ""

#: cove/templatetags/cove_tags.py:123
#: cove/templatetags/cove_tags.py:133
msgid "<code>{}</code> is missing but required"
msgstr ""

#: cove/templatetags/cove_tags.py:127
#: cove/templatetags/cove_tags.py:137
msgid "Invalid code found in <code>{}</code>"
msgstr ""

#: cove/templatetags/cove_tags.py:131
#: cove/templatetags/cove_tags.py:141
msgid "<code>{}</code> does not match the regex <code>{}</code>"
msgstr ""

#: cove/templatetags/cove_tags.py:138
#: cove/templatetags/cove_tags.py:148
msgid ""
"<code>{}</code> is too short. You must supply at least one value, or remove "
"the item entirely (unless it’s required)."
msgstr ""

#: cove/templatetags/cove_tags.py:144
#: cove/templatetags/cove_tags.py:154
msgid ""
"<code>\"{}\"</code> is too short. Strings must be at least one character. "
"This error typically indicates a missing value."
msgstr ""

#: cove/templatetags/cove_tags.py:149
#: cove/templatetags/cove_tags.py:159
msgid "{} does not have enough properties"
msgstr ""

#: cove/templatetags/cove_tags.py:154
#: cove/templatetags/cove_tags.py:164
msgid "Array has non-unique elements"
msgstr ""

#: cove/templatetags/cove_tags.py:157
#: cove/templatetags/cove_tags.py:167
msgid "Non-unique {} values"
msgstr ""

#: cove/views.py:26 cove/views.py:37 cove/views.py:46
#: cove/views.py:26 cove/views.py:37 cove/views.py:47
msgid "Sorry, we can't process that data"
msgstr ""

Expand All @@ -454,26 +458,26 @@ msgid ""
"We can only process json, csv, ods and xlsx files."
msgstr ""

#: cove/views.py:50
#: cove/views.py:51
msgid ""
"We think you tried to supply a spreadsheet, but we failed to convert it.\n"
"\n"
"Error message: {}"
msgstr ""

#: cove/views.py:74 cove/views.py:86
#: cove/views.py:75 cove/views.py:87
msgid "Sorry, the page you are looking for is not available"
msgstr ""

#: cove/views.py:76 cove/views.py:88
#: cove/views.py:77 cove/views.py:89
msgid "Go to Home page"
msgstr ""

#: cove/views.py:77
#: cove/views.py:78
msgid "We don't seem to be able to find the data you requested."
msgstr ""

#: cove/views.py:89
#: cove/views.py:90
msgid ""
"The data you were hoping to explore no longer exists.\n"
"\n"
Expand Down
58 changes: 31 additions & 27 deletions cove/locale/es/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
# Eduardo Gomez <[email protected]>, 2018
# David Raznick <[email protected]>, 2019
# Yohanna Lisnichuk <[email protected]>, 2019
# Bibiana Cristòfol <[email protected]>, 2020
# Ben Webb <[email protected]>, 2020
# Maria Esther Cervantes <[email protected]>, 2020
# Bibiana Cristòfol <[email protected]>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-10-15 16:42+0000\n"
"POT-Creation-Date: 2020-11-05 13:13+0000\n"
"PO-Revision-Date: 2018-11-30 11:12+0000\n"
"Last-Translator: Maria Esther Cervantes <mcervantes@cds.com.py>, 2020\n"
"Last-Translator: Bibiana Cristòfol <bcristofol@gmail.com>, 2020\n"
"Language-Team: Spanish (https://www.transifex.com/OpenDataServices/teams/59127/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -45,7 +45,7 @@ msgstr ""
"ConnectionError"

#: cove/input/views.py:74 cove/input/views.py:82 cove/views.py:28
#: cove/views.py:39 cove/views.py:48
#: cove/views.py:39 cove/views.py:49
msgid "Try Again"
msgstr "Inténtelo de nuevo"

Expand Down Expand Up @@ -386,15 +386,15 @@ msgstr "(más información)"
msgid "Column:"
msgstr "Columna:"

#: cove/templatetags/cove_tags.py:71
#: cove/templatetags/cove_tags.py:73
msgid "Date is not in the correct format"
msgstr "El formato de la fecha es incorrecto"

#: cove/templatetags/cove_tags.py:72
#: cove/templatetags/cove_tags.py:74
msgid "Invalid 'uri' found"
msgstr "Se ha encontrado una 'uri' inválida"

#: cove/templatetags/cove_tags.py:73
#: cove/templatetags/cove_tags.py:75
msgid ""
"{}<code>{}</code> is not a string. Check that the value {} has quotes at the"
" start and end. Escape any quotes in the value with <code>\\</code>"
Expand All @@ -403,7 +403,7 @@ msgstr ""
"principio y al final. Escapar de cualquier comillas con el valor "
"<code>/</code>"

#: cove/templatetags/cove_tags.py:74
#: cove/templatetags/cove_tags.py:76
msgid ""
"{}<code>{}</code> is not a integer. Check that the value {} doesn’t contain "
"decimal points or any characters other than 0-9. Integer values should not "
Expand All @@ -413,7 +413,7 @@ msgstr ""
"puntos decimales ni ningún otro carácter que no sea 0-9. Los valores enteros"
" no deben estar entre comillas."

#: cove/templatetags/cove_tags.py:75
#: cove/templatetags/cove_tags.py:77
msgid ""
"{}<code>{}</code> is not a number. Check that the value {} doesn’t contain "
"any characters other than 0-9 and dot (<code>.</code>). Number values should"
Expand All @@ -423,63 +423,67 @@ msgstr ""
"ningún carácter más que 0-9 y el punto (.). Los valores numéricos no deben "
"estar entre comillas"

#: cove/templatetags/cove_tags.py:76
#: cove/templatetags/cove_tags.py:78
msgid "{}<code>{}</code> is not a JSON object"
msgstr "{}<code>{}</code> no es un objeto JSON."

#: cove/templatetags/cove_tags.py:77
#: cove/templatetags/cove_tags.py:79
msgid "{}<code>{}</code> is not a JSON array"
msgstr "{}<code>{}</code> no es una matriz JSON"

#: cove/templatetags/cove_tags.py:91
#: cove/templatetags/cove_tags.py:101
msgid "Array Element "
msgstr "Elemento de matriz"

#: cove/templatetags/cove_tags.py:117
#: cove/templatetags/cove_tags.py:109 cove/templatetags/cove_tags.py:111
msgid "is not null, and"
msgstr "no es 'null', y"

#: cove/templatetags/cove_tags.py:127
msgid "<code>{}</code> is missing but required within <code>{}</code>"
msgstr "<code>{}</code> falta pero se requiere dentro de <code>{}</code>"

#: cove/templatetags/cove_tags.py:123
#: cove/templatetags/cove_tags.py:133
msgid "<code>{}</code> is missing but required"
msgstr "<code>{}</code>falta pero se requiere"

#: cove/templatetags/cove_tags.py:127
#: cove/templatetags/cove_tags.py:137
msgid "Invalid code found in <code>{}</code>"
msgstr "Código inválido encontrado en <code>{}</code>"

#: cove/templatetags/cove_tags.py:131
#: cove/templatetags/cove_tags.py:141
msgid "<code>{}</code> does not match the regex <code>{}</code>"
msgstr "<code>{}</code>no coincide con la expresión regular <code>{}</code>"

#: cove/templatetags/cove_tags.py:138
#: cove/templatetags/cove_tags.py:148
msgid ""
"<code>{}</code> is too short. You must supply at least one value, or remove "
"the item entirely (unless it’s required)."
msgstr ""
"<code>{}</code>es muy corto. Debe proporcionar al menos un valor o eliminar "
"el artículo por completo (a menos que sea necesario)."

#: cove/templatetags/cove_tags.py:144
#: cove/templatetags/cove_tags.py:154
msgid ""
"<code>\"{}\"</code> is too short. Strings must be at least one character. "
"This error typically indicates a missing value."
msgstr ""
"<code>\"{}\"</code>es muy corto. Las cadenas deben tener al menos un "
"carácter. Este error normalmente indica un valor faltante."

#: cove/templatetags/cove_tags.py:149
#: cove/templatetags/cove_tags.py:159
msgid "{} does not have enough properties"
msgstr "{} no tiene suficientes propiedades"

#: cove/templatetags/cove_tags.py:154
#: cove/templatetags/cove_tags.py:164
msgid "Array has non-unique elements"
msgstr "La matriz tiene elementos no únicos"

#: cove/templatetags/cove_tags.py:157
#: cove/templatetags/cove_tags.py:167
msgid "Non-unique {} values"
msgstr "Valores {} no únicos"

#: cove/views.py:26 cove/views.py:37 cove/views.py:46
#: cove/views.py:26 cove/views.py:37 cove/views.py:47
msgid "Sorry, we can't process that data"
msgstr "Lo sentimos, no podemos procesar esos datos"

Expand All @@ -503,7 +507,7 @@ msgstr ""
"\n"
"Solo podemos procesar archivos son, csv, ods y xlsx."

#: cove/views.py:50
#: cove/views.py:51
msgid ""
"We think you tried to supply a spreadsheet, but we failed to convert it.\n"
"\n"
Expand All @@ -513,19 +517,19 @@ msgstr ""
"\n"
"Mensaje del error: {}"

#: cove/views.py:74 cove/views.py:86
#: cove/views.py:75 cove/views.py:87
msgid "Sorry, the page you are looking for is not available"
msgstr "Lo sentimos, la página que está buscando no está disponible"

#: cove/views.py:76 cove/views.py:88
#: cove/views.py:77 cove/views.py:89
msgid "Go to Home page"
msgstr "Ir a la Página de Inicio"

#: cove/views.py:77
#: cove/views.py:78
msgid "We don't seem to be able to find the data you requested."
msgstr "Parece que no podemos encontrar los datos que usted solicitó."

#: cove/views.py:89
#: cove/views.py:90
msgid ""
"The data you were hoping to explore no longer exists.\n"
"\n"
Expand Down
4 changes: 2 additions & 2 deletions cove/templatetags/cove_tags.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ def html_error_msg(error):
if e_validator in ("format", "type"):
if isinstance(e_validator_value, list):
if "null" not in e_validator_value:
null_clause = "is not null, and"
null_clause = _("is not null, and")
else:
null_clause = "is not null, and"
null_clause = _("is not null, and")

message_safe_template = validation_error_template_lookup_safe.get(
validator_type
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

setup(
name='libcoveweb',
version='0.18.1',
version='0.18.2',
author='Open Data Services',
author_email='[email protected]',
packages=find_packages(),
Expand Down

0 comments on commit c242d50

Please sign in to comment.