Merge branch 'develop'

memeLab · Jul 22, 2019 · 5c35d25 · 5c35d25
2 parents 1be3bfa + dadf575
commit 5c35d25
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,4 +22,5 @@ src/ARte/users/media/
 docker/media/
 
 # translations
-*.mo
+*.mo
+*.po~
diff --git 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"
@@ -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
@@ -200,6 +205,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/header.jinja2 b/src/ARte/core/jinja2/core/header.jinja2
@@ -18,7 +18,7 @@
             {% if request.user.is_authenticated %}
                 <div class="welcome">
                     <p>
-                        Welcome, <a href="{{ url('profile') }}">{{ request.user.username }}</a>
+                        {{_("Welcome, ")}}<a href="{{ url('profile') }}">{{ request.user.username }}</a>
                     </p>
                 </div>          
 

diff --git a/src/ARte/core/jinja2/core/home.jinja2 b/src/ARte/core/jinja2/core/home.jinja2
@@ -29,15 +29,15 @@
         {% 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 %}
             <section class="use-guide">
                 <div class="container">
-                    <h2>Welcome to Jandig</h2>
-                    <blockquote>An open source Augmented Reality art community.</blockquote>
-                    <p>To see the artworks you need  to grant camera access to the app.</p>
+                    <h2>{{_("Welcome to Jandig")}}</h2>
+                    <blockquote>{{_("An open source Augmented Reality art community.")}}</blockquote>
+                    <p>{{_("To see the artworks you need  to grant camera access to the app.")}}</p>
                     <div class="go-to-camera">
                         <a href="/exhibit_select" class="button">{{ _('Go to camera') }}</a>
                     </div>

diff --git 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 %}
 
                     <div class="form-options">
                         <p>