Site labels: fix translation of customization

4 files changed, 10 insertions, 11 deletions

diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index c51616e21..e0d31bef7 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -1277,9 +1277,7 @@ class SiteFormSelection(IshtarForm):
 
     @classmethod
     def form_label(cls):
-        return unicode(_(u"{} search")).format(
-            get_current_profile().get_site_label()
-        )
+        return get_current_profile().get_site_label('search')
 
     def clean(self):
         cleaned_data = self.cleaned_data
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 7d0efe34c..035c98190 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -1566,6 +1566,7 @@ def parcel_post_save(sender, **kwargs):
         # parcels are copied between files and operations
         parcel.copy_to_operation()
 
+
 post_save.connect(parcel_post_save, sender=Parcel)
 
 
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index 054963f09..55c688854 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -345,8 +345,8 @@ show_site = show_item(
 
 site_search_wizard = SiteSearch.as_view(
     [('general-site_search', SiteFormSelection)],
-    label=_(u"{} search"),
-    url_name='site_search',)
+    url_name='site_search',
+)
 
 
 site_creation_steps = [
@@ -357,7 +357,6 @@ site_creation_steps = [
 
 site_creation_wizard = SiteWizard.as_view(
     site_creation_steps,
-    label=_(u"New {}"),
     url_name='site_creation',
 )
 
@@ -370,7 +369,6 @@ site_modification_steps = [
 
 site_modification_wizard = SiteModificationWizard.as_view(
     site_modification_steps,
-    label=_(u"{} modification"),
     url_name='site_modification',
 )
 
diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py
index 18c4b20e8..dc96da7be 100644
--- a/archaeological_operations/wizards.py
+++ b/archaeological_operations/wizards.py
@@ -453,21 +453,23 @@ class OperationEditAdministrativeActWizard(OperationAdministrativeActWizard):
 
 
 class SiteLabel(object):
+    SITE_KEY = ""
+
     def get_label(self):
-        return unicode(_(u"Search {}")).format(
-            get_current_profile().get_site_label()
-        )
+        return get_current_profile().get_site_label(self.SITE_KEY)
 
 
 class SiteSearch(SiteLabel, SearchWizard):
-    pass
+    SITE_KEY = "search"
 
 
 class SiteWizard(SiteLabel, Wizard):
+    SITE_KEY = 'new'
     model = models.ArchaeologicalSite
 
 
 class SiteModificationWizard(SiteWizard):
+    SITE_KEY = 'modification'
     modification = True