Revision: 6198
Author: russblau
Date: 2008-12-24 16:13:23 +0000 (Wed, 24 Dec 2008)
Log Message:
-----------
merge recent changes from trunk
Modified Paths:
--------------
branches/rewrite/pywikibot/families/wikipedia_family.py
branches/rewrite/pywikibot/family.py
branches/rewrite/pywikibot/scripts/fixes.py
Property Changed:
----------------
branches/rewrite/pywikibot/families/
branches/rewrite/pywikibot/family.py
branches/rewrite/pywikibot/scripts/fixes.py
Property changes on: branches/rewrite/pywikibot/families
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/pywikipedia/families:5896-6165
+ /trunk/pywikipedia/families:5896-6165,6168-6197
Modified: branches/rewrite/pywikibot/families/wikipedia_family.py
===================================================================
--- branches/rewrite/pywikibot/families/wikipedia_family.py 2008-12-24 16:05:47 UTC (rev
6197)
+++ branches/rewrite/pywikibot/families/wikipedia_family.py 2008-12-24 16:13:23 UTC (rev
6198)
@@ -261,7 +261,7 @@
# On most Wikipedias page names must start with a capital letter, but some
# languages don't use this.
-## self.nocapitalize = ['jbo',]
+ self.nocapitalize = ['jbo',]
# A revised sorting order worked out on
http://meta.wikimedia.org/wiki/Interwiki_sorting_order
Modified: branches/rewrite/pywikibot/family.py
===================================================================
--- branches/rewrite/pywikibot/family.py 2008-12-24 16:05:47 UTC (rev 6197)
+++ branches/rewrite/pywikibot/family.py 2008-12-24 16:13:23 UTC (rev 6198)
@@ -783,6 +783,7 @@
'hy': [u'ՎԵՐԱՀՂՈՒՄ'],
'id': [u'alih'],
'is': [u'tilvísun'],
+ 'ja': [u'転送', u'リダイレクト'],
'jv': [u'alih'],
'ka': [u'გადამისამართება'],
'kk': [u'айдау'],
Property changes on: branches/rewrite/pywikibot/family.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/pywikipedia/family.py:6057-6165
+ /trunk/pywikipedia/family.py:6057-6165,6168-6197
Modified: branches/rewrite/pywikibot/scripts/fixes.py
===================================================================
--- branches/rewrite/pywikibot/scripts/fixes.py 2008-12-24 16:05:47 UTC (rev 6197)
+++ branches/rewrite/pywikibot/scripts/fixes.py 2008-12-24 16:13:23 UTC (rev 6198)
@@ -386,6 +386,8 @@
'replacements': [
# colon
(r'ISBN: (\d+)', r'ISBN \1'),
+ # superfluous word "number"
+ (r'ISBN( number| no\.?| No\.?|-Nummer|-Nr\.):? (\d+)', r'ISBN
\2'),
# Spaces, dashes, or dots instead of hyphens as separators,
# or spaces between digits and separators.
# Note that these regular expressions also match valid ISBNs, but
Property changes on: branches/rewrite/pywikibot/scripts/fixes.py
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/pywikipedia/fixes.py:6187-6197