Download as
Browse Code »

Commit c4161b98e16af3ec4b37dffc470ccec6fd7b586f

Authored by Felipe Henrique de Almeida Bormann
1 parent 372863e2
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

added empty answer to be correct displayed

Showing 7 changed files with 99 additions and 9 deletions   Show diff stats
file_link/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @c4161b9
@@ -116,8 +116,7 @@ msgstr "Visualizar" @@ -116,8 +116,7 @@ msgstr "Visualizar"
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 ""  
120 -"O Link para Arquivo \"%s\" foi adicionado ao tópico \"%s\" do ambiente " 119 +msgstr "O Link para Arquivo \"%s\" foi adicionado ao tópico \"%s\" do ambiente "
121 "virtual \"%s\" com sucesso!" 120 "virtual \"%s\" com sucesso!"
122 121
123 #: file_link/views.py:291 122 #: file_link/views.py:291
@@ -134,8 +133,7 @@ msgstr "O Link para Arquivo \"%s\" foi atualizado com sucesso!" @@ -134,8 +133,7 @@ msgstr "O Link para Arquivo \"%s\" foi atualizado com sucesso!"
134 msgid "" 133 msgid ""
135 "The File Link \"%s\" was removed successfully from virtual environment \"%s" 134 "The File Link \"%s\" was removed successfully from virtual environment \"%s"
136 "\"!" 135 "\"!"
137 -msgstr ""  
138 -"O Link para Arquivo \"%s\" foi removido do ambiente virtual \"%s\" com " 136 +msgstr "O Link para Arquivo \"%s\" foi removido do ambiente virtual \"%s\" com "
139 "sucesso!" 137 "sucesso!"
140 138
141 #~ msgid "Close" 139 #~ msgid "Close"
mural/templates/mural/list.html.py 0 → 100644
  Diff comments   View file @c4161b9
@@ -0,0 +1,49 @@ @@ -0,0 +1,49 @@
  1 +BBBBBBB BBBBBBBBBBB
  2 +
  3 +BBBB BBBBBB BBBB BBBBBBBBBB
  4 +BBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBB
  5 +
  6 +BBBBB BBBBBBBBBBB
  7 +
  8 +
  9 + gettext(u'Mural: General')
  10 +
  11 + BBBBBBBBBB BBBBBBB BBBBBBBBBBBBBBBBBBBBBB
  12 +BBBBBBBB
  13 +
  14 +BBBBB BBBBBBB
  15 + XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  16 + XXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  17 + XX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBXXXXX XXXXXXXXXXXXXXX gettext(u'General') XXXXXXXXXXX
  18 + XX XXXXXXXXXXXX gettext(u'Per Category') XXXXXXXXXXX
  19 + XX XXXXXXXXXXXX gettext(u'Per Subject') XXXXXXXXXXX
  20 + XXXXX
  21 + XXXXXX
  22 +
  23 + XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXX
  24 + XXXX XXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXX
  25 + XXXX XXXXXXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXX
  26 + XXXX XXXXXXXXXXXXXXXXXXX
  27 + XXXX XXXXXXXXXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXXXXXXX
  28 + XXXX XXXXXX XXXXXXXXXXXXXXXXXXXXXX XX
  29 + XXXXXX
  30 + XXXX XXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXX XXXXXXXXX XXXXXXXXXXXX
  31 + XXXXX
  32 + XXXX gettext(u'Wish to make a new post?') XXXXX
  33 + XXXXXX
  34 + XXXXXX
  35 + XXXXXX
  36 + XXXXXX
  37 +
  38 + BB BBBBBBBBBBB B B
  39 + BBBB
  40 + XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX
  41 + XX XXXXXXXXX XXXXXXXXXXXXX
  42 + XXXX gettext(u'There are no posts in this mural yet.') XXXXX
  43 + XXXXXX
  44 + BBBBB
  45 + XXXXXX
  46 + XXXX XXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXX
  47 + XXXXXX
  48 + XXXXXX
  49 +BBBBBBBB
