2704: Translation problem word Title (contribution by jannek)

svn: r11970

src/BasicUtils/_NameDisplay.py

@@ -29,7 +29,7 @@ Class handling language-specific displaying of names.
 # Python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 import re
 
 #-------------------------------------------------------------------------
@@ -276,7 +276,7 @@ class NameDisplay:
         # we need the names of each of the variables or methods that are
         # called to fill in each format flag.
         # Dictionary is "code": ("expression", "keyword", "i18n-keyword")
-        d = {"t": ("raw_data[_TITLE]",     "title",      _("title")),
+        d = {"t": ("raw_data[_TITLE]",     "title",      _("Person|title")),
              "f": ("raw_data[_FIRSTNAME]", "given",      _("given")),
              "p": ("raw_data[_PREFIX]",    "prefix",     _("prefix")),
              "l": ("raw_data[_SURNAME]",   "surname",    _("surname")),
@@ -315,7 +315,7 @@ class NameDisplay:
         # we need the names of each of the variables or methods that are
         # called to fill in each format flag.
         # Dictionary is "code": ("expression", "keyword", "i18n-keyword")
-        d = {"t": ("title",      "title",      _("title")),
+        d = {"t": ("title",      "title",      _("Person|title")),
              "f": ("first",      "given",      _("given")),
              "p": ("prefix",     "prefix",     _("prefix")),
              "l": ("surname",    "surname",    _("surname")),

src/Editors/_EditPerson.py

@@ -266,7 +266,7 @@ class EditPerson(EditPrimary):
         self.patro_title = widgets.MonitoredComboSelectedEntry(
                 self.top.get_widget("patrocmb"), 
                 self.top.get_widget("patroentry"),
-                [_('Patronymic'), _('Title')],
+                [_('Patronymic'), _('Person|Title')],
                 [self.pname.set_patronymic, self.pname.set_title], 
                 [self.pname.get_patronymic, self.pname.get_title],
                 default = Config.get(Config.PATRO_TITLE),

src/ScratchPad.py

@@ -589,7 +589,7 @@ class ScratchPadName(ScratchPadGrampsTypeWrapper):
             _("Family"),escape(self._obj.get_surname()),
             _("Patronymic"),escape(self._obj.get_patronymic()),
             _("Prefix"),escape(self._obj.get_surname_prefix()),
-            _("Title"),escape(self._obj.get_title()),
+            _("Person|Title"),escape(self._obj.get_title()),
             _("Suffix"),escape(self._obj.get_suffix()),
             _("Type"),escape(self._obj.get_type().__str__()),
             )

src/Utils.py

@@ -31,7 +31,7 @@ import locale
 import random
 import time
 
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #-------------------------------------------------------------------------
 #
@@ -1164,7 +1164,7 @@ def profile(func, *args):
 #-------------------------------------------------------------------------
 
 # keyword, code, translated standard, translated upper
-KEYWORDS = [("title",     "t", _("Title"),     _("TITLE")),
+KEYWORDS = [("title",     "t", _("Title"),     _("Person|TITLE")),
             ("given",     "f", _("Given"),     _("GIVEN")),
             ("prefix",    "p", _("Prefix"),    _("PREFIX")),
             ("surname",   "l", _("Surname"),   _("SURNAME")),

src/plugins/export/ExportCsv.py

@@ -29,7 +29,7 @@
 #
 #-------------------------------------------------------------------------
 import os
-from gettext import gettext as _
+from TransUtils import sgettext as _
 import csv
 import cStringIO
 import codecs
@@ -336,7 +336,7 @@ class CSVWriter:
             if self.translate_headers:
                 self.write_csv(_("Person"), _("Surname"), _("Given"), 
                                _("Call"), _("Suffix"), _("Prefix"), 
-                               _("Title"), _("Gender"), _("Birth date"), 
+                               _("Person|Title"), _("Gender"), _("Birth date"), 
                                _("Birth place"), _("Birth source"),
                                _("Death date"), _("Death place"), 
                                _("Death source"), _("Note"))

src/plugins/import/ImportCsv.py

@@ -30,7 +30,7 @@
 #
 #-------------------------------------------------------------------------
 import time
-from gettext import gettext as _
+from TransUtils import sgettext as _
 from gettext import ngettext
 import csv
 import codecs
@@ -158,7 +158,7 @@ def cleanup_column_name(column):
                     "Call name", _("Call name"),
                     "Call", _("Call")]:
         return "callname"
-    elif retval in ["Title", _("Title")]:
+    elif retval in ["Title", _("Person|Title")]:
         return "title"
     elif retval in ["Prefix", _("Prefix")]:
         return "prefix"
@@ -230,7 +230,7 @@ def cleanup_column_name(column):
                     "call name", 
                     "call", _("call")]:
         return "callname"
-    elif retval in ["title", _("title")]:
+    elif retval in ["title", _("Person|title")]:
         return "title"
     elif retval in ["prefix", _("prefix")]:
         return "prefix"

src/plugins/tool/PatchNames.py

@@ -263,7 +263,7 @@ class PatchNames(Tool.BatchTool, ManagedWindow.ManagedWindow):
             handle = self.model.append()
             self.model.set_value(handle, 0, 1)
             self.model.set_value(handle, 1, gid)
-            self.model.set_value(handle, 2, _('Title'))
+            self.model.set_value(handle, 2, _('Person|Title'))
             self.model.set_value(handle, 3, title)
             self.model.set_value(handle, 4, p.get_primary_name().get_name())
             self.title_hash[pid] = handle