Merge branch 'staging' into batch_categories_ui

django/website/hid/tests/views_tests.py

@@ -42,14 +42,14 @@ def test_get_deleted_returns_empty_list_on_empty_selection():
 
 def test_get_deleted_returns_submitted_values_as_ints():
     params = mock.MagicMock()
-    params.getlist.return_value = ['201', '199', '3']
+    params.getlist.return_value = ["201", "199", "3"]
 
     assert get_deleted(params) == [201, 199, 3]
 
 
 def test_process_items_always_redirects_to_data_view():
-    url = reverse("data-view-process")
-    redirect_url = reverse("data-view")
+    url = reverse('data-view-process')
+    redirect_url = reverse('data-view')
 
     request = ReqFactory.get(url)
 
@@ -66,17 +66,17 @@ def test_process_items_always_redirects_to_data_view():
 
 @pytest.mark.django_db
 def test_process_items_deletes_items():
-    msg = {'body': 'Message text'}
+    msg = {'body': "Message text"}
     transport.create_item(msg)
 
     [item] = list(transport.get_items())
 
-    url = reverse("data-view-process")
+    url = reverse('data-view-process')
     request = ReqFactory.post(url, {'delete': [item['id']]})
     request = fix_messages(request)
 
     process_items(request)
-    assert check_message(request, u'Successfully deleted 1 items.') is True
+    assert check_message(request, u"Successfully deleted 1 item.") is True
 
     items = list(transport.get_items())
     assert len(list(items)) == 0

django/website/hid/views.py

@@ -2,6 +2,7 @@ from django.contrib import messages
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.utils.translation import ugettext as _
+from django.utils.translation import ungettext
 from django.views.generic import FormView
 from django.views.generic.base import TemplateView
 
@@ -14,7 +15,7 @@ from .tables import ItemTable
 
 
 class ListSources(TemplateView):
-    template_name = 'hid/sources.html'
+    template_name = "hid/sources.html"
 
     def get_sources(self):
         sources = []
@@ -34,7 +35,7 @@ class ListSources(TemplateView):
 
 class UploadSpreadsheetView(FormView):
     form_class = UploadForm
-    template_name = 'hid/upload.html'
+    template_name = "hid/upload.html"
 
     def get_success_url(self):
         return reverse("data-view")
@@ -46,7 +47,9 @@ class UploadSpreadsheetView(FormView):
 
         try:
             saved = store_spreadsheet(source, uploaded_file)
-            msg = _("Upload successful! %d entries have been added.") % saved
+            msg = ungettext("Upload successful! %d entry has been added.",
+                            "Upload successful! %d entries have been added.",
+                            saved) % saved
             messages.success(self.request, msg)
         except SheetImportException as exc:
             msg = exc.message
@@ -93,7 +96,10 @@ def process_items(request):
         if len(deleted):
             try:
                 transport.delete_items(deleted)
-                msg = _("Successfully deleted %d items.") % len(deleted)
+                num_deleted = len(deleted)
+                msg = ungettext("Successfully deleted %d item.",
+                                "Successfully deleted %d items.",
+                                num_deleted) % num_deleted
                 messages.success(request, msg)
             except:
                 msg = _("There was an error while deleting.")