Merge remote-tracking branch 'origin/master'

This commit is contained in:
Frisk 2020-11-30 20:48:50 +01:00
commit afcd36a85b
No known key found for this signature in database
GPG key ID: 213F7C15068AF8AC
2 changed files with 9 additions and 9 deletions

View file

@ -390,9 +390,9 @@ async def compact_formatter(action, change, parsed_comment, categories, recent_c
elif action == "pagetranslation/mark":
link = create_article_path(change["title"], WIKI_ARTICLE_PATH)
if "?" in link:
link = link + "&oldid=" + change["logparams"]["revision"]
link = link + "&oldid={}".format(change["logparams"]["revision"])
else:
link = link + "?oldid=" + change["logparams"]["revision"]
link = link + "?oldid={}".format(change["logparams"]["revision"])
link = link_formatter(link)
content = "🌐 " + _("[{author}]({author_url}) marked [{article}]({article_url}) for translation{comment}").format(
author=author, author_url=author_url,
@ -507,9 +507,9 @@ async def compact_formatter(action, change, parsed_comment, categories, recent_c
elif action == "translationreview/message":
link = create_article_path(change["title"], WIKI_ARTICLE_PATH)
if "?" in link:
link = link + "&oldid=" + change["logparams"]["revision"]
link = link + "&oldid={}".format(change["logparams"]["revision"])
else:
link = link + "?oldid=" + change["logparams"]["revision"]
link = link + "?oldid={}".format(change["logparams"]["revision"])
link = link_formatter(link)
content = "🌐 " + _("[{author}]({author_url}) reviewed translation [{article}]({article_url}){comment}").format(
author=author, author_url=author_url,
@ -984,9 +984,9 @@ async def embed_formatter(action, change, parsed_comment, categories, recent_cha
elif action == "pagetranslation/mark":
link = create_article_path(change["title"], WIKI_ARTICLE_PATH)
if "?" in link:
link = link + "&oldid=" + change["logparams"]["revision"]
link = link + "&oldid={}".format(change["logparams"]["revision"])
else:
link = link + "?oldid=" + change["logparams"]["revision"]
link = link + "?oldid={}".format(change["logparams"]["revision"])
embed["title"] = _("Marked \"{article}\" for translation").format(article=change["title"])
elif action == "pagetranslation/unmark":
link = create_article_path(change["title"], WIKI_ARTICLE_PATH)
@ -1034,9 +1034,9 @@ async def embed_formatter(action, change, parsed_comment, categories, recent_cha
elif action == "translationreview/message":
link = create_article_path(change["title"], WIKI_ARTICLE_PATH)
if "?" in link:
link = link + "&oldid=" + change["logparams"]["revision"]
link = link + "&oldid={}".format(change["logparams"]["revision"])
else:
link = link + "?oldid=" + change["logparams"]["revision"]
link = link + "?oldid={}".format(change["logparams"]["revision"])
embed["title"] = _("Reviewed translation \"{article}\"").format(article=change["title"])
elif action == "translationreview/group":
link = create_article_path(change["title"], WIKI_ARTICLE_PATH)

View file

@ -2,7 +2,7 @@ import sys, logging, gettext
from collections import defaultdict
logger = logging.getLogger("rcgcdb.i18n")
supported_languages = ('de', 'pl', 'pt-br')
supported_languages = ('de', 'hi', 'pl', 'pt-br', 'ru')
translated_files = ('wiki', 'misc', 'discord', 'rc_formatters', 'discussion_formatters')
try: