Revision: 6504
Author:   philip
Date:     2009-03-10 15:35:52 +0000 (Tue, 10 Mar 2009)

Log Message:
-----------
New feature: connect to wikimedia projects though SSL connection.
New translations of some messages.

Patched by [[:zh:User:Alexsh]].

Modified Paths:
--------------
    trunk/pywikipedia/config.py
    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
    trunk/pywikipedia/maintenance/readtalk.py
    trunk/pywikipedia/speedy_delete.py
    trunk/pywikipedia/wikipedia.py

Modified: trunk/pywikipedia/config.py
===================================================================
--- trunk/pywikipedia/config.py 2009-03-09 14:43:57 UTC (rev 6503)
+++ trunk/pywikipedia/config.py 2009-03-10 15:35:52 UTC (rev 6504)
@@ -63,6 +63,18 @@
 # 2. You must use the hostname of the site, not its family/language pair
 authenticate = {}
 
+#
+#      Security Connection for Wikimedia Projects
+#
+#
+#
+SSL_connection = False
+
+available_ssl_project = [
+    
u'wikipedia',u'wikinews',u'wikisource',u'wiktionary',u'wikibooks',u'wikiquote',u'wikiversity'
+]
+    #u'meta',u'mediawiki',u'commons',u'species',u'incubator']
+
 # password_file = ".passwd"
 # A password file with default passwords. For more information, please
 # see LoginManager.readPassword in login.py.

Modified: trunk/pywikipedia/families/wikibooks_family.py
===================================================================
--- trunk/pywikipedia/families/wikibooks_family.py      2009-03-09 14:43:57 UTC 
(rev 6503)
+++ trunk/pywikipedia/families/wikibooks_family.py      2009-03-10 15:35:52 UTC 
(rev 6504)
@@ -26,8 +26,12 @@
             'xh', 'rm', 'ba', 'za', 'bi', 'my', 'wa', 'zu', 'mi',
         ]
 
-        for lang in self.languages_by_size:
-            self.langs[lang] = '%s.wikibooks.org' % lang
+        if config.SSL_connection and config.family in 
config.available_ssl_project:
+            for lang in self.languages_by_size:
+                self.langs[lang] = 'secure.wikimedia.org'
+        else:
+            for lang in self.languages_by_size:
+                self.langs[lang] = '%s.wikibooks.org' % lang
 
         # Override defaults
         self.namespaces[2]['pl'] = u'Wikipedysta'
@@ -64,6 +68,7 @@
             'ml': u'വിക്കിപാഠശാല',
             'no': u'Wikibøker',
             'oc': u'Wikilibres',
+            'ps': u'ويکيتابونه',
             'ro': u'Wikimanuale',
             'ru': u'Викиучебник',
             'sl': u'Wikiknjige',
@@ -141,7 +146,7 @@
             'oc': u'Discussion Wikilibres',
             'pa': u'Wikibooks ਚਰਚਾ',
             'pl': u'Dyskusja Wikibooks',
-            'ps': u'د Wikibooks خبرې اترې',
+            'ps': u'د ويکيتابونه خبرې اترې',
             'pt': u'Wikibooks Discussão',
             'qu': u'Wikibooks rimanakuy',
             'ro': u'Discuţie Wikimanuale',
@@ -168,6 +173,7 @@
             'vi': u'Thảo luận Wikibooks',
             'vo': u'Bespik dö Vükibuks',
             'wa': u'Wikibooks copene',
+            'za': u'Wikibooks讨论',
         }
 
         self.namespaces[100] = {

Modified: trunk/pywikipedia/families/wikinews_family.py
===================================================================
--- trunk/pywikipedia/families/wikinews_family.py       2009-03-09 14:43:57 UTC 
(rev 6503)
+++ trunk/pywikipedia/families/wikinews_family.py       2009-03-10 15:35:52 UTC 
(rev 6504)
@@ -1,6 +1,6 @@
 # -*- coding: utf-8  -*-
 import urllib
-import family, config
+import family, config, wikipedia
 
 __version__ = '$Id$'
 
@@ -17,8 +17,12 @@
             'th', 'bs', 'ar', 'bg', 'ta', 'cs', 'hu',
         ]
 
