From 252aacee41a5f0543c24799632f6e454da262368 Mon Sep 17 00:00:00 2001 From: Paul Franklin Date: Sat, 5 Dec 2015 21:03:34 -0800 Subject: [PATCH] disambiguate "none" (for French) from po/fr.po: The same "none" is used for name, surname and date. However, in French we say "aucun" for name and surname, but we say "aucune" for date... --- gramps/gen/const.py | 4 ++-- gramps/gen/lib/date.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gramps/gen/const.py b/gramps/gen/const.py index 644d36db2..c8e5fc3ca 100644 --- a/gramps/gen/const.py +++ b/gramps/gen/const.py @@ -247,8 +247,8 @@ DOCUMENTERS = [ THUMBSCALE = 96.0 THUMBSCALE_LARGE = 180.0 XMLFILE = "data.gramps" -NO_SURNAME = "(%s)" % _("none") -NO_GIVEN = "(%s)" % _("none") +NO_SURNAME = "(%s)" % _("surname|none") +NO_GIVEN = "(%s)" % _("given-name|none") ARABIC_COMMA = "،" ARABIC_SEMICOLON = "؛" diff --git a/gramps/gen/lib/date.py b/gramps/gen/lib/date.py index 780dbeb8d..5fc848ed2 100644 --- a/gramps/gen/lib/date.py +++ b/gramps/gen/lib/date.py @@ -1841,7 +1841,8 @@ class Date(object): Lookup date quality keyword, even if translated. """ qualities = ["none", "estimated", "calculated"] - ui_qualities = [_("none"), _("estimated"), _("calculated")] + ui_qualities = [_("date-quality|none"), + _("estimated"), _("calculated")] if quality.lower() in qualities: return qualities.index(quality.lower()) elif quality.lower() in ui_qualities: @@ -1855,7 +1856,8 @@ class Date(object): """ mods = ["none", "before", "after", "about", "range", "span", "textonly"] - ui_mods = [_("none"), _("before"), _("after"), _("about"), + ui_mods = [_("date-modifier|none"), + _("before"), _("after"), _("about"), _("range"), _("span"), _("textonly")] if modifier.lower() in mods: return mods.index(modifier.lower())