""")
+ retval += """
"""
retval += table.get_html()
if user.is_superuser and act == "view":
count = 1
@@ -412,16 +411,16 @@ def event_table(obj, user, act, url, args):
retval = retval.replace("}}", """""")
for (djevent, event_ref) in event_list:
item = obj.__class__.__name__.lower()
- retval = retval.replace("[[x%d]]" % count, make_button("x", cuni("/%s/%s/remove/eventref/%d") % (item, obj.handle, count)))
- retval = retval.replace("[[^%d]]" % count, make_button("^", cuni("/%s/%s/up/eventref/%d") % (item, obj.handle, count)))
- retval = retval.replace("[[v%d]]" % count, make_button("v", cuni("/%s/%s/down/eventref/%d") % (item, obj.handle, count)))
+ retval = retval.replace("[[x%d]]" % count, make_button("x", "/%s/%s/remove/eventref/%d" % (item, obj.handle, count)))
+ retval = retval.replace("[[^%d]]" % count, make_button("^", "/%s/%s/up/eventref/%d" % (item, obj.handle, count)))
+ retval = retval.replace("[[v%d]]" % count, make_button("v", "/%s/%s/down/eventref/%d" % (item, obj.handle, count)))
count += 1
if has_data:
- retval += cuni(""" \n""") % cssid
+ retval += """ \n""" % cssid
return retval
def history_table(obj, user, act):
- retval = cuni("")
+ retval = ""
has_data = False
cssid = "tab-history"
table = Table("history_table")
@@ -435,23 +434,23 @@ def history_table(obj, user, act):
object_id=obj.id,
object_type=obj_type):
table.row(
- cuni("%s on %s by %s") % (entry.log_type,
+ "%s on %s by %s" % (entry.log_type,
entry.last_changed,
entry.last_changed_by),
entry.reason)
has_data = True
table.row(
- cuni("Latest on %s by %s") % (obj.last_changed,
+ "Latest on %s by %s" % (obj.last_changed,
obj.last_changed_by),
"Current status")
retval += table.get_html()
retval += nbsp("") # to keep tabs same height
if has_data:
- retval += cuni(""" \n""") % cssid
+ retval += """ \n""" % cssid
return retval
def name_table(obj, user, act, url=None, *args):
- retval = cuni("")
+ retval = ""
has_data = False
cssid = "tab-names"
table = Table("name_table")
@@ -468,20 +467,20 @@ def name_table(obj, user, act, url=None, *args):
object_id=name.id).count() > 0
note_refs = dji.NoteRef.filter(object_type=obj_type,
object_id=name.id)
- note = cuni("")
+ note = ""
if note_refs.count() > 0:
try:
note = dji.Note.get(id=note_refs[0].object_id).text[:50]
except:
note = None
table.row(make_name(name, user),
- cuni(name.name_type) + ["", " (preferred)"][int(name.preferred)],
+ str(name.name_type) + ["", " (preferred)"][int(name.preferred)],
name.group_as,
["No", "Yes"][citationq],
note)
links.append(('URL',
# url is "/person/%s/name"
- (url % name.person.handle) + (cuni("/%s") % name.order)))
+ (url % name.person.handle) + ("/%s" % name.order)))
has_data = True
table.links(links)
retval += """"""
if user.is_superuser and act == "view":
retval += make_button(_("+Add New Event"), (url % args).replace("$act", "add"))
retval += make_button(_("$Add Existing Event"), (url % args).replace("$act", "share"))
else:
- retval += cuni("""""") # to keep tabs same height
- retval += cuni("""
""")
+ retval += """""" # to keep tabs same height
+ retval += """"""
@@ -492,13 +491,13 @@ def name_table(obj, user, act, url=None, *args):
retval += """
"""
retval += table.get_html()
if has_data:
- retval += cuni(""" \n""") % cssid
+ retval += """ \n""" % cssid
return retval
def surname_table(obj, user, act, url=None, *args):
person_handle = args[0]
order = args[1]
- retval = cuni("")
+ retval = ""
has_data = False
cssid = "tab-surnames"
table = Table("surname_table")
@@ -516,19 +515,19 @@ def surname_table(obj, user, act, url=None, *args):
name = None
if name:
for surname in name.surname_set.all().order_by("order"):
- table.row(cuni(surname.order), surname)
+ table.row(str(surname.order), surname)
has_data = True
retval += table.get_html()
else:
- retval += cuni("No such name order = %s
") % order + retval += "No such name order = %s
" % order if has_data: - retval += cuni(""" \n""") % cssid + retval += """ \n""" % cssid return retval def citation_table(obj, user, act, url=None, *args): # FIXME: how can citation_table and source_table both be on same # page? This causes problems with form names, tab names, etc. - retval = cuni("") + retval = "" has_data = False cssid = "tab-sources" table = Table("citation_table") @@ -549,8 +548,8 @@ def citation_table(obj, user, act, url=None, *args): citation_ref.citation.handle) table.row(Link("{{[[x%d]][[^%d]][[v%d]]}}" % (count, count, count)) if user.is_superuser and url and act == "view" else "", citation.gramps_id, - cuni(citation.confidence), - cuni(citation.page), + str(citation.confidence), + str(citation.page), ) links.append(('URL', citation_ref.get_url())) has_data = True @@ -570,16 +569,16 @@ def citation_table(obj, user, act, url=None, *args): count = 1 for citation_ref in citation_refs: item = obj.__class__.__name__.lower() - retval = retval.replace("[[x%d]]" % count, make_button("x", cuni("/%s/%s/remove/citationref/%d") % (item, obj.handle, count))) - retval = retval.replace("[[^%d]]" % count, make_button("^", cuni("/%s/%s/up/citationref/%d") % (item, obj.handle, count))) - retval = retval.replace("[[v%d]]" % count, make_button("v", cuni("/%s/%s/down/citationref/%d") % (item, obj.handle, count))) + retval = retval.replace("[[x%d]]" % count, make_button("x", "/%s/%s/remove/citationref/%d" % (item, obj.handle, count))) + retval = retval.replace("[[^%d]]" % count, make_button("^", "/%s/%s/up/citationref/%d" % (item, obj.handle, count))) + retval = retval.replace("[[v%d]]" % count, make_button("v", "/%s/%s/down/citationref/%d" % (item, obj.handle, count))) count += 1 if has_data: - retval += cuni(""" \n""") % cssid + retval += """ \n""" % cssid return retval def repository_table(obj, user, act, url=None, *args): - retval = cuni("") + retval = "" has_data = False cssid = "tab-repositories" table = Table("repository_table") @@ -610,7 +609,7 @@ def repository_table(obj, user, act, url=None, *args): repository.gramps_id, repository.name, repo_ref.call_number, - cuni(repository.repository_type), + str(repository.repository_type), ) has_data = True count += 1 @@ -620,17 +619,17 @@ def repository_table(obj, user, act, url=None, *args): count = 1 for repo_ref in refs: item = obj.__class__.__name__.lower() - text = text.replace("[[x%d]]" % count, make_button("x", cuni("/%s/%s/remove/repositoryref/%d") % (item, obj.handle, count))) - text = text.replace("[[^%d]]" % count, make_button("^", cuni("/%s/%s/up/repositoryref/%d") % (item, obj.handle, count))) - text = text.replace("[[v%d]]" % count, make_button("v", cuni("/%s/%s/down/repositoryref/%d") % (item, obj.handle, count))) + text = text.replace("[[x%d]]" % count, make_button("x", "/%s/%s/remove/repositoryref/%d" % (item, obj.handle, count))) + text = text.replace("[[^%d]]" % count, make_button("^", "/%s/%s/up/repositoryref/%d" % (item, obj.handle, count))) + text = text.replace("[[v%d]]" % count, make_button("v", "/%s/%s/down/repositoryref/%d" % (item, obj.handle, count))) count += 1 retval += text if has_data: - retval += cuni(""" \n""") % cssid + retval += """ \n""" % cssid return retval def note_table(obj, user, act, url=None, *args): - retval = cuni("") + retval = "" has_data = False cssid = "tab-notes" table = Table("note_table") @@ -650,7 +649,7 @@ def note_table(obj, user, act, url=None, *args): note = note_ref.ref_object table.row(Link("{{[[x%d]][[^%d]][[v%d]]}}" % (count, count, count)) if user.is_superuser else "", note.gramps_id, - cuni(note.note_type), + str(note.note_type), note.text[:50] ) links.append(('URL', note_ref.get_url())) @@ -671,17 +670,17 @@ def note_table(obj, user, act, url=None, *args): count = 1 for note_ref in note_refs: item = obj.__class__.__name__.lower() - text = text.replace("[[x%d]]" % count, make_button("x", cuni("/%s/%s/remove/noteref/%d") % (item, obj.handle, count))) - text = text.replace("[[^%d]]" % count, make_button("^", cuni("/%s/%s/up/noteref/%d") % (item, obj.handle, count))) - text = text.replace("[[v%d]]" % count, make_button("v", cuni("/%s/%s/down/noteref/%d") % (item, obj.handle, count))) + text = text.replace("[[x%d]]" % count, make_button("x", "/%s/%s/remove/noteref/%d" % (item, obj.handle, count))) + text = text.replace("[[^%d]]" % count, make_button("^", "/%s/%s/up/noteref/%d" % (item, obj.handle, count))) + text = text.replace("[[v%d]]" % count, make_button("v", "/%s/%s/down/noteref/%d" % (item, obj.handle, count))) count += 1 retval += text if has_data: - retval += cuni(""" \n""") % cssid + retval += """ \n""" % cssid return retval def data_table(obj, user, act, url=None, *args): - retval = cuni("") + retval = "" has_data = False cssid = "tab-data" table = Table("data_table") @@ -722,9 +721,9 @@ def data_table(obj, user, act, url=None, *args): text = text.replace("}}", """""") count = 1 for repo_ref in refs: - text = text.replace("[[x%d]]" % count, make_button("x", cuni("/%s/%s/remove/attribute/%d") % (item_class, obj.handle, count))) - text = text.replace("[[^%d]]" % count, make_button("^", cuni("/%s/%s/up/attribute/%d") % (item_class, obj.handle, count))) - text = text.replace("[[v%d]]" % count, make_button("v", cuni("/%s/%s/down/attribute/%d") % (item_class, obj.handle, count))) + text = text.replace("[[x%d]]" % count, make_button("x", "/%s/%s/remove/attribute/%d" % (item_class, obj.handle, count))) + text = text.replace("[[^%d]]" % count, make_button("^", "/%s/%s/up/attribute/%d" % (item_class, obj.handle, count))) + text = text.replace("[[v%d]]" % count, make_button("v", "/%s/%s/down/attribute/%d" % (item_class, obj.handle, count))) count += 1 retval += text if has_data: @@ -732,7 +731,7 @@ def data_table(obj, user, act, url=None, *args): return retval def attribute_table(obj, user, act, url=None, *args): - retval = cuni("") + retval = "" has_data = False cssid = "tab-attributes" table = Table("attribute_table") @@ -759,7 +758,7 @@ def attribute_table(obj, user, act, url=None, *args): return retval def address_table(obj, user, act, url=None, *args): - retval = cuni("") + retval = "" has_data = False cssid = "tab-addresses" table = Table("address_table") @@ -790,7 +789,7 @@ def address_table(obj, user, act, url=None, *args): return retval def media_table(obj, user, act, url=None, *args): - retval = cuni("") + retval = "" has_data = False cssid = "tab-media" table = Table("media_table") @@ -806,7 +805,7 @@ def media_table(obj, user, act, url=None, *args): media = table.db.get_object_from_handle( media_ref.ref_object.handle) table.row(table.db.get_object_from_handle(media.handle), - cuni(media_ref.ref_object.desc), + str(media_ref.ref_object.desc), media_ref.ref_object.path) has_data = True retval += """"""
@@ -822,7 +821,7 @@ def media_table(obj, user, act, url=None, *args):
return retval
def internet_table(obj, user, act, url=None, *args):
- retval = cuni("")
+ retval = ""
has_data = False
cssid = "tab-internet"
table = Table("internet_table")
@@ -832,13 +831,13 @@ def internet_table(obj, user, act, url=None, *args):
if user.is_authenticated() or obj.public:
urls = dji.Url.filter(person=obj)
for url_obj in urls:
- table.row(cuni(url_obj.url_type),
+ table.row(str(url_obj.url_type),
url_obj.path,
url_obj.desc)
has_data = True
retval += """
""")
count = 1
for childref in childrefs:
- text = text.replace("[[x%d]]" % count, make_button("x", cuni("/family/%s/remove/child/%d") % (family.handle, count)))
- text = text.replace("[[^%d]]" % count, make_button("^", cuni("/family/%s/up/child/%d") % (family.handle, count)))
- text = text.replace("[[v%d]]" % count, make_button("v", cuni("/family/%s/down/child/%d") % (family.handle, count)))
+ text = text.replace("[[x%d]]" % count, make_button("x", "/family/%s/remove/child/%d" % (family.handle, count)))
+ text = text.replace("[[^%d]]" % count, make_button("^", "/family/%s/up/child/%d" % (family.handle, count)))
+ text = text.replace("[[v%d]]" % count, make_button("v", "/family/%s/down/child/%d" % (family.handle, count)))
count += 1
retval += make_button(_("+Add New Person as Child"), (url.replace("$act", "add") % args))
retval += make_button(_("$Add Existing Person as Child"), (url.replace("$act", "share") % args))
@@ -1315,7 +1314,7 @@ def children_table(obj, user, act, url=None, *args):
retval += """"""
retval += text
if has_data:
- retval += cuni(""" \n""") % cssid
+ retval += """ \n""" % cssid
return retval
## FIXME: these dji function wrappers just use the functions
@@ -1337,9 +1336,9 @@ def display_date(obj):
return ""
def media_link(handle, user, act):
- retval = cuni(""""""
if user.is_superuser and url and act == "view":
- retval += make_button(_("+Add Internet"), (cuni(url) % args))
+ retval += make_button(_("+Add Internet"), (str(url) % args))
else:
retval += nbsp("") # to keep tabs same height
retval += """
"""
@@ -848,7 +847,7 @@ def internet_table(obj, user, act, url=None, *args):
return retval
def association_table(obj, user, act, url=None, *args):
- retval = cuni("")
+ retval = ""
has_data = False
cssid = "tab-associations"
table = Table("association_table")
@@ -892,7 +891,7 @@ def association_table(obj, user, act, url=None, *args):
def location_table(obj, user, act, url=None, *args):
# obj is Place or Address
- retval = cuni("")
+ retval = ""
has_data = False
cssid = "tab-alternatelocations"
table = Table("location_table")
@@ -926,7 +925,7 @@ def location_table(obj, user, act, url=None, *args):
return retval
def lds_table(obj, user, act, url=None, *args):
- retval = cuni("")
+ retval = ""
has_data = False
cssid = "tab-lds"
table = Table("lds_table")
@@ -939,9 +938,9 @@ def lds_table(obj, user, act, url=None, *args):
obj_type = ContentType.objects.get_for_model(obj)
ldss = obj.lds_set.all().order_by("order")
for lds in ldss:
- table.row(cuni(lds.lds_type),
+ table.row(str(lds.lds_type),
display_date(lds),
- cuni(lds.status),
+ str(lds.status),
lds.temple,
get_title(lds.place))
has_data = True
@@ -957,11 +956,11 @@ def lds_table(obj, user, act, url=None, *args):
return retval
def person_reference_table(obj, user, act):
- retval = cuni("")
+ retval = ""
has_data = False
cssid = "tab-references"
- text1 = cuni("")
- text2 = cuni("")
+ text1 = ""
+ text2 = ""
table1 = Table("person_reference_table", style="background-color: #f4f0ec;")
table1.columns(
"As Spouse",
@@ -1037,11 +1036,11 @@ def person_reference_table(obj, user, act):
retval += """""" % TAB_HEIGHT
retval += text1 + text2 + "
"
if has_data:
- retval += cuni(""" \n""") % cssid
+ retval += """ \n""" % cssid
return retval
def note_reference_table(obj, user, act):
- retval = cuni("")
+ retval = ""
has_data = False
cssid = "tab-references"
table = Table("note_reference_table")
@@ -1065,7 +1064,7 @@ def note_reference_table(obj, user, act):
return retval
def event_reference_table(obj, user, act):
- retval = cuni("")
+ retval = ""
has_data = False
cssid = "tab-references"
table = Table("event_reference_table")
@@ -1089,11 +1088,11 @@ def event_reference_table(obj, user, act):
retval += table.get_html()
retval += nbsp("") # to keep tabs same height
if has_data:
- retval += cuni(""" \n""") % cssid
+ retval += """ \n""" % cssid
return retval
def repository_reference_table(obj, user, act):
- retval = cuni("")
+ retval = ""
has_data = False
cssid = "tab-references"
table = Table("repository_reference_table")
@@ -1113,11 +1112,11 @@ def repository_reference_table(obj, user, act):
retval += table.get_html()
retval += nbsp("") # to keep tabs same height
if has_data:
- retval += cuni(""" \n""") % cssid
+ retval += """ \n""" % cssid
return retval
def citation_reference_table(obj, user, act):
- retval = cuni("")
+ retval = ""
has_data = False
cssid = "tab-references"
table = Table("citation_reference_table")
@@ -1137,11 +1136,11 @@ def citation_reference_table(obj, user, act):
retval += table.get_html()
retval += nbsp("") # to keep tabs same height
if has_data:
- retval += cuni(""" \n""") % cssid
+ retval += """ \n""" % cssid
return retval
def source_reference_table(obj, user, act):
- retval = cuni("")
+ retval = ""
has_data = False
cssid = "tab-references"
table = Table("source_reference_table")
@@ -1159,11 +1158,11 @@ def source_reference_table(obj, user, act):
retval += table.get_html()
retval += nbsp("") # to keep tabs same height
if has_data:
- retval += cuni(""" \n""") % cssid
+ retval += """ \n""" % cssid
return retval
def media_reference_table(obj, user, act):
- retval = cuni("")
+ retval = ""
has_data = False
cssid = "tab-references"
table = Table("media_reference_table")
@@ -1183,11 +1182,11 @@ def media_reference_table(obj, user, act):
retval += table.get_html()
retval += nbsp("") # to keep tabs same height
if has_data:
- retval += cuni(""" \n""") % cssid
+ retval += """ \n""" % cssid
return retval
def place_reference_table(obj, user, act):
- retval = cuni("")
+ retval = ""
has_data = False
cssid = "tab-references"
table = Table("place_reference_table")
@@ -1206,11 +1205,11 @@ def place_reference_table(obj, user, act):
retval += table.get_html()
retval += nbsp("") # to keep tabs same height
if has_data:
- retval += cuni(""" \n""") % cssid
+ retval += """ \n""" % cssid
return retval
def tag_reference_table(obj, user, act):
- retval = cuni("")
+ retval = ""
has_data = False
cssid = "tab-references"
table = Table("tag_reference_table")
@@ -1230,7 +1229,7 @@ def tag_reference_table(obj, user, act):
retval += table.get_html()
retval += nbsp("") # to keep tabs same height
if has_data:
- retval += cuni(""" \n""") % cssid
+ retval += """ \n""" % cssid
return retval
class Link(object):
@@ -1243,7 +1242,7 @@ class Link(object):
return self.string
def children_table(obj, user, act, url=None, *args):
- retval = cuni("")
+ retval = ""
has_data = False
cssid = "tab-children"
table = Table("children_table")
@@ -1269,8 +1268,8 @@ def children_table(obj, user, act, url=None, *args):
child = childref.ref_object
if user.is_authenticated() or obj.public:
table.row(Link("{{[[x%d]][[^%d]][[v%d]]}}" % (count, count, count)) if user.is_superuser and url and act == "view" else "",
- cuni(count),
- cuni("[%s]") % child.gramps_id,
+ str(count),
+ "[%s]" % child.gramps_id,
render_name(child, user),
child.gender_type,
childref.father_rel_type,
@@ -1282,8 +1281,8 @@ def children_table(obj, user, act, url=None, *args):
count += 1
else:
table.row("",
- cuni(count),
- cuni("[%s]") % child.gramps_id,
+ str(count),
+ "[%s]" % child.gramps_id,
render_name(child, user) if not child.private else "[Private]",
child.gender_type if not child.private else "[Private]",
"[Private]",
@@ -1304,9 +1303,9 @@ def children_table(obj, user, act, url=None, *args):
text = text.replace("}}", """