Skip to content
This repository has been archived by the owner on Dec 13, 2022. It is now read-only.

Commit

Permalink
Fix capitalization, and make blocktrans/trans tags easier to read
Browse files Browse the repository at this point in the history
  • Loading branch information
jpmckinney committed Nov 25, 2019
1 parent 23e275c commit dfc3343
Show file tree
Hide file tree
Showing 5 changed files with 127 additions and 99 deletions.
31 changes: 24 additions & 7 deletions default/templates/default/compile.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,31 @@
{% load i18n %}

{% block subtitle %} >> {% trans "Compile Releases" %} {% endblock %}

{% block info %}
<p>{% blocktrans %}Drag and drop one or more <a href="https://standard.open-contracting.org/latest/en/schema/release_package/" target="_blank">Release Packages</a> to generate a
<a href="https://standard.open-contracting.org/latest/en/schema/record_package/" target="_blank">Record Package</a> with Compiled Releases included.{% endblocktrans %}
{% blocktrans %}You can also click the <strong>Add a file</strong> link below.{% endblocktrans %}</p>
<p>{% blocktrans %}Use the <strong>Published Date</strong> option to set the Published Date in the output package.{% endblocktrans %}
{% blocktrans %}Check the <strong>Include Versioned Releases</strong> option if you want to add a Versioned Release to each Record. Read more about Compiled and Versioned releases in the
<a href="https://standard.open-contracting.org/latest/en/schema/merging/" target="_blank">OCDS documentation</a>.{% endblocktrans %}</p>
<p>{% blocktrans %}Please verify that your files are Release Packages before uploading.{% endblocktrans %}</p>
<p>
{% blocktrans trimmed %}
Drag and drop one or more
<a href="https://standard.open-contracting.org/latest/en/schema/release_package/" target="_blank">release packages</a>
to create a
<a href="https://standard.open-contracting.org/latest/en/schema/record_package/" target="_blank">record package</a>
with compiled releases included.
{% endblocktrans %}
{% trans "You can also click the <strong>Add a file</strong> link below." %}
</p>

<p>
{% trans "Fill in the <strong>Published date</strong> textbox to set <code>publishedDate</code> in the output package." %}
{% blocktrans trimmed %}
Check the <strong>Include Versioned Releases</strong> checkbox if you want to add a versioned release to each record.
Read more about compiled releases and versioned releases in the
<a href="https://standard.open-contracting.org/latest/en/schema/merging/" target="_blank">OCDS documentation</a>.
{% endblocktrans %}
</p>

<p>{% trans "Please verify that your files are release packages before uploading." %}</p>
{% endblock %}

{% block extraoptions %}
{% include "default/snippets/published_date.html" %}
<div class="checkbox">
Expand All @@ -19,6 +35,7 @@
</label>
</div>
{% endblock %}

{% block scripts %}
{{ block.super }}
<script type="text/javascript">
Expand Down
23 changes: 18 additions & 5 deletions default/templates/default/package-releases.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,29 @@
{% load i18n %}

{% block subtitle %} &gt;&gt; {% trans "Create Release Packages" %}{% endblock %}

{% block info %}
<p> {% blocktrans %}Drag and drop one or more <a href="https://standard.open-contracting.org/latest/en/getting_started/releases_and_records/#releases" target="_blank">Release</a> files
in the box below to create a <a href="https://standard.open-contracting.org/latest/en/schema/release_package/" target="_blank">Release Package</a> {% endblocktrans %}.
{% blocktrans %}You can also click the <strong>Add a file</strong> link below.{% endblocktrans %}
{% blocktrans %}Use the <strong>Published Date</strong> option to set the Published Date in the output package.{% endblocktrans %}</p>
<p>{% blocktrans %}The input files must be JSON files with a single Release each or a JSON Array of Releases.{% endblocktrans%}</p>
<p>
{% blocktrans trimmed %}
Drag and drop one or more
<a href="https://standard.open-contracting.org/latest/en/getting_started/releases_and_records/#releases" target="_blank">releases</a>
to create a
<a href="https://standard.open-contracting.org/latest/en/schema/release_package/" target="_blank">release package</a>.
{% endblocktrans %}
{% trans "You can also click the <strong>Add a file</strong> link below." %}
</p>
<p>
{% trans "Fill in the <strong>Published date</strong> textbox to set <code>publishedDate</code> in the output package." %}
</p>
<p>
{% trans "Each input file must be a JSON file containing either one release or an array of releases." %}
</p>
{% endblock %}

