jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/842444 )
Change subject: [IMPR] Simplify i18n parameters in category_redirect.py ......................................................................
[IMPR] Simplify i18n parameters in category_redirect.py
Change-Id: Idb9ffc1eae7f921907b48ee19607c9c851825f4d --- M scripts/category_redirect.py 1 file changed, 18 insertions(+), 11 deletions(-)
Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified
diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index 53db97c..9ce5a21 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -360,27 +360,33 @@ .format(len(nonemptypages)))
for cat in pagegenerators.PreloadingGenerator(nonemptypages): + i18n_param = {'oldcat': cat.title(as_link=True, textlink=True)} + try: if not cat.isCategoryRedirect(): message = i18n.twtranslate( - self.site, 'category_redirect-log-false-positive', - {'oldcat': cat.title(as_link=True, textlink=True)}) + self.site, + 'category_redirect-log-false-positive', + i18n_param + ) self.log_text.append(message) continue except Error: - message = i18n.twtranslate( - self.site, 'category_redirect-log-not-loaded', - {'oldcat': cat.title(as_link=True, textlink=True)}) + message = i18n.twtranslate(self.site, + 'category_redirect-log-not-loaded', + i18n_param) self.log_text.append(message) continue + cat_title = cat.title(with_ns=False) if not self.ready_to_edit(cat): counts[cat_title] = None - message = i18n.twtranslate( - self.site, 'category_redirect-log-skipping', - {'oldcat': cat.title(as_link=True, textlink=True)}) + message = i18n.twtranslate(self.site, + 'category_redirect-log-skipping', + i18n_param) self.log_text.append(message) continue + dest = cat.getCategoryRedirectTarget() if not dest.exists(): message = i18n.twtranslate( @@ -394,12 +400,13 @@ with suppress(Exception): cat.save() continue + if dest.isCategoryRedirect(): double = dest.getCategoryRedirectTarget() if double in (dest, cat): - message = i18n.twtranslate( - self.site, 'category_redirect-log-loop', - {'oldcat': dest.title(as_link=True, textlink=True)}) + message = i18n.twtranslate(self.site, + 'category_redirect-log-loop', + i18n_param) self.log_text.append(message) # do a null edit on cat with suppress(Exception):