From bf978e7644634603091bf2e38a1c0bee42dd5dc0 Mon Sep 17 00:00:00 2001 From: pablodiegoss Date: Mon, 22 Jul 2019 11:10:06 -0300 Subject: [PATCH 1/3] Translate welcome message on home --- locale/pt_BR/LC_MESSAGES/django.po | 14 +++++++++++++- src/ARte/core/jinja2/core/home.jinja2 | 6 +++--- src/ARte/users/jinja2/users/artwork-create.jinja2 | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po index bcb842b4..4f4dedf0 100644 --- a/locale/pt_BR/LC_MESSAGES/django.po +++ b/locale/pt_BR/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-18 12:07-0300\n" +"POT-Creation-Date: 2019-07-22 13:58+0000\n" "PO-Revision-Date: 2019-07-18 12:13-0300\n" "Last-Translator: \n" "Language-Team: \n" @@ -200,6 +200,18 @@ msgstr "Cadastro" msgid "Log in" msgstr "Entrar" +#: src/ARte/core/jinja2/core/home.jinja2:38 +msgid "Welcome to Jandig" +msgstr "Bem vindo ao Jandig" + +#: src/ARte/core/jinja2/core/home.jinja2:39 +msgid "An open source Augmented Reality art community." +msgstr "Uma comunidade open source de arte em Realidade Aumentada." + +#: src/ARte/core/jinja2/core/home.jinja2:40 +msgid "To see the artworks you need to grant camera access to the app." +msgstr "Para ver as obras você precisa dar acesso a câmera no aplicativo" + #: src/ARte/core/jinja2/core/home.jinja2:42 msgid "Go to camera" msgstr "Ir para câmera" diff --git a/src/ARte/core/jinja2/core/home.jinja2 b/src/ARte/core/jinja2/core/home.jinja2 index 6cdbda24..02dc1ada 100644 --- a/src/ARte/core/jinja2/core/home.jinja2 +++ b/src/ARte/core/jinja2/core/home.jinja2 @@ -35,9 +35,9 @@ {% else %}
-

Welcome to Jandig

-
An open source Augmented Reality art community.
-

To see the artworks you need to grant camera access to the app.

+

{{_("Welcome to Jandig")}}

+
{{_("An open source Augmented Reality art community.")}}
+

{{_("To see the artworks you need to grant camera access to the app.")}}

diff --git a/src/ARte/users/jinja2/users/artwork-create.jinja2 b/src/ARte/users/jinja2/users/artwork-create.jinja2 index 6b74b3e6..70dc5e39 100644 --- a/src/ARte/users/jinja2/users/artwork-create.jinja2 +++ b/src/ARte/users/jinja2/users/artwork-create.jinja2 @@ -40,7 +40,7 @@ {% with repository_list = marker_list, element_type = 'marker', selected=selected_marker %} {% include "users/components/repository-list.jinja2" %} - {% endwith%} + {% endwith %}

From afe7280a1d3e14bc63c6dbf65a79cb02fd2dcae9 Mon Sep 17 00:00:00 2001 From: pablodiegoss Date: Mon, 22 Jul 2019 11:10:26 -0300 Subject: [PATCH 2/3] Fix logged out access to exhibits info --- src/ARte/core/jinja2/core/home.jinja2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ARte/core/jinja2/core/home.jinja2 b/src/ARte/core/jinja2/core/home.jinja2 index 02dc1ada..2e1156e3 100644 --- a/src/ARte/core/jinja2/core/home.jinja2 +++ b/src/ARte/core/jinja2/core/home.jinja2 @@ -29,7 +29,7 @@ {% if (request.user.is_authenticated and request.path == '/community/') or (request.path == '/community/')%} {% block community %} {% endblock %} - {% elif (request.user.is_authenticated) or (request.path == '/collection/') or (request.path == '/documentation/') %} + {% elif (request.user.is_authenticated) or (request.path == "/exhibit/") or (request.path == '/collection/') or (request.path == '/documentation/') %} {% block content %} {% endblock %} {% else %} From dadf57574be4e2894db414b573ef6dc5fa2ffd3d Mon Sep 17 00:00:00 2001 From: pablodiegoss Date: Mon, 22 Jul 2019 11:33:37 -0300 Subject: [PATCH 3/3] Translate header "Welcome" --- .gitignore | 3 ++- locale/pt_BR/LC_MESSAGES/django.po | 5 +++++ src/ARte/core/jinja2/core/header.jinja2 | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d898fb90..f4bc373d 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,5 @@ src/ARte/users/media/ docker/media/ # translations -*.mo \ No newline at end of file +*.mo +*.po~ diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po index 4f4dedf0..ec7eeb1c 100644 --- a/locale/pt_BR/LC_MESSAGES/django.po +++ b/locale/pt_BR/LC_MESSAGES/django.po @@ -189,6 +189,11 @@ msgstr "" "Conteúdo sob licenciamento CC BY-SA, a não ser quando explicitado o " "contrário." +#: src/ARte/core/jinja2/core/header.jinja2:21 +#, fuzzy +msgid "Welcome, " +msgstr "Bem vindo, " + #: src/ARte/core/jinja2/core/header.jinja2:28 #: src/ARte/users/jinja2/users/login.jinja2:16 #: src/ARte/users/jinja2/users/signup.jinja2:14 diff --git a/src/ARte/core/jinja2/core/header.jinja2 b/src/ARte/core/jinja2/core/header.jinja2 index 68833ebf..2fbd236e 100644 --- a/src/ARte/core/jinja2/core/header.jinja2 +++ b/src/ARte/core/jinja2/core/header.jinja2 @@ -18,7 +18,7 @@ {% if request.user.is_authenticated %}