0 \ No newline at end of file 50 \ No newline at end of file
requirements.txt.py 0 → 100644
  Diff comments   View file @c4161b9
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
  1 +XXXXXXXXXXXXXXXXXXXXX
  2 +XXXXXXXXXX
  3 +XXXXXXXXXXXXX
  4 +XXXXXXXXXXXXXXXXX
  5 +XXXXXXXXXXX
  6 +XXXXXXXXXXXXXXXXXXXXXX
  7 +XXXXXXXXXXXXXX
  8 +XXXXXXXXXXXXXXXXXXXXXX
  9 +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  10 +XXXXXXXXXXXXXXXXXXXXX
  11 +XXXXXXXXXXXXXXXXXXXXXXXXXXX
  12 +XXXXXXXXXXXXXXXXXXXXXXXXX
  13 +XXXXXXXXXXXXXXXXXXXXXXX
  14 +XXXXXXXXXXXXXXXXXXXXXXXXXXXX
  15 +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  16 +XXXXXXXXXXXXXXXXXXXXXX
  17 +XXXXXXXXXXXXXXXXXXXXXXXX
  18 +XXXXXXXXXXXXXXXXXXXXXXXXXXX
  19 +XXXXXXXXXXXXXXXXXXXXX
  20 +XXXXXXXXXXXXXXXXXXXXXXXXXX
  21 +XXXXXXXXXXXXXXXX
  22 +XXXXXXXXXXX
  23 +XXXXXXXXXXX
  24 +XXXXXXXXXXXXXXXX
  25 +XXXXXXXXXXXXXXX
  26 +XXXXXXXXXXXXX
  27 +XXXXXXXXXXXXXXX
  28 +XXXXXXXXXXXXXXXX
  29 +XXXXXXXXXXXXXXXX
  30 +XXXXXXXXXXX
  31 +XXXXXXXXXXXXXX
  32 +XXXXXXXXXXXXXXXXXX
  33 +XXXXXXXXXXXXXXXXX
  34 +XXXXXXXXXXXXXXXXX
  35 +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  36 +XXXXXXXXXXXXXXXXXX
  37 +XXXXXXXXXXXXXXXXXXXXX
  38 +XXXXXXXXXXXXXXXXXXXXXX
  39 +XXXXXXXXXXXXXXX
  40 +XXXXXXXXXXXXXXXXX
0 \ No newline at end of file 41 \ No newline at end of file
runtime.txt.py 0 → 100644
  Diff comments   View file @c4161b9
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +XXXXXXXXXXXX
0 \ No newline at end of file 2 \ No newline at end of file
subjects/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @c4161b9
@@ -272,8 +272,7 @@ msgstr "Início" @@ -272,8 +272,7 @@ msgstr "Início"
272 272
273 #: subjects/views.py:152 273 #: subjects/views.py:152
274 msgid "Page is not 'last', nor can it be converted to an int." 274 msgid "Page is not 'last', nor can it be converted to an int."
275 -msgstr ""  
276 -"Página não é a 'última', e também não pode ser convertido para um inteiro" 275 +msgstr "Página não é a 'última', e também não pode ser convertido para um inteiro"
277 276
278 #: subjects/views.py:158 277 #: subjects/views.py:158
279 #, python-format 278 #, python-format
subjects/templates/subjects/list_search.html
  Diff comments   View file @c4161b9
@@ -27,10 +27,11 @@ @@ -27,10 +27,11 @@
27 </script> 27 </script>
28 {% endfor %} 28 {% endfor %}
29 {% endif %} 29 {% endif %}
30 - {% if subjects|length > 0 %}  
31 - <p id="search-results-title">{% trans "Search results" %}:</p> 30 + {% if empty %}
  31 + <p id="search-results-title">{% trans "Search results" %}: {% trans " Any subjects or Resources were not found on the search for " %} {{tags}} </p>
  32 +
32 {% else %} 33 {% else %}
33 - <p id="search-results-title">{% trans "Search results" %}: {% trans " Any subjects or Resources were not found on the search for " %} {{tags}} </p> 34 + <p id="search-results-title">{% trans "Search results" %}:</p>
34 {% endif %} 35 {% endif %}
35 <div id="core-subjects-options-div"> 36 <div id="core-subjects-options-div">
36 <ul class="core-subjects-options"> 37 <ul class="core-subjects-options">
subjects/views.py
  Diff comments   View file @c4161b9
@@ -577,6 +577,8 @@ class SubjectSearchView(LoginRequiredMixin, LogMixin, ListView): @@ -577,6 +577,8 @@ class SubjectSearchView(LoginRequiredMixin, LogMixin, ListView):
577 def get_context_data(self, **kwargs): 577 def get_context_data(self, **kwargs):
578 context = super(SubjectSearchView, self).get_context_data(**kwargs) 578 context = super(SubjectSearchView, self).get_context_data(**kwargs)
579 579
  580 + if self.totals['resources'] == 0 and self.totals['my_subjects'] == 0:
  581 + context['empty'] = True
580 context['tags'] = self.tags 582 context['tags'] = self.tags
581 context['all'] = False 583 context['all'] = False
582 context['title'] = _('Subjects') 584 context['title'] = _('Subjects')