Use str.format in preference to %-formatting for more flexible translation.

Author: stevenyoungs

Form/UK1841.py

@@ -79,7 +79,7 @@ def command(dbstate, uistate, track, citation_handle, person_handle):
         db = dbstate.db
         person = db.get_person_from_handle(person_handle)
         person.get_primary_name().add_citation(citation_handle)
-        with DbTxn(_("Add Person (%s)") % name_displayer.display(person), db) as trans:
+        with DbTxn(_("Add Person ({name})").format(name=name_displayer.display(person)), db) as trans:
             db.commit_person(person, trans)
 
 class AlternateName:
@@ -91,7 +91,8 @@ def get_actions(dbstate, citation, form_event):
             alternate = Name()
             alternate.set_first_name(attr.get_value())
             alternate.add_citation(citation.handle)
-            actions.append((name_displayer.display(person), attr.get_value(),
+            detail = _('Given Name: {name}').format(name=attr.get_value())
+            actions.append((name_displayer.display(person), detail,
                          lambda dbstate, uistate, track, person_handle = person.handle, alternate_ = alternate: AlternateName.command(dbstate, uistate, track, person_handle, alternate_)))
         return (_("Add alternate name"), actions)
 
@@ -100,7 +101,7 @@ def command(dbstate, uistate, track, person_handle, alternate):
         db = dbstate.db
         person = db.get_person_from_handle(person_handle)
         person.add_alternate_name(alternate)
-        with DbTxn(_("Add Person (%s)") % name_displayer.display(person), db) as trans:
+        with DbTxn(_("Add Person ({name})").format(name=name_displayer.display(person)), db) as trans:
             db.commit_person(person, trans)
 
 class BirthEvent:
@@ -175,7 +176,7 @@ def command(dbstate, uistate, track, citation_handle, event_date_object, event_p
         event.set_date_object(event_date_object)
         event.set_place_handle(event_place_handle)
         event.add_citation(citation_handle)
-        with DbTxn(_("Add Event (%s)") % event.get_gramps_id(), db) as trans:
+        with DbTxn(_("Add Event ({id})").format(id=event.get_gramps_id()), db) as trans:
             db.add_event(event, trans)
 
         # and reference the event from all people
@@ -185,5 +186,5 @@ def command(dbstate, uistate, track, citation_handle, event_date_object, event_p
             event_ref.set_role(role)
             person = db.get_person_from_handle(person_handle)
             person.add_event_ref(event_ref)
-            with DbTxn(_("Add Event (%s)") % name_displayer.display(person), db) as trans:
+            with DbTxn(_("Add Event ({name})").format(name=name_displayer.display(person)), db) as trans:
                 db.commit_person(person, trans)

Form/actionutils.py

@@ -53,15 +53,15 @@ def add_event_to_person(dbstate, uistate, track, person_handle, event_type, even
     event.set_description(event_description)
 
     # add to the database
-    with DbTxn(_("Add Event (%s)") % event.get_gramps_id(), db) as trans:
+    with DbTxn(_("Add Event ({0})").format(event.get_gramps_id()), db) as trans:
         db.add_event(event, trans)
     # Add new event reference to the Person record
     event_ref = EventRef()
     event_ref.ref = event.get_handle()
     event_ref.set_role(event_role_type)
     person = db.get_person_from_handle(person_handle)
     person.add_event_ref(event_ref)
-    with DbTxn(_("Add Event (%s)") % name_displayer.display(person), db) as trans:
+    with DbTxn(_("Add Event ({name})").format(name=name_displayer.display(person)), db) as trans:
         db.commit_person(person, trans)
 
 def get_form_person_attr(db, form_event_handle, attr_type):

Form/formactions.py

@@ -109,8 +109,7 @@ def __init__(self, dbstate, uistate, track, citation):
                 spec.loader.exec_module(self.actions_module)
             except (ValueError, ImportError, SyntaxError) as err:
                 self.actions_module = None
-                LOG.warning("Form plugin error (from '%s'): %s"
-                                    % (self.form_id, err))
+                LOG.warning(_("Form plugin error (from '{path}'): {error}").format(path=full_path, error=err))
             finally:
                 # must make sure we restore sys.path
                 sys.path.pop(0)
@@ -275,6 +274,7 @@ def get_dialog_title(self):
         """
         Get the title of the dialog.
         """
-        dialog_title = _('Form: %s: %s')  % (self.source.get_title(), self.citation.get_page())
+        dialog_title = _('Form: {source_title}: {event_reference}').format(
+            source_title=self.source.get_title(), event_reference=self.citation.get_page())
 
         return dialog_title