-        for lang in self.languages_by_size:
-            self.langs[lang] = '%s.wikinews.org' % lang
+        if config.SSL_connection and wikipedia.default_family in 
config.available_ssl_project:
+            for lang in self.languages_by_size:
+                self.langs[lang] = 'secure.wikimedia.org'
+        else:
+            for lang in self.languages_by_size:
+                self.langs[lang] = '%s.wikinews.org' % lang
 
         # Override defaults
         self.namespaces[2]['cs'] = u'Redaktor'

Modified: trunk/pywikipedia/families/wikipedia_family.py
===================================================================
--- trunk/pywikipedia/families/wikipedia_family.py      2009-03-09 14:43:57 UTC 
(rev 6503)
+++ trunk/pywikipedia/families/wikipedia_family.py      2009-03-10 15:35:52 UTC 
(rev 6504)
@@ -40,8 +40,12 @@
             'myv', 'sah', 'srn', 'szl', 'arz',
         ]
 
-        for lang in self.languages_by_size:
-            self.langs[lang] = '%s.wikipedia.org' % lang
+        if config.SSL_connection and wikipedia.default_family in 
config.available_ssl_project:
+            for lang in self.languages_by_size:
+                self.langs[lang] = 'secure.wikimedia.org'
+        else:
+            for lang in self.languages_by_size:
+                self.langs[lang] = '%s.wikipedia.org' % lang
 
         # Override defaults
         self.namespaces[2]['cs'] = u'Wikipedista'

Modified: trunk/pywikipedia/families/wikiquote_family.py
===================================================================
--- trunk/pywikipedia/families/wikiquote_family.py      2009-03-09 14:43:57 UTC 
(rev 6503)
+++ trunk/pywikipedia/families/wikiquote_family.py      2009-03-10 15:35:52 UTC 
(rev 6504)
@@ -1,6 +1,6 @@
 # -*- coding: utf-8  -*-
 import urllib
-import family, config
+import family, config, wikipedia
 
 __version__ = '$Id$'
 
@@ -23,8 +23,12 @@
             'ga', 'cr', 'nds', 'kk', 'kr', 'als', 'za', 'ks',
         ]
 
-        for lang in self.languages_by_size:
-            self.langs[lang] = '%s.wikiquote.org' % lang
+        if config.SSL_connection and wikipedia.default_family in 
config.available_ssl_project:
+            for lang in self.languages_by_size:
+                self.langs[lang] = 'secure.wikimedia.org'
+        else:
+            for lang in self.languages_by_size:
+                self.langs[lang] = '%s.wikiquote.org' % lang
 
         # Most namespaces are inherited from family.Family.
         # Translation used on all wikis for the different namespaces.

Modified: trunk/pywikipedia/families/wikisource_family.py
===================================================================
--- trunk/pywikipedia/families/wikisource_family.py     2009-03-09 14:43:57 UTC 
(rev 6503)
+++ trunk/pywikipedia/families/wikisource_family.py     2009-03-10 15:35:52 UTC 
(rev 6504)
@@ -1,6 +1,6 @@
 # -*- coding: utf-8  -*-
 import urllib
-import family, config
+import family, config, wikipedia
 
 __version__ = '$Id$'
 
@@ -23,8 +23,12 @@
         self.langs = {
             '-': 'wikisource.org',
         }
-        for lang in self.languages_by_size:
-            self.langs[lang] = '%s.wikisource.org' % lang
+        if config.SSL_connection and wikipedia.default_family in 
config.available_ssl_project:
+            for lang in self.languages_by_size:
+                self.langs[lang] = 'secure.wikimedia.org'
+        else:
+            for lang in self.languages_by_size:
+                self.langs[lang] = '%s.wikisource.org' % lang
 
         # Override defaults
         self.namespaces[2]['pl'] = 'Wikiskryba'
