jenkins-bot has submitted this change and it was merged.

Change subject: replace pywikibot.translate with i18n.translate
......................................................................


replace pywikibot.translate with i18n.translate

imported the i18n module if not already
(used multiple inline imports)

note: this change does not include case-by-case improvements

Change-Id: I6cc16f23fe9fbb851b26725557525619c3051a26
---
M scripts/blockpageschecker.py
M scripts/blockreview.py
M scripts/category.py
M scripts/checkimages.py
M scripts/clean_sandbox.py
M scripts/commonscat.py
M scripts/disambredir.py
M scripts/image.py
M scripts/noreferences.py
M scripts/reflinks.py
M scripts/replace.py
M scripts/solve_disambiguation.py
M scripts/unusedfiles.py
M scripts/welcome.py
14 files changed, 115 insertions(+), 115 deletions(-)

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



diff --git a/scripts/blockpageschecker.py b/scripts/blockpageschecker.py
index c21625b..44a595a 100755
--- a/scripts/blockpageschecker.py
+++ b/scripts/blockpageschecker.py
@@ -262,14 +262,14 @@
     if protectedpages:
         generator = site.protectedpages(namespace=namespace, type=protectType)
     # Take the right templates to use, the category and the comment
-    TSP = pywikibot.translate(site, templateSemiProtection)
-    TTP = pywikibot.translate(site, templateTotalProtection)
-    TSMP = pywikibot.translate(site, templateSemiMoveProtection)
-    TTMP = pywikibot.translate(site, templateTotalMoveProtection)
-    TNR = pywikibot.translate(site, templateNoRegex)
-    TU = pywikibot.translate(site, templateUnique)
+    TSP = i18n.translate(site, templateSemiProtection)
+    TTP = i18n.translate(site, templateTotalProtection)
+    TSMP = i18n.translate(site, templateSemiMoveProtection)
+    TTMP = i18n.translate(site, templateTotalMoveProtection)
+    TNR = i18n.translate(site, templateNoRegex)
+    TU = i18n.translate(site, templateUnique)
 
-    categories = pywikibot.translate(site, categoryToCheck)
+    categories = i18n.translate(site, categoryToCheck)
     commentUsed = i18n.twtranslate(site, 'blockpageschecker-summary')
     if not generator:
         generator = genFactory.getCombinedGenerator()
diff --git a/scripts/blockreview.py b/scripts/blockreview.py
index 59b9f5c..6dac7b1 100644
--- a/scripts/blockreview.py
+++ b/scripts/blockreview.py
@@ -133,12 +133,12 @@
                             admin = pywikibot.User(self.site, 
self.info['user'])
                             adminPage = admin.getUserTalkPage()
                             adminText = adminPage.get()
-                            note = pywikibot.translate(self.site.code,
-                                                       self.note_admin,
-                                                       self.parts)
-                            comment = pywikibot.translate(self.site.code,
-                                                          self.msg_admin,
-                                                          self.parts)
+                            note = i18n.translate(self.site.code,
+                                                  self.note_admin,
+                                                  self.parts)
+                            comment = i18n.translate(self.site.code,
+                                                     self.msg_admin,
+                                                     self.parts)
                             adminText += note
                             self.save(adminText, adminPage, comment, False)
                         ### test for pt-wiki
@@ -153,9 +153,9 @@
                                                     u'{{%s|2}}' % unblock_tpl)
                         talkText = talkText.replace(u'{{%s|1}}' % unblock_tpl,
                                                     u'{{%s|2}}' % unblock_tpl)
-                        talkComment = pywikibot.translate(self.site.code,
-                                                          self.msg_user
-                                                          % self.parts)
+                        talkComment = i18n.translate(self.site.code,
+                                                     self.msg_user
+                                                     % self.parts)
 
                         # some test stuff
                         if pywikibot.logger.isEnabledFor(pywikibot.DEBUG) \
@@ -172,8 +172,8 @@
                                                     u'{{%s|4}}' % unblock_tpl)
                         talkText = talkText.replace(u'{{%s|1}}' % unblock_tpl,
                                                     u'{{%s|4}}' % unblock_tpl)
-                        talkComment = pywikibot.translate(self.site.code,
-                                                          self.msg_done)
+                        talkComment = i18n.translate(self.site.code,
+                                                     self.msg_done)
                 # Step 2
                 # Admin has been notified.
                 # Wait for 2 hours, than put a message to the project page
