7276: translate some punctuation marks -- partial

This commit is contained in:
Paul Franklin 2014-03-17 08:03:23 -07:00
parent eeea77e9c1
commit 471ec72966
8 changed files with 29 additions and 14 deletions

View File

@ -40,6 +40,8 @@ from .datebase import DateBase
from .surnamebase import SurnameBase from .surnamebase import SurnameBase
from .nametype import NameType from .nametype import NameType
from .const import IDENTICAL, EQUAL, DIFFERENT from .const import IDENTICAL, EQUAL, DIFFERENT
from gramps.gen.const import GRAMPS_LOCALE as glocale
_ = glocale.translation.gettext
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -463,9 +465,11 @@ class Name(SecondaryObject, PrivacyBase, SurnameBase, CitationBase, NoteBase,
first = self.first_name first = self.first_name
surname = self.get_surname() surname = self.get_surname()
if self.suffix: 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: else:
return "%s, %s" % (surname, first) # translators: needed for Arabic, ignore otherwise
return _("%s, %s") % (surname, first)
def get_upper_name(self): def get_upper_name(self):
""" """
@ -475,9 +479,11 @@ class Name(SecondaryObject, PrivacyBase, SurnameBase, CitationBase, NoteBase,
first = self.first_name first = self.first_name
surname = self.get_surname().upper() surname = self.get_surname().upper()
if self.suffix: 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: else:
return "%s, %s" % (surname, first) # translators: needed for Arabic, ignore otherwise
return _("%s, %s") % (surname, first)
def get_regular_name(self): def get_regular_name(self):
""" """
@ -489,7 +495,8 @@ class Name(SecondaryObject, PrivacyBase, SurnameBase, CitationBase, NoteBase,
if (self.suffix == ""): if (self.suffix == ""):
return "%s %s" % (first, surname) return "%s %s" % (first, surname)
else: 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): def get_gedcom_parts(self):
""" """

View File

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

View File

@ -374,7 +374,8 @@ class DetAncestorReport(Report):
date = addr.get_date_object().get_year() date = addr.get_date_object().get_year()
if date: 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( text )
self.doc.write_text_citation( self.endnotes(addr) ) self.doc.write_text_citation( self.endnotes(addr) )
self.doc.end_paragraph() self.doc.end_paragraph()

View File

@ -826,7 +826,8 @@ class DetDescendantReport(Report):
self.doc.write_text(self._('Address: ')) self.doc.write_text(self._('Address: '))
if date: 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( text )
self.doc.write_text_citation( self.endnotes(addr) ) self.doc.write_text_citation( self.endnotes(addr) )
self.doc.end_paragraph() self.doc.end_paragraph()

View File

@ -162,11 +162,13 @@ class IndivCompleteReport(Report):
column_1 = self._(self._get_type(event.get_type())) column_1 = self._(self._get_type(event.get_type()))
if role not in (EventRoleType.PRIMARY, EventRoleType.FAMILY): if role not in (EventRoleType.PRIMARY, EventRoleType.FAMILY):
column_1 = column_1 + ' (' + self._(role.xml_str()) + ')' 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: else:
# Groups with a single type (remove event type from first column) # Groups with a single type (remove event type from first column)
column_1 = date 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 = "" endnotes = ""
if self.use_srcs: if self.use_srcs:

View File

@ -274,11 +274,14 @@ class Verify(tool.Tool, ManagedWindow, UpdateCallback):
# print data for the user, no GUI # print data for the user, no GUI
(msg,gramps_id, name, the_type, rule_id, severity, handle) = results (msg,gramps_id, name, the_type, rule_id, severity, handle) = results
if severity == Rule.WARNING: 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: 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: 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): def init_gui(self):
# Draw dialog and make it handle everything # Draw dialog and make it handle everything

View File

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

View File

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