Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

8184: regression: Complete Individual report has some untranslated output

Browse Source
This commit is contained in:
Paul Franklin 2014-11-20 10:03:55 -08:00
parent 1a8c73212e
commit 14ed0c4d16
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gramps/gen/lib/eventtype.py
View File

@ -137,25 +137,29 @@ class EventType(GrampsType):
RETIREMENT = 43 RETIREMENT = 43
WILL = 44 WILL = 44
_MENU = [[_('Life Events'), def _T_(value): # enable deferred translations (see Python docs 22.1.3.4)
return value
# _T_ is a gramps-defined keyword -- see po/update_po.py and po/genpot.sh
_MENU = [[_T_('Life Events'),
[BIRTH, BAPTISM, DEATH, BURIAL, CREMATION, ADOPT]], [BIRTH, BAPTISM, DEATH, BURIAL, CREMATION, ADOPT]],
[_('Family'), [_T_('Family'),
[ENGAGEMENT, MARRIAGE, DIVORCE, ANNULMENT, MARR_SETTL, MARR_LIC, [ENGAGEMENT, MARRIAGE, DIVORCE, ANNULMENT, MARR_SETTL, MARR_LIC,
MARR_CONTR, MARR_BANNS, DIV_FILING, MARR_ALT]], MARR_CONTR, MARR_BANNS, DIV_FILING, MARR_ALT]],
[_('Religious'), [_T_('Religious'),
[CHRISTEN, ADULT_CHRISTEN, CONFIRMATION, FIRST_COMMUN, BLESS, [CHRISTEN, ADULT_CHRISTEN, CONFIRMATION, FIRST_COMMUN, BLESS,
BAR_MITZVAH, BAS_MITZVAH, RELIGION]], BAR_MITZVAH, BAS_MITZVAH, RELIGION]],
[_('Vocational'), [_T_('Vocational'),
[OCCUPATION, RETIREMENT, ELECTED, MILITARY_SERV, ORDINATION]], [OCCUPATION, RETIREMENT, ELECTED, MILITARY_SERV, ORDINATION]],
[_('Academic'), [_T_('Academic'),
[EDUCATION, DEGREE, GRADUATION]], [EDUCATION, DEGREE, GRADUATION]],
[_('Travel'), [_T_('Travel'),
[EMIGRATION, IMMIGRATION, NATURALIZATION]], [EMIGRATION, IMMIGRATION, NATURALIZATION]],
[_('Legal'), [_T_('Legal'),
[PROBATE, WILL]], [PROBATE, WILL]],
[_('Residence'), [_T_('Residence'),
[RESIDENCE, CENSUS, PROPERTY]], [RESIDENCE, CENSUS, PROPERTY]],
[_('Other'), [_T_('Other'),
[CAUSE_DEATH, MED_INFO, NOB_TITLE, NUM_MARRIAGES]]] [CAUSE_DEATH, MED_INFO, NOB_TITLE, NUM_MARRIAGES]]]
_CUSTOM = CUSTOM _CUSTOM = CUSTOM
@ -210,10 +214,6 @@ class EventType(GrampsType):
(MARR_ALT , _("Alternate Marriage"), "Alternate Marriage"), (MARR_ALT , _("Alternate Marriage"), "Alternate Marriage"),
] ]
def _T_(value): # enable deferred translations (see Python docs 22.1.3.4)
return value
# _T_ is a gramps-defined keyword -- see po/update_po.py and po/genpot.sh
_ABBREVIATIONS = { _ABBREVIATIONS = {
BIRTH: _T_("birth abbreviation|b."), BIRTH: _T_("birth abbreviation|b."),
DEATH: _T_("death abbreviation|d."), DEATH: _T_("death abbreviation|d."),

7
gramps/gen/lib/grampstype.py
View File

@ -289,6 +289,13 @@ class GrampsType(GrampsTypeC):
return self._CUSTOM return self._CUSTOM
def get_menu(self): def get_menu(self):
"""Return the list of localized names for the menu."""
if self._MENU:
return [[_(i),s] for (i, s) in self._MENU]
return self._MENU
def get_menu_standard_xml(self):
"""Return the list of XML (english) names for the menu."""
return self._MENU return self._MENU
def __eq__(self, value): def __eq__(self, value):

2
gramps/plugins/textreport/indivcomplete.py
View File

@ -72,7 +72,7 @@ CUSTOM = _T_("Custom")
# Construct section list and type to group map # Construct section list and type to group map
SECTION_LIST = [] SECTION_LIST = []
TYPE2GROUP = {} TYPE2GROUP = {}
for event_group, type_list in EventType().get_menu(): for event_group, type_list in EventType().get_menu_standard_xml():
SECTION_LIST.append(event_group) SECTION_LIST.append(event_group)
for event_type in type_list: for event_type in type_list:
TYPE2GROUP[event_type] = event_group TYPE2GROUP[event_type] = event_group