SVN: [4678] trunk/pywikipedia - Pywikipedia-l

9 Dec 2007

Revision: 4678
Author:   rotem
Date:     2007-12-09 19:48:54 +0000 (Sun, 09 Dec 2007)
Log Message:
-----------
Updating Wiktionary, Wikinews and Wikiversity family files, updating version number, removing languages zh-tw and zh-cn from known languages.
Modified Paths:
--------------
    trunk/pywikipedia/families/wikibooks_family.py
    trunk/pywikipedia/families/wikinews_family.py
    trunk/pywikipedia/families/wikipedia_family.py
    trunk/pywikipedia/families/wikiquote_family.py
    trunk/pywikipedia/families/wikisource_family.py
    trunk/pywikipedia/families/wikiversity_family.py
    trunk/pywikipedia/families/wiktionary_family.py
    trunk/pywikipedia/family.py
Modified: trunk/pywikipedia/families/wikibooks_family.py
===================================================================

--- trunk/pywikipedia/families/wikibooks_family.py	2007-12-09 18:48:27 UTC (rev 4677)
+++ trunk/pywikipedia/families/wikibooks_family.py	2007-12-09 19:48:54 UTC (rev 4678)
@@ -268,7 +268,7 @@
         }
def version(self, code):
-        return "1.11"
+        return "1.12alpha"
def shared_image_repository(self, code):
         return ('commons', 'commons')
Modified: trunk/pywikipedia/families/wikinews_family.py
===================================================================
--- trunk/pywikipedia/families/wikinews_family.py	2007-12-09 18:48:27 UTC (rev 4677)
+++ trunk/pywikipedia/families/wikinews_family.py	2007-12-09 19:48:54 UTC (rev 4678)
@@ -7,21 +7,14 @@
# The Wikimedia family that is known as WikiNews
-# Known WikiNews languages, given as a dictionary mapping the language code
-# to the hostname of the site hosting that wikinews. For human consumption,
-# the full name of the language is given behind each line as a comment
-
 class Family(family.Family):
     def __init__(self):
         family.Family.__init__(self)
         self.name = 'wikinews'
-        self.langs = {
-      
-            }
-        
+
         for lang in self.knownlanguages:
             self.langs[lang] = lang+'.wikinews.org'
-        
+
         # Override defaults
         self.namespaces[2]['pl'] = u'Wikireporter'
         self.namespaces[3]['pl'] = u'Dyskusja Wikireportera'
@@ -37,6 +30,7 @@
             'bs': u'Wikivijesti',
             'ca': u'Viquinotícies',
             'es': u'Wikinoticias',
+            'fi': u'Wikiuutiset',
             'he': u'ויקיחדשות',
             'it': u'Wikinotizie',
             'ja': u'ウィキニュース',
@@ -56,7 +50,7 @@
             'ca': u'Viquinotícies Discussió',
             'de': u'Wikinews Diskussion',
             'es': u'Wikinoticias Discusión',
-            'fi': u'Keskustelu Wikinewsistä',
+            'fi': u'Keskustelu Wikiuutisista',
             'fr': u'Discussion Wikinews',
             'he': u'שיחת ויקיחדשות',
             'it': u'Discussioni Wikinotizie',
@@ -72,83 +66,94 @@
             'ta': u'Wikinews பேச்சு',
             'th': u'คุยเรื่องวิกิข่าว',
             'uk': u'Обговорення ВікіНовини',
-        }   
-        
+        }
+
         self.namespaces[100] = {
-            '_default': u'Portal',
+            'ar': u'بوابة',
+            'de': u'Portal',
+            'en': u'Portal',
+            'es': u'Comentarios',
             'he': u'פורטל',
             'it': u'Portale',
             'ja': u'ポータル',
+            'pl': u'Portal',
+            'pt': u'Portal',
             'zh': u'频道',
-        }   
+        }
self.namespaces[101] = {
-            '_default': u'Portal talk',
+            'ar': u'نقاش البوابة',
+            'de': u'Portal Diskussion',
+            'en': u'Portal talk',
+            'es': u'Comentarios Discusión',
             'he': u'שיחת פורטל',
             'it': u'Discussioni portale',
             'ja': u'ポータル‐ノート',
-            'de': u'Portal Diskussion',
             'pl': u'Dyskusja portalu',
             'pt': u'Portal Discussão',
             'zh': u'频道 talk',
-        }   
+        }
self.namespaces[102] = {
+            'ar': u'تعليقات',
             'en': u'Comments',
             'fr': u'Transwiki',
             'pt': u'Efeméride',
-        }   
+        }
self.namespaces[103] = {
+            'ar': u'نقاش التعليقات',
             'en': u'Comments talk',
             'fr': u'Discussion Transwiki',
             'pt': u'Efeméride Discussão',
-        }   
+        }
self.namespaces[104] = {
             'fr': u'Page',
-        }   
+        }
self.namespaces[105] = {
             'fr': u'Discussion Page',
-        }   
+        }
self.namespaces[106] = {
             'fr': u'Dossier',
-        }   
+        }
self.namespaces[107] = {
             'fr': u'Discussion Dossier',
-        }   
+        }
self.namespaces[108] = {
             'ja': u'短信',
-        }   
+        }
self.namespaces[109] = {
             'ja': u'短信‐ノート',
-        }   
+        }
# On most Wikipedias page names must start with a capital letter, but some
         # languages don't use this.
