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

9 Dec 2007

Revision: 4677
Author:   rotem
Date:     2007-12-09 18:48:27 +0000 (Sun, 09 Dec 2007)
Log Message:
-----------
Various updates and fixes for the family files, updating Wikibooks file, fixing pl: user and user talk namespaces to match the default ones in the language file.
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:04:06 UTC (rev 4676)
+++ trunk/pywikipedia/families/wikibooks_family.py	2007-12-09 18:48:27 UTC (rev 4677)
@@ -11,27 +11,24 @@
     def __init__(self):
         family.Family.__init__(self)
         self.name = 'wikibooks'
-        # Known wikibooks languages, given as a dictionary mapping the language code
-        # to the hostname of the site hosting that wiktibooks. For human consumption,
-        # the full name of the language is given behind each line as a comment
+
         self.langs = {
+            'dk':'da.wikibooks.org',
+            'jp':'ja.wikibooks.org',
             'minnan':'zh-min-nan.wikibooks.org',
             'nb':'no.wikibooks.org',
             'zh-cn':'zh.wikibooks.org',
             'zh-tw':'zh.wikibooks.org'
             }
-        
+
         for lang in self.knownlanguages:
             self.langs[lang] = '%s.wikibooks.org' % lang
-        self.obsolete = {'nb':'no',
-                    'minnan':'zh-min-nan',
-                    'zh-tw':'zh',
-                    'zh-cn':'zh'}
-
         # Override defaults
+        self.namespaces[2]['pl'] = u'Wikipedysta'
         self.namespaces[3]['pl'] = u'Dyskusja Wikipedysty'
+        # Most namespaces are inherited from family.Family.
         # Translation used on all wikis for the different namespaces.
         # (Please sort languages alphabetically)
         # You only need to enter translations that differ from _default.
@@ -99,6 +96,7 @@
             'fr': u'Discussion Wikilivres',
             'fy': u'Wikibooks oerlis',
             'ga': u'Plé Vicíleabhar',
+            'gl': u'Conversa Wikibooks',
             'gn': u'Wikibooks Discusión',
             'he': u'שיחת ויקיספר',
             'hi': u'Wikibooks वार्ता',
@@ -157,16 +155,14 @@
         }
self.namespaces[100] = {
-            '_default': u'Portal',
             'id': u'Resep',
             'fr': u'Transwiki',
             'he': u'שער',
             'it': u'Progetto',
             'ms': u'Resipi',
         }
-        
+
         self.namespaces[101] = {
-            '_default': u'Portal talk',
             'id': u'Pembicaraan Resep',
             'fr': u'Discussion Transwiki',
             'he': u'שיחת שער',
@@ -175,7 +171,6 @@
         }
self.namespaces[102] = {
-            '_default': u'',
             'cy': u'Silff lyfrau',
             'de': u'Regal',
             'en': u'Cookbook',
@@ -184,10 +179,9 @@
             'it': u'Ripiano',
             'nl': u'Transwiki',
             'sr': u'Кувар',
-        }   
+        }
self.namespaces[103] = {
-            '_default': u'',
             'cy': u'Sgwrs Silff lyfrau',
             'de': u'Regal Diskussion',
             'en': u'Cookbook talk',
@@ -196,49 +190,41 @@
             'it': u'Discussioni ripiano',
             'nl': u'Overleg transwiki',
             'sr': u'Разговор о кувару',
-        }   
+        }
self.namespaces[104] = {
-            '_default': u'',
             'he': u'מדף',
             'ka': u'თარო',
             'nl': u'Wikijunior',
-        }   
+        }
self.namespaces[105] = {
-            '_default': u'',
             'he': u'שיחת מדף',
             'ka': u'თარო განხილვა',
             'nl': u'Overleg Wikijunior',
-        }   
+        }
self.namespaces[108] = {
-            '_default': u'',
             'en': u'Transwiki',
-        }   
+        }
self.namespaces[109] = {
-            '_default': u'',
             'en': u'Transwiki talk',
-        }   
+        }
self.namespaces[110] = {
-            '_default': u'',
             'en': u'Wikijunior',
-        }   
+        }
self.namespaces[111] = {
-            '_default': u'',
             'en': u'Wikijunior talk',
-        }   
-        
+        }
+
         self.namespaces[112] = {
-            '_default': u'',
             'en': u'Subject',
         }
