diff --git a/extensions/base/__init__.py b/extensions/base/__init__.py index 9624133..e6ffd54 100644 --- a/extensions/base/__init__.py +++ b/extensions/base/__init__.py @@ -20,4 +20,7 @@ import extensions.base.cargo import extensions.base.datadump import extensions.base.sprite import extensions.base.translate -import extensions.base.discussions \ No newline at end of file +import extensions.base.discussions +import extensions.base.curseprofile +import extensions.base.interwiki +import extensions.base.renameuser \ No newline at end of file diff --git a/extensions/base/curseprofile.py b/extensions/base/curseprofile.py index 24c7138..3582a79 100644 --- a/extensions/base/curseprofile.py +++ b/extensions/base/curseprofile.py @@ -18,13 +18,13 @@ import logging from src.configloader import settings from src.discord.message import DiscordMessage from src.api import formatter -from src.i18n import rc_formatters +from src.i18n import formatters_i18n from src.api.context import Context from src.api.util import embed_helper, clean_link, compact_author, create_article_path, sanitize_to_markdown, sanitize_to_url from src.misc import profile_field_name -_ = rc_formatters.gettext -ngettext = rc_formatters.ngettext +_ = formatters_i18n.gettext +ngettext = formatters_i18n.ngettext # CurseProfile - https://help.fandom.com/wiki/Extension:CurseProfile diff --git a/extensions/base/interwiki.py b/extensions/base/interwiki.py index 99477b9..a9dffd2 100644 --- a/extensions/base/interwiki.py +++ b/extensions/base/interwiki.py @@ -17,12 +17,12 @@ import logging from src.discord.message import DiscordMessage from src.api import formatter -from src.i18n import rc_formatters +from src.i18n import formatters_i18n from src.api.context import Context -from src.api.util import embed_helper, clean_link, compact_author, create_article_path, sanitize_to_url +from src.api.util import embed_helper, clean_link, compact_author, create_article_path, sanitize_to_url, compact_summary -_ = rc_formatters.gettext -ngettext = rc_formatters.ngettext +_ = formatters_i18n.gettext +ngettext = formatters_i18n.ngettext # Interwiki - https://www.mediawiki.org/wiki/Extension:Interwiki @@ -45,7 +45,7 @@ def embed_interwiki_iw_add(ctx: Context, change: dict) -> DiscordMessage: def compact_interwiki_iw_add(ctx: Context, change: dict) -> DiscordMessage: author, author_url = compact_author(ctx, change) link = clean_link(create_article_path("Special:Interwiki")) - parsed_comment = "" if ctx.parsedcomment is None else " *(" + ctx.parsedcomment + ")*" + parsed_comment = compact_summary(ctx) content = _( "[{author}]({author_url}) added an entry to the [interwiki table]({table_url}) pointing to {website} with {prefix} prefix").format( author=author, author_url=author_url, desc=parsed_comment, prefix=change["logparams"]['0'], @@ -72,7 +72,7 @@ def embed_interwiki_iw_edit(ctx: Context, change: dict) -> DiscordMessage: def compact_interwiki_iw_edit(ctx: Context, change: dict) -> DiscordMessage: author, author_url = compact_author(ctx, change) link = clean_link(create_article_path("Special:Interwiki")) - parsed_comment = "" if ctx.parsedcomment is None else " *(" + ctx.parsedcomment + ")*" + parsed_comment = compact_summary(ctx) content = _( "[{author}]({author_url}) edited an entry in [interwiki table]({table_url}) pointing to {website} with {prefix} prefix").format( author=author, author_url=author_url, desc=parsed_comment, prefix=change["logparams"]['0'], @@ -98,7 +98,7 @@ def embed_interwiki_iw_delete(ctx: Context, change: dict) -> DiscordMessage: def compact_interwiki_iw_delete(ctx: Context, change: dict) -> DiscordMessage: author, author_url = compact_author(ctx, change) link = clean_link(create_article_path("Special:Interwiki")) - parsed_comment = "" if ctx.parsedcomment is None else " *(" + ctx.parsedcomment + ")*" + parsed_comment = compact_summary(ctx) content = _("[{author}]({author_url}) deleted an entry in [interwiki table]({table_url}){desc}").format( author=author, author_url=author_url, diff --git a/extensions/base/renameuser.py b/extensions/base/renameuser.py index fa2aad4..bdffbb4 100644 --- a/extensions/base/renameuser.py +++ b/extensions/base/renameuser.py @@ -17,12 +17,12 @@ import logging from src.discord.message import DiscordMessage from src.api import formatter -from src.i18n import rc_formatters +from src.i18n import formatters_i18n from src.api.context import Context -from src.api.util import embed_helper, clean_link, compact_author, create_article_path, sanitize_to_markdown, sanitize_to_url +from src.api.util import embed_helper, compact_summary, clean_link, compact_author, create_article_path, sanitize_to_markdown, sanitize_to_url -_ = rc_formatters.gettext -ngettext = rc_formatters.ngettext +_ = formatters_i18n.gettext +ngettext = formatters_i18n.ngettext # Renameuser - https://www.mediawiki.org/wiki/Extension:Renameuser @@ -52,7 +52,7 @@ def compact_renameuser_renameuser(ctx: Context, change: dict) -> DiscordMessage: author, author_url = compact_author(ctx, change) link = clean_link(create_article_path("User:" + sanitize_to_url(change["logparams"]["newuser"]))) edits = change["logparams"]["edits"] - parsed_comment = "" if ctx.parsedcomment is None else " *(" + ctx.parsedcomment + ")*" + parsed_comment = compact_summary(ctx) if edits > 0: content = ngettext( "[{author}]({author_url}) renamed user *{old_name}* with {edits} edit to [{new_name}]({link}){comment}",