Download as
Browse Code »

Commit da1d41b205bd8db30166e432b531bbaac5e353d2

Authored by felipebormann
2 parents cf71441e 64a396f2
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

Merge branch 'refactoring' of https://github.com/amadeusproject/amadeuslms into refactoring

Showing 21 changed files with 282 additions and 53 deletions   Show diff stats
amadeus/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @da1d41b
@@ -8,7 +8,7 @@ msgid "" @@ -8,7 +8,7 @@ msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-02-02 18:45-0300\n" 11 +"POT-Creation-Date: 2017-02-06 13:59-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -82,23 +82,23 @@ msgstr &quot;Remover Conta&quot; @@ -82,23 +82,23 @@ msgstr &quot;Remover Conta&quot;
82 msgid "Logout" 82 msgid "Logout"
83 msgstr "Sair" 83 msgstr "Sair"
84 84
85 -#: amadeus/templates/base.html:177 amadeus/templates/base.html:226 85 +#: amadeus/templates/base.html:177 amadeus/templates/base.html:228
86 msgid "Subjects" 86 msgid "Subjects"
87 msgstr "Assuntos" 87 msgstr "Assuntos"
88 88
89 -#: amadeus/templates/base.html:182 amadeus/templates/base.html:231 89 +#: amadeus/templates/base.html:182 amadeus/templates/base.html:233
90 msgid "Timeline" 90 msgid "Timeline"
91 msgstr "Timeline" 91 msgstr "Timeline"
92 92
93 -#: amadeus/templates/base.html:185 amadeus/templates/base.html:234 93 +#: amadeus/templates/base.html:187 amadeus/templates/base.html:238
94 msgid "Messages" 94 msgid "Messages"
95 msgstr "Mensagens" 95 msgstr "Mensagens"
96 96
97 -#: amadeus/templates/base.html:188 amadeus/templates/base.html:237 97 +#: amadeus/templates/base.html:190 amadeus/templates/base.html:241
98 msgid "Pendencias" 98 msgid "Pendencias"
99 msgstr "Pendências" 99 msgstr "Pendências"
100 100
101 -#: amadeus/templates/base.html:196 amadeus/templates/base.html:245 101 +#: amadeus/templates/base.html:198 amadeus/templates/base.html:249
102 msgid "Analytics" 102 msgid "Analytics"
103 msgstr "Analytics" 103 msgstr "Analytics"
104 104
categories/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @da1d41b
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-02-02 18:45-0300\n" 11 +"POT-Creation-Date: 2017-02-06 13:59-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
file_link/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @da1d41b
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-02-02 18:45-0300\n" 11 +"POT-Creation-Date: 2017-02-06 13:59-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -116,7 +116,8 @@ msgstr &quot;Visualizar&quot; @@ -116,7 +116,8 @@ msgstr &quot;Visualizar&quot;
116 msgid "" 116 msgid ""
117 "The File Link \"%s\" was added to the Topic \"%s\" of the virtual " 117 "The File Link \"%s\" was added to the Topic \"%s\" of the virtual "
118 "environment \"%s\" successfully!" 118 "environment \"%s\" successfully!"
119 -msgstr "O Link para Arquivo \"%s\" foi adicionado ao tópico \"%s\" do ambiente " 119 +msgstr ""
  120 +"O Link para Arquivo \"%s\" foi adicionado ao tópico \"%s\" do ambiente "
120 "virtual \"%s\" com sucesso!" 121 "virtual \"%s\" com sucesso!"
121 122
122 #: file_link/views.py:291 123 #: file_link/views.py:291
@@ -133,7 +134,8 @@ msgstr &quot;O Link para Arquivo \&quot;%s\&quot; foi atualizado com sucesso!&quot; @@ -133,7 +134,8 @@ msgstr &quot;O Link para Arquivo \&quot;%s\&quot; foi atualizado com sucesso!&quot;
133 msgid "" 134 msgid ""
134 "The File Link \"%s\" was removed successfully from virtual environment \"%s" 135 "The File Link \"%s\" was removed successfully from virtual environment \"%s"
135 "\"!" 136 "\"!"
136 -msgstr "O Link para Arquivo \"%s\" foi removido do ambiente virtual \"%s\" com " 137 +msgstr ""
  138 +"O Link para Arquivo \"%s\" foi removido do ambiente virtual \"%s\" com "