-            
         self.nocapitalize = ['cs', 'de', 'es', 'fa', 'fr', 'gu', 'hi', 'hr',
                         'hu', 'it', 'ja', 'ka', 'kn', 'ku', 'nl', 'sa',
-                        'scn', 'sq', 'sv', 'sw', 'tokipona', 'tr', 'vi']
-    
-        self.obsolete = {'nb':'no',
-                    'minnan':'zh-min-nan',
-                    'zh-tw':'zh',
-                    'zh-cn':'zh'}
-    
+                        'scn', 'sq', 'sv', 'sw', 'tr', 'vi']
+
+        self.obsolete = {
+            'dk': 'da',
+            'jp': 'ja',
+            'minnan':'zh-min-nan',
+            'nb': 'no',
+            'zh-tw': 'zh',
+            'zh-cn': 'zh'
+        }
+
         # Which languages have a special order for putting interlanguage links,
         # and what order is it? If a language is not in interwiki_putfirst,
         # alphabetical order on language code is used. For languages that are in
         # interwiki_putfirst, interwiki_putfirst is checked first, and
         # languages are put in the order given there. All other languages are put
         # after those, in code-alphabetical order.
-    
         self.interwiki_putfirst = {
             'en': self.alphabetic,
             'fi': self.alphabetic,
@@ -164,12 +169,12 @@
             'es', 'fi', 'hi', 'ko', 'la', 'pt', 'ru', 'tr', 'zh',
             'ca', 'eo', 'et', 'gu', 'he', 'hr', 'ro'
         ]
-       
+
     def code2encoding(self, code):
         return 'utf-8'
def version(self, code):
-        return "1.11"
-    
+        return "1.12alpha"
+
     def shared_image_repository(self, code):
         return ('commons', 'commons')
Modified: trunk/pywikipedia/families/wikipedia_family.py
===================================================================
--- trunk/pywikipedia/families/wikipedia_family.py	2007-12-09 18:48:27 UTC (rev 4677)
+++ trunk/pywikipedia/families/wikipedia_family.py	2007-12-09 19:48:54 UTC (rev 4678)
@@ -950,7 +950,7 @@
             return self.known_families
def version(self, code):
-        return "1.11"
+        return "1.12alpha"
def dbName(self, code):
         # returns the name of the MySQL database
Modified: trunk/pywikipedia/families/wikiquote_family.py
===================================================================
--- trunk/pywikipedia/families/wikiquote_family.py	2007-12-09 18:48:27 UTC (rev 4677)
+++ trunk/pywikipedia/families/wikiquote_family.py	2007-12-09 19:48:54 UTC (rev 4678)
@@ -243,7 +243,7 @@
         }