@@ -134,9 +138,11 @@
             'fa': [u'درگاه', u'Portal'],
             'fr': u'Transwiki',
             'he': u'קטע',
+            'hr': u'Autor',
             'hu': u'Szerző',
             'hy': u'Հեղինակ',
             'nl': u'Hoofdportaal',
+            'pl': u'Strona',
             'pt': u'Portal',
             'sl': u'Stran',
             'tr': u'Kişi',
@@ -150,9 +156,11 @@
             'fa': [u'بحث درگاه', u'Portal talk'],
             'fr': u'Discussion Transwiki',
             'he': u'שיחת קטע',
+            'hr': u'Razgovor o autoru',
             'hu': u'Szerző vita',
             'hy': u'Հեղինակի քննարկում',
             'nl': u'Overleg hoofdportaal',
+            'pl': u'Dyskusja strony',
             'pt': u'Portal Discussão',
             'sl': u'Pogovor o strani',
             'tr': u'Kişi tartışma',
@@ -166,11 +174,13 @@
             'en': u'Author',
             'es': u'Página',
             'fa': [u'مؤلف', u'Author'],
+            'hr': u'Stranica',
             'hy': u'Պորտալ',
             'it': u'Autore',
             'la': u'Scriptor',
             'nb': u'Forfatter',
             'no': u'Forfatter',
+            'pl': u'Indeks',
             'pt': u'Autor',
         }
         self.namespaces[103] = {
@@ -182,11 +192,13 @@
             'en': u'Author talk',
             'es': u'Página Discusión',
             'fa': [u'بحث مؤلف', u'Author talk'],
+            'hr': u'Razgovor o stranici',
             'hy': u'Պորտալի քննարկում',
             'it': u'Discussioni autore',
             'la': u'Disputatio Scriptoris',
             'nb': u'Forfatterdiskusjon',
             'no': u'Forfatterdiskusjon',
+            'pl': u'Dyskusja indeksu',
             'pt': u'Autor Discussão',
         }
 
@@ -199,11 +211,13 @@
             'fa': [u'برگه', u'Page'],
             'fr': u'Page',
             'he': u'עמוד',
+            'hr': u'Sadržaj',
             'hy': u'Էջ',
             'it': u'Progetto',
             'la': u'Pagina',
             'pt': u'Galeria',
             'ru': u'Страница',
+            'sl': u'Kazalo',
             'sv': u'Sida',
             'te': [u'పేజీ', u'Page'],
         }
@@ -217,11 +231,13 @@
             'fa': [u'بحث برگه', u'Page talk'],
             'fr': u'Discussion Page',
             'he': u'שיחת עמוד',
+            'hr': u'Razgovor o sadržaju',
             'hy': u'Էջի քննարկում',
             'it': u'Discussioni progetto',
             'la': u'Disputatio Paginae',
             'pt': u'Galeria Discussão',
             'ru': u'Обсуждение страницы',
+            'sl': u'Pogovor o kazalu',
             'sv': u'Siddiskussion',
             'te': [u'పేజీ చర్చ', u'Page talk'],
         }

Modified: trunk/pywikipedia/families/wikiversity_family.py
===================================================================
--- trunk/pywikipedia/families/wikiversity_family.py    2009-03-09 14:43:57 UTC 
(rev 6503)
+++ trunk/pywikipedia/families/wikiversity_family.py    2009-03-10 15:35:52 UTC 
(rev 6504)
@@ -1,6 +1,6 @@
 # -*- coding: utf-8  -*-
 import urllib
-import family, config
+import family, config, wikipedia
 
 __version__ = '$Id$'
 
@@ -18,8 +18,12 @@
         self.langs = {
             'beta': 'beta.wikiversity.org',
         }