137 "sucesso!" 139 "sucesso!"
138 140
139 #~ msgid "Close" 141 #~ msgid "Close"
links/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @da1d41b
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-02-02 18:45-0300\n" 11 +"POT-Creation-Date: 2017-02-06 13:59-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
log/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @da1d41b
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-02-02 18:45-0300\n" 11 +"POT-Creation-Date: 2017-02-06 13:59-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
mailsender/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @da1d41b
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-02-02 18:45-0300\n" 11 +"POT-Creation-Date: 2017-02-06 13:59-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
mural/locale/pt_BR/LC_MESSAGES/django.po 0 → 100644
  Diff comments   View file @da1d41b
@@ -0,0 +1,159 @@ @@ -0,0 +1,159 @@
  1 +# SOME DESCRIPTIVE TITLE.
  2 +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
  3 +# This file is distributed under the same license as the PACKAGE package.
  4 +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
  5 +#
  6 +#, fuzzy
  7 +msgid ""
  8 +msgstr ""
  9 +"Project-Id-Version: PACKAGE VERSION\n"
  10 +"Report-Msgid-Bugs-To: \n"
  11 +"POT-Creation-Date: 2017-02-06 13:59-0300\n"
  12 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  13 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  14 +"Language-Team: LANGUAGE <LL@li.org>\n"
  15 +"Language: \n"
  16 +"MIME-Version: 1.0\n"
  17 +"Content-Type: text/plain; charset=UTF-8\n"
  18 +"Content-Transfer-Encoding: 8bit\n"
  19 +"Plural-Forms: nplurals=2; plural=(n > 1);\n"
  20 +#: mural/forms.py:16
  21 +msgid "This field is required."
  22 +msgstr ""
  23 +
  24 +#: mural/forms.py:28
  25 +msgid "The image is too large. It should have less than 5MB."
  26 +msgstr ""
  27 +
  28 +#: mural/models.py:16
  29 +msgid "File not supported."
  30 +msgstr ""
  31 +
  32 +#: mural/models.py:19
  33 +msgid "Action"
  34 +msgstr ""
  35 +
  36 +#: mural/models.py:19 mural/models.py:37 mural/models.py:47
  37 +msgid "Comment"
  38 +msgstr ""
  39 +
  40 +#: mural/models.py:19
  41 +msgid "Ask for Help"
  42 +msgstr ""
  43 +
  44 +#: mural/models.py:20 mural/models.py:39 mural/models.py:46 mural/models.py:51
  45 +msgid "Post"
  46 +msgstr ""
  47 +
  48 +#: mural/models.py:21 mural/models.py:38
  49 +msgid "Image"
  50 +msgstr ""
  51 +
  52 +#: mural/models.py:22 mural/models.py:40 mural/models.py:48 mural/models.py:52
  53 +msgid "User"
  54 +msgstr ""
  55 +
  56 +#: mural/models.py:23 mural/models.py:41
  57 +msgid "Create Date"
  58 +msgstr ""
  59 +
  60 +#: mural/models.py:24 mural/models.py:42
  61 +msgid "Last Update"
  62 +msgstr ""
  63 +
  64 +#: mural/models.py:27
  65 +msgid "Space"
  66 +msgstr ""
  67 +
  68 +#: mural/models.py:33
  69 +msgid "Subject"
  70 +msgstr ""
  71 +
  72 +#: mural/models.py:34
  73 +msgid "Resource"
  74 +msgstr ""
  75 +
  76 +#: mural/models.py:45
  77 +msgid "Viewed"
  78 +msgstr ""
  79 +
  80 +#: mural/templates/mural/_form.html:54
  81 +msgid "Choose your photo..."
  82 +msgstr ""
  83 +
  84 +#: mural/templates/mural/_form.html:63
  85 +msgid "Click or drop the file here"
  86 +msgstr ""
  87 +
  88 +#: mural/templates/mural/_form.html:65
  89 +msgid "The file could not exceed 5MB."
  90 +msgstr ""
  91 +
  92 +#: mural/templates/mural/_form.html:87
  93 +msgid "Save"
  94 +msgstr ""
  95 +
  96 +#: mural/templates/mural/_form.html:88
  97 +msgid "Cancel"
  98 +msgstr ""
  99 +
  100 +#: mural/templates/mural/_view.html:21
  101 +msgid "Edit"
  102 +msgstr ""
  103 +
  104 +#: mural/templates/mural/_view.html:23
  105 +msgid "Remove"
  106 +msgstr ""
  107 +
  108 +#: mural/templates/mural/_view.html:35
  109 +msgid "In"
  110 +msgstr ""
  111 +
  112 +#: mural/templates/mural/_view.html:52
  113 +msgid "Make a comment..."
  114 +msgstr ""
  115 +
  116 +#: mural/templates/mural/list.html:9
  117 +msgid "Mural: General"
  118 +msgstr ""
  119 +
  120 +#: mural/templates/mural/list.html:17
  121 +msgid "General"
  122 +msgstr ""
  123 +
  124 +#: mural/templates/mural/list.html:18
  125 +msgid "Per Category"
  126 +msgstr ""
  127 +
  128 +#: mural/templates/mural/list.html:19
  129 +msgid "Per Subject"
  130 +msgstr ""
  131 +
  132 +#: mural/templates/mural/list.html:32
  133 +msgid "Wish to make a new post?"
  134 +msgstr ""
  135 +
  136 +#: mural/templates/mural/list.html:45
  137 +msgid "There are no posts in this mural yet."
  138 +msgstr ""
  139 +
  140 +#: mural/templatetags/mural_filters.py:20
  141 +msgid "Unfavorite"
  142 +msgstr ""
  143 +
  144 +#: mural/templatetags/mural_filters.py:22
  145 +msgid "Favorite"
  146 +msgstr ""
  147 +
  148 +#: mural/views.py:44
  149 +msgid "Mural"
  150 +msgstr ""
  151 +
  152 +#: mural/views.py:76
  153 +#, python-format
  154 +msgid "%s has made a post in General"
  155 +msgstr ""
  156 +
  157 +#: mural/views.py:105
  158 +msgid "Your post was published successfully!"
  159 +msgstr ""