{% block extraoptions %}
{% include "default/snippets/published_date.html" %}
{% endblock %}

{% block scripts %}
{{ block.super }}
{% include "default/snippets/published_date_scripts.html" %}
Expand Down
2 changes: 1 addition & 1 deletion default/templates/default/snippets/published_date.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load i18n %}
<div class="form-group pull-right">
<label for="publishedDate">{% blocktrans %}Published date: {% endblocktrans %}</label>
<label for="publishedDate">{% trans "Published date:" %}</label>
<input type="text" class="form-control" id="publishedDate"/>
</div>
12 changes: 9 additions & 3 deletions default/templates/default/upgrade.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@
{% load i18n %}

{% block subtitle %} &gt;&gt; {% trans "Upgrade from 1.0 to 1.1" %} {% endblock %}

{% block info %}
<p>
{% blocktrans%}Drag and drop one of more OCDS <a href="https://standard.open-contracting.org/latest/en/getting_started/releases_and_records/#releases" target="_blank">Release</a> files or
<a href="https://standard.open-contracting.org/latest/en/schema/release_package/" target="_blank">Release</a>/<a href="https://standard.open-contracting.org/latest/en/schema/record_package/" target="_blank">Record</a> Package files to update them to OCDS 1.1.{% endblocktrans %}
{% blocktrans %}You can also click the <strong>Add a file</strong> link below to add files.{% endblocktrans %}
{% blocktrans trimmed %}
Drag and drop one or more
<a href="https://standard.open-contracting.org/latest/en/getting_started/releases_and_records/#releases" target="_blank">releases</a>,
<a href="https://standard.open-contracting.org/latest/en/schema/release_package/" target="_blank">release packages</a>, or
<a href="https://standard.open-contracting.org/latest/en/schema/record_package/" target="_blank">record packages</a>
to update them to OCDS 1.1.
{% endblocktrans %}
{% trans "You can also click the <strong>Add a file</strong> link below." %}
</p>
{% endblock %}
158 changes: 75 additions & 83 deletions locale/es/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: 2019-11-22 18:40-0300\n"
"POT-Creation-Date: 2019-11-25 20:54+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -123,58 +123,56 @@ msgstr "OCDS Toucan"
msgid "Compile Releases"
msgstr "Compilar Releases"

#: default/templates/default/compile.html:6
#: default/templates/default/compile.html:8
msgid ""
"Drag and drop one or more <a href=\"https://standard.open-contracting.org/"
"latest/en/schema/release_package/\" target=\"_blank\">Release Packages</a> "
"to generate a\n"
"<a href=\"https://standard.open-contracting.org/latest/en/schema/"
"record_package/\" target=\"_blank\">Record Package</a> with Compiled "
"Releases included."
"latest/en/schema/release_package/\" target=\"_blank\">release packages</a> "
"to create a <a href=\"https://standard.open-contracting.org/latest/en/schema/"
"record_package/\" target=\"_blank\">record package</a> with compiled "
"releases included."
msgstr ""
"Arrastre y suelte uno o más <a href=\"https://standard.open-contracting.org/"
"latest/es/schema/release_package/\" target=\"_blank\">Paquetes de Release</"
"a> para generar un\n"
"<a href=\"https://standard.open-contracting.org/latest/es/schema/"
"record_package/\" target=\"_blank\">Paquete de Record</a> con Compiled "
"Releases incluidos."

#: default/templates/default/compile.html:8
#: default/templates/default/package-releases.html:8
"latest/es/schema/release_package/\" target=\"_blank\">paquetes de delease</"
"a> para generar un <a href=\"https://standard.open-contracting.org/latest/es/"
"schema/record_package/\" target=\"_blank\">paquete de record</a> con "
"compiled releases incluidos."

#: default/templates/default/compile.html:15
#: default/templates/default/package-releases.html:14
#: default/templates/default/upgrade.html:15
msgid "You can also click the <strong>Add a file</strong> link below."
msgstr ""
"También puede hacer clic en el enlace de <strong>Agregue un archivo</strong> "
"más abajo."

