From 7a57fbd3bea9487f07113165c65ff1e091b9391d Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Sat, 2 Dec 2006 07:30:15 +0000 Subject: [PATCH] In .: * src/plugins/Check.py (fix_encoding): Fix mime type string. In help: 2006-12-01 Alex Roitman * sk/sk.po: Typo. svn: r7748 --- gramps2/ChangeLog | 1 + gramps2/help/ChangeLog | 3 +++ gramps2/help/sk/sk.po | 2 +- gramps2/src/plugins/Check.py | 6 ++++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 51b343b3c..10ae8b45c 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -6,6 +6,7 @@ parents in case the toolbar is not visible. 2006-12-01 Alex Roitman + * src/plugins/Check.py (fix_encoding): Fix mime type string. * src/Filters/Rules/_RuleUtils.py (loose_date_cmp): Compare textual dates. * src/Filters/Rules/_HasEventBase.py (apply): Do not match empty diff --git a/gramps2/help/ChangeLog b/gramps2/help/ChangeLog index e1493424f..b48aaff2d 100644 --- a/gramps2/help/ChangeLog +++ b/gramps2/help/ChangeLog @@ -1,3 +1,6 @@ +2006-12-01 Alex Roitman + * sk/sk.po: Typo. + 2006-11-29 Lubo Vasko * sk/sk.po: Translation update. diff --git a/gramps2/help/sk/sk.po b/gramps2/help/sk/sk.po index a0cf696dd..8826052f1 100644 --- a/gramps2/help/sk/sk.po +++ b/gramps2/help/sk/sk.po @@ -2829,7 +2829,7 @@ msgstr "Používanie pohľadu Rodina" #: gramps.xml:4433(para) msgid "When in the Family View (see ), you can easily navigate between the members of the displayed family as follows:" -msgstr "V pohľade Rodina (viď ), môžete ľahko prechádzať medzi členmi zobrazenej rodiny takto:" +msgstr "V pohľade Rodina (viď ), môžete ľahko prechádzať medzi členmi zobrazenej rodiny takto:" #: gramps.xml:4439(para) msgid "To make the currently selected spouse the Active Person, click the double-arrow button to the right of the Active Person box. Alternatively, right-click into the spouse box and select Make the selected spouse an Active Person item from the context menu." diff --git a/gramps2/src/plugins/Check.py b/gramps2/src/plugins/Check.py index c545773d7..e9092d156 100644 --- a/gramps2/src/plugins/Check.py +++ b/gramps2/src/plugins/Check.py @@ -309,6 +309,12 @@ class CheckIntegrity: obj.path = Utils.fix_encoding( obj.path) obj.desc = Utils.fix_encoding( obj.desc) self.db.commit_media_object(obj,self.trans) + # Once we are here, fix the mime string if not str + if type(data[3]) != str: + try: + data[3] = str(data{3]) + except: + data[3] = "" self.progress.step() def check_for_broken_family_links(self):