diff --git a/app/locale/pt_BR/LC_MESSAGES/django.po b/app/locale/pt_BR/LC_MESSAGES/django.po index 935213f..2f49127 100644 --- a/app/locale/pt_BR/LC_MESSAGES/django.po +++ b/app/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-02 17:13-0300\n" +"POT-Creation-Date: 2016-09-03 00:18-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,10 +18,90 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#: app/templates/app/base.html:10 +msgid "The Project" +msgstr "" + +#: app/templates/app/base.html:11 +msgid "CCTE Group" +msgstr "" + +#: app/templates/app/base.html:14 +msgid "Hi" +msgstr "" + +#: app/templates/app/base.html:16 +#, fuzzy +#| msgid "Profile" +msgid "See Profile" +msgstr "Perfil" + +#: app/templates/app/base.html:17 +msgid "Settings" +msgstr "Configurações" + +#: app/templates/app/base.html:18 +msgid "Logout" +msgstr "Sair" + +#: app/templates/app/index.html:6 +msgid "You have:" +msgstr "" + +#: app/templates/app/index.html:10 +#, fuzzy +#| msgid "Pending tasks" +msgid "Pending Tasks" +msgstr "Tarefas Pendentes" + +#: app/templates/app/index.html:14 +msgid "Users Online" +msgstr "Usuários Online" + +#: app/templates/app/index.html:20 +msgid "You can:" +msgstr "" + #: app/templates/app/index.html:24 app/templates/home_professor.html:23 msgid "Create Course" msgstr "Criar Curso" +#: app/templates/app/index.html:29 +#, fuzzy +#| msgid "Manage Course" +msgid "Manage Users" +msgstr "Gerenciar Curso" + +#: app/templates/app/index.html:33 +#, fuzzy +#| msgid "Manage Course" +msgid "Manage Courses" +msgstr "Gerenciar Curso" + +#: app/templates/app/index.html:37 +msgid "Gerenciar Categorias" +msgstr "" + +#: app/templates/app/index.html:45 +msgid "Your course(s):" +msgstr "" + +#: app/templates/app/index.html:46 +msgid "No courses subscribed yet" +msgstr "" + +#: app/templates/app/index.html:56 +msgid "Search course:" +msgstr "" + +#: app/templates/app/index.html:62 +msgid "Search" +msgstr "" + +#: app/templates/app/index.html:67 +msgid "Most popular keywords:" +msgstr "" + #: app/templates/home_professor.html:9 app/templates/home_student.html:9 msgid "Home" msgstr "Início" diff --git a/app/templates/home_professor.html b/app/templates/home_professor.html index 66f031d..952271c 100644 --- a/app/templates/home_professor.html +++ b/app/templates/home_professor.html @@ -6,7 +6,7 @@
diff --git a/app/templates/home_student.html b/app/templates/home_student.html index 4750757..51624da 100644 --- a/app/templates/home_student.html +++ b/app/templates/home_student.html @@ -6,7 +6,7 @@
diff --git a/core/locale/pt_BR/LC_MESSAGES/django.po b/core/locale/pt_BR/LC_MESSAGES/django.po index a143a28..c8b3550 100644 --- a/core/locale/pt_BR/LC_MESSAGES/django.po +++ b/core/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-02 17:13-0300\n" +"POT-Creation-Date: 2016-09-03 00:18-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,3 +21,43 @@ msgstr "" #: core/templates/base.html:56 msgid "Log out" msgstr "Sair" + +#: core/templates/index.html:30 +msgid "Username" +msgstr "Usuário" + +#: core/templates/index.html:36 +msgid "Password" +msgstr "Senha" + +#: core/templates/index.html:44 +msgid "Remember Email" +msgstr "" + +#: core/templates/index.html:53 +msgid "Guest" +msgstr "" + +#: core/templates/index.html:56 +msgid "Login" +msgstr "Entrar" + +#: core/templates/index.html:65 +msgid "Sign Up" +msgstr "Cadastrar" + +#: core/templates/remember_password.html:18 +msgid "E-mail" +msgstr "E-mail" + +#: core/templates/remember_password.html:22 +msgid "Registration" +msgstr "" + +#: core/templates/remember_password.html:26 +msgid "Send" +msgstr "Enviar" + +#: core/views.py:25 +msgid "E-mail or password are incorrect!" +msgstr "O E-mail e/ou a senha estão incorretos" diff --git a/core/templates/remember_password.html b/core/templates/remember_password.html index e9f971e..4a1afd6 100644 --- a/core/templates/remember_password.html +++ b/core/templates/remember_password.html @@ -1,5 +1,5 @@ {% extends "index.html" %} - +{% load i18n %} {% block content %}
@@ -15,23 +15,21 @@
- +
- +
- +
- -
diff --git a/core/urls.py b/core/urls.py index bcf898e..8ddc64b 100644 --- a/core/urls.py +++ b/core/urls.py @@ -4,7 +4,6 @@ from django.contrib.auth import views as auth_views from . import views urlpatterns = [ - url(r'^$', views.index, name='index'), url(r'^login/$', views.login, name='home'), url(r'^remember_password/$', views.remember_password, name='remember_password'), url(r'^logout/$', auth_views.logout, {'next_page': 'core:home'}, name='logout'), diff --git a/core/views.py b/core/views.py index a897763..7f9e74a 100644 --- a/core/views.py +++ b/core/views.py @@ -4,18 +4,9 @@ from django.http import HttpResponse from django.contrib.auth import authenticate, login as login_user from django.shortcuts import redirect from django.core.urlresolvers import reverse +from django.utils.translation import ugettext_lazy as _ from .decorators import log_decorator -# from django.contrib.auth.views import LoginView - -def index(request): - context = { - 'subscribed_courses': 'testando' - } - return render(request, "index.html", context) - -def create_account(request): - return render(request, "create_account.html") def remember_password(request): return render(request, "remember_password.html") @@ -26,12 +17,12 @@ def login(request): if request.POST: username = request.POST['username'] password = request.POST['password'] - usuario = authenticate(username=username, password=password) - if usuario is not None: - login_user(request, usuario) + user = authenticate(username=username, password=password) + if user is not None: + login_user(request, user) return redirect(reverse("app:index")) else: - context["message"] = "Email ou senha incorretos!" + context["message"] = _("E-mail or password are incorrect!") return render(request,"index.html",context) diff --git a/courses/locale/pt_BR/LC_MESSAGES/django.po b/courses/locale/pt_BR/LC_MESSAGES/django.po index 3013380..7bca265 100644 --- a/courses/locale/pt_BR/LC_MESSAGES/django.po +++ b/courses/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-02 17:13-0300\n" +"POT-Creation-Date: 2016-09-03 00:18-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -22,7 +22,7 @@ msgstr "" #: courses/models.py:7 courses/models.py:20 courses/models.py:44 #: courses/templates/category/index.html:38 msgid "Name" -msgstr "" +msgstr "Nome" #: courses/forms.py:14 msgid "Category name" @@ -38,7 +38,7 @@ msgstr "" #: courses/forms.py:28 msgid "Number of studets maximum" -msgstr "" +msgstr "Número máximo de estudantes" #: courses/forms.py:29 msgid "Course registration start date" @@ -50,19 +50,19 @@ msgstr "" #: courses/forms.py:31 msgid "Course start date" -msgstr "" +msgstr "Data de inicio do Curso" #: courses/forms.py:32 msgid "Course end date" -msgstr "" +msgstr "Data de termino do curso" #: courses/forms.py:33 courses/models.py:30 msgid "Image" -msgstr "" +msgstr "Imagem" #: courses/forms.py:34 courses/models.py:12 courses/models.py:31 msgid "Category" -msgstr "" +msgstr "Categoria" #: courses/forms.py:37 msgid "Course name" @@ -139,7 +139,7 @@ msgstr "" #: courses/templates/category/update.html:16 #: courses/templates/category/view.html:15 msgid "Categories" -msgstr "" +msgstr "Categorias" #: courses/models.py:22 msgid "Objectivies" @@ -171,7 +171,7 @@ msgstr "" #: courses/models.py:36 courses/models.py:49 msgid "Course" -msgstr "" +msgstr "Curso" #: courses/models.py:37 courses/templates/course/create.html:16 #: courses/templates/course/delete.html:15 @@ -184,19 +184,19 @@ msgstr "" #: courses/templates/module/index.html:16 #: courses/templates/module/update.html:17 msgid "Courses" -msgstr "" +msgstr "Cursos" #: courses/models.py:47 courses/templates/module/index.html:107 msgid "Visible" -msgstr "" +msgstr "Visível" #: courses/models.py:53 msgid "Module" -msgstr "" +msgstr "Modulo" #: courses/models.py:54 courses/templates/module/index.html:92 msgid "Modules" -msgstr "" +msgstr "Modulos" #: courses/templates/category/create.html:8 #: courses/templates/category/delete.html:7 @@ -210,14 +210,14 @@ msgstr "" #: courses/templates/module/delete.html:7 courses/templates/module/index.html:7 #: courses/templates/module/update.html:8 msgid "Home" -msgstr "" +msgstr "Inicio" #: courses/templates/category/create.html:9 #: courses/templates/category/delete.html:18 #: courses/templates/category/index.html:18 #: courses/templates/category/view.html:18 msgid "Create Category" -msgstr "" +msgstr "Criar Categoria" #: courses/templates/category/create.html:26 #: courses/templates/category/update.html:26 @@ -226,7 +226,7 @@ msgstr "" #: courses/templates/module/create.html:52 #: courses/templates/module/update.html:52 msgid "All fields are required" -msgstr "" +msgstr "Todos os campos são obrigatótios" #: courses/templates/category/create.html:51 #: courses/templates/category/update.html:51 @@ -235,7 +235,7 @@ msgstr "" #: courses/templates/module/create.html:77 #: courses/templates/module/update.html:77 msgid "Save" -msgstr "" +msgstr "Salvar" #: courses/templates/category/delete.html:8 #: courses/templates/category/index.html:8 @@ -250,13 +250,13 @@ msgstr "" #: courses/templates/course/delete.html:28 #: courses/templates/module/delete.html:50 msgid "Yes" -msgstr "" +msgstr "Sim" #: courses/templates/category/delete.html:28 #: courses/templates/course/delete.html:29 #: courses/templates/module/delete.html:51 msgid "No" -msgstr "" +msgstr "Não" #: courses/templates/category/index.html:40 msgid "Actions" diff --git a/users/locale/pt_BR/LC_MESSAGES/django.po b/users/locale/pt_BR/LC_MESSAGES/django.po index d27ed23..6ee0fa3 100644 --- a/users/locale/pt_BR/LC_MESSAGES/django.po +++ b/users/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-02 17:13-0300\n" +"POT-Creation-Date: 2016-09-03 00:18-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,11 +20,11 @@ msgstr "" #: users/forms.py:10 msgid "Password" -msgstr "" +msgstr "Senha" #: users/models.py:10 msgid "Login" -msgstr "" +msgstr "Entrar" #: users/models.py:13 msgid "" @@ -44,31 +44,31 @@ msgstr "" #: users/models.py:18 msgid "Name" -msgstr "" +msgstr "Nome" #: users/models.py:19 msgid "City" -msgstr "" +msgstr "Cidade" #: users/models.py:20 msgid "State" -msgstr "" +msgstr "Estado" #: users/models.py:21 msgid "Gender" -msgstr "" +msgstr "Genero" #: users/models.py:21 msgid "Male" -msgstr "" +msgstr "Masculino" #: users/models.py:21 msgid "Female" -msgstr "" +msgstr "Feminino" #: users/models.py:22 msgid "Image" -msgstr "" +msgstr "Imagem" #: users/models.py:23 msgid "Birth Date" @@ -76,7 +76,7 @@ msgstr "" #: users/models.py:24 msgid "Phone" -msgstr "" +msgstr "Telefone" #: users/models.py:25 users/templates/users/profile.html:42 msgid "Cpf" @@ -92,7 +92,7 @@ msgstr "" #: users/models.py:26 msgid "Student" -msgstr "" +msgstr "Aluno" #: users/models.py:27 msgid "Create Date" @@ -108,11 +108,11 @@ msgstr "" #: users/models.py:37 msgid "User" -msgstr "" +msgstr "Usuário" #: users/models.py:38 msgid "Users" -msgstr "" +msgstr "Usuários" #: users/templates/list_users.html:8 users/templates/list_users.html:15 #: users/templates/users/index.html:8 -- libgit2 0.21.2