Download as
Browse Code »

Commit 2d8e5eb2a72189f896ed945eb38bcf5f1e916a6e

Authored by Jailson Dias
1 parent 1f62aebd
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

resolve #21

Showing 9 changed files with 166 additions and 58 deletions   Show diff stats
app/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @2d8e5eb
... ... @@ -8,7 +8,7 @@ msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2016-09-02 17:13-0300\n"
  11 +"POT-Creation-Date: 2016-09-03 00:18-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -18,10 +18,90 @@ msgstr &quot;&quot;
18 18 "Content-Transfer-Encoding: 8bit\n"
19 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20  
  21 +#: app/templates/app/base.html:10
  22 +msgid "The Project"
  23 +msgstr ""
  24 +
  25 +#: app/templates/app/base.html:11
  26 +msgid "CCTE Group"
  27 +msgstr ""
  28 +
  29 +#: app/templates/app/base.html:14
  30 +msgid "Hi"
  31 +msgstr ""
  32 +
  33 +#: app/templates/app/base.html:16
  34 +#, fuzzy
  35 +#| msgid "Profile"
  36 +msgid "See Profile"
  37 +msgstr "Perfil"
  38 +
  39 +#: app/templates/app/base.html:17
  40 +msgid "Settings"
  41 +msgstr "Configurações"
  42 +
  43 +#: app/templates/app/base.html:18
  44 +msgid "Logout"
  45 +msgstr "Sair"
  46 +
  47 +#: app/templates/app/index.html:6
  48 +msgid "You have:"
  49 +msgstr ""
  50 +
  51 +#: app/templates/app/index.html:10
  52 +#, fuzzy
  53 +#| msgid "Pending tasks"
  54 +msgid "Pending Tasks"
  55 +msgstr "Tarefas Pendentes"
  56 +
  57 +#: app/templates/app/index.html:14
  58 +msgid "Users Online"
  59 +msgstr "Usuários Online"
  60 +
  61 +#: app/templates/app/index.html:20
  62 +msgid "You can:"
  63 +msgstr ""
  64 +
21 65 #: app/templates/app/index.html:24 app/templates/home_professor.html:23
22 66 msgid "Create Course"
23 67 msgstr "Criar Curso"
24 68  
  69 +#: app/templates/app/index.html:29
  70 +#, fuzzy
  71 +#| msgid "Manage Course"
  72 +msgid "Manage Users"
  73 +msgstr "Gerenciar Curso"
  74 +
  75 +#: app/templates/app/index.html:33
  76 +#, fuzzy
  77 +#| msgid "Manage Course"
  78 +msgid "Manage Courses"
  79 +msgstr "Gerenciar Curso"
  80 +
  81 +#: app/templates/app/index.html:37
  82 +msgid "Gerenciar Categorias"
  83 +msgstr ""
  84 +
  85 +#: app/templates/app/index.html:45
  86 +msgid "Your course(s):"
  87 +msgstr ""
  88 +
  89 +#: app/templates/app/index.html:46
  90 +msgid "No courses subscribed yet"
  91 +msgstr ""
  92 +
  93 +#: app/templates/app/index.html:56
  94 +msgid "Search course:"
  95 +msgstr ""
  96 +
  97 +#: app/templates/app/index.html:62
  98 +msgid "Search"
  99 +msgstr ""
  100 +
  101 +#: app/templates/app/index.html:67
  102 +msgid "Most popular keywords:"
  103 +msgstr ""
  104 +
25 105 #: app/templates/home_professor.html:9 app/templates/home_student.html:9
26 106 msgid "Home"
27 107 msgstr "Início"
... ...
app/templates/home_professor.html
  Diff comments   View file @2d8e5eb
... ... @@ -6,7 +6,7 @@
6 6 <div class="row">
7 7 <div class="col-md-12">
8 8 <ul class="breadcrumb">
9   - <li><a href="{% url 'core:index' %}">{% trans 'Home' %}</a></li>
  9 + <li><a href="{% url 'core:home' %}">{% trans 'Home' %}</a></li>
10 10 </ul>
11 11 </div>
12 12 </div>
... ...
app/templates/home_student.html
  Diff comments   View file @2d8e5eb
... ... @@ -6,7 +6,7 @@
6 6 <div class="row">
7 7 <div class="col-md-12">
8 8 <ul class="breadcrumb">
9   - <li><a href="{% url 'core:index' %}">{% trans 'Home' %} {{ logged }}</a></li>
  9 + <li><a href="{% url 'core:home' %}">{% trans 'Home' %} {{ logged }}</a></li>
