Pywikipedia-svn April 2012

pywikipedia-svn@lists.wikimedia.org

7 participants
90 discussions

SVN: [10132] trunk/pywikipedia/pywikibot/i18n.py
by xqt＠svn.wikimedia.org 18 Apr '12

18 Apr '12

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10132 Revision: 10132 Author: xqt Date: 2012-04-18 14:04:17 +0000 (Wed, 18 Apr 2012) Log Message: ----------- First step for twn support for userinterface. This supports input questions by replacing pywikibot.input() by i18n.input(). Notify the parameters. Modified Paths: -------------- trunk/pywikipedia/pywikibot/i18n.py Modified: trunk/pywikipedia/pywikibot/i18n.py =================================================================== --- trunk/pywikipedia/pywikibot/i18n.py 2012-04-18 13:04:29 UTC (rev 10131) +++ trunk/pywikipedia/pywikibot/i18n.py 2012-04-18 14:04:17 UTC (rev 10132) @@ -12,6 +12,7 @@ import re, sys from pywikibot import Error import wikipedia as pywikibot +import config # Languages to use for comment text after the actual language but before # en:. For example, if for language 'xx', you want the preference of @@ -423,3 +424,22 @@ if hasattr(code, 'lang'): code = code.lang return code in transdict and twtitle in transdict[code] + +def input(twtitle, parameters=None, password=False): + """ Ask the user a question, return the user's answer. + @param twtitle The TranslateWiki string title, in <package>-<key> format + @param parameters For passing parameters. In the future, this will + be used for plural support. + @param password Hides the user's input (for password entry) + Returns a unicode string + + The translations are retrieved from i18n.<package>, based on the callers + import table. + Translation code should be set by in the user_config.py like + userinterface_lang = 'de' + default is mylang setting + + """ + code = config.userinterface_lang or config.mylang + trans = twtranslate(code, twtitle, parameters) + return pywikibot.input(trans, password)

1 0

SVN: [10131] trunk/pywikipedia/pywikibot/i18n.py
by xqt＠svn.wikimedia.org 18 Apr '12

