Merge branch 'master' into develop

This commit is contained in:
Griatch 2020-04-20 23:15:53 +02:00
commit dc81d275e6
18 changed files with 411 additions and 71 deletions

View file

@ -131,7 +131,7 @@ class HelpEntryManager(TypedObjectManager):
for topic in topics:
topic.help_category = default_category
topic.save()
string = "Help database moved to category %s" % default_category
string = _("Help database moved to category {default_category}").format(default_category=default_category)
logger.log_info(string)
def search_help(self, ostring, help_category=None):