10 10 </ul>
11 11 </div>
12 12 </div>
... ...
core/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @2d8e5eb
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2016-09-02 17:13-0300\n"
  11 +"POT-Creation-Date: 2016-09-03 00:18-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -21,3 +21,43 @@ msgstr &quot;&quot;
21 21 #: core/templates/base.html:56
22 22 msgid "Log out"
23 23 msgstr "Sair"
  24 +
  25 +#: core/templates/index.html:30
  26 +msgid "Username"
  27 +msgstr "Usuário"
  28 +
  29 +#: core/templates/index.html:36
  30 +msgid "Password"
  31 +msgstr "Senha"
  32 +
  33 +#: core/templates/index.html:44
  34 +msgid "Remember Email"
  35 +msgstr ""
  36 +
  37 +#: core/templates/index.html:53
  38 +msgid "Guest"
  39 +msgstr ""
  40 +
  41 +#: core/templates/index.html:56
  42 +msgid "Login"
  43 +msgstr "Entrar"
  44 +
  45 +#: core/templates/index.html:65
  46 +msgid "Sign Up"
  47 +msgstr "Cadastrar"
  48 +
  49 +#: core/templates/remember_password.html:18
  50 +msgid "E-mail"
  51 +msgstr "E-mail"
  52 +
  53 +#: core/templates/remember_password.html:22
  54 +msgid "Registration"
  55 +msgstr ""
  56 +
  57 +#: core/templates/remember_password.html:26
  58 +msgid "Send"
  59 +msgstr "Enviar"
  60 +
  61 +#: core/views.py:25
  62 +msgid "E-mail or password are incorrect!"
  63 +msgstr "O E-mail e/ou a senha estão incorretos"
... ...
core/templates/remember_password.html
  Diff comments   View file @2d8e5eb
1 1 {% extends "index.html" %}
2   -
  2 +{% load i18n %}
3 3 {% block content %}
4 4  
5 5 <div class="row logo-row">
... ... @@ -15,23 +15,21 @@
15 15 <div class="card-body">
16 16 <form class="form-group ">
17 17 <div class="form-group">
18   - <label for="inputEmail" class="control-label label-static"> E-mail</label>
  18 + <label for="inputEmail" class="control-label label-static"> {% trans 'E-mail' %}</label>
19 19 <input type="email" class="form-control" id="inputEmail" placeholder="Email">
20 20 </div>
21 21 <div class="form-group">
22   - <label for="inputRegistration" class=" control-label"> Registration </label>
  22 + <label for="inputRegistration" class=" control-label"> {% trans 'Registration' %} </label>
23 23 <input type="text" class="form-control" id="inputRegistration" placeholder="Registration">
24 24 </div>
25 25 <div class="col-lg-offset-4 col-lg-4">
26   - <button class="btn btn-raised btn-primary btn-lg btn-block">Send</button>
  26 + <button class="btn btn-raised btn-primary btn-lg btn-block">{% trans 'Send' %}</button>
27 27  
28 28 </div>
29 29  
30 30 </form>
31 31 </div>
32 32  
33   -
34   -
35 33 </div>
36 34  
37 35  
... ...
core/urls.py
  Diff comments   View file @2d8e5eb