-        
+
         self.namespaces[113] = {
-            '_default': u'',
             'en': u'Subject talk',
         }
@@ -257,10 +243,20 @@
                       'mk','mg','ml','mi','mr','ms','zh-cfr','mn','nah','na',
                       'nl','ja','no','nb','oc','nds','pl','pt','ro','ru',
                       'sa','st','sq','si','simple','sk','sl','sr','su',
-                      'fi','sv','ta','tt','th','ur','vi','tokipona',
+                      'fi','sv','ta','tt','th','ur','vi',
                       'tpi','tr','uk','vo','yi','yo','za','zh','zh-cn',
                       'zh-tw']
+        self.obsolete = {
+            'dk': 'da',
+            'jp': 'ja',
+            'minnan':'zh-min-nan',
+            'nb': 'no',
+            'tokipona': None,
+            'zh-tw': 'zh',
+            'zh-cn': 'zh'
+        }
+
         self.interwiki_putfirst = {
             'en': alphabetic,
             'fi': alphabetic,
@@ -273,6 +269,6 @@
def version(self, code):
         return "1.11"
-    
+
     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:04:06 UTC (rev 4676)
+++ trunk/pywikipedia/families/wikinews_family.py	2007-12-09 18:48:27 UTC (rev 4677)
@@ -27,6 +27,9 @@
         self.namespaces[3]['pl'] = u'Dyskusja Wikireportera'
# Most namespaces are inherited from family.Family.
+        # Translation used on all wikis for the different namespaces.
+        # (Please sort languages alphabetically)
+        # You only need to enter translations that differ from _default.
         self.namespaces[4] = {
             '_default': [u'Wikinews', self.namespaces[4]['_default']],
             'ar': u'ويكي الأخبار',
Modified: trunk/pywikipedia/families/wikipedia_family.py
===================================================================
--- trunk/pywikipedia/families/wikipedia_family.py	2007-12-09 18:04:06 UTC (rev 4676)
+++ trunk/pywikipedia/families/wikipedia_family.py	2007-12-09 18:48:27 UTC (rev 4677)
@@ -29,8 +29,13 @@
         # Override defaults
         self.namespaces[2]['cs'] = u'Wikipedista'
         self.namespaces[3]['cs'] = u'Wikipedista diskuse'
+        self.namespaces[2]['pl'] = u'Wikipedysta'
+        self.namespaces[3]['pl'] = u'Dyskusja wikipedysty'
# Most namespaces are inherited from family.Family.
+        # Translation used on all wikis for the different namespaces.
+        # (Please sort languages alphabetically)
+        # You only need to enter translations that differ from _default.
         self.namespaces[4] = {
             '_default': [u'Wikipedia', self.namespaces[4]['_default']],
             'ar': u'ويكيبيديا',
Modified: trunk/pywikipedia/families/wikiquote_family.py
===================================================================
--- trunk/pywikipedia/families/wikiquote_family.py	2007-12-09 18:04:06 UTC (rev 4676)
+++ trunk/pywikipedia/families/wikiquote_family.py	2007-12-09 18:48:27 UTC (rev 4677)
@@ -33,15 +33,10 @@
         for lang in self.languages_by_size:
             self.langs[lang] = lang+'.wikiquote.org'
-        # Most namespaces are inherited from family.Family()
+        # Most namespaces are inherited from family.Family.
         # Translation used on all wikis for the different namespaces.
         # (Please sort languages alphabetically)
         # You only need to enter translations that differ from _default.
-
-        # Override defaults
-        self.namespaces[2]['pl'] = u'Użytkownik'
-        self.namespaces[3]['pl'] = u'Dyskusja użytkownika'
-
         self.namespaces[4] = {
             '_default': [u'Wikiquote', self.namespaces[4]['_default']],
             'ar': u'ويكي الاقتباس',
Modified: trunk/pywikipedia/families/wikisource_family.py
===================================================================
--- trunk/pywikipedia/families/wikisource_family.py	2007-12-09 18:04:06 UTC (rev 4676)
+++ trunk/pywikipedia/families/wikisource_family.py	2007-12-09 18:48:27 UTC (rev 4677)
@@ -24,9 +24,14 @@
             if lang not in self.langs:
                 self.langs[lang] = lang+'.wikisource.org'
+        # Override defaults
         self.namespaces[2]['pl'] = 'Wikiskryba'
         self.namespaces[3]['pl'] = 'Dyskusja Wikiskryby'
+        # Most namespaces are inherited from family.Family.
+        # Translation used on all wikis for the different namespaces.
+        # (Please sort languages alphabetically)
+        # You only need to enter translations that differ from _default.
         self.namespaces[4] = {
             '_default': [u'Wikisource', self.namespaces[4]['_default']],
             'ang': u'Wicifruma',
@@ -249,6 +254,16 @@
             'zh-cn': 'zh'
         }
+        self.interwiki_putfirst = {
+            'en': self.alphabetic,
+            'fi': self.alphabetic,
+            'fr': self.alphabetic,
+            'he': ['en'],
+            'hu': ['en'],
+            'pl': self.alphabetic,
+            'simple': self.alphabetic
+        }
+
     def version(self, code):
         return "1.11"
     def shared_image_repository(self, code):
Modified: trunk/pywikipedia/families/wikiversity_family.py
===================================================================
--- trunk/pywikipedia/families/wikiversity_family.py	2007-12-09 18:04:06 UTC (rev 4676)
+++ trunk/pywikipedia/families/wikiversity_family.py	2007-12-09 18:48:27 UTC (rev 4677)
@@ -19,6 +19,10 @@
             if lang not in self.langs:
                 self.langs[lang] = lang+'.wikiversity.org'
+        # Most namespaces are inherited from family.Family.
+        # Translation used on all wikis for the different namespaces.
+        # (Please sort languages alphabetically)
+        # You only need to enter translations that differ from _default.
         self.namespaces[4] = {
             '_default': [u'Wikiversity', self.namespaces[4]['_default']],
             'es': u'Wikiversidad',
Modified: trunk/pywikipedia/families/wiktionary_family.py
===================================================================
--- trunk/pywikipedia/families/wiktionary_family.py	2007-12-09 18:04:06 UTC (rev 4676)
+++ trunk/pywikipedia/families/wiktionary_family.py	2007-12-09 18:48:27 UTC (rev 4677)
@@ -29,8 +29,13 @@
         # Most namespaces are inherited from family.Family.
# Override defaults
+        self.namespaces[2]['pl'] = u'Wikipedysta'
         self.namespaces[3]['pl'] = u'Dyskusja Wikipedysty'
+        # Most namespaces are inherited from family.Family.
+        # Translation used on all wikis for the different namespaces.
+        # (Please sort languages alphabetically)
+        # You only need to enter translations that differ from _default.
         self.namespaces[4] = {
             '_default': [u'Wiktionary', self.namespaces[4]['_default']],
             'ar': u'ويكاموس',
@@ -113,6 +118,7 @@
             'fr': u'Discussion Wiktionnaire',
             'fy': u'Wiktionary oerlis',
             'ga': u'Plé Vicífhoclóra',
+            'gl': u'Conversa Wiktionary',
             'gn': u'Wiktionary Discusión',
             'gu': u'વિક્ષનરી talk',
             'he': u'שיחת ויקימילון',
Modified: trunk/pywikipedia/family.py
===================================================================
--- trunk/pywikipedia/family.py	2007-12-09 18:04:06 UTC (rev 4676)
+++ trunk/pywikipedia/family.py	2007-12-09 18:48:27 UTC (rev 4677)
@@ -466,7 +466,7 @@
                 'os': u'Архайæг',
                 'pa': u'ਮੈਂਬਰ',
                 'pdc': u'Benutzer',
-                'pl': u'Wikipedysta',
+                'pl': u'Użytkownik',
                 'pms':u'Utent',
                 'pt': u'Usuário',
                 'qu': u'Ruraq',
@@ -602,7 +602,7 @@
                 'os': u'Архайæджы дискусси',
                 'pa': u'ਮੈਂਬਰ ਚਰਚਾ',
                 'pdc': u'Benutzer Diskussion',
-                'pl': u'Dyskusja wikipedysty',
+                'pl': u'Dyskusja użytkownika',
                 'pms':u'Ciaciarade',
                 'pt': u'Usuário Discussão',
                 'qu': u'Ruraq rimanakuy',

    