Merge branch 'v0.9' into wheezy

1 files changed, 8 insertions, 6 deletions

diff --git a/archaeological_files/tests.py b/archaeological_files/tests.py
index 4a09e1caa..f3419013a 100644
--- a/archaeological_files/tests.py
+++ b/archaeological_files/tests.py
@@ -87,17 +87,19 @@ class FileTest(TestCase, FileInit):
                             self.item.numeric_reference))
 
     def testCachedLabel(self):
-        lbls = ['No town', self.item.external_id,
-                self.item.internal_reference]
-        lbl = settings.JOINT.join(lbls)
-        self.assertEqual(self.item.cached_label, lbl)
+        # localisation fix
+        lbls = []
+        for town_lbl in (u'No town', u'Pas de commune'):
+            lbls.append(settings.JOINT.join(
+                [town_lbl, self.item.external_id,
+                 self.item.internal_reference]))
+        self.assertIn(self.item.cached_label, lbls)
         default_town = Town.objects.create(name="Paris", numero_insee='75001')
         self.item.towns.add(default_town)
         # manually done inside wizards
         self.item._cached_label_checked = False
         self.item.save()
-        lbls[0] = "Paris"
-        lbl = settings.JOINT.join(lbls)
+        lbl = lbls[0].replace('No town', 'Paris')
         self.assertEqual(self.item.cached_label, lbl)
 
     def testAddAndGetHistorized(self):