-        for lang in self.languages_by_size:
-            self.langs[lang] = '%s.wikiversity.org' % lang
+        if config.SSL_connection and wikipedia.default_family in 
config.available_ssl_project:
+            for lang in self.languages_by_size:
+                self.langs[lang] = 'secure.wikimedia.org'
+        else:
+            for lang in self.languages_by_size:
+                self.langs[lang] = '%s.wikiversity.org' % lang
 
         # Most namespaces are inherited from family.Family.
         # Translation used on all wikis for the different namespaces.
@@ -47,6 +51,7 @@
         }
 
         self.namespaces[100] = {
+            'cs': u'Fórum',
             'el': u'Σχολή',
             'en': u'School',
             'it': u'Facoltà',
@@ -54,6 +59,7 @@
            'cs': u'Fórum',
         }
         self.namespaces[101] = {
+            'cs': u'Fórum diskuse',
             'el': u'Συζήτηση Σχολής',
             'en': u'School talk',
             'it': u'Discussioni facoltà',

Modified: trunk/pywikipedia/families/wiktionary_family.py
===================================================================
--- trunk/pywikipedia/families/wiktionary_family.py     2009-03-09 14:43:57 UTC 
(rev 6503)
+++ trunk/pywikipedia/families/wiktionary_family.py     2009-03-10 15:35:52 UTC 
(rev 6504)
@@ -1,6 +1,6 @@
 # -*- coding: utf-8  -*-
 import urllib
-import family, config
+import family, config, wikipedia
 
 __version__ = '$Id$'
 
@@ -29,8 +29,12 @@
             'om', 'ln', 'sm', 'za', 'roa-rup', 'dz', 'my', 'wa',
         ]
 
-        for lang in self.languages_by_size:
-            self.langs[lang] = '%s.wiktionary.org' % lang
+        if config.SSL_connection and wikipedia.default_family in 
config.available_ssl_project:
+            for lang in self.languages_by_size:
+                self.langs[lang] = 'secure.wikimedia.org'
+        else:
+            for lang in self.languages_by_size:
+                self.langs[lang] = '%s.wiktionary.org' % lang
 
         # Override defaults
         self.namespaces[2]['pl'] = u'Wikipedysta'

Modified: trunk/pywikipedia/family.py
===================================================================
--- trunk/pywikipedia/family.py 2009-03-09 14:43:57 UTC (rev 6503)
+++ trunk/pywikipedia/family.py 2009-03-10 15:35:52 UTC (rev 6504)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8  -*-
-import config, urllib, re
+import config, urllib, re, wikipedia
 from datetime import timedelta, datetime
 
 __version__='$Id$'
@@ -3331,7 +3331,10 @@
         Can be overridden to return 'https'.
         Other protocols are not supported.
         """
-        return 'http'
+        if config.SSL_connection and wikipedia.default_family in 
config.available_ssl_project:
+            return 'https'
+        else:
+            return 'http'
 
     def hostname(self, code):
         return self.langs[code]
@@ -3348,7 +3351,10 @@
         uses a different value.
 
         """
-        return '/w'
+        if config.SSL_connection and wikipedia.default_family in 
config.available_ssl_project:
+            return '/%s/%s/w' % (wikipedia.default_family, code)
+        else:
+            return '/w'
 
     def path(self, code):
         return '%s/index.php' % self.scriptpath(code)
@@ -3360,7 +3366,10 @@
         return '%s/api.php' % self.scriptpath(code)
 
     def nicepath(self, code):
-        return '/wiki/'
+        if config.SSL_connection and wikipedia.default_family in 
config.available_ssl_project:
+            return '/%s/%s/wiki/' % (wikipedia.default_family, code)
+        else:
+            return '/wiki/'
 
     def dbName(self, code):
         # returns the name of the MySQL database