mural/migrations/0004_auto_20170206_1348.py 0 → 100644
  Diff comments   View file @da1d41b
@@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2017-02-06 16:48
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.conf import settings
  6 +from django.db import migrations, models
  7 +import django.db.models.deletion
  8 +
  9 +
  10 +class Migration(migrations.Migration):
  11 +
  12 + dependencies = [
  13 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  14 + ('mural', '0003_auto_20170204_1625'),
  15 + ]
  16 +
  17 + operations = [
  18 + migrations.CreateModel(
  19 + name='MuralFavorites',
  20 + fields=[
  21 + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
  22 + ],
  23 + ),
  24 + migrations.AlterField(
  25 + model_name='mural',
  26 + name='action',
  27 + field=models.CharField(choices=[('comment', 'Comment'), ('help', 'Ask for Help')], default='comment', max_length=100, verbose_name='Action'),
  28 + ),
  29 + migrations.AddField(
  30 + model_name='muralfavorites',
  31 + name='post',
  32 + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='favorites_post', to='mural.Mural', verbose_name='Post'),
  33 + ),
  34 + migrations.AddField(
  35 + model_name='muralfavorites',
  36 + name='user',
  37 + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='favorites_user', to=settings.AUTH_USER_MODEL, verbose_name='User'),
  38 + ),
  39 + ]
mural/models.py
  Diff comments   View file @da1d41b
