From a78a25aa143271d415a2f4ee5f985c23bd2bde9a Mon Sep 17 00:00:00 2001 From: Francisco J Migueles Student <99977786+Framigdom@users.noreply.github.com> Date: Sat, 3 Dec 2022 12:41:22 +0100 Subject: [PATCH] [DES] Interfaz traducible actualizada. Modificado todas las etiquetas "trans" del html del proyecto. --- .../locale/en_US/LC_MESSAGES/django.po | 16 ++++++++++++-- .../templates/authentication/register.html | 6 ++--- decide/base/templates/base.html | 9 +------- decide/booth/templates/booth/booth.html | 6 ++--- decide/booth/templates/booth/votings.html | 12 +++++----- decide/census/templates/census/census.html | 12 +++++----- .../templates/visualizer/visualizer.html | 22 +++++++++---------- 7 files changed, 44 insertions(+), 39 deletions(-) diff --git a/decide/authentication/locale/en_US/LC_MESSAGES/django.po b/decide/authentication/locale/en_US/LC_MESSAGES/django.po index a1d1ecefce..6054ff85e3 100644 --- a/decide/authentication/locale/en_US/LC_MESSAGES/django.po +++ b/decide/authentication/locale/en_US/LC_MESSAGES/django.po @@ -14,7 +14,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -msgid "registrar" +msgid "register" msgstr "Registration" msgid "infoRegistrar" @@ -33,4 +33,16 @@ msgid "email" msgstr "Email" msgid "password" -msgstr "Password" \ No newline at end of file +msgstr "Password" + +msgid "acceptRegister" +msgstr "By registering, you accept the" + +msgid "terms" +msgstr "Terms & Privacy" + +msgid "alreadyAccount" +msgstr "Already have an account?" + +msgid "sign" +msgstr "Sign In" \ No newline at end of file diff --git a/decide/authentication/templates/authentication/register.html b/decide/authentication/templates/authentication/register.html index a898817be4..c872e904ea 100644 --- a/decide/authentication/templates/authentication/register.html +++ b/decide/authentication/templates/authentication/register.html @@ -40,13 +40,13 @@

{% trans "registrar" %}:

-

By registering, you accept the Terms & Privacy.

+

{% trans "acceptRegister" %}{% trans "terms" %}.

- +
-

Already have an account? Sign In

+

{% trans "alreadyAccount" %}{% trans "sign" %}

diff --git a/decide/base/templates/base.html b/decide/base/templates/base.html index 8f40326e0d..89b8fb45c0 100644 --- a/decide/base/templates/base.html +++ b/decide/base/templates/base.html @@ -8,14 +8,7 @@ {% block content %} -
- - -
+ {% endblock %} {% block extrabody %}{% endblock %} diff --git a/decide/booth/templates/booth/booth.html b/decide/booth/templates/booth/booth.html index 2fd34d4242..719f3e1657 100644 --- a/decide/booth/templates/booth/booth.html +++ b/decide/booth/templates/booth/booth.html @@ -56,12 +56,12 @@

{% trans "vName" %}: [[ voting.name ]]

{% if not user.is_authenticated and not user.is_staff %} - Login with GitHub + {% trans "LoginGitHub" %} {% elif not user.is_staff %} -

Registrado en {{user.social_auth.get.provider}} como {{user}}

+

{% trans "register_as_1" %}{{user.social_auth.get.provider}} {% trans "register_as_2" %} {{user}}

- Vote with {{user.social_auth.get.provider}} + {% trans "vote_with" %} {{user.social_auth.get.provider}} {% endif %} diff --git a/decide/booth/templates/booth/votings.html b/decide/booth/templates/booth/votings.html index bb41b9790f..9b1fd54466 100644 --- a/decide/booth/templates/booth/votings.html +++ b/decide/booth/templates/booth/votings.html @@ -16,9 +16,9 @@ # - Votación - Enlace a la votación - Enlace al censo + {% trans "voting" %} + {% trans "link_voting" %} + {% trans "link_census" %} @@ -27,11 +27,11 @@ {{voting.id}} {{voting.name}} {% if voting.end_date == None %} -

Booth votación {{voting.id}}

 +

{% trans "booth_voting" %} {{voting.id}}

 {% else %} -

Votación cerrada

+

{% trans "closed_voting" %}

{% endif %} -

Censo votación {{voting.id}}

 +

{% trans "voting_census" %} {{voting.id}}

 {% endfor %} diff --git a/decide/census/templates/census/census.html b/decide/census/templates/census/census.html index 644267f29c..77471d6ac5 100644 --- a/decide/census/templates/census/census.html +++ b/decide/census/templates/census/census.html @@ -13,30 +13,30 @@
- Decide + {% trans "decide" %}
-

Administración de censos en votaciones

+

{% trans "administration_census" %}

- +
- +
- +
- +
diff --git a/decide/visualizer/templates/visualizer/visualizer.html b/decide/visualizer/templates/visualizer/visualizer.html index fd3cdf93ee..782b76f13d 100644 --- a/decide/visualizer/templates/visualizer/visualizer.html +++ b/decide/visualizer/templates/visualizer/visualizer.html @@ -33,27 +33,27 @@

{% trans "vID" %}: [[ voting.id ]]

{% trans "vName" %}: [[ voting.name ]]

-

Descripción de la votación: [[ voting.desc ]]

-

Fecha de inicio de la votación: [[ startDate ]]

+

{% trans "desc" %}: [[ voting.desc ]]

+

{% trans "startDate" %}: [[ startDate ]]

{% trans "nonstarted" %}

{% trans "running" %}

-

Fecha de fin de la votación: [[ endDate ]]

+

{% trans "endDate" %}: [[ endDate ]]


{% trans "results" %}

-

Número de escaños a repartir: [[ voting.seats ]]

-

Porcentaje mínimo para tener representación: [[ voting.min_percentage_representation ]]% de los votos totales

-

El cálculo en el reparto de escaños esta basado en la Ley D'Hont, en la cual se ignoran las candidaturas con menos del mínimo porcentaje necesario de votos totales, además en caso de empate en el reparto de un escaño, este será dado al candidato con más votos totales obtenidos

+

{% trans "seatsNum" %}: [[ voting.seats ]]

+

{% trans "minPercentage_1" %}: [[ voting.min_percentage_representation ]]% {% trans "minPercentage_2" %}

+

{% trans "hontDes" %}

- + @@ -70,15 +70,15 @@

Porcentaje mínimo para tener representación: [[ voting.min_percentage_repr
-

Gráficas de la votación:

+

{% trans "graph_info" %}:

-
Grafica 1
+
{% trans "graph" %} 1
-
Grafica 2
+
{% trans "graph" %} 2
-
Grafica 3
+
{% trans "graph" %} 3

{% trans "option" %}Escaños{% trans "seats" %} {% trans "points" %} {% trans "votes" %}