Merge remote-tracking branch 'origin/master'

trans/models/translation.py

@@ -1203,3 +1203,10 @@ class Translation(models.Model, URLMixin):
         for rqtype in keys:
             cache_key = 'counts-%s-%s-%s' % (slug, code, rqtype)
             cache.delete(cache_key)
+
+    def get_gwargs(self):
+        return {
+            'lang': self.language.code,
+            'subproject': self.subproject.slug,
+            'project': self.subproject.project.slug
+        }

trans/views/basic.py

@@ -313,21 +313,11 @@ def show_translation(request, project, subproject, lang):
         'search_form': search_form,
         'review_form': review_form,
         'last_changes': last_changes,
-        'last_changes_url': urlencode(
-            {
-                'lang': obj.language.code,
-                'subproject': obj.subproject.slug,
-                'project': obj.subproject.project.slug
-            }
-        ),
         'last_changes_rss': reverse(
             'rss-translation',
-            kwargs={
-                'lang': obj.language.code,
-                'subproject': obj.subproject.slug,
-                'project': obj.subproject.project.slug
-            }
+            kwargs=obj.get_kwargs(),
         ),
+        'last_changes_url': urlencode(obj.get_kwargs()),
     }))
 
 

trans/views/changes.py

@@ -22,6 +22,7 @@ from django.views.generic.list import ListView
 from django.http import Http404
 from django.contrib import messages
 from django.contrib.auth.models import User
+from django.utils.translation import ugettext as _
 from trans.models.changes import Change
 from trans.views.helper import get_project_translation
 from lang.models import Language

trans/views/charts.py

@@ -25,7 +25,6 @@ from trans.models import Change
 from lang.models import Language
 from trans.views.helper import get_project_translation
 from django.shortcuts import render_to_response, get_object_or_404
-from django.utils.translation import ugettext as _
 from django.template import RequestContext
 from django.http import HttpResponse
 from django.contrib.auth.models import User

trans/views/edit.py

@@ -480,19 +480,9 @@ def translate(request, project, subproject, lang):
                 'last_changes': unit.change_set.all()[:10],
                 'last_changes_rss': reverse(
                     'rss-translation',
-                    kwargs={
-                        'lang': obj.language.code,
-                        'subproject': obj.subproject.slug,
-                        'project': obj.subproject.project.slug
-                    }
-                ),
-                'last_changes_url': urlencode(
-                    {
-                        'lang': obj.language.code,
-                        'subproject': obj.subproject.slug,
-                        'project': obj.subproject.project.slug
-                    }
+                    kwargs=obj.get_kwargs(),
                 ),
+                'last_changes_url': urlencode(obj.get_kwargs()),
                 'total': obj.unit_set.all().count(),
                 'search_id': search_result['search_id'],
                 'offset': offset,