@@ -45,4 +45,8 @@ class MuralVisualizations(models.Model): @@ -45,4 +45,8 @@ class MuralVisualizations(models.Model):
45 viewed = models.BooleanField(_('Viewed'), default = False) 45 viewed = models.BooleanField(_('Viewed'), default = False)
46 post = models.ForeignKey(Mural, verbose_name = _('Post'), related_name = 'visualization_post', null = True) 46 post = models.ForeignKey(Mural, verbose_name = _('Post'), related_name = 'visualization_post', null = True)
47 comment = models.ForeignKey(Comment, verbose_name = _('Comment'), related_name = 'visualization_comment', null = True) 47 comment = models.ForeignKey(Comment, verbose_name = _('Comment'), related_name = 'visualization_comment', null = True)
48 - user = models.ForeignKey(User, verbose_name = _('User'), related_name = "visualization_user", null = True)  
49 \ No newline at end of file 48 \ No newline at end of file
  49 + user = models.ForeignKey(User, verbose_name = _('User'), related_name = "visualization_user", null = True)
  50 +
  51 +class MuralFavorites(models.Model):
  52 + post = models.ForeignKey(Mural, verbose_name = _('Post'), related_name = 'favorites_post', null = True)
  53 + user = models.ForeignKey(User, verbose_name = _('User'), related_name = "favorites_user", null = True)
50 \ No newline at end of file 54 \ No newline at end of file
mural/templates/mural/_view.html
  Diff comments   View file @da1d41b
@@ -24,6 +24,11 @@ @@ -24,6 +24,11 @@
24 </ul> 24 </ul>
25 </span> 25 </span>
26 {% endif %} 26 {% endif %}
  27 + <span class="btn-group pull-right">
  28 + <button class="btn btn-sm btn_menu" data-toggle="tooltip" data-placement="top" title="{{ post|fav_label:request.user }}">
  29 + <i class="fa fa-thumb-tack"></i>
  30 + </button>
  31 + </span>
27 </h4> 32 </h4>
28 <p class="time"> 33 <p class="time">
29 <i class="fa fa-clock-o"></i> 34 <i class="fa fa-clock-o"></i>
@@ -37,7 +42,6 @@ @@ -37,7 +42,6 @@
37 {% if post.image %} 42 {% if post.image %}
38 <img src="{{ post.image.url }}" class="img-responsive center-block" /> 43 <img src="{{ post.image.url }}" class="img-responsive center-block" />
39 {% endif %} 44 {% endif %}
40 -  
41 </div> 45 </div>
42 <div class="col-md-12 post-comment"> 46 <div class="col-md-12 post-comment">
43 <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 user-img"> 47 <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 user-img">
mural/templatetags/mural_filters.py
  Diff comments   View file @da1d41b
1 from django import template 1 from django import template
  2 +from django.utils.translation import ugettext_lazy as _
  3 +
  4 +from mural.models import MuralFavorites
2 5
3 register = template.Library() 6 register = template.Library()
4 7
@@ -9,4 +12,11 @@ def action_icon(action): @@ -9,4 +12,11 @@ def action_icon(action):
9 elif action == "help": 12 elif action == "help":
10 icon = "fa-comments-o" 13 icon = "fa-comments-o"
11 14
12 - return icon  
13 \ No newline at end of file 15 \ No newline at end of file
  16 + return icon
  17 +
  18 +@register.filter(name = 'fav_label')
  19 +def fav_label(post, user):
  20 + if MuralFavorites.objects.filter(post = post, user = user).exists():
  21 + return _('Unfavorite')
  22 +
  23 + return _('Favorite')
14 \ No newline at end of file 24 \ No newline at end of file
notifications/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @da1d41b
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-02-02 18:45-0300\n" 11 +"POT-Creation-Date: 2017-02-06 13:59-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
pendencies/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @da1d41b
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-02-02 18:45-0300\n" 11 +"POT-Creation-Date: 2017-02-06 13:59-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
security/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @da1d41b
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-02-02 18:45-0300\n" 11 +"POT-Creation-Date: 2017-02-06 13:59-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
students_group/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @da1d41b
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-02-02 18:45-0300\n" 11 +"POT-Creation-Date: 2017-02-06 13:59-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
subjects/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @da1d41b
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-02-02 18:45-0300\n" 11 +"POT-Creation-Date: 2017-02-06 13:59-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -173,21 +173,23 @@ msgid &quot;Create new subject&quot; @@ -173,21 +173,23 @@ msgid &quot;Create new subject&quot;
173 msgstr "Criar novo assunto" 173 msgstr "Criar novo assunto"
174 174
175 #: subjects/templates/subjects/list_search.html:31 175 #: subjects/templates/subjects/list_search.html:31
176 -#: subjects/templates/subjects/list_search.html:33 176 +#: subjects/templates/subjects/list_search.html:34
177 msgid "Search results" 177 msgid "Search results"
178 msgstr "Resultados da busca" 178 msgstr "Resultados da busca"
179 179
180 -#: subjects/templates/subjects/list_search.html:33  
181 -msgid " any subjects or resources were found on the search for " 180 +#: subjects/templates/subjects/list_search.html:31
  181 +#, fuzzy
  182 +#| msgid " any subjects or resources were found on the search for "
  183 +msgid " Any subjects or Resources were not found on the search for "