Modified: trunk/pywikipedia/maintenance/readtalk.py
===================================================================
--- trunk/pywikipedia/maintenance/readtalk.py   2009-03-09 14:43:57 UTC (rev 
6503)
+++ trunk/pywikipedia/maintenance/readtalk.py   2009-03-10 15:35:52 UTC (rev 
6504)
@@ -16,6 +16,7 @@
 
 def readtalk(lang, familyName):
     site = wikipedia.getSite(code=lang, fam=familyName)
+    site.forceLogin();
     page = wikipedia.Page(site, u'User_Talk:' + 
config.usernames[familyName][lang])
     wikipedia.output(u'Reading talk page from %s:%s'% (lang,familyName))
     try:

Modified: trunk/pywikipedia/speedy_delete.py
===================================================================
--- trunk/pywikipedia/speedy_delete.py  2009-03-09 14:43:57 UTC (rev 6503)
+++ trunk/pywikipedia/speedy_delete.py  2009-03-10 15:35:52 UTC (rev 6504)
@@ -45,94 +45,101 @@
     """
 
     csd_cat={
-        'als': u'Kategorie:Wikipedia:Schnelllöschen',
-        'ar': u'تصنيف:صفحات للحذف السريع',
-        'be': u'Катэгорыя:Вікіпэдыя:Кандыдатуры на выдаленьне',
-        'cs': u'Kategorie:Stránky ke smazání',
-        'de': u'Kategorie:Wikipedia:Schnelllöschen',
-        'en': u'Category:Candidates for speedy deletion',
-        'es': u'Categoría:Wikipedia:Borrar (definitivo)',
-        'fa': u'رده:مقالات نامزد حذف سریع',
-        'fi': u'Luokka:Roskaa',
-        'he': u'קטגוריה:ויקיפדיה: למחיקה מהירה',
-        'hsb': u'Kategorija:Strony k spěšnemu wušmórnjenju',
-        'ia': u'Categoria:Wikipedia:Eliminar',
-        'it': 'Categoria:Da_cancellare_subito',
-        'ja': u'Category:即時削除',
-        'ks': u'Category:Candidates for speedy deletion',
-        'nah': u'Categoría:Huiquipedia:Borrar (definitivo)',
-        'nl': u'Categorie:Wikipedia:Nuweg',
-        'no': u'Kategori:Sider som er foreslått raskt slettet',
-        'pl': u'Kategoria:Ekspresowe kasowanko',
-        'pt': u'Categoria:Páginas para eliminação rápida',
-        'ru': u'Категория:Википедия:К быстрому удалению',
-        'sv': u'Kategori:Snabba raderingar',
-        'uk': u'Категорія:Статті до швидкого вилучення',
-        'vi': u'Thể loại:Chờ xoá',
-        'zh': u'Category:快速删除候选',
-        'zh-yue': u'Category:快速刪除候選',
+        'wikipedia':{
+            'als': u'Kategorie:Wikipedia:Schnelllöschen',
+            'ar': u'تصنيف:صفحات للحذف السريع',
+            'be': u'Катэгорыя:Вікіпэдыя:Кандыдатуры на выдаленьне',
+            'cs': u'Kategorie:Stránky ke smazání',
+            'de': u'Kategorie:Wikipedia:Schnelllöschen',
+            'en': u'Category:Candidates for speedy deletion',
+            'es': u'Categoría:Wikipedia:Borrar (definitivo)',
+            'fa': u'رده:مقالات نامزد حذف سریع',
+            'fi': u'Luokka:Roskaa',
+            'he': u'קטגוריה:ויקיפדיה: למחיקה מהירה',
+            'hsb': u'Kategorija:Strony k spěšnemu wušmórnjenju',
+            'ia': u'Categoria:Wikipedia:Eliminar',
+            'it': 'Categoria:Da_cancellare_subito',
+            'ja': u'Category:即時削除',
+            'ks': u'Category:Candidates for speedy deletion',
+            'nah': u'Categoría:Huiquipedia:Borrar (definitivo)',
+            'nl': u'Categorie:Wikipedia:Nuweg',
+            'no': u'Kategori:Sider som er foreslått raskt slettet',
+            'pl': u'Kategoria:Ekspresowe kasowanko',
+            'pt': u'Categoria:Páginas para eliminação rápida',
+            'ru': u'Категория:Википедия:К быстрому удалению',
+            'sv': u'Kategori:Snabba raderingar',
+            'uk': u'Категорія:Статті до швидкого вилучення',
+            'vi': u'Thể loại:Chờ xoá',
+            'zh': u'Category:快速删除候选',
+            'zh-yue': u'Category:快速刪除候選',
+        },
+        'wikinews':{
+            'zh': u'Category:快速删除候选',
+        },
     }
 
     # If the site has several templates for speedy deletion, it might be
     # possible to find out the reason for deletion by the template used.
     # _default will be used if no such semantic template was used.
     deletion_messages = {
-           'ar': {
-            u'_default': u'حذف مرشح للحذف السريع حسب [[ويكيبيديا:حذف 
سريع|معايير الحذف السريع]]',
-            },
-        'de': {
-            u'_default': u'Lösche Artikel mit 
[[Wikipedia:Schnelllöschantrag|Schnelllöschantrag]]',
-            },
-        'en': {
-            u'_default':      u'Deleting candidate for speedy deletion per 
[[WP:CSD|CSD]]',
-            u'Db-author':     u'Deleting page per [[WP:CSD|CSD]] G7: Author 
requests deletion and is its only editor.',
-            u'Db-nonsense':   u'Deleting page per [[WP:CSD|CSD]] G1: Page is 
patent nonsense or gibberish.',
-            u'Db-test':       u'Deleting page per [[WP:CSD|CSD]] G2: Test 
page.',
-            u'Db-nocontext':  u'Deleting page per [[WP:CSD|CSD]] A1: Short 
article that provides little or no context.',
-            u'Db-empty':      u'Deleting page per [[WP:CSD|CSD]] A1: Empty 
article.',
-            u'Db-attack':     u'Deleting page per [[WP:CSD|CSD]] G10: Page 
that exists solely to attack its subject.',
-            u'Db-catempty':   u'Deleting page per [[WP:CSD|CSD]] C1: Empty 
category.',
-            u'Db-band':       u'Deleting page per [[WP:CSD|CSD]] A7: Article 
about a non-notable band.',
-            u'Db-banned':     u'Deleting page per [[WP:CSD|CSD]] G5: Page 
created by a banned user.',
-            u'Db-bio':        u'Deleting page per [[WP:CSD|CSD]] A7: Article 
about a non-notable person.',
-            u'Db-notenglish': u'Deleting page per [[WP:CSD|CSD]] A2: Article 
isn\'t written in English.',
-            u'Db-copyvio':    u'Deleting page per [[WP:CSD|CSD]] G12: Page is 
a blatant copyright violation.',
-            u'Db-repost':     u'Deleting page per [[WP:CSD|CSD]] G4: 
Recreation of previously deleted material.',
-            u'Db-vandalism':  u'Deleting page per [[WP:CSD|CSD]] G3: Blatant 
vandalism.',
-            u'Db-talk':       u'Deleting page per [[WP:CSD|CSD]] G8: Talk page 
of a deleted or non-existent page.',
-            u'Db-spam':       u'Deleting page per [[WP:CSD|CSD]] G11: Blatant 
advertising.',
-            u'Db-disparage':  u'Deleting page per [[WP:CSD|CSD]] T1: Divisive 
or inflammatory template.',
-            u'Db-r1':         u'Deleting page per [[WP:CSD|CSD]] R1: Redirect 
to a deleted or non-existent page.',
-            u'Db-experiment': u'Deleting page per [[WP:CSD|CSD]] G2: Page was 
created as an experiment.',
-            },
-        'he': {
-            u'_default':      u'מחיקת מועמד למחיקה מהירה לפי 
[[ויקיפדיה:מדיניות המחיקה|מדיניות המחיקה]]',
-            u'גם בוויקישיתוף': u'הקובץ זמין כעת בוויקישיתוף.',
-            },
-        'ja':{
-            u'_default':u'[[WP:CSD|即時削除の方針]]に基づい削除',
-            },
-        'pt': {
-            u'_default':      u'Apagando página por [[Wikipedia:Páginas para 
eliminar|eliminação rápida]]',
-            },
-        'pl': {
-            u'_default':      u'Usuwanie artykułu zgodnie z zasadami 
[[Wikipedia:Ekspresowe kasowanko|ekspresowego kasowania]]',
-            },
-        'it': {
-            u'_default':      u'Bot: Cancello pagine taggate come 
[[Aiuto:Cancella subito|cancella subito]].',
-            },
-        'zh':{
-            u'_default':u'[[WP:CSD]]',
-            u'Notchinese':u'[[WP:CSD#G7|CSD G7]]: 非中文條目且長時間未翻譯',
-            u'No source':u'[[WP:CSD#I3|CSD I3]]: 沒有來源連結,無法確認來源與版權資訊',
-            u'No license':u'[[WP:CSD#I3|CSD I3]]: 沒有版權模板,無法確認版權資訊',
-            u'Unknown':u'[[WP:CSD#I3|CSD I3]]: 沒有版權模板,無法確認版權資訊',
-            u'TempPage':u'[[WP:CSD]]: 臨時頁面',
-            u'NowCommons':u'[[WP:CSD#I7|CSD I7]]: 此圖片已存在於[[:commons:|維基共享資源]]',
-            u'Nowcommons':u'[[WP:CSD#I7|CSD I7]]: 此圖片已存在於[[:commons:|維基共享資源]]',
-            u'RoughTranslation':u'[[WP:CSD#G7|CSD G7]]: 機器翻譯',
-            u'Advert':u'[[WP:CSD#G11|CSD G11]]: [[WP:NOT#維基百科不是宣傳工具|廣告、宣傳頁面]]',
-            },
+        'wikipedia':{
+               'ar': {
+                u'_default': u'حذف مرشح للحذف السريع حسب [[ويكيبيديا:حذف 
سريع|معايير الحذف السريع]]',
+                },
+            'de': {
+                u'_default': u'Lösche Artikel mit 
[[Wikipedia:Schnelllöschantrag|Schnelllöschantrag]]',
+                },
+            'en': {
+                u'_default':      u'Deleting candidate for speedy deletion per 
[[WP:CSD|CSD]]',
+                u'Db-author':     u'Deleting page per [[WP:CSD|CSD]] G7: 
Author requests deletion and is its only editor.',
+                u'Db-nonsense':   u'Deleting page per [[WP:CSD|CSD]] G1: Page 
is patent nonsense or gibberish.',
+                u'Db-test':       u'Deleting page per [[WP:CSD|CSD]] G2: Test 
page.',
+                u'Db-nocontext':  u'Deleting page per [[WP:CSD|CSD]] A1: Short 
article that provides little or no context.',
+                u'Db-empty':      u'Deleting page per [[WP:CSD|CSD]] A1: Empty 
article.',
+                u'Db-attack':     u'Deleting page per [[WP:CSD|CSD]] G10: Page 
that exists solely to attack its subject.',
+                u'Db-catempty':   u'Deleting page per [[WP:CSD|CSD]] C1: Empty 
category.',
+                u'Db-band':       u'Deleting page per [[WP:CSD|CSD]] A7: 
Article about a non-notable band.',
+                u'Db-banned':     u'Deleting page per [[WP:CSD|CSD]] G5: Page 
created by a banned user.',
+                u'Db-bio':        u'Deleting page per [[WP:CSD|CSD]] A7: 
Article about a non-notable person.',
+                u'Db-notenglish': u'Deleting page per [[WP:CSD|CSD]] A2: 
Article isn\'t written in English.',
+                u'Db-copyvio':    u'Deleting page per [[WP:CSD|CSD]] G12: Page 
is a blatant copyright violation.',
+                u'Db-repost':     u'Deleting page per [[WP:CSD|CSD]] G4: 
Recreation of previously deleted material.',
+                u'Db-vandalism':  u'Deleting page per [[WP:CSD|CSD]] G3: 
Blatant vandalism.',
+                u'Db-talk':       u'Deleting page per [[WP:CSD|CSD]] G8: Talk 
page of a deleted or non-existent page.',
+                u'Db-spam':       u'Deleting page per [[WP:CSD|CSD]] G11: 
Blatant advertising.',
+                u'Db-disparage':  u'Deleting page per [[WP:CSD|CSD]] T1: 
Divisive or inflammatory template.',
+                u'Db-r1':         u'Deleting page per [[WP:CSD|CSD]] R1: 
Redirect to a deleted or non-existent page.',
+                u'Db-experiment': u'Deleting page per [[WP:CSD|CSD]] G2: Page 
was created as an experiment.',
+                },
+            'he': {
+                u'_default':      u'מחיקת מועמד למחיקה מהירה לפי 
[[ויקיפדיה:מדיניות המחיקה|מדיניות המחיקה]]',
+                u'גם בוויקישיתוף': u'הקובץ זמין כעת בוויקישיתוף.',
+                },
+            'ja':{
+                u'_default':u'[[WP:CSD|即時削除の方針]]に基づい削除',
+                },
+            'pt': {
+                u'_default':      u'Apagando página por [[Wikipedia:Páginas 
para eliminar|eliminação rápida]]',
+                },
+            'pl': {
+                u'_default':      u'Usuwanie artykułu zgodnie z zasadami 
[[Wikipedia:Ekspresowe kasowanko|ekspresowego kasowania]]',
+                },
+            'it': {
+                u'_default':      u'Bot: Cancello pagine taggate come 
[[Aiuto:Cancella subito|cancella subito]].',
+                },
+            'zh':{
+                u'_default':u'[[WP:CSD]]',
+                u'Notchinese':u'[[WP:CSD#G7|CSD G7]]: 非中文條目且長時間未翻譯',
+                u'No source':u'[[WP:CSD#I3|CSD I3]]: 沒有來源連結,無法確認來源與版權資訊',
+                u'No license':u'[[WP:CSD#I3|CSD I3]]: 沒有版權模板,無法確認版權資訊',
+                u'Unknown':u'[[WP:CSD#I3|CSD I3]]: 沒有版權模板,無法確認版權資訊',
+                u'TempPage':u'[[WP:CSD]]: 臨時頁面',
+                u'NowCommons':u'[[WP:CSD#I7|CSD I7]]: 
此圖片已存在於[[:commons:|維基共享資源]]',
+                u'Nowcommons':u'[[WP:CSD#I7|CSD I7]]: 
此圖片已存在於[[:commons:|維基共享資源]]',
+                u'RoughTranslation':u'[[WP:CSD#G7|CSD G7]]: 機器翻譯',
+                u'Advert':u'[[WP:CSD#G11|CSD G11]]: 
[[WP:NOT#維基百科不是宣傳工具|廣告、宣傳頁面]]',
+                },
+        },
     }
 
     # Default reason for deleting a talk page.

Modified: trunk/pywikipedia/wikipedia.py
===================================================================
--- trunk/pywikipedia/wikipedia.py      2009-03-09 14:43:57 UTC (rev 6503)
+++ trunk/pywikipedia/wikipedia.py      2009-03-10 15:35:52 UTC (rev 6504)
@@ -6524,6 +6524,12 @@
     if hasattr(code,'lang'):
         code = code.lang
 
+    if xdict.has_key('wikipedia') :
+        if xdict.has_key(default_family):
+            xdict = xdict[default_family]
+        else:
+            xdict = xdict['wikipedia']
+
     if xdict.has_key(code):
         return xdict[code]
     for alt in altlang(code):



_______________________________________________
Pywikipedia-l mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l

Reply via email to