jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1119711?usp=email )

Change subject: [IMPR] use i18n.translate instead of dictonaries directly. ......................................................................

[IMPR] use i18n.translate instead of dictonaries directly.

Bug: T219094 Change-Id: I1574231107308298e2d10d11499ee21c747bfff3 --- M pywikibot/cosmetic_changes.py M scripts/category.py M scripts/commonscat.py M scripts/imagetransfer.py M scripts/interwiki.py M scripts/solve_disambiguation.py 6 files changed, 17 insertions(+), 10 deletions(-)

Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved

diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py index 4bf1fdc..ffc66cd 100644 --- a/pywikibot/cosmetic_changes.py +++ b/pywikibot/cosmetic_changes.py @@ -374,7 +374,7 @@ subpage = False if self.template: try: - tmpl, loc = moved_links[self.site.code] + tmpl, loc = i18n.translate(self.site.code, moved_links) del tmpl except KeyError: loc = None diff --git a/scripts/category.py b/scripts/category.py index 15200be..7cd95e1 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -302,7 +302,7 @@

tmpl: Sequence = [] with suppress(KeyError): - tmpl, _loc = moved_links[page.site.code] + tmpl, _loc = i18n.translate(page.site.code, moved_links)

if not isinstance(tmpl, list): tmpl = [tmpl] diff --git a/scripts/commonscat.py b/scripts/commonscat.py index 9074deb..1c7c4e0 100755 --- a/scripts/commonscat.py +++ b/scripts/commonscat.py @@ -261,7 +261,8 @@ def skipPage(page) -> bool: """Determine if the page should be skipped.""" try: - templates_to_ignore = ignoreTemplates[page.site.code] + templates_to_ignore = i18n.translate(page.site.code, + ignoreTemplates) except KeyError: return False

diff --git a/scripts/imagetransfer.py b/scripts/imagetransfer.py index c6f7f3b..a1820a7 100755 --- a/scripts/imagetransfer.py +++ b/scripts/imagetransfer.py @@ -230,7 +230,8 @@ pywikibot.info('Adding nowCommons template to ' + sourceImagePage.title()) sourceImagePage.put(sourceImagePage.get() + '\n\n' - + nowCommonsTemplate[sourceSite.code] + + i18n.translate(sourceSite.code, + nowCommonsTemplate) % target_filename, summary=reason)

diff --git a/scripts/interwiki.py b/scripts/interwiki.py index b19e0d1..e357276 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -1865,7 +1865,7 @@ if page.namespace() == 10: loc = None with suppress(KeyError): - tmpl, loc = moved_links[page.site.code] + tmpl, loc = i18n.translate(page.site.code, moved_links) del tmpl if loc is not None and loc in page.title(): pywikibot.info( @@ -2085,15 +2085,17 @@ """Test for allowed edits.""" tmpl = [] with suppress(KeyError): - tmpl, _ = moved_links[page.site.code] + tmpl, _ = i18n.translate(page.site.code, moved_links)

if not isinstance(tmpl, list): tmpl = [tmpl]

with suppress(KeyError): - tmpl += ignoreTemplates[page.site.code] + tmpl += i18n.translate(page.site.code, ignoreTemplates, + fallback=i18n.DEFAULT_FALLBACK)

- tmpl += ignoreTemplates['_default'] + tmpl += i18n.translate('_default', ignoreTemplates, + fallback=i18n.DEFAULT_FALLBACK) if tmpl != []: templates = page.templatesWithParams() for template in templates: diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index fe9a3fe..ef114b1 100755 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -1037,7 +1037,9 @@ if params and template == primary_page: baseTerm = params[1] break - disambTitle = primary_topic_format[self.site.lang] % baseTerm + disambTitle = i18n.translate( + self.site.lang, + primary_topic_format) % baseTerm try: page2 = pywikibot.Page( pywikibot.Link(disambTitle, self.site)) @@ -1078,7 +1080,8 @@ try: page2 = pywikibot.Page( pywikibot.Link( - primary_topic_format[self.site.lang] + i18n.translate(self.site.lang, + primary_topic_format) % page.title(), self.site)) links = page2.linkedPages()