182 msgstr " Nenhum assunto ou recursos foram encontrados na busca por " 184 msgstr " Nenhum assunto ou recursos foram encontrados na busca por "
183 185
184 -#: subjects/templates/subjects/list_search.html:38  
185 -#: subjects/templates/subjects/list_search.html:41 subjects/views.py:624 186 +#: subjects/templates/subjects/list_search.html:39
  187 +#: subjects/templates/subjects/list_search.html:42 subjects/views.py:586
186 msgid "Subjects" 188 msgid "Subjects"
187 msgstr "Assuntos" 189 msgstr "Assuntos"
188 190
189 -#: subjects/templates/subjects/list_search.html:39  
190 -#: subjects/templates/subjects/list_search.html:42 subjects/views.py:631 191 +#: subjects/templates/subjects/list_search.html:40
  192 +#: subjects/templates/subjects/list_search.html:43 subjects/views.py:593
191 msgid "Resources" 193 msgid "Resources"
192 msgstr "Recursos" 194 msgstr "Recursos"
193 195
@@ -211,6 +213,7 @@ msgstr &quot;&quot; @@ -211,6 +213,7 @@ msgstr &quot;&quot;
211 msgid "Subject" 213 msgid "Subject"
212 msgstr "Assuntos" 214 msgstr "Assuntos"
213 215
  216 +#: subjects/templates/subjects/resource_card.html:59
214 #: subjects/templates/subjects/resource_card.html:61 217 #: subjects/templates/subjects/resource_card.html:61
215 #, fuzzy 218 #, fuzzy
216 #| msgid "Resources" 219 #| msgid "Resources"
@@ -266,50 +269,51 @@ msgstr &quot;Editar: &quot; @@ -266,50 +269,51 @@ msgstr &quot;Editar: &quot;
266 msgid "Create new topic" 269 msgid "Create new topic"
267 msgstr "Criar novo tópico" 270 msgstr "Criar novo tópico"
268 271
269 -#: subjects/views.py:56 272 +#: subjects/views.py:57
270 msgid "Home" 273 msgid "Home"
271 msgstr "Início" 274 msgstr "Início"
272 275
273 -#: subjects/views.py:152 276 +#: subjects/views.py:153
274 msgid "Page is not 'last', nor can it be converted to an int." 277 msgid "Page is not 'last', nor can it be converted to an int."
275 -msgstr "Página não é a 'última', e também não pode ser convertido para um inteiro" 278 +msgstr ""
  279 +"Página não é a 'última', e também não pode ser convertido para um inteiro"
