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

#2657,#1718 use ngettext (contribution by josip)

Browse Source 
svn: r11826
This commit is contained in:
Jérôme Rapinat 2009-02-03 13:05:30 +00:00
parent b240878e50
commit ea9ecee8d9
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/textreport/NumberOfAncestorsReport.py
View File

@ -31,6 +31,7 @@
# #
#------------------------------------------------------------------------ #------------------------------------------------------------------------
from gettext import gettext as _ from gettext import gettext as _
from gettext import ngettext
import math import math
#------------------------------------------------------------------------ #------------------------------------------------------------------------
@ -94,13 +95,14 @@ class NumberOfAncestorsReport(Report):
gen += 1 gen += 1
theoretical = math.pow(2, ( gen - 1 ) ) theoretical = math.pow(2, ( gen - 1 ) )
total_theoretical += theoretical total_theoretical += theoretical
percent = ( sum(thisgen.values()) / theoretical ) * 100 percent = '(%3.2f%%)' % ((sum(thisgen.values()) / theoretical ) * 100)
if thisgensize == 1 :
text = _("Generation %d has 1 individual. (%3.2f%%)") \ # TC # English return something like:
% (gen, percent) # Generation 3 has 2 individuals. (50.00%)
else: text = ngettext(
text = _("Generation %d has %d individuals. (%3.2f%%)")\ "Generation %(generation)d has %(count)d individual. %(percent)s",
% (gen, thisgensize, percent) "Generation %(generation)d has %(count)d individuals. %(percent)s",
thisgensize) % {'generation': gen, 'count': thisgensize, 'percent': percent}
self.doc.start_paragraph('NOA-Normal') self.doc.start_paragraph('NOA-Normal')
self.doc.write_text(text) self.doc.write_text(text)
@ -129,12 +131,16 @@ class NumberOfAncestorsReport(Report):
temp[person_handle] temp[person_handle]
if( total_theoretical != 1 ): if( total_theoretical != 1 ):
percent = ( sum(all_people.values()) / (total_theoretical-1) ) * 100 percent = '(%3.2f%%)' % (( sum(all_people.values()) / (total_theoretical-1) ) * 100)
else: else:
percent = 0 percent = 0
text = _("Total ancestors in generations 2 to %d is %d. (%3.2f%%)") \ # TC # English return something like:
% (gen, len(all_people.keys()) ,percent) # Total ancestors in generations 2 to 3 is 4. (66.67%)
text = _("Total ancestors in generations %(second_generation)d to \
%(last_generation)d is %(count)d. %(percent)s") % {
'second_generation':2, 'last_generation': gen,
'count':len(all_people.keys()), 'percent': percent}
self.doc.start_paragraph('NOA-Normal') self.doc.start_paragraph('NOA-Normal')
self.doc.write_text(text) self.doc.write_text(text)