18 Apr '12

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10131 Revision: 10131 Author: xqt Date: 2012-04-18 13:04:29 +0000 (Wed, 18 Apr 2012) Log Message: ----------- minor doc changes Modified Paths: -------------- trunk/pywikipedia/pywikibot/i18n.py Modified: trunk/pywikipedia/pywikibot/i18n.py =================================================================== --- trunk/pywikipedia/pywikibot/i18n.py 2012-04-18 09:22:25 UTC (rev 10130) +++ trunk/pywikipedia/pywikibot/i18n.py 2012-04-18 13:04:29 UTC (rev 10131) @@ -3,7 +3,7 @@ and for TranslateWiki-based translations """ # -# (C) Pywikipedia bot team, 2004-2011 +# (C) Pywikipedia bot team, 2004-2012 # # Distributed under the terms of the MIT license. # @@ -262,8 +262,7 @@ @param code The language code @param twtitle The TranslateWiki string title, in <package>-<key> format - @param parameters For passing parameters. In the future, this will - be used for plural support. + @param parameters For passing parameters. The translations are retrieved from i18n.<package>, based on the callers import table. @@ -316,7 +315,7 @@ @param code The language code @param twtitle The TranslateWiki string title, in <package>-<key> format - @param parameters For passing parameters. + @param parameters For passing (plural) parameters. Support is implemented like in MediaWiki extension. If the tw message contains a plural tag inside which looks like

1 0

SVN: [10130] branches/rewrite/pywikibot/family.py
by xqt＠svn.wikimedia.org 18 Apr '12

18 Apr '12

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10130 Revision: 10130 Author: xqt Date: 2012-04-18 09:22:25 +0000 (Wed, 18 Apr 2012) Log Message: ----------- remove wron linktrail for nl-wiki due to bug #3518575, update from trunk r10129 Modified Paths: -------------- branches/rewrite/pywikibot/family.py Modified: branches/rewrite/pywikibot/family.py =================================================================== --- branches/rewrite/pywikibot/family.py 2012-04-18 09:20:32 UTC (rev 10129) +++ branches/rewrite/pywikibot/family.py 2012-04-18 09:22:25 UTC (rev 10130) @@ -127,8 +127,7 @@ 'kk': u'[a-zäçéğıïñöşüýʺʹа-яёәғіқңөұүһٴابپتجحدرزسشعفقكلمنڭەوۇۋۆىيچھ“»]*', 'ksh': u'[a-zäöüėëĳßəğåůæœç]*', 'mk': u'[a-zабвгдѓежзѕијклљмнњопрстќуфхцчџш]*', - 'nl': u'[a-zäöüïëéèà]*', - 'nl': u'[a-zæøå]*', + 'nl': u'[a-zäöüïëéèàë]*', 'pl': u'[a-zęóąśłżźćńĘÓĄŚŁŻŹĆŃ]*', 'pt': u'[a-záâàãéêíóôõúüç]*', 'ro': u'[a-zăâîşţșțĂÂÎŞŢȘȚ]*',

1 0

SVN: [10129] trunk/pywikipedia/family.py
by xqt＠svn.wikimedia.org 18 Apr '12

18 Apr '12

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10129 Revision: 10129 Author: xqt Date: 2012-04-18 09:20:32 +0000 (Wed, 18 Apr 2012) Log Message: ----------- remove wron linktrail for nl-wiki due to bug #3518575 Modified Paths: -------------- trunk/pywikipedia/family.py Modified: trunk/pywikipedia/family.py =================================================================== --- trunk/pywikipedia/family.py 2012-04-18 09:03:39 UTC (rev 10128) +++ trunk/pywikipedia/family.py 2012-04-18 09:20:32 UTC (rev 10129) @@ -3113,8 +3113,7 @@ 'kk': u'[a-zäçéğıïñöşüýʺʹа-яёәғіқңөұүһٴابپتجحدرزسشعفقكلمنڭەوۇۋۆىيچھ“»]*', 'ksh': u'[a-zäöüėëĳßəğåůæœç]*', 'mk': u'[a-zабвгдѓежзѕијклљмнњопрстќуфхцчџш]*', - 'nl': u'[a-zäöüïëéèà]*', - 'nl': u'[a-zæøå]*', + 'nl': u'[a-zäöüïëéèàë]*', 'pl': u'[a-zęóąśłżźćńĘÓĄŚŁŻŹĆŃ]*', 'pt': u'[a-záâàãéêíóôõúüç]*', 'ro': u'[a-zăâîşţșțĂÂÎŞŢȘȚ]*',

1 0

SVN: [10128] branches/rewrite/pywikibot/families
by xqt＠svn.wikimedia.org 18 Apr '12

18 Apr '12

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10128 Revision: 10128 Author: xqt Date: 2012-04-18 09:03:39 +0000 (Wed, 18 Apr 2012) Log Message: ----------- update mw release 1.20wmf1, update from trunk r10127 Modified Paths: -------------- branches/rewrite/pywikibot/families/commons_family.py branches/rewrite/pywikibot/families/meta_family.py branches/rewrite/pywikibot/families/test_family.py Modified: branches/rewrite/pywikibot/families/commons_family.py =================================================================== --- branches/rewrite/pywikibot/families/commons_family.py 2012-04-18 09:01:21 UTC (rev 10127) +++ branches/rewrite/pywikibot/families/commons_family.py 2012-04-18 09:03:39 UTC (rev 10128) @@ -42,6 +42,10 @@ 'meta', 'mediawiki', 'test', 'incubator', 'species', ] + + def version(self, code): + return '1.20wmf1' + def dbName(self, code): return 'commonswiki_p' Modified: branches/rewrite/pywikibot/families/meta_family.py =================================================================== --- branches/rewrite/pywikibot/families/meta_family.py 2012-04-18 09:01:21 UTC (rev 10127) +++ branches/rewrite/pywikibot/families/meta_family.py 2012-04-18 09:03:39 UTC (rev 10128) @@ -21,6 +21,9 @@ 'commons', 'species', ] + def version(self,code): + return '1.20wmf1' + def shared_image_repository(self, code): return ('commons', 'commons') Modified: branches/rewrite/pywikibot/families/test_family.py =================================================================== --- branches/rewrite/pywikibot/families/test_family.py 2012-04-18 09:01:21 UTC (rev 10127) +++ branches/rewrite/pywikibot/families/test_family.py 2012-04-18 09:03:39 UTC (rev 10128) @@ -14,6 +14,9 @@ 'test': 'test.wikipedia.org', } + def version(self, code): + return '1.20wmf1' + def shared_image_repository(self, code): return ('commons', 'commons')

1 0

SVN: [10127] trunk/pywikipedia/families
by xqt＠svn.wikimedia.org 18 Apr '12

18 Apr '12

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10127 Revision: 10127 Author: xqt Date: 2012-04-18 09:01:21 +0000 (Wed, 18 Apr 2012) Log Message: ----------- update mw release 1.20wmf1 Modified Paths: -------------- trunk/pywikipedia/families/commons_family.py trunk/pywikipedia/families/meta_family.py trunk/pywikipedia/families/test_family.py Modified: trunk/pywikipedia/families/commons_family.py =================================================================== --- trunk/pywikipedia/families/commons_family.py 2012-04-17 18:13:05 UTC (rev 10126) +++ trunk/pywikipedia/families/commons_family.py 2012-04-18 09:01:21 UTC (rev 10127) @@ -78,6 +78,10 @@ 'meta', 'mediawiki', 'test', 'incubator', 'species', ] + + def version(self, code): + return '1.20wmf1' + def dbName(self, code): return 'commonswiki_p' Modified: trunk/pywikipedia/families/meta_family.py =================================================================== --- trunk/pywikipedia/families/meta_family.py 2012-04-17 18:13:05 UTC (rev 10126) +++ trunk/pywikipedia/families/meta_family.py 2012-04-18 09:01:21 UTC (rev 10127) @@ -159,6 +159,9 @@ 'commons', 'species', ] + def version(self,code): + return '1.20wmf1' + def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/test_family.py =================================================================== --- trunk/pywikipedia/families/test_family.py 2012-04-17 18:13:05 UTC (rev 10126) +++ trunk/pywikipedia/families/test_family.py 2012-04-18 09:01:21 UTC (rev 10127) @@ -151,6 +151,9 @@ 'meta', 'mediawiki', 'incubator', 'commons', 'species', ] + def version(self, code): + return '1.20wmf1' + def shared_image_repository(self, code): return ('commons', 'commons')

1 0

SVN: [10126] trunk/pywikipedia/wikipedia.py
by xqt＠svn.wikimedia.org 17 Apr '12

17 Apr '12

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10126 Revision: 10126 Author: xqt Date: 2012-04-17 18:13:05 +0000 (Tue, 17 Apr 2012) Log Message: ----------- enable withSection parameter for Page.title() Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2012-04-17 15:32:32 UTC (rev 10125) +++ trunk/pywikipedia/wikipedia.py 2012-04-17 18:13:05 UTC (rev 10126) @@ -453,7 +453,7 @@ @param underscore: if true, replace all ' ' characters with '_' @param withNamespace: if false, omit the namespace prefix - @param withSection: - not implemented yet - + @param withSection: if false, omit the section @param asUrl: - not implemented yet - @param asLink: if true, return the title in the form of a wikilink @param allowInterwiki: (only used if asLink is true) if true, format @@ -486,7 +486,7 @@ else: title = u'[[%s%s:%s]]' % (colon, self._site.lang, title) elif textlink and (self.isImage() or self.isCategory()): - title = u'[[:%s]]' % title + title = u'[[:%s]]' % title else: title = u'[[%s]]' % title if savetitle or asLink: @@ -494,6 +494,10 @@ title = title.replace(u"''", u'%27%27') if underscore: title = title.replace(' ', '_') + if not withSection: + sectionName = self.section(underscore=underscore) + if sectionName: + title = title[:-len(sectionName)-1] return title #@deprecated("Page.title(withNamespace=False)")

1 0

SVN: [10125] branches/rewrite/scripts/i18n/redirect.py
by xqt＠svn.wikimedia.org 17 Apr '12

17 Apr '12

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10125 Revision: 10125 Author: xqt Date: 2012-04-17 15:32:32 +0000 (Tue, 17 Apr 2012) Log Message: ----------- fix for r10123 Modified Paths: -------------- branches/rewrite/scripts/i18n/redirect.py Modified: branches/rewrite/scripts/i18n/redirect.py =================================================================== --- branches/rewrite/scripts/i18n/redirect.py 2012-04-17 09:48:07 UTC (rev 10124) +++ branches/rewrite/scripts/i18n/redirect.py 2012-04-17 15:32:32 UTC (rev 10125) @@ -124,7 +124,7 @@ 'de': { 'redirect-broken-redirect-template': u'{{Löschen|Kaputte Weiterleitung}}', 'redirect-fix-double': u'Bot: Korrigiere doppelte Weiterleitung auf %(to)s', - 'redirect-fix-double': u'Bot: Korrigiere Weiterleitungschleife auf %(to)s', + 'redirect-fix-loop': u'Bot: Korrigiere Weiterleitungschleife auf %(to)s', 'redirect-remove-broken': u'Bot: Weiterleitungsziel existiert nicht', 'redirect-remove-loop': u'Bot: Weiterleitungsziel auf sich selbst', }, @@ -202,7 +202,7 @@ 'fr': { 'redirect-broken-redirect-template': u'{{db-r1}}', 'redirect-fix-double': u'Robot : répare double redirection à %(to)s', - 'redirect-fix-double': u'Robot : répare boucle de redirection à %(to)s', + 'redirect-fix-loop': u'Robot : répare boucle de redirection à %(to)s', 'redirect-remove-broken': u'Robot : Cible du redirect inexistante', 'redirect-remove-loop': u'Bot : la cible de la redirection forme une boucle de redirection', },

1 0

SVN: [10124]
by xqt＠svn.wikimedia.org 17 Apr '12

17 Apr '12

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10124 Revision: 10124 Author: xqt Date: 2012-04-17 09:48:07 +0000 (Tue, 17 Apr 2012) Log Message: ----------- messages must be changed Modified Paths: -------------- branches/rewrite/scripts/redirect.py trunk/pywikipedia/redirect.py Modified: branches/rewrite/scripts/redirect.py =================================================================== --- branches/rewrite/scripts/redirect.py 2012-04-17 07:55:56 UTC (rev 10123) +++ branches/rewrite/scripts/redirect.py 2012-04-17 09:48:07 UTC (rev 10124) @@ -552,11 +552,11 @@ ## # Delete the two redirects ## content = i18n.twtranslate( ## targetPage.site.lang, -## 'redirect-remove-loop', +## 'redirect-broken-redirect-template' ## ) + "\n" + content ## summ = i18n.twtranslate( ## targetPage.site.lang, -## 'redirect-broken-redirect-template') +## 'redirect-remove-loop') ## targetPage.put(content, summ) ## redir.put(content, summ) ## break # TODO Better implement loop redirect Modified: trunk/pywikipedia/redirect.py =================================================================== --- trunk/pywikipedia/redirect.py 2012-04-17 07:55:56 UTC (rev 10123) +++ trunk/pywikipedia/redirect.py 2012-04-17 09:48:07 UTC (rev 10124) @@ -396,7 +396,7 @@ def get_moved_pages_redirects_old(self): move_regex = re.compile( - r'moved <a href.*?>(.*?)</a> to <a href=.*?>.*?</a>.*?</li>') + r'moved <a href.*?>(.*?)</a> to <a href=.*?>.*?</a>.*?</li>') if self.offset <= 0: self.offset = 1 @@ -410,8 +410,8 @@ offset_time = start.strftime("%Y%m%d%H%M%S") while True: move_url = \ - self.site.path() + "?title=Special:Log&limit=500&offset=%s&type=move"\ - % offset_time +"%(path)s?title=Special:Log&limit=500&offset=%(offset)s&type=move&uselang=en" \ + % {'path': self.site.path(), 'offset': offset_time} try: move_list = self.site.getUrl(move_url) if pywikibot.verbose: @@ -632,11 +632,11 @@ ## # Delete the two redirects ## content = i18n.translate( ## targetPage.site().lang, -## 'redirect-remove-loop', +## 'redirect-broken-redirect-template' ## ) + "\n" + content ## summ = i18n.translate( ## targetPage.site().lang, -## 'redirect-broken-redirect-template') +## 'redirect-remove-loop') ## targetPage.put(content, summ) ## redir.put(content, summ) ## break # TODO Better implement loop redirect @@ -781,6 +781,8 @@ number = int(arg[7:]) # old param, use -total instead elif arg.startswith('-number:'): + pywikibot.output(u'\nNOTE: -number option is deprecated.' + u' Use -total instead') number = int(arg[8:]) elif arg == '-always': always = True

1 0

SVN: [10123] branches/rewrite/scripts/i18n/redirect.py
by xqt＠svn.wikimedia.org 17 Apr '12

17 Apr '12

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/10123 Revision: 10123 Author: xqt Date: 2012-04-17 07:55:56 +0000 (Tue, 17 Apr 2012) Log Message: ----------- new message: Fixing redirect loop Modified Paths: -------------- branches/rewrite/scripts/i18n/redirect.py Modified: branches/rewrite/scripts/i18n/redirect.py =================================================================== --- branches/rewrite/scripts/i18n/redirect.py 2012-04-16 14:27:09 UTC (rev 10122) +++ branches/rewrite/scripts/i18n/redirect.py 2012-04-17 07:55:56 UTC (rev 10123) @@ -11,6 +11,7 @@ 'af': { 'redirect-broken-redirect-template': u'{{db-r1}}', 'redirect-fix-double': u'Robot: dubbele aanstuur na %(to)s reggemaak', + 'redirect-fix-loop': u'Robot: sirkulêre aanstuur na %(to)s reggemaak', 'redirect-remove-broken': u'[[WP:CSD#G8|G8]]: Verwyder [[Wikipedia:Redirect|aanstuur]] na nie-bestaande bladsy', 'redirect-remove-loop': u'[[WP:CSD#G8|G8]]: Sirkulêre [[Wikipedia:Redirect|aanstuur]]', }, @@ -123,6 +124,7 @@ 'de': { 'redirect-broken-redirect-template': u'{{Löschen|Kaputte Weiterleitung}}', 'redirect-fix-double': u'Bot: Korrigiere doppelte Weiterleitung auf %(to)s', + 'redirect-fix-double': u'Bot: Korrigiere Weiterleitungschleife auf %(to)s', 'redirect-remove-broken': u'Bot: Weiterleitungsziel existiert nicht', 'redirect-remove-loop': u'Bot: Weiterleitungsziel auf sich selbst', }, @@ -142,6 +144,7 @@ 'en': { 'redirect-broken-redirect-template': u'{{db-r1}}', 'redirect-fix-double': u'Robot: Fixing double redirect to %(to)s', + 'redirect-fix-loop': u'Robot: Fixing redirect loop to %(to)s', 'redirect-remove-broken': u'[[WP:CSD#G8|G8]]: [[Wikipedia:Redirect|Redirect]] to a deleted or non-existent page', 'redirect-remove-loop': u'[[WP:CSD#G8|G8]]: [[Wikipedia:Redirect|Redirect]] target forms a redirect loop', }, @@ -199,6 +202,7 @@ 'fr': { 'redirect-broken-redirect-template': u'{{db-r1}}', 'redirect-fix-double': u'Robot : répare double redirection à %(to)s', + 'redirect-fix-double': u'Robot : répare boucle de redirection à %(to)s', 'redirect-remove-broken': u'Robot : Cible du redirect inexistante', 'redirect-remove-loop': u'Bot : la cible de la redirection forme une boucle de redirection', }, @@ -708,4 +712,4 @@ 'redirect-fix-double': u'機械人：拉直連串跳轉 → %(to)s', 'redirect-remove-broken': u'機械人：跳轉目標唔存在', }, -} \ No newline at end of file +}

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn April 2012