Merge branch 'mes-2016-1-identifyPrivateList' into detach_super_archives

colab · Jun 7, 2016 · 0eceadb · 0eceadb
2 parents 299be45 + c6fa7eb
commit 0eceadb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/colab/accounts/templates/accounts/manage_subscriptions.html b/colab/accounts/templates/accounts/manage_subscriptions.html
@@ -22,6 +22,9 @@ <h3 class="panel-title">{{ email }}</h3>
               <div class="checkbox" title="{{ list.description }}">
                 <label>
                   <input name="{{ email }}" value="{{ list.listname }}" type="checkbox" {% if checked %}checked{% endif%}>{{ list.listname }}</input>
+                  {% if list.archive_private != 0 %}
+                    <span class="label label-default">{% trans 'Private' %}</span>
+                  {% endif %}
                 </label>
               </div>
             {% endfor %}

diff --git a/colab/locale/pt_BR/LC_MESSAGES/django.mo b/colab/locale/pt_BR/LC_MESSAGES/django.mo
diff --git a/colab/locale/pt_BR/LC_MESSAGES/django.po b/colab/locale/pt_BR/LC_MESSAGES/django.po
@@ -756,3 +756,6 @@ msgstr "de"
 
 msgid "Invalid email"
 msgstr "E-mail inválido"
+
+msgid "Private"
+msgstr "Privada"