#: default/templates/default/compile.html:9
#: default/templates/default/package-releases.html:9
#: default/templates/default/compile.html:19
#: default/templates/default/package-releases.html:17
msgid ""
"Use the <strong>Published Date</strong> option to set the Published Date in "
"the output package."
"Fill in the <strong>Published date</strong> textbox to set "
"<code>publishedDate</code> in the output package."
msgstr ""
"Use la opción <strong>Fecha de Publicación</strong> para establecer la Fecha "
"de Publicación del paquete de salida."
"Use la opción <strong>Fecha de Publicación</strong> para establecer "
"<code>publishedDate</code> del paquete de salida."

#: default/templates/default/compile.html:10
#: default/templates/default/compile.html:20
msgid ""
"Check the <strong>Include Versioned Releases</strong> option if you want to "
"add a Versioned Release to each Record. Read more about Compiled and "
"Versioned releases in the\n"
"<a href=\"https://standard.open-contracting.org/latest/en/schema/merging/\" "
"target=\"_blank\">OCDS documentation</a>."
"Check the <strong>Include Versioned Releases</strong> checkbox if you want "
"to add a versioned release to each record. Read more about compiled releases "
"and versioned releases in the <a href=\"https://standard.open-contracting."
"org/latest/en/schema/merging/\" target=\"_blank\">OCDS documentation</a>."
msgstr ""
"Seleccione la opción <strong>Incluir Versioned Releases</strong> si quiere "
"añadir un Versioned Release para cada Record. Lea más sobre Compiled y "
"Versioned releases en la\n"
"<a href=\"https://standard.open-contracting.org/latest/es/schema/merging/\" "
"target=\"_blank\">documentación de OCDS</a>."

#: default/templates/default/compile.html:12
msgid "Please verify that your files are Release Packages before uploading."
"Seleccione la opción <strong>Incluir el bloque versionedRelease</strong> si "
"quiere añadir un versioned release para cada record. Lea más sobre compiled "
"releases y versioned releases en la <a href=\"https://standard.open-"
"contracting.org/latest/es/schema/merging/\" target=\"_blank\">documentación "
"de OCDS</a>."

#: default/templates/default/compile.html:27
msgid "Please verify that your files are release packages before uploading."
msgstr ""
"Favor verifique que sus archivos sean Paquetes de Release antes de subirlos."
"Favor verifique que sus archivos sean paquetes de release antes de subirlos."

#: default/templates/default/compile.html:18
#: default/templates/default/compile.html:34
msgid "Include Versioned Releases"
msgstr "Incluir el bloque versionedRelease"

Expand All @@ -197,18 +195,6 @@ msgstr "Generar una planilla del esquema"
msgid "Convert to CSV/Excel"
msgstr "Convertir a CSV/Excel"

#: default/templates/default/index.html:63
msgid "More Tools"
msgstr "Más Herramientas"

#: default/templates/default/index.html:74
msgid "Data Review Tool"
msgstr "Herramienta de Revisión de Datos"

#: default/templates/default/index.html:87
msgid "OCDS Extension Creator"
msgstr "Creador de Extensiones OCDS"

#: default/templates/default/mapping_sheet.html:4
msgid "Generate a spreadsheet version of the schema"
msgstr "Generar una planilla del esquema"
Expand Down Expand Up @@ -279,32 +265,30 @@ msgstr "Añadir URL"
msgid "Generate"
msgstr "Generar"

#: default/templates/default/package-releases.html:6
#: default/templates/default/package-releases.html:8
msgid ""
"Drag and drop one or more <a href=\"https://standard.open-contracting.org/"
"latest/en/getting_started/releases_and_records/#releases\" target=\"_blank"
"\">Release</a> files\n"
"in the box below to create a <a href=\"https://standard.open-contracting.org/"
"latest/en/schema/release_package/\" target=\"_blank\">Release Package</a> "
"\">releases</a> to create a <a href=\"https://standard.open-contracting.org/"
"latest/en/schema/release_package/\" target=\"_blank\">release package</a>."
msgstr ""
"Arrastre y suelte uno o más archivos de <a href=\"https://standard.open-"
"contracting.org/latest/es/getting_started/releases_and_records/#releases\" "
"target=\"_blank\">Release</a>\n"
"en la caja más abajo para crear un <a href=\"https://standard.open-"
"contracting.org/latest/es/schema/release_package/\" target=\"_blank"
"\">Paquete de Release</a> "
"target=\"_blank\">release</a> en la caja más abajo para crear un <a href="
"\"https://standard.open-contracting.org/latest/es/schema/release_package/\" "
"target=\"_blank\">paquete de release</a>."