276 280
277 -#: subjects/views.py:158 281 +#: subjects/views.py:159
278 #, python-format 282 #, python-format
279 msgid "Invalid page (%(page_number)s): %(message)s" 283 msgid "Invalid page (%(page_number)s): %(message)s"
280 msgstr "Página inválida (%(page_number)s): %(message)s" 284 msgstr "Página inválida (%(page_number)s): %(message)s"
281 285
282 -#: subjects/views.py:181 286 +#: subjects/views.py:182
283 msgid "My Subjects" 287 msgid "My Subjects"
284 msgstr "Meus assuntos" 288 msgstr "Meus assuntos"
285 289
286 -#: subjects/views.py:188 290 +#: subjects/views.py:189
287 msgid "All Subjects" 291 msgid "All Subjects"
288 msgstr "Todos os assuntos" 292 msgstr "Todos os assuntos"
289 293
290 -#: subjects/views.py:295 294 +#: subjects/views.py:283
291 msgid "Create Subject" 295 msgid "Create Subject"
292 msgstr "Criar Assunto" 296 msgstr "Criar Assunto"
293 297
294 -#: subjects/views.py:301 298 +#: subjects/views.py:289
295 msgid "Replicate Subject" 299 msgid "Replicate Subject"
296 msgstr "Replicar Assunto" 300 msgstr "Replicar Assunto"
297 301
298 -#: subjects/views.py:343 302 +#: subjects/views.py:331
299 #, python-format 303 #, python-format
300 msgid "The Subject \"%s\" was registered on \"%s\" Category successfully!" 304 msgid "The Subject \"%s\" was registered on \"%s\" Category successfully!"
301 msgstr "Assunto \"%s\" foi registrado na categoria \"%s\" com sucesso!" 305 msgstr "Assunto \"%s\" foi registrado na categoria \"%s\" com sucesso!"
302 306
303 -#: subjects/views.py:380 307 +#: subjects/views.py:357
304 msgid "Update Subject" 308 msgid "Update Subject"
305 msgstr "Atualizar Assunto" 309 msgstr "Atualizar Assunto"
306 310
307 -#: subjects/views.py:400 311 +#: subjects/views.py:377
308 #, python-format 312 #, python-format
309 msgid "The Subject \"%s\" was updated on \"%s\" Category successfully!" 313 msgid "The Subject \"%s\" was updated on \"%s\" Category successfully!"
310 msgstr "Assunto \"%s\" foi atualizado na categoria \"%s\" com sucesso!" 314 msgstr "Assunto \"%s\" foi atualizado na categoria \"%s\" com sucesso!"
311 315
312 -#: subjects/views.py:432 subjects/views.py:436 316 +#: subjects/views.py:403 subjects/views.py:407
313 msgid "" 317 msgid ""
314 "Subject can't be removed. The subject still possess students and learning " 318 "Subject can't be removed. The subject still possess students and learning "
315 "objects associated" 319 "objects associated"
@@ -317,15 +321,15 @@ msgstr &quot;&quot; @@ -317,15 +321,15 @@ msgstr &quot;&quot;
317 "Assunto não pode ser removido. Ele ainda possui alunos e objetos de " 321 "Assunto não pode ser removido. Ele ainda possui alunos e objetos de "
318 "aprendizado associados" 322 "aprendizado associados"
319 323
320 -#: subjects/views.py:464 324 +#: subjects/views.py:435
321 #, python-format 325 #, python-format
322 msgid "Subject \"%s\" removed successfully!" 326 msgid "Subject \"%s\" removed successfully!"
323 msgstr "Assunto \"%s\" removido com sucesso!" 327 msgstr "Assunto \"%s\" removido com sucesso!"
324 328
325 -#: subjects/views.py:552 329 +#: subjects/views.py:511
326 msgid "Subscription date is due!" 330 msgid "Subscription date is due!"
327 msgstr "O período de inscrição está encerrado!" 331 msgstr "O período de inscrição está encerrado!"
328 332
329 -#: subjects/views.py:565 333 +#: subjects/views.py:524
330 msgid "Subscription was successfull!" 334 msgid "Subscription was successfull!"
331 msgstr "Inscrição feita com sucesso!" 335 msgstr "Inscrição feita com sucesso!"
themes/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @da1d41b
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-02-02 18:45-0300\n" 11 +"POT-Creation-Date: 2017-02-06 13:59-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
topics/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @da1d41b
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-02-02 18:45-0300\n" 11 +"POT-Creation-Date: 2017-02-06 13:59-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -112,11 +112,11 @@ msgstr &quot;Fechar&quot; @@ -112,11 +112,11 @@ msgstr &quot;Fechar&quot;
112 msgid "Delete" 112 msgid "Delete"
113 msgstr "Deletar" 113 msgstr "Deletar"
114 114
115 -#: topics/templates/resources/list.html:30 topics/templates/topics/list.html:28 115 +#: topics/templates/resources/list.html:32 topics/templates/topics/list.html:28
116 msgid "Edit" 116 msgid "Edit"
117 msgstr "Editar" 117 msgstr "Editar"
118 118
119 -#: topics/templates/resources/list.html:31 topics/templates/topics/list.html:29 119 +#: topics/templates/resources/list.html:33 topics/templates/topics/list.html:29
120 msgid "Remove" 120 msgid "Remove"
121 msgstr "Remover" 121 msgstr "Remover"
122 122
users/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @da1d41b
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-02-02 18:45-0300\n" 11 +"POT-Creation-Date: 2017-02-06 13:59-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
webpage/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @da1d41b
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-02-02 18:45-0300\n" 11 +"POT-Creation-Date: 2017-02-06 13:59-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
youtube_video/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @da1d41b
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2017-02-02 18:45-0300\n" 11 +"POT-Creation-Date: 2017-02-06 13:59-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,7 @@ msgstr &quot;&quot; @@ -17,6 +17,7 @@ msgstr &quot;&quot;
17 "Content-Type: text/plain; charset=UTF-8\n" 17 "Content-Type: text/plain; charset=UTF-8\n"
18 "Content-Transfer-Encoding: 8bit\n" 18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
  20 +