def version(self, code):
-        return "1.11alpha"
+        return "1.12alpha"
def code2encodings(self, code):
         """
@@ -255,5 +255,6 @@
         if code == 'ru':
             return 'utf-8', 'iso8859-5'
         return self.code2encoding(code),
+
     def shared_image_repository(self, code):
         return ('commons', 'commons')
Modified: trunk/pywikipedia/families/wikisource_family.py
===================================================================
--- trunk/pywikipedia/families/wikisource_family.py	2007-12-09 18:48:27 UTC (rev 4677)
+++ trunk/pywikipedia/families/wikisource_family.py	2007-12-09 19:48:54 UTC (rev 4678)
@@ -265,7 +265,8 @@
         }
def version(self, code):
-        return "1.11"
+        return "1.12alpha"
+
     def shared_image_repository(self, code):
         return ('commons', 'commons')
Modified: trunk/pywikipedia/families/wikiversity_family.py
===================================================================
--- trunk/pywikipedia/families/wikiversity_family.py	2007-12-09 18:48:27 UTC (rev 4677)
+++ trunk/pywikipedia/families/wikiversity_family.py	2007-12-09 19:48:54 UTC (rev 4678)
@@ -12,7 +12,7 @@
         self.name = 'wikiversity'
self.langs = {
-            'beta':'beta.wikiversity.org'
+            'beta': 'beta.wikiversity.org',
         }
for lang in self.knownlanguages:
@@ -38,61 +38,65 @@
         }
self.namespaces[100] = {
-            '_default': u'School',
+            'en': u'School',
             'it': u'Facoltà',
         }
         self.namespaces[101] = {
-            '_default': u'School talk',
+            'en': u'School talk',
             'it': u'Discussioni facoltà',
         }
         self.namespaces[102] = {
-            '_default': u'Portal',
+            'en': u'Portal',
             'fr': u'Projet',
             'it': u'Corso',
         }
         self.namespaces[103] = {
-            '_default': u'Portal talk',
+            'en': u'Portal talk',
             'fr': u'Discussion Projet',
             'it': u'Discussioni corso',
         }
         self.namespaces[104] = {
-            '_default': u'Topic',
+            'en': u'Topic',
             'it': u'Materia',
         }
         self.namespaces[105] = {
-            '_default': u'Topic talk',
+            'en': u'Topic talk',
             'it': u'Discussioni materia',
         }
         self.namespaces[106] = {
-            '_default': u'',
             'de': u'Kurs',
             'fr': u'Faculté',
-			'it': u'Dipartimento',
+            'it': u'Dipartimento',
         }
         self.namespaces[107] = {
-            '_default': u'',
             'de': u'Kurs Diskussion',
             'fr': u'Discussion Faculté',
-			'it': u'Discussioni dipartimento',
+            'it': u'Discussioni dipartimento',
         }
         self.namespaces[108] = {
-            '_default': u'',
             'de': u'Projekt',
             'fr': u'Département',
         }
         self.namespaces[109] = {
-            '_default': u'',
             'de': u'Projekt Diskussion',
             'fr': u'Discussion Département',
         }
         self.namespaces[110] = {
-            '_default': u'',
             'fr': u'Transwiki',
         }
         self.namespaces[111] = {
-            '_default': u'',
             'fr': u'Discussion Transwiki',
         }
+
+        self.obsolete = {
+            'dk': 'da',
+            'jp': 'ja',
+            'minnan':'zh-min-nan',
+            'nb': 'no',
+            'zh-tw': 'zh',
+            'zh-cn': 'zh'
+        }
+
         self.mainpages = {
             'de': u'Hauptseite',
             'fr': u'Accueil',
@@ -100,6 +104,7 @@
         }
def version(self,code):
-        return "1.11alpha"
+        return "1.12alpha"
+
     def shared_image_repository(self, code):
         return ('commons', 'commons')
Modified: trunk/pywikipedia/families/wiktionary_family.py
===================================================================
--- trunk/pywikipedia/families/wiktionary_family.py	2007-12-09 18:48:27 UTC (rev 4677)
+++ trunk/pywikipedia/families/wiktionary_family.py	2007-12-09 19:48:54 UTC (rev 4678)
@@ -7,26 +7,22 @@
# The Wikimedia family that is known as Wiktionary
-# Known wiktionary languages, given as a dictionary mapping the language code
-# to the hostname of the site hosting that wiktionary. For human consumption,
-# the full name of the language is given behind each line as a comment
-
 class Family(family.Family):
     def __init__(self):
         family.Family.__init__(self)
         self.name = 'wiktionary'
         self.langs = {
+            'dk':'da.wiktionary.org',
+            'jp':'ja.wiktionary.org',
             'minnan':'zh-min-nan.wiktionary.org',
             'nb':'no.wiktionary.org',
             'zh-cn':'zh.wiktionary.org',
             'zh-tw':'zh.wiktionary.org'
             }
-        
+
         for lang in self.knownlanguages:
             if not lang in ['ee','ht','ny', 'se', 'tum']:
                 self.langs[lang] = lang+'.wiktionary.org'
-        
-        # Most namespaces are inherited from family.Family.
# Override defaults
         self.namespaces[2]['pl'] = u'Wikipedysta'
@@ -64,7 +60,7 @@
             'kk': u'Уикисөздік',
             'ko': u'위키낱말사전',
             'la': u'Victionarium',
-            'ml': u'വിക്കി‌‌ നിഘണ്ടു',
+            'ml': u'വിക്കിനിഘണ്ടു',
             'ms': u'Wiktionary',
             'nl': u'WikiWoordenboek',
             'oc': u'Wikiccionari',
@@ -80,9 +76,9 @@
             'ur': u'وکی لغت',
             'uz': u'Vikilug‘at',
             'vo': u'Vükivödabuk',
-            'yi': u'װיקיװערטערבוך',
+            'yi': [u'װיקיװערטערבוך', u'וויקיווערטערבוך'],
         }
-        
+
         self.namespaces[5] = {
             '_default': [u'Wiktionary talk', self.namespaces[5]['_default']],
             'ab': u'Обсуждение Wiktionary',
@@ -130,7 +126,7 @@
             'ia': u'Discussion Wiktionary',
             'id': u'Pembicaraan Wiktionary',
             'io': u'Wikivortaro Debato',
-            'is': u'Wikiorðabókarspjall',
+            'is': [u'Wikiorðabókarspjall', u'Wikiorðabókspjall'],
             'it': u'Discussioni Wikizionario',
             'ja': u'Wiktionary‐ノート',
             'jv': u'Dhiskusi Wiktionary',
@@ -146,7 +142,7 @@
             'lt': u'Wiktionary aptarimas',
             'lv': u'Wiktionary diskusija',
             'mk': u'Разговор за Wiktionary',
-            'ml': u'വിക്കി‌‌ നിഘണ്ടു സംവാദം',
+            'ml': u'വിക്കിനിഘണ്ടു സംവാദം',
             'mr': u'Wiktionary चर्चा',
             'ms': u'Perbincangan Wiktionary',
             'nah': u'Wiktionary Discusión',
@@ -183,102 +179,104 @@
             'vo': u'Bespik dö Vükivödabuk',
             'wa': u'Wiktionary copene',
             'wo': u'Discussion Wiktionary',
-            'yi': u'װיקיװערטערבוך רעדן',
+            'yi': [u'װיקיװערטערבוך רעדן', u'וויקיווערטערבוך רעדן'],
         }
self.namespaces[100] = {
-            '_default': u'Appendix',
             'bg': u'Словоформи',
             'bs': u'Portal',
             'cy': u'Atodiad',
+            'en': u'Appendix',
             'fi': u'Liite',
             'fr': u'Annexe',
             'he': u'נספח',
             'it': u'Appendice',
             'ko': u'부록',
+            'oc': u'Annèxa',
             'pl': u'Aneks',
             'pt': u'Apêndice',
             'ro': u'Portal',
-            'ru': u'Приложение',
+            'ru': [u'Приложение', u'Appendix'],
             'sr': u'Портал',
             'sv': u'WT',
         }
         self.namespaces[101] = {
-            '_default': u'Appendix talk',
             'bg': u'Словоформи беседа',
             'bs': u'Razgovor o Portalu',
             'cy': u'Sgwrs Atodiad',
+            'en': u'Appendix talk',
             'fi': u'Keskustelu liitteestä',
             'fr': u'Discussion Annexe',
             'he': u'שיחת נספח',
             'it': u'Discussioni appendice',
             'ko': u'부록 토론',
+            'oc': u'Discussion Annèxa',
             'pl': u'Dyskusja aneksu',
             'pt': u'Apêndice Discussão',
             'ro': u'Discuţie Portal',
-            'ru': u'Обсуждение приложения',
+            'ru': [u'Обсуждение приложения', u'Appendix talk'],
             'sr': u'Разговор о порталу',
             'sv': u'WT-diskussion',
         }
self.namespaces[102] = {
-            '_default': u'Concordance',
             'bs': u'Indeks',
             'cy': u'Odliadur',
             'de': u'Verzeichnis',
+            'en': u'Concordance',
             'fr': u'Transwiki',
             'pl': u'Indeks',
             'pt': u'Vocabulário',
             'ro': u'Apendice',
-            'ru': u'Конкорданс',
+            'ru': [u'Конкорданс', u'Concordance'],
             'sv': u'Appendix',
         }
self.namespaces[103] = {
-            '_default': u'Concordance talk',
             'bs': u'Razgovor o Indeksu',
             'cy': u'Sgwrs Odliadur',
             'de': u'Verzeichnis Diskussion',
+            'en': u'Concordance talk',
             'fr': u'Discussion Transwiki',
             'pl': u'Dyskusja indeksu',
             'pt': u'Vocabulário Discussão',
             'ro': u'Discuţie Apendice',
-            'ru': u'Обсуждение конкорданса',
+            'ru': [u'Обсуждение конкорданса', u'Concordance talk'],
             'sv': u'Appendixdiskussion',
         }
self.namespaces[104] = {
-            '_default': u'Index',
             'bs': u'Dodatak',
             'cy': u'WiciSawrws',
+            'en': u'Index',
             'fr': u'Portail',
             'pl': u'Portal',
             'pt': u'Rimas',
-            'ru': u'Индекс',
+            'ru': [u'Индекс', u'Index'],
         }
self.namespaces[105] = {
-            '_default': u'Index talk',
             'bs': u'Razgovor o Dodatku',
             'cy': u'Sgwrs WiciSawrws',
+            'en': u'Index talk',
             'fr': u'Discussion Portail',
             'pl': u'Dyskusja portalu',
             'pt': u'Rimas Discussão',
-            'ru': u'Обсуждение индекса',
+            'ru': [u'Обсуждение индекса', u'Index talk'],
         }
self.namespaces[106] = {
             'en': u'Rhymes',
             'is': u'Viðauki',
             'pt': u'Portal',
-            'ru': u'Рифмы',
+            'ru': [u'Рифмы', u'Rhymes'],
         }
self.namespaces[107] = {
             'en': u'Rhymes talk',
             'is': u'Viðaukaspjall',
             'pt': u'Portal Discussão',
-            'ru': u'Обсуждение рифм',
+            'ru': [u'Обсуждение рифм', u'Rhymes talk'],
         }
self.namespaces[108] = {
@@ -305,23 +303,35 @@
             'en': u'WT talk',
         }
+        self.namespaces[114] = {
+            'en': u'Citations',
+        }
+
+        self.namespaces[115] = {
+            'en': u'Citations talk',
+        }
+
         # Other than most Wikipedias, page names must not start with a capital
         # letter on ALL Wiktionaries.
+        self.nocapitalize = self.langs.keys()
-        self.nocapitalize = self.langs.keys()
-    
-        self.obsolete = {'nb':'no',
-                    'minnan':'zh-min-nan',
-                    'zh-tw':'zh',
-                    'zh-cn':'zh'}
-    
+        self.obsolete = {
+            'dk': 'da',
+            'jp': 'ja',
+            'minnan':'zh-min-nan',
+            'nb': 'no',
+            'tokipona': None,
+            'zh-tw': 'zh',
+            'zh-cn': 'zh'
+        }
+
         # Which languages have a special order for putting interlanguage links,
         # and what order is it? If a language is not in interwiki_putfirst,
         # alphabetical order on language code is used. For languages that are in
         # interwiki_putfirst, interwiki_putfirst is checked first, and
         # languages are put in the order given there. All other languages are put
         # after those, in code-alphabetical order.
-    
+
         self.interwiki_putfirst = {
             'en': self.alphabetic,
             'et': self.alphabetic,
@@ -332,7 +342,7 @@
             'pl': self.alphabetic,
             'simple': self.alphabetic
             }
-            
+
         self.languages_by_size = [
             'en', 'fr', 'vi', 'zh', 'io', 'el', 'pl', 'it', 'de', 'hu',
             'fi', 'nl', 'bg', 'pt', 'ku', 'es', 'gl', 'sr', 'id', 'sv',
@@ -344,14 +354,14 @@
             'mr', 'be', 'rw', 'tl', 'eu', 'ms', 'ast', 'an', 'ga', 'pa',
             'nah', 'ha', 'oc'
             ]
-        
+
         self.interwiki_on_one_line = ['pl']
self.interwiki_attop = ['pl']
def version(self, code):
-        return "1.11"
-    
+        return "1.12alpha"
+
     def shared_image_repository(self, code):
         return ('commons', 'commons')
Modified: trunk/pywikipedia/family.py
===================================================================
--- trunk/pywikipedia/family.py	2007-12-09 18:48:27 UTC (rev 4677)
+++ trunk/pywikipedia/family.py	2007-12-09 19:48:54 UTC (rev 4678)
@@ -28,8 +28,7 @@
            'si','simple','sd','ss','sk','sl','cu','so','sr','sh','su','fi','sv','tl',
            'ta','kab','roa-tara','tt','te','tet','th','vi','ti','tg','tpi','to','chr','chy','ve',
            'tr','tk','tw','udm','bug','uk','ur','vec','vo','fiu-vro','wa',
-           'vls','war','wo','wuu','ts','ii','yi','yo','zh-yue','cbk-zam','diq','zea','bat-smg','zh',
-           'zh-tw','zh-cn']
+           'vls','war','wo','wuu','ts','ii','yi','yo','zh-yue','cbk-zam','diq','zea','bat-smg','zh']
# knownlanguages is the same list but sorted by code
         self.knownlanguages = list(self.alphabetic)

    