Merge remote-tracking branch 'origin/master'

trans/formats.py

@@ -460,7 +460,6 @@ class PoFormat(FileFormat):
                 mounit.source = ""
             else:
                 mounit.source = unit.source
-                context = unit.getcontext()
                 mounit.msgctxt = [unit.getcontext()]
             mounit.target = unit.target
             outputfile.addunit(mounit)

trans/tests/files.py

@@ -190,7 +190,6 @@ class ExportTest(ViewTestCase):
                 kwargs=self.kw_translation
             )
         )
-        self.assertContains(response, 'Weblate Hello World 2012')
         self.assertEqual(
             response['Content-Disposition'],
             'attachment; filename=cs.mo'

trans/views/basic.py

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

trans/views/changes.py

@@ -26,6 +26,7 @@ from trans.models.changes import Change
 from trans.views.helper import get_project_translation
 from lang.models import Language
 
+
 class ChangesView(ListView):
     '''
     Browser for changes.

trans/views/charts.py

@@ -25,6 +25,7 @@ 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