20 #: youtube_video/forms.py:31 21 #: youtube_video/forms.py:31
21 msgid "Tags" 22 msgid "Tags"
22 msgstr "Tags" 23 msgstr "Tags"
@@ -30,7 +31,9 @@ msgid &quot;This subject already has a youtube video with this name&quot; @@ -30,7 +31,9 @@ msgid &quot;This subject already has a youtube video with this name&quot;
30 msgstr "Esse assunto já possui um vídeo do YouTube com esse nome" 31 msgstr "Esse assunto já possui um vídeo do YouTube com esse nome"
31 32
32 #: youtube_video/forms.py:67 33 #: youtube_video/forms.py:67
33 -msgid "Invalid URL. It should be an embed YouTube link." 34 +#, fuzzy
  35 +#| msgid "Invalid URL. It should be an embed YouTube link."
  36 +msgid "Invalid URL. It should be an YouTube link."
34 msgstr "URL inválida. Ela deve ser uma URL de embed do YouTube." 37 msgstr "URL inválida. Ela deve ser uma URL de embed do YouTube."
35 38
36 #: youtube_video/models.py:7 39 #: youtube_video/models.py:7
@@ -119,7 +122,9 @@ msgstr &quot;Adicionar Vídeo do YouTube&quot; @@ -119,7 +122,9 @@ msgstr &quot;Adicionar Vídeo do YouTube&quot;
119 msgid "" 122 msgid ""
120 "The Youtube Video \"%s\" was added to the Topic \"%s\" of the virtual " 123 "The Youtube Video \"%s\" was added to the Topic \"%s\" of the virtual "
121 "environment \"%s\" successfully!" 124 "environment \"%s\" successfully!"
122 -msgstr "O Vídeo do YouTube \"%s\" foi adicionado ao tópico \"%s\" do ambiente virtual \"%s\" com sucesso!" 125 +msgstr ""
  126 +"O Vídeo do YouTube \"%s\" foi adicionado ao tópico \"%s\" do ambiente "
  127 +"virtual \"%s\" com sucesso!"
123 128
124 #: youtube_video/views.py:346 129 #: youtube_video/views.py:346
125 msgid "Update YouTube Video" 130 msgid "Update YouTube Video"
@@ -135,4 +140,6 @@ msgstr &quot;O Vídeo do YouTube \&quot;%s\&quot; foi atualizado com sucesso!&quot; @@ -135,4 +140,6 @@ msgstr &quot;O Vídeo do YouTube \&quot;%s\&quot; foi atualizado com sucesso!&quot;
135 msgid "" 140 msgid ""
136 "The YouTube Video \"%s\" was removed successfully from virtual environment " 141 "The YouTube Video \"%s\" was removed successfully from virtual environment "
137 "\"%s\"!" 142 "\"%s\"!"
138 -msgstr "O Vídeo do YouTube \"%s\" foi removido do ambiente virtual \"%s\" com sucesso!" 143 +msgstr ""
  144 +"O Vídeo do YouTube \"%s\" foi removido do ambiente virtual \"%s\" com "
  145 +"sucesso!"