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

Remove duplicated keywords.

Browse Source 
The keywords for the name formats have
been duplicated in order to provide a
translated version.

To remove this duplication, the
translation is produced by mapping
over the keywords that was duplicated.

The actual mapping is delayed
until a choose is made on which
should be the new name format hereby
reducing the amount of translation that
is actually done.
This commit is contained in:
Baizley
2019-12-20 18:57:15 +01:00
parent fc9e5c2a4a
commit 467d24a766
1 changed files with 25 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
gramps/gui/configure.py
View File

@@ -840,58 +840,31 @@ class GrampsPreferences(ConfigureDialog):
return name_format_model, the_index return name_format_model, the_index
def __new_name(self, obj): def __new_name(self, obj):
lyst = [
"%s, %s %s (%s)" % (_("Surname"), _("Given"), _("Suffix"), formats = [
_("Common")), "%s, %s %s (%s)", ("Surname", "Given", "Suffix", "Common"),
"%s, %s %s (%s)" % (_("Surname"), _("Given"), _("Suffix"), "%s, %s %s (%s)", ("Surname", "Given", "Suffix", "Nickname"),
_("Nickname")), "%s, %s %s (%s)", ("Surname", "Name|Common", "Suffix", "Nickname"),
"%s, %s %s (%s)" % (_("Surname"), _("Name|Common"), _("Suffix"), "%s, %s %s", ("Surname", "Name|Common", "Suffix"),
_("Nickname")), "%s, %s %s (%s)", ("SURNAME", "Given", "Suffix", "Call"),
"%s, %s %s" % (_("Surname"), _("Name|Common"), _("Suffix")), "%s, %s (%s)", ("Surname", "Given", "Name|Common"),
"%s, %s %s (%s)" % (_("SURNAME"), _("Given"), _("Suffix"), "%s, %s (%s)", ("Surname", "Name|Common", "Nickname"),
_("Call")), "%s %s", ("Given", "Surname"),
"%s, %s (%s)" % (_("Surname"), _("Given"), _("Name|Common")), "%s %s, %s", ("Given", "Surname", "Suffix"),
"%s, %s (%s)" % (_("Surname"), _("Name|Common"), _("Nickname")), "%s %s %s", ("Given", "NotPatronymic", "Patronymic"),
"%s %s" % (_("Given"), _("Surname")), "%s, %s %s (%s)", ("SURNAME", "Given", "Suffix", "Common"),
"%s %s, %s" % (_("Given"), _("Surname"), _("Suffix")), "%s, %s (%s)", ("SURNAME", "Given", "Name|Common"),
"%s %s %s" % (_("Given"), _("NotPatronymic"), _("Patronymic")), "%s, %s (%s)", ("SURNAME", "Given", "Nickname"),
"%s, %s %s (%s)" % (_("SURNAME"), _("Given"), _("Suffix"), "%s %s", ("Given", "SURNAME"),
_("Common")), "%s %s, %s", ("Given", "SURNAME", "Suffix"),
"%s, %s (%s)" % (_("SURNAME"), _("Given"), _("Name|Common")), "%s /%s/", ("Given", "SURNAME"),
"%s, %s (%s)" % (_("SURNAME"), _("Given"), _("Nickname")), "%s %s, %s", ("Given", "Rawsurnames", "Suffix"),
"%s %s" % (_("Given"), _("SURNAME")), ]
"%s %s, %s" % (_("Given"), _("SURNAME"), _("Suffix")),
"%s /%s/" % (_("Given"), _("SURNAME")), (name_format, keywords) = random.choice(formats)
"%s %s, %s" % (_("Given"), _("Rawsurnames"), _("Suffix")),
] f = name_format % tuple(_(keyword) for keyword in keywords)
# repeat above list, but not translated. fmt = name_format % keywords
fmtlyst = [
"%s, %s %s (%s)" % (("Surname"), ("Given"), ("Suffix"),
("Common")),
"%s, %s %s (%s)" % (("Surname"), ("Given"), ("Suffix"),
("Nickname")),
"%s, %s %s (%s)" % (("Surname"), ("Name|Common"), ("Suffix"),
("Nickname")),
"%s, %s %s" % (("Surname"), ("Name|Common"), ("Suffix")),
"%s, %s %s (%s)" % (("SURNAME"), ("Given"), ("Suffix"),
("Call")),
"%s, %s (%s)" % (("Surname"), ("Given"), ("Name|Common")),
"%s, %s (%s)" % (("Surname"), ("Name|Common"), ("Nickname")),
"%s %s" % (("Given"), ("Surname")),
"%s %s, %s" % (("Given"), ("Surname"), ("Suffix")),
"%s %s %s" % (("Given"), ("NotPatronymic"), ("Patronymic")),
"%s, %s %s (%s)" % (("SURNAME"), ("Given"), ("Suffix"),
("Common")),
"%s, %s (%s)" % (("SURNAME"), ("Given"), ("Name|Common")),
"%s, %s (%s)" % (("SURNAME"), ("Given"), ("Nickname")),
"%s %s" % (("Given"), ("SURNAME")),
"%s %s, %s" % (("Given"), ("SURNAME"), ("Suffix")),
"%s /%s/" % (("Given"), ("SURNAME")),
"%s %s, %s" % (("Given"), ("Rawsurnames"), ("Suffix")),
]
rand = int(random.random() * len(lyst))
f = lyst[rand]
fmt = fmtlyst[rand]
i = _nd.add_name_format(f, fmt) i = _nd.add_name_format(f, fmt)
fmt_str = _nd.format_str(self.examplename, fmt) fmt_str = _nd.format_str(self.examplename, fmt)
node = self.fmt_model.append(row=[i, f, fmt, fmt_str]) node = self.fmt_model.append(row=[i, f, fmt, fmt_str])