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

Compressed text some; changed common to mean 'nickname or first of given'

Browse Source 
svn: r16215
This commit is contained in:
Doug Blank
2010-11-19 14:36:04 +00:00
parent 3ef4d169ff
commit 92758a5a69
2 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gen/display/name.py
View File

@@ -29,7 +29,7 @@ Specific symbols for parts of a name are defined:
'f' : given (first names)
'l' : full surname (lastname)
'c' : callname
'x' : callname if existing, otherwise first first name (common name)
'x' : nick name if existing, otherwise first first name (common name)
'i' : initials of the first names
'y' : patronymic surname (father)
'o' : surnames without patronymic
@@ -368,7 +368,7 @@ class NameDisplay(object):
'f' : given = given (first names)
'l' : surname = full surname (lastname)
'c' : call = callname
'x' : common = callname if existing, otherwise first first name (common name)
'x' : common = nick name if existing, otherwise first first name (common name)
'i' : initials = initials of the first names
'y' : patronymic = patronymic surname (father)
'o' : notpatronymic = surnames without patronymic
@@ -394,7 +394,7 @@ class NameDisplay(object):
_("suffix")),
"c": ("raw_data[_CALL]", "call",
_("Name|call")),
"x": ("(raw_data[_CALL] or raw_data[_FIRSTNAME].split(' ')[0])",
"x": ("(raw_data[_NICK] or raw_data[_FIRSTNAME].split(' ')[0])",
"common",
_("Name|common")),
"i": ("''.join([word[0] +'.' for word in ('. ' +" +
@@ -443,7 +443,7 @@ class NameDisplay(object):
'f' : given = given (first names)
'l' : surname = full surname (lastname)
'c' : call = callname
'x' : common = callname if existing, otherwise first first name (common name)
'x' : common = nick name if existing, otherwise first first name (common name)
'i' : initials = initials of the first names
'y' : patronymic = patronymic surname (father)
'o' : notpatronymic = surnames without patronymic
@@ -469,7 +469,7 @@ class NameDisplay(object):
_("suffix")),
"c": ("call", "call",
_("Name|call")),
"x": ("(call or first.split(' ')[0])", "common",
"x": ("(nick or first.split(' ')[0])", "common",
_("Name|common")),
"i": ("''.join([word[0] +'.' for word in ('. ' + first).split()][1:])",
"initials",
@@ -623,7 +623,7 @@ def fn(%s):
'%f' : given (first names)
'%l' : full surname (lastname)
'%c' : callname
'%x' : callname if existing, otherwise first first name (common name)
'%x' : nick name if existing, otherwise first first name (common name)
'%i' : initials of the first names
'%y' : patronymic surname (father)
'%o' : surnames without patronymic