#: default/templates/default/package-releases.html:10
#: default/templates/default/package-releases.html:20
msgid ""
"The input files must be JSON files with a single Release each or a JSON "
"Array of Releases."
"Each input file must be a JSON file containing either one release or an "
"array of releases."
msgstr ""
"Los archivos de entrada deben ser JSON con un solo Release cada uno o un "
"JSON Array de Releases."
"array de releases."

#: default/templates/default/snippets/published_date.html:3
msgid "Published date: "
msgstr "Fecha de Publicación: "
msgid "Published date:"
msgstr "Fecha de Publicación:"

#: default/templates/default/to-spreadsheet.html:30
msgid ""
Expand All @@ -323,30 +307,22 @@ msgstr ""
msgid "Added:"
msgstr "Añadido:"

#: default/templates/default/upgrade.html:7
#: default/templates/default/upgrade.html:8
msgid ""
"Drag and drop one of more OCDS <a href=\"https://standard.open-contracting."
"org/latest/en/getting_started/releases_and_records/#releases\" target="
"\"_blank\">Release</a> files or \n"
"<a href=\"https://standard.open-contracting.org/latest/en/schema/"
"release_package/\" target=\"_blank\">Release</a>/<a href=\"https://standard."
"open-contracting.org/latest/en/schema/record_package/\" target=\"_blank"
"\">Record</a> Package files to update them to OCDS 1.1."
"Drag and drop one or more <a href=\"https://standard.open-contracting.org/"
"latest/en/getting_started/releases_and_records/#releases\" target=\"_blank"
"\">releases</a>, <a href=\"https://standard.open-contracting.org/latest/en/"
"schema/release_package/\" target=\"_blank\">release packages</a>, or <a href="
"\"https://standard.open-contracting.org/latest/en/schema/record_package/\" "
"target=\"_blank\">record packages</a> to update them to OCDS 1.1."
msgstr ""
"Arrastre y suelte uno o más archivos de <a href=\"https://standard.open-"
"contracting.org/latest/es/getting_started/releases_and_records/#releases\" "
"target=\"_blank\">Release</a> OCDS o Paquete de \n"
"<a href=\"https://standard.open-contracting.org/latest/es/schema/"
"release_package/\" target=\"_blank\">Release</a>/<a href=\"https://standard."
"open-contracting.org/latest/es/schema/record_package/\" target=\"_blank"
"\">Record</a> para actualizarlos a OCDS 1.1."

#: default/templates/default/upgrade.html:9
msgid ""
"You can also click the <strong>Add a file</strong> link below to add files."
msgstr ""
"También puede hacer click en el enlace <strong>Añadir un archivo</strong> "
"más abajo para agregar archivos."
"target=\"_blank\">release</a>, <a href=\"https://standard.open-contracting."
"org/latest/es/schema/release_package/\" target=\"_blank\">paquete de "
"release</a> o <a href=\"https://standard.open-contracting.org/latest/es/"
"schema/record_package/\" target=\"_blank\">paquete de record</a> para "
"actualizarlos a OCDS 1.1."

#: default/templates/jquery-file-upload/download.html:14
msgid "Upload successful"
Expand All @@ -367,3 +343,19 @@ msgstr "Inglés"
#: ocdstoucan/settings.py:139
msgid "Spanish"
msgstr "Español"

#~ msgid "More Tools"
#~ msgstr "Más Herramientas"

#~ msgid "Data Review Tool"
#~ msgstr "Herramienta de Revisión de Datos"

#~ msgid "OCDS Extension Creator"
#~ msgstr "Creador de Extensiones OCDS"

#~ msgid ""
#~ "You can also click the <strong>Add a file</strong> link below to add "
#~ "files."
#~ msgstr ""
#~ "También puede hacer click en el enlace <strong>Añadir un archivo</strong> "
#~ "más abajo para agregar archivos."

0 comments on commit dfc3343

Please sign in to comment.