... ... @@ -4,7 +4,6 @@ from django.contrib.auth import views as auth_views
4 4 from . import views
5 5  
6 6 urlpatterns = [
7   - url(r'^$', views.index, name='index'),
8 7 url(r'^login/$', views.login, name='home'),
9 8 url(r'^remember_password/$', views.remember_password, name='remember_password'),
10 9 url(r'^logout/$', auth_views.logout, {'next_page': 'core:home'}, name='logout'),
... ...
core/views.py
  Diff comments   View file @2d8e5eb
... ... @@ -4,18 +4,9 @@ from django.http import HttpResponse
4 4 from django.contrib.auth import authenticate, login as login_user
5 5 from django.shortcuts import redirect
6 6 from django.core.urlresolvers import reverse
  7 +from django.utils.translation import ugettext_lazy as _
7 8  
8 9 from .decorators import log_decorator
9   -# from django.contrib.auth.views import LoginView
10   -
11   -def index(request):
12   - context = {
13   - 'subscribed_courses': 'testando'
14   - }
15   - return render(request, "index.html", context)
16   -
17   -def create_account(request):
18   - return render(request, "create_account.html")
19 10  
20 11 def remember_password(request):
21 12 return render(request, "remember_password.html")
... ... @@ -26,12 +17,12 @@ def login(request):
26 17 if request.POST:
27 18 username = request.POST['username']
28 19 password = request.POST['password']
29   - usuario = authenticate(username=username, password=password)
30   - if usuario is not None:
31   - login_user(request, usuario)
  20 + user = authenticate(username=username, password=password)
  21 + if user is not None:
  22 + login_user(request, user)
32 23 return redirect(reverse("app:index"))
33 24 else:
34   - context["message"] = "Email ou senha incorretos!"
  25 + context["message"] = _("E-mail or password are incorrect!")
35 26 return render(request,"index.html",context)
36 27  
37 28  
... ...
courses/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @2d8e5eb
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2016-09-02 17:13-0300\n"
  11 +"POT-Creation-Date: 2016-09-03 00:18-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -22,7 +22,7 @@ msgstr &quot;&quot;
22 22 #: courses/models.py:7 courses/models.py:20 courses/models.py:44
23 23 #: courses/templates/category/index.html:38
24 24 msgid "Name"
25   -msgstr ""
  25 +msgstr "Nome"
26 26  
27 27 #: courses/forms.py:14
28 28 msgid "Category name"
... ... @@ -38,7 +38,7 @@ msgstr &quot;&quot;
38 38  
39 39 #: courses/forms.py:28
40 40 msgid "Number of studets maximum"
41   -msgstr ""
  41 +msgstr "Número máximo de estudantes"
42 42  
43 43 #: courses/forms.py:29
44 44 msgid "Course registration start date"
... ... @@ -50,19 +50,19 @@ msgstr &quot;&quot;
50 50  
51 51 #: courses/forms.py:31
52 52 msgid "Course start date"
53   -msgstr ""
  53 +msgstr "Data de inicio do Curso"
54 54  
55 55 #: courses/forms.py:32
56 56 msgid "Course end date"
57   -msgstr ""
  57 +msgstr "Data de termino do curso"
58 58  
59 59 #: courses/forms.py:33 courses/models.py:30
60 60 msgid "Image"
61   -msgstr ""
  61 +msgstr "Imagem"
62 62  
63 63 #: courses/forms.py:34 courses/models.py:12 courses/models.py:31
64 64 msgid "Category"
65   -msgstr ""
  65 +msgstr "Categoria"
66 66  
67 67 #: courses/forms.py:37
68 68 msgid "Course name"
... ... @@ -139,7 +139,7 @@ msgstr &quot;&quot;
139 139 #: courses/templates/category/update.html:16
140 140 #: courses/templates/category/view.html:15
141 141 msgid "Categories"
142   -msgstr ""
  142 +msgstr "Categorias"
143 143  
144 144 #: courses/models.py:22
145 145 msgid "Objectivies"
... ... @@ -171,7 +171,7 @@ msgstr &quot;&quot;
171 171  
172 172 #: courses/models.py:36 courses/models.py:49
173 173 msgid "Course"
174   -msgstr ""
  174 +msgstr "Curso"
175 175  
176 176 #: courses/models.py:37 courses/templates/course/create.html:16
177 177 #: courses/templates/course/delete.html:15
... ... @@ -184,19 +184,19 @@ msgstr &quot;&quot;
184 184 #: courses/templates/module/index.html:16
185 185 #: courses/templates/module/update.html:17
186 186 msgid "Courses"
187   -msgstr ""
  187 +msgstr "Cursos"
188 188  
189 189 #: courses/models.py:47 courses/templates/module/index.html:107
190 190 msgid "Visible"
191   -msgstr ""
  191 +msgstr "Visível"
192 192  
193 193 #: courses/models.py:53
194 194 msgid "Module"
195   -msgstr ""
  195 +msgstr "Modulo"
196 196  
197 197 #: courses/models.py:54 courses/templates/module/index.html:92
198 198 msgid "Modules"
199   -msgstr ""
  199 +msgstr "Modulos"
200 200  
201 201 #: courses/templates/category/create.html:8
202 202 #: courses/templates/category/delete.html:7
... ... @@ -210,14 +210,14 @@ msgstr &quot;&quot;
210 210 #: courses/templates/module/delete.html:7 courses/templates/module/index.html:7
211 211 #: courses/templates/module/update.html:8
212 212 msgid "Home"
213   -msgstr ""
  213 +msgstr "Inicio"
214 214  
215 215 #: courses/templates/category/create.html:9
216 216 #: courses/templates/category/delete.html:18
217 217 #: courses/templates/category/index.html:18
218 218 #: courses/templates/category/view.html:18
219 219 msgid "Create Category"
220   -msgstr ""
  220 +msgstr "Criar Categoria"
221 221  
222 222 #: courses/templates/category/create.html:26
223 223 #: courses/templates/category/update.html:26
... ... @@ -226,7 +226,7 @@ msgstr &quot;&quot;
226 226 #: courses/templates/module/create.html:52
227 227 #: courses/templates/module/update.html:52
228 228 msgid "All fields are required"
229   -msgstr ""
  229 +msgstr "Todos os campos são obrigatótios"
230 230  
231 231 #: courses/templates/category/create.html:51
232 232 #: courses/templates/category/update.html:51
... ... @@ -235,7 +235,7 @@ msgstr &quot;&quot;
235 235 #: courses/templates/module/create.html:77
236 236 #: courses/templates/module/update.html:77
237 237 msgid "Save"
238   -msgstr ""
  238 +msgstr "Salvar"
239 239  
240 240 #: courses/templates/category/delete.html:8
241 241 #: courses/templates/category/index.html:8
... ... @@ -250,13 +250,13 @@ msgstr &quot;&quot;
250 250 #: courses/templates/course/delete.html:28
251 251 #: courses/templates/module/delete.html:50
252 252 msgid "Yes"
253   -msgstr ""
  253 +msgstr "Sim"
254 254  
255 255 #: courses/templates/category/delete.html:28
256 256 #: courses/templates/course/delete.html:29
257 257 #: courses/templates/module/delete.html:51
258 258 msgid "No"
259   -msgstr ""
  259 +msgstr "Não"
260 260  
261 261 #: courses/templates/category/index.html:40
262 262 msgid "Actions"
... ...
users/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @2d8e5eb
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2016-09-02 17:13-0300\n"
  11 +"POT-Creation-Date: 2016-09-03 00:18-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -20,11 +20,11 @@ msgstr &quot;&quot;
20 20  
21 21 #: users/forms.py:10
22 22 msgid "Password"
23   -msgstr ""
  23 +msgstr "Senha"
24 24  
25 25 #: users/models.py:10
26 26 msgid "Login"
27   -msgstr ""
  27 +msgstr "Entrar"
28 28  
29 29 #: users/models.py:13
30 30 msgid ""
... ... @@ -44,31 +44,31 @@ msgstr &quot;&quot;
44 44  
45 45 #: users/models.py:18
46 46 msgid "Name"
47   -msgstr ""
  47 +msgstr "Nome"
48 48  
49 49 #: users/models.py:19
50 50 msgid "City"
51   -msgstr ""
  51 +msgstr "Cidade"
52 52  
53 53 #: users/models.py:20
54 54 msgid "State"
55   -msgstr ""
  55 +msgstr "Estado"
56 56  
57 57 #: users/models.py:21
58 58 msgid "Gender"
59   -msgstr ""
  59 +msgstr "Genero"
60 60  
61 61 #: users/models.py:21
62 62 msgid "Male"
63   -msgstr ""
  63 +msgstr "Masculino"
64 64  
65 65 #: users/models.py:21
66 66 msgid "Female"
67   -msgstr ""
  67 +msgstr "Feminino"
68 68  
69 69 #: users/models.py:22
70 70 msgid "Image"
71   -msgstr ""
  71 +msgstr "Imagem"
72 72  
73 73 #: users/models.py:23
74 74 msgid "Birth Date"
... ... @@ -76,7 +76,7 @@ msgstr &quot;&quot;
76 76  
77 77 #: users/models.py:24
78 78 msgid "Phone"
79   -msgstr ""
  79 +msgstr "Telefone"
80 80  
81 81 #: users/models.py:25 users/templates/users/profile.html:42
82 82 msgid "Cpf"
... ... @@ -92,7 +92,7 @@ msgstr &quot;&quot;
92 92  
93 93 #: users/models.py:26
94 94 msgid "Student"
95   -msgstr ""
  95 +msgstr "Aluno"
96 96  
97 97 #: users/models.py:27
98 98 msgid "Create Date"
... ... @@ -108,11 +108,11 @@ msgstr &quot;&quot;
108 108  
109 109 #: users/models.py:37
110 110 msgid "User"
111   -msgstr ""
  111 +msgstr "Usuário"
112 112  
113 113 #: users/models.py:38
114 114 msgid "Users"
115   -msgstr ""
  115 +msgstr "Usuários"
116 116  
117 117 #: users/templates/list_users.html:8 users/templates/list_users.html:15
118 118 #: users/templates/users/index.html:8
... ...