Commit 22a78c58bc2bbaeceed8fc9e6da32e3e7205a8c0
1 parent
e76ea01e
Exists in
master
and in
3 other branches
modified translation messages on links and corrected some english in templates
Showing
4 changed files
with
12 additions
and
9 deletions
Show diff stats
links/locale/pt_BR/LC_MESSAGES/django.po
| ... | ... | @@ -131,14 +131,16 @@ msgstr "" |
| 131 | 131 | msgid "" |
| 132 | 132 | "The Link \"%s\" was added to the Topic \"%s\" of the virtual environment " |
| 133 | 133 | "\"%s\" successfully!" |
| 134 | -msgstr "O link \"%s\" foi adicionado com sucesso ao Topico \"%s\" do ambiente virtual "\"%s\"" " | |
| 134 | +msgstr "O link \"%s\" foi adicionado com sucesso ao Topico \"%s\" do ambiente virtual " | |
| 135 | +"\"%s\" " | |
| 135 | 136 | |
| 136 | 137 | #: links/views.py:163 |
| 137 | 138 | #, python-format |
| 138 | 139 | msgid "" |
| 139 | 140 | "The Website Link \"%s\" was removed successfully from virtual environment " |
| 140 | 141 | "\"%s\"!" |
| 141 | -msgstr "O Link do site \"%s\" foi removido com sucesso do ambiente virtual "\"%s\" " " | |
| 142 | +msgstr "O Link do site \"%s\" foi removido com sucesso do ambiente virtual " | |
| 143 | +"\"%s\" " | |
| 142 | 144 | |
| 143 | 145 | #: links/views.py:288 |
| 144 | 146 | msgid "Update Website Link" | ... | ... |
subjects/templates/subjects/list_search.html
| ... | ... | @@ -6,7 +6,7 @@ |
| 6 | 6 | {% block breadcrumbs %} |
| 7 | 7 | {% clear_breadcrumbs %} |
| 8 | 8 | {% breadcrumb 'Home' 'subjects:home' %} |
| 9 | - {% with "You search for "|add:tags as term %} | |
| 9 | + {% with "You searched for "|add:tags as term %} | |
| 10 | 10 | {% breadcrumb term 'subjects:index' %} |
| 11 | 11 | {% endwith %} |
| 12 | 12 | ... | ... |
subjects/templates/subjects/resource_card.html
| ... | ... | @@ -55,8 +55,12 @@ |
| 55 | 55 | <p>{{resource.brief_description|safe}}</p> |
| 56 | 56 | |
| 57 | 57 | {% endif %} |
| 58 | + {% if resource.link_url %} | |
| 59 | + <p>teste</p> | |
| 60 | + {% else %} | |
| 61 | + <a href="{% url resource.access_link resource.slug %}" class="btn btn-success btn-raised"> {% trans "Access Resource" %}</a> | |
| 62 | + {% endif %} | |
| 58 | 63 | |
| 59 | - <a href="{% url resource.access_link resource.slug %}" class="btn btn-success btn-raised"> {% trans "Access Resource" %}</a> | |
| 60 | 64 | |
| 61 | 65 | </div> |
| 62 | 66 | ... | ... |
subjects/views.py
| ... | ... | @@ -606,14 +606,11 @@ class SubjectSearchView(LoginRequiredMixin, LogMixin, ListView): |
| 606 | 606 | q = q | Q(tags__name__unaccent__icontains=tag ) |
| 607 | 607 | |
| 608 | 608 | subjects = Subject.objects.filter(q).distinct() |
| 609 | - | |
| 610 | 609 | self.resources = Resource.objects.filter(q).distinct() |
| 611 | - #pk = self.request.user.pk | |
| 612 | - #my_subjects = Subject.objects.filter(Q(students__pk=pk) | Q(professor__pk=pk) | Q(category__coordinators__pk=pk) & Q(tags__name__in=tags) ).distinct() | |
| 613 | 610 | |
| 611 | + | |
| 614 | 612 | self.totals = {'resources': self.resources.count(), 'my_subjects': subjects.count()} |
| 615 | - #if self.kwargs.get('option'): | |
| 616 | - # subjects = my_subjects | |
| 613 | + | |
| 617 | 614 | option = self.kwargs.get('option') |
| 618 | 615 | if option and option == 'resources': |
| 619 | 616 | return self.resources | ... | ... |