jenkins-bot has submitted this change and it was merged. Change subject: Use Site with i18n.tw* ......................................................................
Use Site with i18n.tw* Change-Id: I5758346c20b6da33ac40aa3ad62ef74490bb5aca --- M scripts/catall.py M scripts/category_redirect.py M scripts/commonscat.py M scripts/redirect.py 4 files changed, 12 insertions(+), 12 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/catall.py b/scripts/catall.py index 4998c93..cc065e0 100755 --- a/scripts/catall.py +++ b/scripts/catall.py @@ -78,7 +78,7 @@ pllist.append(pywikibot.Page(site, cattitle)) page.put_async(textlib.replaceCategoryLinks(page.get(), pllist, site=page.site), - summary=i18n.twtranslate(site.code, 'catall-changing')) + summary=i18n.twtranslate(site, 'catall-changing')) def main(*args): diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index 7860d67..6f0378f 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -96,9 +96,9 @@ self.dbl_redir_comment = 'category_redirect-fix-double' self.maint_comment = 'category_redirect-comment' self.edit_request_text = i18n.twtranslate( - self.site.code, 'category_redirect-edit-request') + u'\n~~~~' + self.site, 'category_redirect-edit-request') + u'\n~~~~' self.edit_request_item = i18n.twtranslate( - self.site.code, 'category_redirect-edit-request-item') + self.site, 'category_redirect-edit-request-item') def get_cat_title(self): """Specify the category title.""" @@ -215,7 +215,7 @@ softredirect template. """ pywikibot.output("Checking hard-redirect category pages.") - comment = i18n.twtranslate(self.site.code, self.redir_comment) + comment = i18n.twtranslate(self.site, self.redir_comment) # generator yields all hard redirect pages in namespace 14 for page in pagegenerators.PreloadingGenerator( @@ -303,7 +303,7 @@ self.check_hard_redirect() - comment = i18n.twtranslate(self.site.code, self.move_comment) + comment = i18n.twtranslate(self.site, self.move_comment) counts = {} nonemptypages = [] redircat = pywikibot.Category(pywikibot.Link(self.cat_title, self.site)) @@ -405,7 +405,7 @@ newtext = newtext + oldtext.strip() try: cat.text = newtext - cat.save(i18n.twtranslate(self.site.code, + cat.save(i18n.twtranslate(self.site, self.dbl_redir_comment)) except pywikibot.Error as e: self.log_text.append("** Failed: %s" % e) @@ -436,7 +436,7 @@ self.log_text.sort() self.problems.sort() newredirs.sort() - comment = i18n.twtranslate(self.site.code, self.maint_comment) + comment = i18n.twtranslate(self.site, self.maint_comment) self.log_page.text = (u"\n== %i-%02i-%02iT%02i:%02i:%02iZ ==\n" % time.gmtime()[:6] + u'\n'.join(self.log_text) + diff --git a/scripts/commonscat.py b/scripts/commonscat.py index 64b6b12..2289005 100755 --- a/scripts/commonscat.py +++ b/scripts/commonscat.py @@ -365,7 +365,7 @@ if self.getOption('summary'): comment = self.getOption('summary') else: - comment = i18n.twtranslate(page.site.code, + comment = i18n.twtranslate(page.site, 'commonscat-msg_change', {'oldcat': oldcat, 'newcat': newcat}) diff --git a/scripts/redirect.py b/scripts/redirect.py index f50e183..e2b53ad 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -603,17 +603,17 @@ targetPage.title(withSection=False)) content = content_page.get(get_redirect=True) if i18n.twhas_key( - targetPage.site.lang, + targetPage.site, 'redirect-broken-redirect-template') and \ - i18n.twhas_key(targetPage.site.lang, + i18n.twhas_key(targetPage.site, 'redirect-remove-loop'): pywikibot.output(u"Tagging redirect for deletion") # Delete the two redirects content = i18n.twtranslate( - targetPage.site.lang, + targetPage.site, 'redirect-broken-redirect-template' ) + "\n" + content - summ = i18n.twtranslate(targetPage.site.lang, + summ = i18n.twtranslate(targetPage.site, 'redirect-remove-loop') targetPage.put(content, summ) redir.put(content, summ) -- To view, visit https://gerrit.wikimedia.org/r/222734 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5758346c20b6da33ac40aa3ad62ef74490bb5aca Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jay...@gmail.com> Gerrit-Reviewer: John Vandenberg <jay...@gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgr...@gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhall...@arctus.nl> Gerrit-Reviewer: Xqt <i...@gno.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits