7276: translate some punctuation marks -- partial

This commit is contained in:
Paul Franklin 2014-03-17 08:00:18 -07:00
parent 644aab5db9
commit e44be07f62
8 changed files with 29 additions and 14 deletions

View File

@ -39,6 +39,8 @@ from .datebase import DateBase
from .surnamebase import SurnameBase
from .nametype import NameType
from .const import IDENTICAL, EQUAL, DIFFERENT
from gramps.gen.const import GRAMPS_LOCALE as glocale
_ = glocale.translation.gettext
#-------------------------------------------------------------------------
#
@ -437,9 +439,11 @@ class Name(SecondaryObject, PrivacyBase, SurnameBase, CitationBase, NoteBase,
first = self.first_name
surname = self.get_surname()
if self.suffix:
return "%s, %s %s" % (surname, first, self.suffix)
# translators: needed for Arabic, ignore otherwise
return _("%s, %s %s") % (surname, first, self.suffix)
else:
return "%s, %s" % (surname, first)
# translators: needed for Arabic, ignore otherwise
return _("%s, %s") % (surname, first)
def get_upper_name(self):
"""
@ -449,9 +453,11 @@ class Name(SecondaryObject, PrivacyBase, SurnameBase, CitationBase, NoteBase,
first = self.first_name
surname = self.get_surname().upper()
if self.suffix:
return "%s, %s %s" % (surname, first, self.suffix)
# translators: needed for Arabic, ignore otherwise
return _("%s, %s %s") % (surname, first, self.suffix)
else:
return "%s, %s" % (surname, first)
# translators: needed for Arabic, ignore otherwise
return _("%s, %s") % (surname, first)
def get_regular_name(self):
"""
@ -463,7 +469,8 @@ class Name(SecondaryObject, PrivacyBase, SurnameBase, CitationBase, NoteBase,
if (self.suffix == ""):
return "%s %s" % (first, surname)
else:
return "%s %s, %s" % (first, surname, self.suffix)
# translators: needed for Arabic, ignore otherwise
return _("%s %s, %s") % (first, surname, self.suffix)
def get_gedcom_parts(self):
"""

View File

@ -232,7 +232,8 @@ def get_address_str(addr):
if str == "":
str = info
else:
str = "%s, %s" % (str, info)
# translators: needed for Arabic, ignore otherwise
str = _("%s, %s") % (str, info)
return str
#-------------------------------------------------------------------------

View File

@ -374,7 +374,8 @@ class DetAncestorReport(Report):
date = addr.get_date_object().get_year()
if date:
self.doc.write_text( '%s, ' % date )
# translators: needed for Arabic, ignore otherwise
self.doc.write_text(self._('%s, ') % date )
self.doc.write_text( text )
self.doc.write_text_citation( self.endnotes(addr) )
self.doc.end_paragraph()

View File

@ -826,7 +826,8 @@ class DetDescendantReport(Report):
self.doc.write_text(self._('Address: '))
if date:
self.doc.write_text( '%s, ' % date )
# translators: needed for Arabic, ignore otherwise
self.doc.write_text(self._('%s, ') % date )
self.doc.write_text( text )
self.doc.write_text_citation( self.endnotes(addr) )
self.doc.end_paragraph()

View File

@ -162,11 +162,13 @@ class IndivCompleteReport(Report):
column_1 = self._(self._get_type(event.get_type()))
if role not in (EventRoleType.PRIMARY, EventRoleType.FAMILY):
column_1 = column_1 + ' (' + self._(role.xml_str()) + ')'
column_2 = combine('%s, %s', '%s', description, date_place)
# translators: needed for Arabic, ignore otherwise
column_2 = combine(self._('%s, %s'), '%s', description, date_place)
else:
# Groups with a single type (remove event type from first column)
column_1 = date
column_2 = combine('%s, %s', '%s', description, place)
# translators: needed for Arabic, ignore otherwise
column_2 = combine(self._('%s, %s'), '%s', description, place)
endnotes = ""
if self.use_srcs:

View File

@ -273,11 +273,14 @@ class Verify(tool.Tool, ManagedWindow, UpdateCallback):
# print data for the user, no GUI
(msg,gramps_id, name, the_type, rule_id, severity, handle) = results
if severity == Rule.WARNING:
print("W: %s, %s: %s, %s" % (msg,the_type, gramps_id, name))
# translators: needed for Arabic, ignore otherwise
print(_("W: %s, %s: %s, %s") % (msg, the_type, gramps_id, name))
elif severity == Rule.ERROR:
print("E: %s, %s: %s, %s" % (msg,the_type,gramps_id, name))
# translators: needed for Arabic, ignore otherwise
print(_("E: %s, %s: %s, %s") % (msg, the_type, gramps_id, name))
else:
print("S: %s, %s: %s, %s" % (msg,the_type,gramps_id, name))
# translators: needed for Arabic, ignore otherwise
print(_("S: %s, %s: %s, %s") % (msg, the_type,gramps_id, name))
def init_gui(self):
# Draw dialog and make it handle everything

View File

@ -274,6 +274,7 @@ gramps/gen/lib/familyreltype.py
gramps/gen/lib/grampstype.py
gramps/gen/lib/ldsord.py
gramps/gen/lib/markertype.py
gramps/gen/lib/name.py
gramps/gen/lib/nameorigintype.py
gramps/gen/lib/nametype.py
gramps/gen/lib/notetype.py

View File

@ -146,7 +146,6 @@ gramps/gen/lib/locationbase.py
gramps/gen/lib/mediaobj.py
gramps/gen/lib/mediabase.py
gramps/gen/lib/mediaref.py
gramps/gen/lib/name.py
gramps/gen/lib/note.py
gramps/gen/lib/notebase.py
gramps/gen/lib/personref.py