Merge branch 'master' into bootstrap

nijel · Oct 13, 2014 · d7fc93d · d7fc93d
2 parents 46799ab + 70eeade
commit d7fc93d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/weblate/html/language.html b/weblate/html/language.html
@@ -23,9 +23,7 @@
   <div class="panel-heading"><h4 class="panel-title">{% trans "Projects" %}</h4></div>
   <div class="panel-body">
 
-{% with object.translation_set.enabled as translations %}
 {% include "list-translations.html" %}
-{% endwith %}
 
   </div>
 </div>

diff --git a/weblate/lang/views.py b/weblate/lang/views.py
@@ -45,6 +45,10 @@ def show_language(request, lang):
     dicts = Dictionary.objects.filter(
         language=obj
     ).values_list('project', flat=True).distinct()
+    projects = Project.objects.all_acl(request.user)
+    translations = obj.translation_set.enabled().filter(
+        subproject__project__in=projects
+    )
 
     return render(
         request,
@@ -56,8 +60,7 @@ def show_language(request, lang):
                 'rss-language', kwargs={'lang': obj.code}
             ),
             'last_changes_url': urlencode({'lang': obj.code}),
-            'dicts': Project.objects.all_acl(request.user).filter(
-                id__in=dicts
-            ),
+            'dicts': projects.filter(id__in=dicts),
+            'translations': translations,
         }
     )