Revision: 8440
Author: xqt
Date: 2010-08-23 11:42:42 +0000 (Mon, 23 Aug 2010)
Log Message:
-----------
fix for r8439
Modified Paths:
--------------
branches/rewrite/scripts/interwiki.py
Modified: branches/rewrite/scripts/interwiki.py
===================================================================
--- branches/rewrite/scripts/interwiki.py 2010-08-23 11:36:04 UTC (rev 8439)
+++ branches/rewrite/scripts/interwiki.py 2010-08-23 11:42:42 UTC (rev 8440)
@@ -1135,14 +1135,14 @@
if linkedPage.namespace() in nsmatch:
return False
if globalvar.autonomous:
- pywikibot.output(u"NOTE: Ignoring link from page %s in namespace %i to page %s in namespace %i." % (self.linkingPage, self.linkingPage.namespace(), linkedPage, linkedPage.namespace()))
+ pywikibot.output(u"NOTE: Ignoring link from page %s in namespace %i to page %s in namespace %i." % (linkingPage, linkingPage.namespace(), linkedPage, linkedPage.namespace()))
# Fill up foundIn, so that we will not write this notice
self.foundIn[linkedPage] = [linkingPage]
return True
else:
preferredPage = self.getFoundInCorrectNamespace(linkedPage.site)
if preferredPage:
- pywikibot.output(u"NOTE: Ignoring link from page %s in namespace %i to page %s in namespace %i because page %s in the correct namespace has already been found." % (self.linkingPage, self.linkingnPage.namespace(), linkedPage, linkedPage.namespace(), preferredPage))
+ pywikibot.output(u"NOTE: Ignoring link from page %s in namespace %i to page %s in namespace %i because page %s in the correct namespace has already been found." % (linkingPage, linkingPage.namespace(), linkedPage, linkedPage.namespace(), preferredPage))
return True
else:
choice = pywikibot.inputChoice(u'WARNING: %s is in namespace %i, but %s is in namespace %i. Follow it anyway?' % (self.originPage, self.originPage.namespace(), linkedPage, linkedPage.namespace()), ['Yes', 'No', 'Add an alternative', 'give up'], ['y', 'n', 'a', 'g'])
Revision: 8439
Author: xqt
Date: 2010-08-23 11:36:04 +0000 (Mon, 23 Aug 2010)
Log Message:
-----------
update from trunk r8438 (Messages for skipped links to wrong namespaces showed the starting page where the current linking page was to be shown. Corrected.)
Modified Paths:
--------------
branches/rewrite/scripts/interwiki.py
Modified: branches/rewrite/scripts/interwiki.py
===================================================================
--- branches/rewrite/scripts/interwiki.py 2010-08-23 10:06:27 UTC (rev 8438)
+++ branches/rewrite/scripts/interwiki.py 2010-08-23 11:36:04 UTC (rev 8439)
@@ -1135,14 +1135,14 @@
if linkedPage.namespace() in nsmatch:
return False
if globalvar.autonomous:
- pywikibot.output(u"NOTE: Ignoring link from page %s in namespace %i to page %s in namespace %i." % (self.originPage, self.originPage.namespace(), linkedPage, linkedPage.namespace()))
+ pywikibot.output(u"NOTE: Ignoring link from page %s in namespace %i to page %s in namespace %i." % (self.linkingPage, self.linkingPage.namespace(), linkedPage, linkedPage.namespace()))
# Fill up foundIn, so that we will not write this notice
self.foundIn[linkedPage] = [linkingPage]
return True
else:
preferredPage = self.getFoundInCorrectNamespace(linkedPage.site)
if preferredPage:
- pywikibot.output(u"NOTE: Ignoring link from page %s in namespace %i to page %s in namespace %i because page %s in the correct namespace has already been found." % (self.originPage, self.originPage.namespace(), linkedPage, linkedPage.namespace(), preferredPage))
+ pywikibot.output(u"NOTE: Ignoring link from page %s in namespace %i to page %s in namespace %i because page %s in the correct namespace has already been found." % (self.linkingPage, self.linkingnPage.namespace(), linkedPage, linkedPage.namespace(), preferredPage))
return True
else:
choice = pywikibot.inputChoice(u'WARNING: %s is in namespace %i, but %s is in namespace %i. Follow it anyway?' % (self.originPage, self.originPage.namespace(), linkedPage, linkedPage.namespace()), ['Yes', 'No', 'Add an alternative', 'give up'], ['y', 'n', 'a', 'g'])
Revision: 8438
Author: purodha
Date: 2010-08-23 10:06:27 +0000 (Mon, 23 Aug 2010)
Log Message:
-----------
Messages for skipped links to wrong namespaces showed the starting page where the current linking page was to be shown. Corrected.
Modified Paths:
--------------
trunk/pywikipedia/interwiki.py
Modified: trunk/pywikipedia/interwiki.py
===================================================================
--- trunk/pywikipedia/interwiki.py 2010-08-23 07:42:28 UTC (rev 8437)
+++ trunk/pywikipedia/interwiki.py 2010-08-23 10:06:27 UTC (rev 8438)
@@ -1107,14 +1107,14 @@
if linkedPage.namespace() in nsmatch:
return False
if globalvar.autonomous:
- pywikibot.output(u"NOTE: Ignoring link from page %s in namespace %i to page %s in namespace %i." % (self.originPage.aslink(True), self.originPage.namespace(), linkedPage.aslink(True), linkedPage.namespace()))
+ pywikibot.output(u"NOTE: Ignoring link from page %s in namespace %i to page %s in namespace %i." % (linkingPage.aslink(True), linkingPage.namespace(), linkedPage.aslink(True), linkedPage.namespace()))
# Fill up foundIn, so that we will not write this notice
self.foundIn[linkedPage] = [linkingPage]
return True
else:
preferredPage = self.getFoundInCorrectNamespace(linkedPage.site())
if preferredPage:
- pywikibot.output(u"NOTE: Ignoring link from page %s in namespace %i to page %s in namespace %i because page %s in the correct namespace has already been found." % (self.originPage.aslink(True), self.originPage.namespace(), linkedPage.aslink(True), linkedPage.namespace(), preferredPage.aslink(True)))
+ pywikibot.output(u"NOTE: Ignoring link from page %s in namespace %i to page %s in namespace %i because page %s in the correct namespace has already been found." % (linkingPage.aslink(True), linkingPage.namespace(), linkedPage.aslink(True), linkedPage.namespace(), preferredPage.aslink(True)))
return True
else:
choice = pywikibot.inputChoice('WARNING: %s is in namespace %i, but %s is in namespace %i. Follow it anyway?' % (self.originPage.aslink(True), self.originPage.namespace(), linkedPage.aslink(True), linkedPage.namespace()), ['Yes', 'No', 'Add an alternative', 'give up'], ['y', 'n', 'a', 'g'])
Revision: 8437
Author: xqt
Date: 2010-08-23 07:42:28 +0000 (Mon, 23 Aug 2010)
Log Message:
-----------
i18n for de- and frr-wiki for former featured articles
Modified Paths:
--------------
trunk/pywikipedia/featured.py
Modified: trunk/pywikipedia/featured.py
===================================================================
--- trunk/pywikipedia/featured.py 2010-08-23 07:16:01 UTC (rev 8436)
+++ trunk/pywikipedia/featured.py 2010-08-23 07:42:28 UTC (rev 8437)
@@ -147,9 +147,11 @@
}
msg_former = {
'ar': u'بوت: [[%s:%s]] مقالة مختارة سابقة',
+ 'de': u'Bot: [[%s:%s]] ist ein ehemaliger ausgezeichneter Artikel',
'en': u'Bot: [[%s:%s]] is a former featured article',
'fa': u'ربات:نوشتار [[%s:%s]] یک نوشتار برگزیده پیشین است.',
'fi': u'Botti: [[%s:%s]] on entinen suositeltu artikkeli',
+ 'frr':u'Bot: [[%s:%s]] wiar ans en auer a miaten guden artiikel',
}
# ALL wikis use 'Link FA', and sometimes other localized templates.