Commit 914f17728e98ef2b94bb9f2a5f46f1ed2bc21e6d

Authored by Luan
2 parents 2434376a 7489e9c4

Merge branch 'master' into sendmail_for_blank_subjects

Conflicts:
	src/locale/pt_BR/LC_MESSAGES/django.mo
	src/locale/pt_BR/LC_MESSAGES/django.po
src/accounts/templates/accounts/user_create_form.html
... ... @@ -43,7 +43,7 @@
43 43 <div class="col-md-6 col-lg-6 col-sm-6 col-xs-12" style="display: inline-block; vertical-align:top;">
44 44 <div class="well">
45 45 <fieldset>
46   - <legend>{% trans 'Subscribe to mail lists' %}</legend>
  46 + <legend>{% trans 'Subscribe to groups' %}</legend>
47 47 {% for choice in lists_form.lists %}
48 48 <div class="checkbox">{{ choice }}</div>
49 49 {% endfor %}
... ...
src/accounts/templates/accounts/user_detail.html
... ... @@ -29,9 +29,7 @@
29 29 <div class="divider"></div>
30 30 {% if request.user.is_active %}
31 31 <ul class="unstyled-list">
32   - {% for email in user_.emails.iterator %}
33   - <li><span class="icon-envelope icon-fixed-width"></span> {{ email.address }}</li>
34   - {% endfor %}
  32 + <li><span class="icon-envelope icon-fixed-width"></span> <a href="mailto:{{ user_.email }}">{{ user_.email }}</a></li>
35 33 </ul>
36 34 <div class="divider"></div>
37 35 {% endif %}
... ... @@ -65,7 +63,7 @@
65 63 </ul>
66 64  
67 65 {% if user_.mailinglists %}
68   - <b>{% trans 'Subscribes: ' %}</b>
  66 + <b>{% trans 'Groups: ' %}</b>
69 67 {% for list in user_.mailinglists %}
70 68 <span class="label label-primary">{{ list }}</span>
71 69 {% endfor %}
... ... @@ -90,7 +88,7 @@
90 88 <div class="col-lg-4 col-md-4 col-sm-7">
91 89 <div class="panel panel-default">
92 90 <div class="panel-heading">
93   - <h3 class="panel-title">{% trans "Mailing list Participation" %}</h3>
  91 + <h3 class="panel-title">{% trans "Groups Inscriptions" %}</h3>