@@ -183,12 +183,12 @@
                         #       check whether this entry already esists
                         project = pywikibot.Page(self.site, project_name)
                         projText = project.get()
-                        note = pywikibot.translate(self.site.code,
-                                                   self.note_project,
-                                                   self.parts)
-                        comment = pywikibot.translate(self.site.code,
-                                                      self.msg_admin,
-                                                      self.parts)
+                        note = i18n.translate(self.site.code,
+                                              self.note_project,
+                                              self.parts)
+                        comment = i18n.translate(self.site.code,
+                                                 self.msg_admin,
+                                                 self.parts)
                         projText += note
                         self.save(projText, project, comment, botflag=False)
                         talkText = talkText.replace(u'{{%s|2}}' % unblock_tpl,
@@ -199,8 +199,8 @@
                         # User is unblocked. Review can be closed
                         talkText = talkText.replace(u'{{%s|2}}' % unblock_tpl,
                                                     u'{{%s|4}}' % unblock_tpl)
-                        talkComment = pywikibot.translate(self.site.code,
-                                                          self.msg_done)
+                        talkComment = i18n.translate(self.site.code,
+                                                     self.msg_done)
                 # Step 3
                 # Admin is notified, central project page has a message
                 # Discussion is going on
@@ -212,8 +212,8 @@
                         # User is unblocked. Review can be closed
                         talkText = talkText.replace(u'{{%s|3}}' % unblock_tpl,
                                                     u'{{%s|4}}' % unblock_tpl)
-                        talkComment = pywikibot.translate(self.site.code,
-                                                          self.msg_done)
+                        talkComment = i18n.translate(self.site.code,
+                                                     self.msg_done)
                 # Step 4
                 # Review is closed
                 elif templates[1][0] == u'4':
diff --git a/scripts/category.py b/scripts/category.py
index 30cb843..ff8ae07 100755
--- a/scripts/category.py
+++ b/scripts/category.py
@@ -525,7 +525,7 @@
         match = re.compile(REGEX,
                            re.IGNORECASE | re.MULTILINE | re.DOTALL)
         self.newcat.text = match.sub('', self.newcat.text)
-        site_templates = pywikibot.translate(self.site, cfd_templates)
+        site_templates = i18n.translate(self.site, cfd_templates)
         for template_name in site_templates:
             match = re.compile(r"{{%s.*?}}" % template_name, re.IGNORECASE)
             self.newcat.text = match.sub('', self.newcat.text)
diff --git a/scripts/checkimages.py b/scripts/checkimages.py
index bd9ee9d..69aa050 100644
--- a/scripts/checkimages.py
+++ b/scripts/checkimages.py
@@ -98,7 +98,7 @@
 import urllib
 import pywikibot
 from pywikibot import pagegenerators as pg
-from pywikibot import config
+from pywikibot import config, i18n
 
 locale.setlocale(locale.LC_ALL, '')
 
@@ -596,19 +596,19 @@
         self.site = site
         self.logFullError = logFullError
         self.logFulNumber = logFulNumber
-        self.rep_page = pywikibot.translate(self.site, report_page)
-        self.rep_text = pywikibot.translate(self.site, report_text)
-        self.com = pywikibot.translate(self.site, msg_comm10)
-        hiddentemplatesRaw = pywikibot.translate(self.site, HiddenTemplate)
+        self.rep_page = i18n.translate(self.site, report_page)
+        self.rep_text = i18n.translate(self.site, report_text)
+        self.com = i18n.translate(self.site, msg_comm10)
+        hiddentemplatesRaw = i18n.translate(self.site, HiddenTemplate)
         self.hiddentemplates = set([pywikibot.Page(self.site, tmp)
                                     for tmp in hiddentemplatesRaw])
-        self.pageHidden = pywikibot.translate(self.site,
+        self.pageHidden = i18n.translate(self.site,
                                               PageWithHiddenTemplates)
-        self.pageAllowed = pywikibot.translate(self.site,
+        self.pageAllowed = i18n.translate(self.site,
                                                PageWithAllowedTemplates)
-        self.comment = pywikibot.translate(self.site, msg_comm, fallback=True)
+        self.comment = i18n.translate(self.site, msg_comm, fallback=True)
         # Adding the bot's nickname at the notification text if needed.
-        botolist = pywikibot.translate(self.site, bot_list)
+        botolist = i18n.translate(self.site, bot_list)
         project = pywikibot.Site().family.name
         self.project = project
         bot = config.usernames[project]
@@ -738,7 +738,7 @@
             self.report_image(self.image_to_report, self.rep_page, self.com,
                               repme)
             return
-        upBots = pywikibot.translate(self.site, uploadBots)
+        upBots = i18n.translate(self.site, uploadBots)
         luser = pywikibot.url2link(nick, self.site, self.site)
 
         if upBots:
@@ -753,9 +753,9 @@
 
     def put_mex_in_talk(self):
         """ Function to put the warning in talk page of the uploader."""
-        commento2 = pywikibot.translate(self.site, msg_comm2, fallback=True)
-        emailPageName = pywikibot.translate(self.site, emailPageWithText)
-        emailSubj = pywikibot.translate(self.site, emailSubject)
+        commento2 = i18n.translate(self.site, msg_comm2, fallback=True)
+        emailPageName = i18n.translate(self.site, emailPageWithText)
+        emailSubj = i18n.translate(self.site, emailSubject)
         if self.notification2:
             self.notification2 = self.notification2 % self.image_to_report
         else:
@@ -785,11 +785,11 @@
                 testoattuale = self.talk_page.get()
             except pywikibot.NoPage:
                 second_text = False
-                testoattuale = pywikibot.translate(self.site, empty)
+                testoattuale = i18n.translate(self.site, empty)
         except pywikibot.NoPage:
             pywikibot.output(u'The user page is blank')
             second_text = False
-            testoattuale = pywikibot.translate(self.site, empty)
+            testoattuale = i18n.translate(self.site, empty)
         if self.commTalk:
             commentox = self.commTalk
         else:
@@ -999,13 +999,13 @@
 
     def checkImageDuplicated(self, duplicates_rollback):
         """ Function to check the duplicated files. """
-        dupText = pywikibot.translate(self.site, duplicatesText)
-        dupRegex = pywikibot.translate(self.site, duplicatesRegex)
-        dupTalkHead = pywikibot.translate(self.site, duplicate_user_talk_head)
-        dupTalkText = pywikibot.translate(self.site, duplicates_user_talk_text)
-        dupComment_talk = pywikibot.translate(self.site,
+        dupText = i18n.translate(self.site, duplicatesText)
+        dupRegex = i18n.translate(self.site, duplicatesRegex)
+        dupTalkHead = i18n.translate(self.site, duplicate_user_talk_head)
+        dupTalkText = i18n.translate(self.site, duplicates_user_talk_text)
+        dupComment_talk = i18n.translate(self.site,
                                               duplicates_comment_talk)
-        dupComment_image = pywikibot.translate(self.site,
+        dupComment_image = i18n.translate(self.site,
                                                duplicates_comment_image)
         duplicateRegex = r'\[\[:File:%s\]\] has the following duplicates' \
                          % re.escape(self.convert_to_url(self.imageName))
@@ -1215,7 +1215,7 @@
 
     def takesettings(self):
         """ Function to take the settings from the wiki. """
-        settingsPage = pywikibot.translate(self.site, page_with_settings)
+        settingsPage = i18n.translate(self.site, page_with_settings)
         try:
             if not settingsPage:
                 self.settingsData = None
@@ -1276,7 +1276,7 @@
 
     def load_licenses(self):
         """ Load the list of the licenses """
-##        catName = pywikibot.translate(self.site, category_with_licenses)
+##        catName = i18n.translate(self.site, category_with_licenses)
 ##        cat = pywikibot.Category(pywikibot.Site(), catName)
 ##        categories = [page.title() for page in 
pagegenerators.SubCategoriesPageGenerator(cat)]
 ##        categories.append(catName)
@@ -1287,7 +1287,7 @@
 ##            gen = pagegenerators.CategorizedPageGenerator(cat)
 ##            pages = [page for page in gen]
 ##            list_licenses.extend(pages)
-        catName = pywikibot.translate(self.site, category_with_licenses)
+        catName = i18n.translate(self.site, category_with_licenses)
         if not catName:
             raise pywikibot.Error(
                 u'No licenses allowed provided, add that option to the code to 
'
@@ -1506,7 +1506,7 @@
         # Print a starting message only if no images has been skipped
         if not self.skip_list:
             pywikibot.output(
-                pywikibot.translate(
+                i18n.translate(
                     'en',
                     u'Skipping the first {{PLURAL:num|file|%(num)s files}}:\n',
                     {'num': skip_number}))
@@ -1593,7 +1593,7 @@
     def isTagged(self):
         """ Understand if a file is already tagged or not. """
         # Is the image already tagged? If yes, no need to double-check, skip
-        for i in pywikibot.translate(self.site, txt_find):
+        for i in i18n.translate(self.site, txt_find):
             # If there are {{ use regex, otherwise no (if there's not the
             # {{ may not be a template and the regex will be wrong)
             if '{{' in i:
@@ -1671,15 +1671,15 @@
         # get the extension from the image's name
         extension = self.imageName.split('.')[-1]
         # Load the notification messages
-        HiddenTN = pywikibot.translate(self.site, HiddenTemplateNotification)
-        self.unvertext = pywikibot.translate(self.site, n_txt)
-        di = pywikibot.translate(self.site, delete_immediately)
-        dih = pywikibot.translate(self.site, delete_immediately_head)
-        din = pywikibot.translate(self.site, delete_immediately_notification)
-        nh = pywikibot.translate(self.site, nothing_head)
-        nn = pywikibot.translate(self.site, nothing_notification)
-        dels = pywikibot.translate(self.site, msg_del_comm, fallback=True)
-        smwl = pywikibot.translate(self.site, second_message_without_license)
+        HiddenTN = i18n.translate(self.site, HiddenTemplateNotification)
+        self.unvertext = i18n.translate(self.site, n_txt)
+        di = i18n.translate(self.site, delete_immediately)
+        dih = i18n.translate(self.site, delete_immediately_head)
+        din = i18n.translate(self.site, delete_immediately_notification)
+        nh = i18n.translate(self.site, nothing_head)
+        nn = i18n.translate(self.site, nothing_notification)
+        dels = i18n.translate(self.site, msg_del_comm, fallback=True)
+        smwl = i18n.translate(self.site, second_message_without_license)
 
         # Some formatting for delete immediately template
         di = u'\n%s' % di
diff --git a/scripts/clean_sandbox.py b/scripts/clean_sandbox.py
index cc763ab..6fc5398 100755
--- a/scripts/clean_sandbox.py
+++ b/scripts/clean_sandbox.py
@@ -42,7 +42,7 @@
 # (C) Siebrand Mazeland, 2007
 # (C) xqt, 2009-2014
 # (C) Dr. Trigon, 2012
-# (C) Pywikibot team, 2012-2013
+# (C) Pywikibot team, 2012-2014
 #
 # Distributed under the terms of the MIT license.
 #
@@ -160,8 +160,8 @@
         self.site = pywikibot.Site()
         self.site.login()
         if self.getOption('user'):
-            localSandboxTitle = pywikibot.translate(self.site,
-                                                    user_sandboxTemplate)
+            localSandboxTitle = i18n.translate(self.site,
+                                               user_sandboxTemplate)
             localSandbox = pywikibot.Page(self.site, localSandboxTitle)
             content.update(user_content)
             sandboxTitle[self.site.lang] = [item.title() for item in
@@ -184,7 +184,7 @@
             if self.getOption('page'):
                 localSandboxTitle = self.getOption('page')
             else:
-                localSandboxTitle = pywikibot.translate(self.site, 
sandboxTitle)
+                localSandboxTitle = i18n.translate(self.site, sandboxTitle)
             if isinstance(localSandboxTitle, list):
                 titles = localSandboxTitle
             else:
@@ -196,7 +196,7 @@
                 try:
                     text = sandboxPage.get()
                     if not self.getOption('text'):
-                        translatedContent = pywikibot.translate(self.site, 
content)
+                        translatedContent = i18n.translate(self.site, content)
                     else:
                         translatedContent = self.getOption('text')
                     if self.getOption('summary'):
diff --git a/scripts/commonscat.py b/scripts/commonscat.py
index 51c7dcc..09b892d 100755
--- a/scripts/commonscat.py
+++ b/scripts/commonscat.py
@@ -67,7 +67,7 @@
 
 import add_text
 import pywikibot
-from pywikibot import pagegenerators
+from pywikibot import i18n, pagegenerators
 
 docuReplacements = {
     '&params;': pagegenerators.parameterHelp
@@ -419,10 +419,10 @@
         if self.summary:
             comment = self.summary
         else:
-            comment = pywikibot.translate(page.site,
-                                          msg_change,
-                                          fallback=True) % {'oldcat': oldcat,
-                                                            'newcat': newcat}
+            comment = i18n.translate(page.site,
+                                     msg_change,
+                                     fallback=True) % {'oldcat': oldcat,
+                                                       'newcat': newcat}
         self.save(newtext, page, comment)
 
     def findCommonscatLink(self, page=None):
diff --git a/scripts/disambredir.py b/scripts/disambredir.py
index caf67d1..a402a44 100644
--- a/scripts/disambredir.py
+++ b/scripts/disambredir.py
@@ -14,7 +14,7 @@
 #
 import re
 import pywikibot
-from pywikibot import pagegenerators
+from pywikibot import i18n, pagegenerators
 
 msg = {
     'ar': u'تغيير التحويلات في صفحة توضيح',
@@ -139,7 +139,7 @@
             continue
         text = treat(text, page2, target)
     if text != page.get():
-        comment = pywikibot.translate(mysite, msg, fallback=True)
+        comment = i18n.translate(mysite, msg, fallback=True)
         page.put(text, comment)
 
 
diff --git a/scripts/image.py b/scripts/image.py
index ca10882..1e900a2 100644
--- a/scripts/image.py
+++ b/scripts/image.py
@@ -43,7 +43,7 @@
 #
 import pywikibot
 import replace
-from pywikibot import pagegenerators
+from pywikibot import i18n, pagegenerators
 import re
 
 
@@ -118,12 +118,12 @@
         if summary:
             self.editSummary = summary
         elif self.newImage:
-            self.editSummary = pywikibot.translate(mysite, self.msg_replace,
-                                                   fallback=True) \
+            self.editSummary = i18n.translate(mysite, self.msg_replace,
+                                              fallback=True) \
             % (self.oldImage, self.newImage)
         else:
-            self.editSummary = pywikibot.translate(mysite, self.msg_remove,
-                                                   fallback=True) \
+            self.editSummary = i18n.translate(mysite, self.msg_remove,
+                                              fallback=True) \
             % self.oldImage
 
     def run(self):
diff --git a/scripts/noreferences.py b/scripts/noreferences.py
index f1aedb3..57b7f8e 100755
--- a/scripts/noreferences.py
+++ b/scripts/noreferences.py
@@ -522,7 +522,7 @@
 
         """
         # Is there an existing section where we can add the references tag?
-        for section in pywikibot.translate(self.site, referencesSections):
+        for section in i18n.translate(self.site, referencesSections):
             sectionR = re.compile(r'\r?\n=+ *%s *=+ *\r?\n' % section)
             index = 0
             while index < len(oldText):
@@ -547,7 +547,7 @@
                     break
 
         # Create a new section for the references tag
-        for section in pywikibot.translate(self.site, placeBeforeSections):
+        for section in i18n.translate(self.site, placeBeforeSections):
             # Find out where to place the new section
             sectionR = re.compile(r'\r?\n(?P<ident>=+) *%s *(?P=ident) *\r?\n'
                                   % section)
@@ -613,7 +613,7 @@
             newSection = u'\n%s\n' % (self.referencesText)
         else:
             newSection = u'\n%s %s %s\n%s\n' % (ident,
-                                                pywikibot.translate(
+                                                i18n.translate(
                                                     self.site,
                                                     referencesSections)[0],
                                                 ident, self.referencesText)
diff --git a/scripts/reflinks.py b/scripts/reflinks.py
index 6a84381..0d56ab4 100644
--- a/scripts/reflinks.py
+++ b/scripts/reflinks.py
@@ -226,7 +226,7 @@
 
     def refDead(self):
         """Dead link, tag it with a {{dead link}}"""
-        tag = pywikibot.translate(self.site, deadLinkTag) % self.link
+        tag = i18n.translate(self.site, deadLinkTag) % self.link
         return '<ref%s>%s</ref>' % (self.refname, tag)
 
     def transform(self, ispdf=False):
@@ -414,9 +414,9 @@
         else:
             self.msg = self.getOption('summary')
         self.stopPage = pywikibot.Page(self.site,
-                                       pywikibot.translate(self.site, 
stopPage))
+                                       i18n.translate(self.site, stopPage))
 
-        local = pywikibot.translate(self.site, badtitles)
+        local = i18n.translate(self.site, badtitles)
         if local:
             bad = '(' + globalbadtitles + '|' + local + ')'
         else:
diff --git a/scripts/replace.py b/scripts/replace.py
index 3e2f788..75b0ccf 100755
--- a/scripts/replace.py
+++ b/scripts/replace.py
@@ -618,8 +618,8 @@
                 edit_summary = i18n.twtranslate(pywikibot.Site(),
                                                 str(fix['msg']))
             else:
-                edit_summary = pywikibot.translate(pywikibot.Site(),
-                                                   fix['msg'], fallback=True)
+                edit_summary = i18n.translate(pywikibot.Site(),
+                                              fix['msg'], fallback=True)
         if "exceptions" in fix:
             exceptions = fix['exceptions']
         if "nocase" in fix:
diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py
index 0266693..7476cb8 100644
--- a/scripts/solve_disambiguation.py
+++ b/scripts/solve_disambiguation.py
@@ -545,7 +545,7 @@
         """
         # TODO: break this function up into subroutines!
 
-        dn_template_str = pywikibot.translate(self.mysite, dn_template)
+        dn_template_str = i18n.translate(self.mysite, dn_template)
         include = False
         unlink = False
         new_targets = []
@@ -933,7 +933,7 @@
         if (self.mysite.family.name in config.disambiguation_comment and
                 self.mylang in 
config.disambiguation_comment[self.mysite.family.name]):
             try:
-                self.comment = pywikibot.translate(
+                self.comment = i18n.translate(
                     self.mysite,
                     config.disambiguation_comment[self.mysite.family.name],
                     fallback=True) % (disambPage.title(), targets)
@@ -941,7 +941,7 @@
             # Backwards compatibility, type error probably caused by too
             # many arguments for format string
             except TypeError:
-                self.comment = pywikibot.translate(
+                self.comment = i18n.translate(
                     self.mysite,
                     config.disambiguation_comment[self.mysite.family.name],
                     fallback=True) % disambPage.title()
diff --git a/scripts/unusedfiles.py b/scripts/unusedfiles.py
index ad6d8a2..55730f3 100644
--- a/scripts/unusedfiles.py
+++ b/scripts/unusedfiles.py
@@ -21,7 +21,7 @@
 #
 
 import pywikibot
-from pywikibot import pagegenerators
+from pywikibot import i18n, pagegenerators
 
 comment = {
     'ar': u'صور للاستبعاد',
@@ -72,8 +72,8 @@
                 always = True
         if always or choice == 'y':
             page.text = text
-            page.save(pywikibot.translate(pywikibot.Site(), comment,
-                                          fallback=True))
+            page.save(i18n.translate(pywikibot.Site(), comment,
+                                     fallback=True))
 
 
 def main():
@@ -85,11 +85,11 @@
 
     mysite = pywikibot.Site()
     # If anything needs to be prepared, you can do it here
-    template_image = pywikibot.translate(pywikibot.Site(),
-                                         template_to_the_image)
-    template_user = pywikibot.translate(pywikibot.Site(),
-                                        template_to_the_user)
-    except_text_translated = pywikibot.translate(pywikibot.Site(), except_text)
+    template_image = i18n.translate(pywikibot.Site(),
+                                    template_to_the_image)
+    template_user = i18n.translate(pywikibot.Site(),
+                                   template_to_the_user)
+    except_text_translated = i18n.translate(pywikibot.Site(), except_text)
     if not(template_image and template_user and except_text_translated):
         pywikibot.warning(u'This script is not localized for %s site.' % 
mysite)
         return
diff --git a/scripts/welcome.py b/scripts/welcome.py
index 86aeaa7..d7db434 100644
--- a/scripts/welcome.py
+++ b/scripts/welcome.py
@@ -193,7 +193,7 @@
 
 locale.setlocale(locale.LC_ALL, '')
 
-# Script users the class pywikibot.translate() to find the right
+# Script uses the method i18n.translate() to find the right
 # page/user/summary/etc so the need to specify language and project have
 # been eliminated.
 # FIXME: Not all language/project combinations have been defined yet.
@@ -486,8 +486,8 @@
 
             # blacklist from wikipage
             badword_page = pywikibot.Page(self.site,
-                                          pywikibot.translate(self.site,
-                                                              bad_pag))
+                                          i18n.translate(self.site,
+                                                         bad_pag))
             list_loaded = list()
             if badword_page.exists():
                 pywikibot.output(u'\nLoading the bad words list from %s...'
@@ -502,7 +502,7 @@
         if not hasattr(self, '_whitelist') or force:
             # initialize whitelist
             whitelist_default = ['emiliano']
-            wtlpg = pywikibot.translate(self.site, whitelist_pg)
+            wtlpg = i18n.translate(self.site, whitelist_pg)
             list_white = list()
             if wtlpg:
                 whitelist_page = pywikibot.Page(self.site, wtlpg)
@@ -568,8 +568,8 @@
             # name in queue is max, put detail to report page
             pywikibot.output("Updating badname accounts to report page...")
             rep_page = pywikibot.Page(self.site,
-                                      pywikibot.translate(self.site,
-                                                          report_page))
+                                      i18n.translate(self.site,
+                                                     report_page))
             if rep_page.exists():
                 text_get = rep_page.get()
             else:
@@ -586,8 +586,8 @@
                                      % username)
                 else:
                     # Adding the log.
-                    rep_text += pywikibot.translate(self.site,
-                                                    report_text) % username
+                    rep_text += i18n.translate(self.site,
+                                               report_text) % username
                     if self.site.code == 'it':
                         rep_text = "%s%s}}" % (rep_text, self.bname[username])
 
@@ -608,7 +608,7 @@
             return
 
         text = u''
-        logg = pywikibot.translate(self.site, logbook)
+        logg = i18n.translate(self.site, logbook)
         if not logg:
             return
 
@@ -626,7 +626,7 @@
             showStatus()
             pywikibot.output(
                 'Log page is not exist, getting information for page creation')
-            text = pywikibot.translate(self.site, logpage_header)
+            text = i18n.translate(self.site, logpage_header)
             text += u'\n!%s' % self.site.namespace(2)
             text += u'\n!%s' % capitalize(
                 self.site.mediawiki_message('contribslink'))
@@ -657,7 +657,7 @@
         signText = u''
         creg = re.compile(r"^\* ?(.*?)$", re.M)
         if not globalvar.signFileName:
-            signPageName = pywikibot.translate(self.site, random_sign)
+            signPageName = i18n.translate(self.site, random_sign)
             if not signPageName:
                 showStatus(4)
                 pywikibot.output(
@@ -734,7 +734,7 @@
                         if self.badNameFilter(users.name()):
                             self.reportBadAccount(users.name())
                             continue
-                        welcome_text = pywikibot.translate(self.site, netext)
+                        welcome_text = i18n.translate(self.site, netext)
                         if globalvar.randomSign:
                             if self.site.family != 'wikinews':
                                 welcome_text = (welcome_text
@@ -749,7 +749,7 @@
                             welcome_text = (welcome_text
                                             % globalvar.defaultSign)
                         if self.site.code in final_new_text_additions:
-                            welcome_text += pywikibot.translate(
+                            welcome_text += i18n.translate(
                                 self.site, final_new_text_additions)
                         welcome_comment = i18n.twtranslate(self.site,
                                                            'welcome-welcome')
@@ -766,7 +766,7 @@
                                              u'skipping this user.')
 
                     if globalvar.makeWelcomeLog and \
-                       pywikibot.translate(self.site, logbook):
+                       i18n.translate(self.site, logbook):
                         showStatus(5)
                         if welcomed_count == 1:
                             pywikibot.output(u'One user has been welcomed.')
@@ -794,7 +794,7 @@
                                          % (users.name(), users.editCount()))
                     # That user mustn't be welcomed.
                     continue
-            if globalvar.makeWelcomeLog and pywikibot.translate(
+            if globalvar.makeWelcomeLog and i18n.translate(
                     self.site, logbook) and welcomed_count > 0:
                 showStatus()
                 if welcomed_count == 1:

-- 
To view, visit https://gerrit.wikimedia.org/r/136609
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6cc16f23fe9fbb851b26725557525619c3051a26
Gerrit-PatchSet: 10
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa <[email protected]>
Gerrit-Reviewer: John Vandenberg <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Ricordisamoa <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to