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

bug #2675 - regression: multiple names not shown correctly

Browse Source 
svn: r11917
This commit is contained in:
Stéphane Charette 2009-02-08 11:42:43 +00:00
parent 09dea89c35
commit 256cc54fee
1 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/plugins/webreport/NarrativeWeb.py
View File

@ -1041,7 +1041,7 @@ class PlaceListPage(BasePage):
if not n: if not n:
continue continue
letter = normalize('NFC', n)[0].upper() letter = normalize('NFKD', n)[0].upper()
if letter != last_letter: if letter != last_letter:
last_letter = letter last_letter = letter
@ -1481,7 +1481,7 @@ class SurnameListPage(BasePage):
# Get a capital normalized version of the first letter of # Get a capital normalized version of the first letter of
# the surname # the surname
letter = normalize('NFC', surname)[0].upper() letter = normalize('NFKD', surname)[0].upper()
if letter is not last_letter: if letter is not last_letter:
last_letter = letter last_letter = letter
@ -2068,18 +2068,42 @@ class IndividualPage(BasePage):
for name in [primary_name] + self.person.get_alternate_names(): for name in [primary_name] + self.person.get_alternate_names():
pname = _nd.display_name(name) pname = _nd.display_name(name)
pname += self.get_citation_links( name.get_source_references() ) pname += self.get_citation_links( name.get_source_references() )
of.write('\t\t\t<tr>\n')
type_ = str( name.get_type() )
# if name is equal to birth name, do not re-print it??? # if we have just a firstname, then the name is preceeded by ", "
if type_ == "Birth Name": # which doesn't exactly look very nice printed on the web page
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _('Name Type')) if pname[:2] == ', ':
of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % type_) pname = pname[2:]
else:
type_ = str( name.get_type() )
of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % type_) of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % type_)
of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % pname) of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % pname)
of.write('\t\t\t</tr>\n') of.write('\t\t\t</tr>\n')
# display call names
first_name = primary_name.get_first_name()
for name in [primary_name] + self.person.get_alternate_names():
call_name = name.get_call_name()
if call_name and call_name != first_name:
call_name += self.get_citation_links( name.get_source_references() )
of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n'
% _('Name'))
of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n'
% call_name)
of.write('\t\t\t</tr>\n')
# display the nickname attribute
nick_name = self.person.get_nick_name()
if nick_name and nick_name != first_name:
nick_name += self.get_citation_links( self.person.get_source_references() )
of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n'
% _('Name'))
of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n'
% nick_name)
of.write('\t\t\t</tr>\n')
# GRAMPS ID # GRAMPS ID
if not self.noid: if not self.noid:
of.write('\t\t\t<tr>\n') of.write('\t\t\t<tr>\n')
@ -2087,23 +2111,6 @@ class IndividualPage(BasePage):
of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % self.person.gramps_id) of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % self.person.gramps_id)
of.write('\t\t\t</tr>\n') of.write('\t\t\t</tr>\n')
# Nick Name, if there is one???
nick_name = False
nick = self.person.get_nick_name()
call_name = primary_name.get_call_name()
first_name = primary_name.get_first_name()
# if (nick and call_name) != first_name???
if (nick is not first_name and call_name is not first_name):
nick_name = True
if nick_name:
if call_name:
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n'
% _('Nick Name'))
of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % call_name)
of.write('\t\t\t</tr>\n')
# Gender # Gender
of.write('\t\t\t<tr>\n') of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _('Gender')) of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _('Gender'))