94 92 </div>
95 93 <div class="panel-body">
96 94 <div id="collabs2"></div>
... ...
src/accounts/templates/accounts/user_update_form.html
... ... @@ -178,22 +178,26 @@ $(function() {
178 178 </div>
179 179 </div>
180 180 </div>
  181 + </div>
181 182  
182   - <div class="col-lg-4 col-md-5 col-sm-12 col-xm-12">
183   - <div class="panel panel-default">
184   - <div class="panel-heading">
185   - <h3 class="panel-title">{% trans "Change SVN and XMPP Client password" %}</h3>
186   - </div>
187   - <div class="panel-body">
188   - <div class="form-group">
189   - {% trans "You don't need to change this password. Change it only if you really know what you are doing." %}
190   - </div>
191   - <a href="{% url 'change_password' %}" class="btn btn-primary pull-right">{% trans "Change Password" %}</a>
  183 + <div class="row">
  184 + <div class="col-lg-12">
  185 + <div class="panel panel-default">
  186 + <div class="panel-heading">
  187 + <h3 class="panel-title">
  188 + {% blocktrans %}Change <a href="http://repositorio.interlegis.gov.br/">SVN</a> and <a href="http://mensageiro.interlegis.gov.br/">XMPP Client</a> password{% endblocktrans %}
  189 + </h3>
  190 + </div>
  191 + <div class="panel-body">
  192 + <div class="form-group">
  193 + {% trans "This feature is available only for who needs to change the password for some reason as having an old user with the same username, forgot your password to commit, usage of other XMPP Client for connection. Usually, you won't need to change this password. Only change it if you are sure about what you are doing." %}
192 194 </div>
  195 + <a href="{% url 'change_password' %}" class="btn btn-default pull-right"><span class="icon-warning-sign"></span> {% trans "Change Password" %}</a>
193 196 </div>
194 197 </div>
195   -
  198 + </div>
196 199 </div>
  200 +
197 201 <div class="row">
198 202 <div class="submit">
199 203 <button type="submit" class="btn btn-primary btn-lg btn-block">{% trans "Update" %}</button>
... ...
src/accounts/views.py
... ... @@ -71,6 +71,7 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
71 71 'ticket': TicketCollabCount,
72 72 }
73 73  
  74 + messages = Message.objects.filter(from_address__user__pk=user.pk)
74 75 for type in ['thread', 'ticket', 'wiki', 'changeset', 'attachment']:
75 76 CounterClass = counter_class.get(type)
76 77 if CounterClass:
... ... @@ -80,6 +81,8 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
80 81 count_types[trans(type)] = 0
81 82 else:
82 83 count_types[trans(type)] = counter.count
  84 + elif type == 'thread':
  85 + count_types[trans(type)] = messages.count()
83 86 else:
84 87 sqs = SearchQuerySet()
85 88 for filter_or in fields_or_lookup:
... ... @@ -100,7 +103,6 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
100 103 context['emails'] = query[:10]
101 104  
102 105 count_by = 'thread__mailinglist__name'
103   - messages = Message.objects.filter(from_address__user__pk=user.pk)
104 106 context['list_activity'] = dict(messages.values_list(count_by)\
105 107 .annotate(Count(count_by))\
106 108 .order_by(count_by))
... ...
src/locale/pt_BR/LC_MESSAGES/django.mo
No preview for this file type
src/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -7,7 +7,7 @@ msgid &quot;&quot;
7 7 msgstr ""
8 8 "Project-Id-Version: PACKAGE VERSION\n"
9 9 "Report-Msgid-Bugs-To: \n"
10   -"POT-Creation-Date: 2013-12-04 18:28+0000\n"
  10 +"POT-Creation-Date: 2013-12-06 10:49+0000\n"
11 11 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -53,11 +53,11 @@ msgstr &quot;Digite a mesma senha que acima, para verificação.&quot;
53 53 msgid "Password mismatch"
54 54 msgstr "Senhas diferentes"
55 55  
56   -#: accounts/views.py:142
  56 +#: accounts/views.py:144
57 57 msgid "Your profile has been created!"
58 58 msgstr "Seu perfil foi criado!"
59 59  
60   -#: accounts/views.py:143
  60 +#: accounts/views.py:145
61 61 msgid ""
62 62 "You must login to validated your profile. Profiles not validated are deleted "
63 63 "in 24h."
... ... @@ -65,12 +65,12 @@ msgstr &quot;&quot;
65 65 "Você deve se logar para validar seu perfil. Perfis não validados serão "
66 66 "deletados em 24h."
67 67  
68   -#: accounts/views.py:224
  68 +#: accounts/views.py:226
69 69 msgid "Could not change your password. Please, try again later."
70 70 msgstr ""
71 71 "Não conseguimos alterar sua senha. Por favor, tente novamente mais tarde."
72 72  
73   -#: accounts/views.py:233
  73 +#: accounts/views.py:235
74 74 msgid "You've changed your password successfully!"
75 75 msgstr "Senha alterada com sucesso!"
76 76  
... ... @@ -81,10 +81,10 @@ msgstr &quot;%(count)s usuários deletados.&quot;
81 81  
82 82 #: accounts/templates/accounts/change_password.html:8
83 83 msgid "Change XMPP Client and SVN Password"
84   -msgstr "Trocar senha do SVN e do Mensageiro"
  84 +msgstr "Trocar senha do Repositório e do Mensageiro"
85 85  
86 86 #: accounts/templates/accounts/change_password.html:17
87   -#: accounts/templates/accounts/user_update_form.html:191
  87 +#: accounts/templates/accounts/user_update_form.html:195
88 88 msgid "Change Password"
89 89 msgstr "Trocar senha"
90 90  
... ... @@ -113,8 +113,8 @@ msgid &quot;Personal Information&quot;
113 113 msgstr "Informações pessoais"
114 114  
115 115 #: accounts/templates/accounts/user_create_form.html:46
116   -msgid "Subscribe to mail lists"
117   -msgstr "Inscreva-se para listas de e-mails"
  116 +msgid "Subscribe to groups"
  117 +msgstr "Inscreva-se nos grupos"
118 118  
119 119 #: accounts/templates/accounts/user_create_form.html:60 templates/base.html:98
120 120 msgid "Register"
... ... @@ -128,47 +128,47 @@ msgstr &quot;perfil&quot;
128 128 msgid "list membership"
129 129 msgstr "participação em listas"
130 130  
131   -#: accounts/templates/accounts/user_detail.html:51
  131 +#: accounts/templates/accounts/user_detail.html:49
132 132 msgid "Twitter account"
133 133 msgstr "Conta Twitter"
134 134  
135   -#: accounts/templates/accounts/user_detail.html:54
  135 +#: accounts/templates/accounts/user_detail.html:52
136 136 msgid "Facebook account"
137 137 msgstr "Conta Facebook"
138 138  
139   -#: accounts/templates/accounts/user_detail.html:62
  139 +#: accounts/templates/accounts/user_detail.html:60
140 140 msgid "Personal webpage"
141 141 msgstr "Página web pessoal"
142 142  
143   -#: accounts/templates/accounts/user_detail.html:68
144   -msgid "Subscribes: "
145   -msgstr "Inscrições: "
  143 +#: accounts/templates/accounts/user_detail.html:66
  144 +msgid "Groups: "
  145 +msgstr "Grupos: "
146 146  
147   -#: accounts/templates/accounts/user_detail.html:81
  147 +#: accounts/templates/accounts/user_detail.html:79
148 148 msgid "Contributions by Area"
149 149 msgstr "Contribuições por área"
150 150  
151   -#: accounts/templates/accounts/user_detail.html:93
152   -msgid "Mailing list Participation"
153   -msgstr "Participação em listas de e-mail"
  151 +#: accounts/templates/accounts/user_detail.html:91
  152 +msgid "Groups Inscriptions"
  153 +msgstr "Inscrições em grupos"
154 154  
155   -#: accounts/templates/accounts/user_detail.html:106 badger/models.py:70
  155 +#: accounts/templates/accounts/user_detail.html:104 badger/models.py:70
156 156 msgid "Badges"
157 157 msgstr "Medalhas"
158 158  
159   -#: accounts/templates/accounts/user_detail.html:125
  159 +#: accounts/templates/accounts/user_detail.html:123
160 160 msgid "Latest posted"
161 161 msgstr "Últimas postagens"
162 162  
163   -#: accounts/templates/accounts/user_detail.html:130
  163 +#: accounts/templates/accounts/user_detail.html:128
164 164 msgid "There are no posts by this user so far."
165 165 msgstr "Não há posts deste usuário até agora."
166 166  
167   -#: accounts/templates/accounts/user_detail.html:136 badger/models.py:23
  167 +#: accounts/templates/accounts/user_detail.html:134 badger/models.py:23
168 168 msgid "Contributions"
169 169 msgstr "Contribuições"
170 170  
171   -#: accounts/templates/accounts/user_detail.html:141
  171 +#: accounts/templates/accounts/user_detail.html:139
172 172 msgid "No contributions of this user so far."
173 173 msgstr "Não há posts deste usuário até agora."
174 174  
... ... @@ -229,19 +229,30 @@ msgstr &quot;Adicionar outro endereço de e-mail&quot;
229 229 msgid "Add"
230 230 msgstr "Adicionar"
231 231  
232   -#: accounts/templates/accounts/user_update_form.html:185
233   -msgid "Change SVN and XMPP Client password"
234   -msgstr "Trocar a senha do SVN e do Mensageiro"
  232 +#: accounts/templates/accounts/user_update_form.html:188
  233 +msgid ""
  234 +"Change <a href=\"http://repositorio.interlegis.gov.br/\">SVN</a> and <a href="
  235 +"\"http://mensageiro.interlegis.gov.br/\">XMPP Client</a> password"
  236 +msgstr ""
  237 +"Trocar a senha do <a href=\"http://repositorio.interlegis.gov.br/"
  238 +"\">Repositório</a> e do <a href=\"http://mensageiro.interlegis.gov.br/"
  239 +"\">Mensageiro</a>"
235 240  
236   -#: accounts/templates/accounts/user_update_form.html:189
  241 +#: accounts/templates/accounts/user_update_form.html:193
237 242 msgid ""
238   -"You don't need to change this password. Change it only if you really know "
239   -"what you are doing."
  243 +"This feature is available only for who needs to change the password for some "
  244 +"reason as having an old user with the same username, forgot your password to "
  245 +"commit, usage of other XMPP Client for connection. Usually, you won't need "
  246 +"to change this password. Only change it if you are sure about what you are "
  247 +"doing."
240 248 msgstr ""
241   -"Você não precisa trocar essa senha. Troque-a somente se tem certeza do que "
242   -"está fazendo."
  249 +"Este recurso está disponível para quem precisa trocar a senha por algum "
  250 +"motivo como ter um usuário antigo com mesmo nome de usuário, esqueceu da "
  251 +"senha antiga para commit, uso de outro cliente XMPP para conexão. "
  252 +"Normalmente, você não terá que trocar essa senha. Somente troque essa senha "
  253 +"se tiver certeza do que está fazendo."
243 254  
244   -#: accounts/templates/accounts/user_update_form.html:199
  255 +#: accounts/templates/accounts/user_update_form.html:203
245 256 msgid "Update"
246 257 msgstr "Atualizar"
247 258  
... ... @@ -394,19 +405,23 @@ msgstr &quot;em&quot;
394 405 msgid "Read original"
395 406 msgstr "Leia o original"
396 407  
397   -#: planet/templates/feedzilla/base.html:5 templates/base.html:76
  408 +#: planet/templates/feedzilla/base.html:4
  409 +msgid "Community Blogs"
  410 +msgstr "Blogs da comunidade"
  411 +
  412 +#: planet/templates/feedzilla/base.html:7 templates/base.html:76
398 413 msgid "Planet"
399 414 msgstr ""
400 415  
401   -#: planet/templates/feedzilla/base.html:15
  416 +#: planet/templates/feedzilla/base.html:17
402 417 msgid "Tags"
403 418 msgstr "Etiquetas"
404 419  
405   -#: planet/templates/feedzilla/base.html:19
  420 +#: planet/templates/feedzilla/base.html:21
406 421 msgid "Source Blogs"
407 422 msgstr "Blogs de origem"
408 423  
409   -#: planet/templates/feedzilla/base.html:22
  424 +#: planet/templates/feedzilla/base.html:24
410 425 #: planet/templates/feedzilla/submit_blog.html:5
411 426 msgid "Submit a blog"
412 427 msgstr "Sugerir um blog"
... ... @@ -741,7 +756,7 @@ msgstr &quot;Endereço de e-mail verificado!&quot;
741 756  
742 757 #: super_archives/management/commands/import_emails.py:205
743 758 msgid "[Colab] Warning - Email sent with a blank subject."
744   -msgstr "[Colab] Aviso - E-mail enviado com o campo assunto em branco."
  759 +msgstr ""
745 760  
746 761 #: super_archives/templates/message-preview.html:42
747 762 #: super_archives/templates/message-preview.html:62
... ... @@ -749,64 +764,64 @@ msgid &quot;by&quot;
749 764 msgstr "por"
750 765  
751 766 #: super_archives/templates/message-preview.html:65
752   -#: super_archives/templates/message-thread.html:157
  767 +#: super_archives/templates/message-thread.html:159
753 768 msgid "ago"
754 769 msgstr "atrás"
755 770  
756   -#: super_archives/templates/message-thread.html:33
  771 +#: super_archives/templates/message-thread.html:35
757 772 msgid "You must login before voting."
758 773 msgstr "Você deve estar logado antes de votar."
759 774  
760   -#: super_archives/templates/message-thread.html:128
  775 +#: super_archives/templates/message-thread.html:130
761 776 msgid "Order by"
762 777 msgstr "Ordernar por"
763 778  
764   -#: super_archives/templates/message-thread.html:132
  779 +#: super_archives/templates/message-thread.html:134
765 780 msgid "Votes"
766 781 msgstr "Votos"
767 782  
768   -#: super_archives/templates/message-thread.html:136
  783 +#: super_archives/templates/message-thread.html:138
769 784 msgid "Date"
770 785 msgstr "Data"
771 786  
772   -#: super_archives/templates/message-thread.html:141
  787 +#: super_archives/templates/message-thread.html:143
773 788 msgid "Related:"
774 789 msgstr "Relacionado:"
775 790  
776   -#: super_archives/templates/message-thread.html:152
  791 +#: super_archives/templates/message-thread.html:154
777 792 msgid "Statistics:"
778 793 msgstr "Estátisticas:"
779 794  
780   -#: super_archives/templates/message-thread.html:156
  795 +#: super_archives/templates/message-thread.html:158
781 796 msgid "started at"
782 797 msgstr "começou às"
783 798  
784   -#: super_archives/templates/message-thread.html:162
  799 +#: super_archives/templates/message-thread.html:164
785 800 msgid "viewed"
786 801 msgstr "visualizado"
787 802  
788   -#: super_archives/templates/message-thread.html:163
789   -#: super_archives/templates/message-thread.html:168
790   -#: super_archives/templates/message-thread.html:173
  803 +#: super_archives/templates/message-thread.html:165
  804 +#: super_archives/templates/message-thread.html:170
  805 +#: super_archives/templates/message-thread.html:175
791 806 msgid "times"
792 807 msgstr "vezes"
793 808  
794   -#: super_archives/templates/message-thread.html:167
  809 +#: super_archives/templates/message-thread.html:169
795 810 msgid "answered"
796 811 msgstr "respondido"
797 812  
798   -#: super_archives/templates/message-thread.html:172
  813 +#: super_archives/templates/message-thread.html:174
799 814 msgid "voted"
800 815 msgstr "votado"
801 816  
802   -#: super_archives/templates/message-thread.html:178
  817 +#: super_archives/templates/message-thread.html:180
803 818 msgid "Tags:"
804 819 msgstr "Etiquetas:"
805 820  
806 821 #: super_archives/templates/superarchives/thread-dashboard.html:5
807 822 #: templates/base.html:73
808   -msgid "Discussions"
809   -msgstr "Discussões"
  823 +msgid "Groups"
  824 +msgstr "Grupos"
810 825  
811 826 #: super_archives/templates/superarchives/thread-dashboard.html:15
812 827 msgid "latest"
... ... @@ -823,7 +838,7 @@ msgstr &quot;mais relevantes&quot;
823 838  
824 839 #: super_archives/templates/superarchives/emails/email_blank_subject.txt:2
825 840 msgid "Hello"
826   -msgstr "Olá"
  841 +msgstr ""
827 842  
828 843 #: super_archives/templates/superarchives/emails/email_blank_subject.txt:3
829 844 #, python-format
... ... @@ -838,15 +853,6 @@ msgid &quot;&quot;
838 853 "\n"
839 854 "Thank you.\n"
840 855 msgstr ""
841   -"\n"
842   -"Você enviou um e-mail para %(mailinglist)s com o campo Assunto em branco e "
843   -"o seguinte conteúdo:\n"
844   -"\n"
845   -"\"%(body)s\"\n"
846   -"\n"
847   -"Por favor, preencha o assunto em todos os e-mails que você enviar.\n"
848   -"\n"
849   -"Obrigado.\n"
850 856  
851 857 #: super_archives/templates/superarchives/emails/email_verification.txt:2
852 858 #, python-format
... ... @@ -906,47 +912,55 @@ msgstr &quot;Opa... algo saiu errado!&quot;
906 912 msgid "Contribute"
907 913 msgstr "Contribua"
908 914  
909   -#: templates/base.html:83
910   -msgid "New Ticket"
911   -msgstr "Novo Tíquete"
912   -
913   -#: templates/base.html:85
  915 +#: templates/base.html:82
914 916 msgid "Timeline"
915 917 msgstr "Histórico"
916 918  
917   -#: templates/base.html:86
  919 +#: templates/base.html:83
918 920 msgid "Roadmap"
919 921 msgstr "Planejamento"
920 922  
921   -#: templates/base.html:87
  923 +#: templates/base.html:84
922 924 msgid "Browse Source"
923 925 msgstr "Ver Código"
924 926  
  927 +#: templates/base.html:86
  928 +msgid "New Ticket"
  929 +msgstr "Novo Tíquete"
  930 +
925 931 #: templates/base.html:88
926 932 msgid "View Tickets"
927 933 msgstr "Visualizar Tiquetes"
928 934  
929   -#: templates/base.html:112
  935 +#: templates/base.html:99
  936 +msgid "Login"
  937 +msgstr "Entrar"
  938 +
  939 +#: templates/base.html:113
930 940 msgid "My Profile"
931 941 msgstr "Meu Perfil"
932 942  
933   -#: templates/base.html:124 templates/base.html.py:127
  943 +#: templates/base.html:114
  944 +msgid "Logout"
  945 +msgstr "Sair"
  946 +
  947 +#: templates/base.html:126 templates/base.html.py:129
934 948 msgid "Search here..."
935 949 msgstr "Pesquise aqui..."
936 950  
937   -#: templates/base.html:140
  951 +#: templates/base.html:142
938 952 msgid "The login has failed. Please, try again."
939 953 msgstr "O login falhou. Por favor, tente novamente."
940 954  
941   -#: templates/base.html:165
  955 +#: templates/base.html:167
942 956 msgid "Last email imported at"
943 957 msgstr "Último e-mail importado em"
944 958  
945   -#: templates/base.html:170
  959 +#: templates/base.html:172
946 960 msgid "The contents of this site is published under license"
947 961 msgstr "O conteúdo deste site está publicado sob a licença"
948 962  
949   -#: templates/base.html:172
  963 +#: templates/base.html:174
950 964 msgid "Creative Commons - attribution, non-commercial"
951 965 msgstr "Creative Commons - atribuição e não-comercial"
952 966  
... ... @@ -994,6 +1008,22 @@ msgstr &quot;Vontade de ajudar&quot;
994 1008 msgid "INTERLEGIS COMMUNITIES"
995 1009 msgstr "COMUNIDADES INTERLEGIS"
996 1010  
  1011 +#~ msgid "Change SVN and XMPP Client password"
  1012 +#~ msgstr "Trocar a senha do SVN e do Mensageiro"
  1013 +
  1014 +#~ msgid ""
  1015 +#~ "You don't need to change this password. Change it only if you really know "
  1016 +#~ "what you are doing."
  1017 +#~ msgstr ""
  1018 +#~ "Você não precisa trocar essa senha. Troque-a somente se tem certeza do "
  1019 +#~ "que está fazendo."
  1020 +
  1021 +#~ msgid "Subscribes: "
  1022 +#~ msgstr "Inscrições: "
  1023 +
  1024 +#~ msgid "Discussions"
  1025 +#~ msgstr "Discussões"
  1026 +
997 1027 #~ msgid "Community inside participations"
998 1028 #~ msgstr "Participações internas da comunidade"
999 1029  
... ...
src/planet/templates/feedzilla/base.html
1 1 {% extends 'base.html' %}
2 2 {% load i18n feedzilla_tags %}
3 3  
  4 +{% block title %}{% trans "Community Blogs" %}{% endblock %}
  5 +
4 6 {% block main-content %}
5 7 <h2>{% trans 'Planet' %}</h2>
6 8 <hr/>
... ... @@ -17,7 +19,7 @@
17 19 </div>
18 20 <div class="well">
19 21 <h3>{% trans 'Source Blogs' %}</h3>
20   - {% feedzilla_donor_list %}
  22 + {% feedzilla_donor_list order_by="title" %}
21 23 <div class="text-center">
22 24 <a class="btn btn-primary" href="{% url "feedzilla_submit_blog" %}">{% trans "Submit a blog" %}</a>
23 25 </div>
... ...
src/search/base_indexes.py
... ... @@ -77,7 +77,9 @@ class BaseIndex(indexes.SearchIndex):
77 77  
78 78 def prepare_modified_by(self, obj):
79 79 if hasattr(obj, 'modified_by'):
80   - return obj.modified_by
  80 + modified_by = obj.get_modified_by()
  81 + if modified_by:
  82 + return modified_by.get_full_name()
81 83 if self.author_obj:
82 84 return self.author_obj.get_full_name()
83 85 return obj.author
... ...
src/super_archives/templates/message-thread.html
... ... @@ -3,6 +3,8 @@
3 3  
4 4 {% trans "Anonymous" as anonymous %}
5 5  
  6 +{% block title %}{{ first_msg.subject_clean }}{% endblock %}
  7 +
6 8 {% block head_js %}
7 9  
8 10 <script>
... ...
src/super_archives/templates/superarchives/thread-dashboard.html
... ... @@ -2,7 +2,7 @@
2 2 {% load i18n %}
3 3  
4 4 {% block main-content %}
5   - <h2>{% trans 'Discussions'|title %}</h2>
  5 + <h2>{% trans 'Groups'|title %}</h2>
6 6 <hr/>
7 7  
8 8 {% for listname, latest, most_relevant in lists %}
... ...
src/templates/base.html
... ... @@ -70,7 +70,7 @@
70 70 <div class="collapse navbar-collapse navbar-main">
71 71 <ul class="nav navbar-nav">
72 72 <li>
73   - <a href="{% url 'thread_list' %}">{% trans "Discussions" %}</a>
  73 + <a href="{% url 'thread_list' %}">{% trans "Groups" %}</a>
74 74 </li>
75 75 <li>
76 76 <a href="{% url "feedzilla_index" %}">{% trans "Planet" %}</a>
... ... @@ -79,12 +79,12 @@
79 79 <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Contribute" %} <b class="caret"></b></a>
80 80 <ul class="dropdown-menu">
81 81 <li><a href="/wiki">Wiki</a></li>
82   - {% if user.is_active %}
83   - <li><a href="/newticket">{% trans "New Ticket" %}</a></li>
84   - {% endif %}
85 82 <li><a href="/timeline">{% trans "Timeline" %}</a></li>
86 83 <li><a href="/roadmap">{% trans "Roadmap" %}</a></li>
87 84 <li><a href="/browser">{% trans "Browse Source" %}</a></li>
  85 + {% if user.is_active %}
  86 + <li><a href="/newticket">{% trans "New Ticket" %}</a></li>
  87 + {% endif %}
88 88 <li><a href="/report">{% trans "View Tickets" %}</a></li>
89 89 </ul>
90 90 </li>
... ... @@ -96,7 +96,8 @@
96 96 <ul class="nav navbar-nav navbar-right">
97 97 {% if not user.is_authenticated %}
98 98 <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
99   - <li>{% browserid_login text='Login' %}</li>
  99 + {% trans 'Login' as login_text %}
  100 + <li>{% browserid_login text=login_text %}</li>
100 101 {% else %}
101 102 <li id="user-menu" class="dropdown">
102 103 <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
... ... @@ -110,7 +111,8 @@
110 111 </div>
111 112 <div>
112 113 <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a>
113   - {% browserid_logout text='Logout' link_class='btn btn-default pull-right' %}
  114 + {% trans 'Logout' as logout_text %}
  115 + {% browserid_logout text=logout_text link_class='btn btn-default pull-right' %}
114 116 </div>
115 117 </div>
116 118 </li>
... ...