[Pywikipedia-svn] SVN: [7276] branches/rewrite/pywikibot

russblau at svn.wikimedia.org russblau at svn.wikimedia.org
Fri Sep 18 13:57:44 UTC 2009


Revision: 7276
Author:   russblau
Date:     2009-09-18 13:57:44 +0000 (Fri, 18 Sep 2009)

Log Message:
-----------
Merge family file changes from trunk, convert recently added families

Modified Paths:
--------------
    branches/rewrite/pywikibot/families/mac_wikia_family.py
    branches/rewrite/pywikibot/families/osm_family.py
    branches/rewrite/pywikibot/families/scratchpad_wikia_family.py
    branches/rewrite/pywikibot/families/test_family.py
    branches/rewrite/pywikibot/families/wikipedia_family.py
    branches/rewrite/pywikibot/families/wikisource_family.py
    branches/rewrite/pywikibot/families/wiktionary_family.py
    branches/rewrite/pywikibot/family.py

Added Paths:
-----------
    branches/rewrite/pywikibot/families/strategy_family.py

Property Changed:
----------------
    branches/rewrite/pywikibot/families/
    branches/rewrite/pywikibot/family.py


Property changes on: branches/rewrite/pywikibot/families
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/pywikipedia/families:5896-6197,6212-7067,7070-7175
   + /trunk/pywikipedia/families:5896-6197,6212-7067,7070-7175,7177-7274

Modified: branches/rewrite/pywikibot/families/mac_wikia_family.py
===================================================================
--- branches/rewrite/pywikibot/families/mac_wikia_family.py	2009-09-18 13:44:52 UTC (rev 7275)
+++ branches/rewrite/pywikibot/families/mac_wikia_family.py	2009-09-18 13:57:44 UTC (rev 7276)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8  -*-
-import family, config
+from pywikibot import family
 
 class Family(family.Family):
     def __init__(self):
@@ -14,13 +14,8 @@
             'id':'id.mac.wikia.com',
             'it':'it.mac.wikia.com',
             'zh':'zh.mac.wikia.com',
-            }
+        }
 
-        # A few selected big languages for things that we do not want to loop over
-        # all languages. This is only needed by the titletranslate.py module, so
-        # if you carefully avoid the options, you could get away without these
-        # for another wikimedia family.
-
         self.languages_by_size = ['en','de']
 
     def version(self, code):

Modified: branches/rewrite/pywikibot/families/osm_family.py
===================================================================
--- branches/rewrite/pywikibot/families/osm_family.py	2009-09-18 13:44:52 UTC (rev 7275)
+++ branches/rewrite/pywikibot/families/osm_family.py	2009-09-18 13:57:44 UTC (rev 7276)
@@ -15,51 +15,8 @@
             'en': 'wiki.openstreetmap.org',
         }
 
-        self.namespaces[4] = {
-            '_default': [u'OpenStreetMap', self.namespaces[4]['_default']],
-        }
-        self.namespaces[5] = {
-            '_default': [u'OpenStreetMap talk', self.namespaces[5]['_default']],
-        }
-        self.namespaces[6] = {
-            '_default': u'Image',
-        }
-        self.namespaces[7] = {
-            '_default': u'Image talk',
-        }
-        self.namespaces[200] = {
-            '_default': u'DE',
-        }
-        self.namespaces[201] = {
-            '_default': u'DE talk',
-        }
-        self.namespaces[202] = {
-            '_default': u'FR',
-        }
-        self.namespaces[203] = {
-            '_default': u'FR talk',
-        }
-        self.namespaces[204] = {
-            '_default': u'ES',
-        }
-        self.namespaces[205] = {
-            '_default': u'ES talk',
-        }
-        self.namespaces[206] = {
-            '_default': u'IT',
-        }
-        self.namespaces[207] = {
-            '_default': u'IT talk',
-        }
-        self.namespaces[208] = {
-            '_default': u'NL',
-        }
-        self.namespaces[209] = {
-            '_default': u'NL talk',
-        }
-
     def scriptpath(self, code):
         return ''
 
     def version(self, code):
-        return "1.13.3"
\ No newline at end of file
+        return "1.13.3"

Modified: branches/rewrite/pywikibot/families/scratchpad_wikia_family.py
===================================================================
--- branches/rewrite/pywikibot/families/scratchpad_wikia_family.py	2009-09-18 13:44:52 UTC (rev 7275)
+++ branches/rewrite/pywikibot/families/scratchpad_wikia_family.py	2009-09-18 13:57:44 UTC (rev 7276)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8  -*-
-import family, config
+from pywikibot import family
 
 class Family(family.Family):
     def __init__(self):
@@ -12,68 +12,14 @@
             'fr':'bloc-notes.wikia.com',
             'ja':'ja.scratchpad.wikia.com',
             'zh':'zh.scratchpad.wikia.com',
-            }
-
-        # Most namespaces are inherited from family.Family.
-        self.namespaces[1]['fr'] = u'Discuter'
-
-        self.namespaces[3]['fr'] = u'Discussion Utilisateur'
-
-        self.namespaces[4] = {
-            '_default': u'Scratchpad',
-            'de': u'Mini-Wikia',
-            'fr': u'Bloc notes',
-            'ja': u'Scratchpad Wiki',
-            'zh': u'圍紀實驗室',
         }
-        self.namespaces[5] = {
-            '_default': u'Scratchpad talk',
-            'de': u'Mini-Wikia Diskussion',
-            'en': u'Scratchpad talk',
-            'fr': u'Discussion Bloc notes',
-            'ja': u'Scratchpad Wiki‐ノート',
-            'zh': u'圍紀實驗室 talk',
-        }
-        self.namespaces[7]['fr'] = u'Discussion Fichier'
 
-        self.namespaces[11]['fr'] = u'Discussion Modèle'
+        # A few selected big languages for things that we do not want
+        # to loop over all languages. This is only needed by the
+        # titletranslate.py module, so if you carefully avoid the
+        # options, you could get away without these for another
+        # wikimedia family.
 
-        self.namespaces[13]['fr'] = u'Discussion Aide'
-
-        self.namespaces[15]['fr'] = u'Discussion Catégorie'
-
-        self.namespaces[400] = {
-            '_default': u'Video',
-        }
-        self.namespaces[401] = {
-            '_default': u'Video talk',
-        }
-        self.namespaces[500] = {
-            '_default': u'User blog',
-            'de': u'Benutzer Blog',
-        }
-        self.namespaces[501] = {
-            '_default': u'User blog comment',
-            'de': u'Benutzer Blog Kommentare',
-        }
-        self.namespaces[502] = {
-            '_default': u'Blog',
-        }
-        self.namespaces[503] = {
-            '_default': u'Blog talk',
-            'de': u'Blog Diskussion',
-        }
-        self.namespaces[110] = {
-            '_default': u'Forum',
-        }
-        self.namespaces[111] = {
-            '_default': u'Forum talk',
-        }
-        # A few selected big languages for things that we do not want to loop over
-        # all languages. This is only needed by the titletranslate.py module, so
-        # if you carefully avoid the options, you could get away without these
-        # for another wikimedia family.
-
         self.languages_by_size = ['en','de']
 
     def version(self, code):

Copied: branches/rewrite/pywikibot/families/strategy_family.py (from rev 7274, trunk/pywikipedia/families/strategy_family.py)
===================================================================
--- branches/rewrite/pywikibot/families/strategy_family.py	                        (rev 0)
+++ branches/rewrite/pywikibot/families/strategy_family.py	2009-09-18 13:57:44 UTC (rev 7276)
@@ -0,0 +1,28 @@
+# -*- coding: utf-8  -*-
+
+__version__ = '$Id$'
+
+from pywikibot import family
+
+# The Wikimedia Strategy family
+
+class Family(family.Family):
+    def __init__(self):
+        family.Family.__init__(self)
+        self.name = 'strategy'
+        self.langs = {
+            'strategy': 'strategy.wikimedia.org',
+        }
+        self.interwiki_forward = 'wikipedia'
+
+    def version(self, code):
+        return '1.16alpha-wmf'
+
+    def dbName(self, code):
+        return 'strategywiki_p'
+
+    def shared_image_repository(self, code):
+        return ('commons', 'commons')
+
+    def ssl_pathprefix(self, code):
+        return "/wikipedia/strategy"

Modified: branches/rewrite/pywikibot/families/test_family.py
===================================================================
--- branches/rewrite/pywikibot/families/test_family.py	2009-09-18 13:44:52 UTC (rev 7275)
+++ branches/rewrite/pywikibot/families/test_family.py	2009-09-18 13:57:44 UTC (rev 7276)
@@ -1,9 +1,8 @@
 # -*- coding: utf-8  -*-
 
 __version__ = '$Id$'
-from pywikibot import family, config
 
-import family, config
+from pywikibot import family
 
 # The test wikipedia family
 
@@ -14,11 +13,12 @@
         self.langs = {
             'test': 'test.wikipedia.org',
         }
-        if config.SSL_connection:
-            self.langs['test'] = None
 
     def version(self, code):
         return '1.16alpha-wmf'
 
     def shared_image_repository(self, code):
         return ('commons', 'commons')
+
+    def ssl_pathprefix(self, code):
+        return "/wikipedia/test"

Modified: branches/rewrite/pywikibot/families/wikipedia_family.py
===================================================================
--- branches/rewrite/pywikibot/families/wikipedia_family.py	2009-09-18 13:44:52 UTC (rev 7275)
+++ branches/rewrite/pywikibot/families/wikipedia_family.py	2009-09-18 13:57:44 UTC (rev 7276)
@@ -135,6 +135,7 @@
             'az':  [u'Dəqiqləşdirmə'],
             'ba':  [u'Күп мәғәнәлелек'],
             'bar': [u'Begriffsklärung'],
+            'bcl': [u'Clarip'],
             'be':  [u'Неадназначнасць', u'Disambig'],
             'be-x-old':  [u'Неадназначнасць', u'Неадназначнасьць', u'Disambig'],
             'bg':  [u'Пояснение', u'Disambig'],
@@ -258,6 +259,7 @@
             'vls': [u'Db', u'Dp', u'Dpintro'],
             'vo':  [u'Telplänov'],
             'wa':  [u'Omonimeye', u'Disambig'],
+            'war': [u'Pansayod'],
             'wo':  [u'Bokktekki'],
             'yi':  [u'באדייטען'],
             'zea': [u'dp', u'Deurverwiespagina'],
@@ -344,19 +346,19 @@
 
         # Global bot allowed languages on http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementation
         self.cross_allowed = [
-            'ab', 'ace', 'af', 'ak', 'als', 'am', 'ang', 'arc', 'arz', 'as', 'ast,', 'av', 'ay', 'az',
+            'ab', 'ace', 'af', 'ak', 'als', 'am', 'ang', 'arc', 'arz', 'as', 'ast', 'av', 'ay', 'az',
             'ba', 'bar', 'bcl', 'be-x-old', 'be', 'bg', 'bh', 'bi', 'bm', 'bo', 'bpy', 'bug', 'bxr',
-            'cbk-zam', 'cdo', 'ce', 'ch', 'chr', 'chy', 'ckb', 'co', 'crh', 'cr', 'csb', 'cu', 'cv', 'cy',
-            'diq', 'dsb', 'dz', 'ee', 'el', 'eml', 'eu', 'ext', 'fa', 'ff', 'fj', 'fo', 'frp', 'fur',
-            'ga', 'gan', 'glk', 'gn', 'got', 'gu', 'gv', 'ha', 'hak', 'haw', 'hif', 'hi', 'hsb', 'ht', 'hu', 'hy',
+            'cbk-zam', 'cdo', 'ce', 'ceb', 'ch', 'chr', 'chy', 'ckb', 'co', 'crh', 'cr', 'csb', 'cu', 'cv', 'cy',
+            'diq', 'dsb', 'dz', 'ee', 'el', 'eml', 'eo', 'et', 'eu', 'ext', 'fa', 'ff', 'fj', 'fo', 'frp', 'fur',
+            'ga', 'gan', 'gd', 'glk', 'gn', 'got', 'gu', 'gv', 'ha', 'hak', 'haw', 'hif', 'hi', 'hr', 'hsb', 'ht', 'hu', 'hy',
             'ia', 'id', 'ie', 'ig', 'ik', 'ilo', 'iow', 'is', 'iu', 'ja', 'jbo', 'jv',
-            'kaa', 'kab', 'ka', 'kg', 'ki', 'kl', 'km', 'kn', 'ko', 'ks', 'ku', 'kv', 'kw', 'ky',
+            'kaa', 'kab', 'ka', 'kg', 'ki', 'kk', 'kl', 'km', 'kn', 'ko', 'ks', 'ku', 'kv', 'kw', 'ky',
             'lad', 'lb', 'lbe', 'lg', 'li', 'lij', 'lmo', 'ln', 'lo', 'lv',
-            'map-bms', 'mdf', 'mg', 'mhr', 'mk', 'mn', 'ms', 'mt', 'mwl', 'myv', 'my', 'mzn',
-            'nah', 'na', 'nap', 'nds-nl', 'ne', 'new', 'ng', 'nl', 'nov', 'nrm', 'nv', 'ny', 'om', 'or', 'os',
-            'pam', 'pap', 'pa', 'pdc', 'pnb', 'pnt', 'ps', 'qu', 'rm', 'rmy', 'rn', 'roa-rup', 'roa-tara', 'rw',
-            'sah', 'sa', 'sc', 'sco', 'sd', 'se', 'sg', 'sh', 'simple', 'si', 'sk', 'sm', 'sn', 'so', 'srn', 'stq', 'st', 'su', 'sw', 'szl',
-            'ta', 'te', 'tet', 'tg', 'ti', 'tk', 'tn', 'to', 'tpi', 'ts', 'tt', 'tum', 'tw', 'ty',
+            'map-bms', 'mdf', 'mg', 'mhr', 'mi', 'mk', 'mn', 'ms', 'mt', 'mwl', 'myv', 'my', 'mzn',
+            'nah', 'na', 'nap', 'nds-nl', 'ne', 'new', 'ng', 'nl', 'nov', 'nrm', 'nv', 'ny', 'oc', 'om', 'or', 'os',
+            'pam', 'pap', 'pa', 'pag', 'pdc', 'pi', 'pms', 'pnb', 'pnt', 'ps', 'qu', 'rm', 'rmy', 'rn', 'roa-rup', 'roa-tara', 'rw',
+            'sah', 'sa', 'sc', 'scn', 'sco', 'sd', 'se', 'sg', 'sh', 'simple', 'si', 'sk', 'sm', 'sn', 'so', 'srn', 'stq', 'st', 'su', 'sw', 'szl',
+            'ta', 'te', 'tet', 'tg', 'th', 'ti', 'tk', 'tl', 'tn', 'to', 'tpi', 'ts', 'tt', 'tum', 'tw', 'ty',
             'udm', 'ug', 'uz', 've', 'vls', 'wa', 'war', 'wo', 'wuu',
             'xal', 'xh', 'yi', 'yo', 'za', 'zea', 'zh', 'zh-classical', 'zh-min-nan', 'zu',
         ]
@@ -403,6 +405,7 @@
             y = y.replace("y","i")+y.count("y")*"!"
             return cmp(x,y)
         self.fyinterwiki = self.alphabetic[:]
+        self.fyinterwiki.remove('nb')
         self.fyinterwiki.sort(fycomp)
 
         # Which languages have a special order for putting interlanguage links,
@@ -479,6 +482,7 @@
             '_default': {
                 'pt': [103],
                 'als': [105],
+                'ar': [105],
                 'en': [13],
                 'es': [105],
                 'fi': [5],
@@ -531,6 +535,9 @@
                 'pt': [0, 102],
                 'hr': [0, 102],
             },
+            'ar': {
+                '_default': [0, 100],
+            },
             'es': {
                 '_default': [0],
                 'pt': [0, 102],
@@ -553,6 +560,9 @@
                 'pt': [0, 103],
                 'hr': [0, 103],
             },
+            'ar': {
+                '_default': [1, 101],
+            },
             'es': {
                 '_default': [1],
                 'pt': [0, 103],

Modified: branches/rewrite/pywikibot/families/wikisource_family.py
===================================================================
--- branches/rewrite/pywikibot/families/wikisource_family.py	2009-09-18 13:44:52 UTC (rev 7275)
+++ branches/rewrite/pywikibot/families/wikisource_family.py	2009-09-18 13:57:44 UTC (rev 7276)
@@ -32,8 +32,6 @@
 
         self.obsolete = {
             'ang': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Old_English_Wikisource
-
-
             'dk': 'da',
             'ht': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Haitian_Creole_Wikisource
             'jp': 'ja',
@@ -58,18 +56,8 @@
             'el','fa','it','ko','no','zh'
         ]
 
-    def scriptpath(self, code):
-        if config.SSL_connection:
-            if code == '-':
-                return '/wikipedia/sources/w'
-            else:
-                return '/%s/%s/w' % (self.name, code)
-        else:
-            return '/w'
-
     def version(self, code):
         return '1.16alpha-wmf'
 
     def shared_image_repository(self, code):
         return ('commons', 'commons')
-

Modified: branches/rewrite/pywikibot/families/wiktionary_family.py
===================================================================
--- branches/rewrite/pywikibot/families/wiktionary_family.py	2009-09-18 13:44:52 UTC (rev 7275)
+++ branches/rewrite/pywikibot/families/wiktionary_family.py	2009-09-18 13:57:44 UTC (rev 7276)
@@ -37,8 +37,9 @@
 
         # Global bot allowed languages on http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementation
         self.cross_allowed = [
-            'ang', 'ast', 'bg', 'bn', 'eo', 'es', 'fa', 'fy', 'ga', 'gd', 'ia', 'ie', 'jv', 'ka', 'lt', 'mk',
-            'nl', 'no', 'sk', 'tg', 'th', 'ti', 'ts', 'ug', 'uk', 'vo', 'za', 'zh-min-nan', 'zh',
+            'ang', 'ast', 'az', 'bg', 'bn', 'da', 'eo', 'es', 'fa', 'fy', 'ga', 'gd', 'hu', 
+            'ia', 'ie', 'ik', 'jv', 'ka', 'li', 'lt', 'mk', 'nl', 'no', 'pt', 'sk', 'tg', 'th', 'ti', 
+            'ts', 'ug', 'uk', 'vo', 'za', 'zh-min-nan', 'zh', 'zu', 
         ]
         self.obsolete = {
             'aa': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Afar_Wiktionary

Modified: branches/rewrite/pywikibot/family.py
===================================================================
--- branches/rewrite/pywikibot/family.py	2009-09-18 13:44:52 UTC (rev 7275)
+++ branches/rewrite/pywikibot/family.py	2009-09-18 13:57:44 UTC (rev 7276)
@@ -23,33 +23,36 @@
         self.name = None
             # Updated from http://meta.wikimedia.org/wiki/Interwiki_sorting_order
         self.alphabetic = [
-            'af', 'ak', 'ace', 'als', 'am', 'ang', 'ab', 'ar', 'an', 'arc', 'roa-rup',
-            'frp', 'as', 'ast', 'gn', 'av', 'ay', 'az', 'bm', 'bn',
-            'zh-min-nan', 'nan', 'map-bms', 'ba', 'be', 'be-x-old', 'bh', 'bcl',
-            'bi', 'bar', 'bo', 'bs', 'br', 'bg', 'bxr', 'ca', 'cv', 'ceb', 'cs',
-            'ch', 'cbk-zam', 'ny', 'sn', 'tum', 'cho', 'co', 'cy', 'da', 'dk',
-            'pdc', 'de', 'dv', 'nv', 'dsb', 'dz', 'mh', 'et', 'el', 'eml', 'en',
-            'myv', 'es', 'eo', 'ext', 'eu', 'ee', 'fa', 'hif', 'fo', 'fr', 'fy',
-            'ff', 'fur', 'ga', 'gv', 'gd', 'gl', 'gan', 'ki', 'glk', 'gu',
-            'got', 'hak', 'xal', 'ko', 'ha', 'haw', 'hy', 'hi', 'ho', 'hsb',
-            'hr', 'io', 'ig', 'ilo', 'bpy', 'id', 'ia', 'ie', 'iu', 'ik', 'os',
-            'xh', 'zu', 'is', 'it', 'he', 'jv', 'kl', 'kn', 'kr', 'pam', 'ka',
-            'ks', 'csb', 'kk', 'kw', 'rw', 'ky', 'rn', 'sw', 'kv', 'kg', 'ht',
-            'ku', 'kj', 'lad', 'lbe', 'lo', 'la', 'lv', 'lb', 'lt', 'lij', 'li',
-            'ln', 'jbo', 'lg', 'lmo', 'hu', 'mk', 'mg', 'ml', 'mt', 'mi', 'mr',
-            'arz', 'mzn', 'ms', 'cdo', 'mwl', 'mdf', 'mo', 'mn', 'mus', 'my', 'nah',
-            'na', 'fj', 'nl', 'nds-nl', 'cr', 'ne', 'new', 'ja', 'nap', 'ce',
-            'pih', 'no', 'nb', 'nn', 'nrm', 'nov', 'ii', 'oc', 'mhr', 'or', 'om', 'ng',
-            'hz', 'uz', 'pa', 'pnb', 'pi', 'pag', 'pap', 'ps', 'km', 'pms', 'tpi',
-            'nds', 'pl', 'tokipona', 'tp', 'pnt', 'pt', 'aa', 'kaa', 'crh',
-            'ty', 'ksh', 'ro', 'rmy', 'rm', 'qu', 'ru', 'sah', 'se', 'sm', 'sa',
-            'sg', 'sc', 'za', 'sco', 'stq', 'st', 'tn', 'sq', 'scn', 'si',
-            'simple', 'sd', 'ss', 'sk', 'cu', 'sl', 'szl', 'so', 'ckb', 'srn', 'sr',
-            'sh', 'su', 'fi', 'sv', 'tl', 'ta', 'kab', 'roa-tara', 'tt', 'te',
-            'tet', 'th', 'ti', 'tg', 'to', 'chr', 'chy', 've', 'tr', 'tk',
-            'tw', 'udm', 'bug', 'uk', 'ur', 'ug', 'vec', 'vi', 'vo', 'fiu-vro',
-            'wa', 'zh-classical', 'vls', 'war', 'wo', 'wuu', 'ts', 'yi', 'yo',
-            'zh-yue', 'diq', 'zea', 'bat-smg', 'zh', 'zh-tw', 'zh-cn'
+            'af', 'ak', 'ace', 'als', 'am', 'ang', 'ab', 'ar', 'an', 'arc',
+            'roa-rup', 'frp', 'as', 'ast', 'gn', 'av', 'ay', 'az', 'bm',
+            'bn', 'zh-min-nan', 'nan', 'map-bms', 'ba', 'be', 'be-x-old',
+            'bh', 'bcl', 'bi', 'bar', 'bo', 'bs', 'br', 'bg', 'bxr', 'ca',
+            'cv', 'ceb', 'cs', 'ch', 'cbk-zam', 'ny', 'sn', 'tum', 'cho',
+            'co', 'cy', 'da', 'dk', 'pdc', 'de', 'dv', 'nv', 'dsb', 'dz',
+            'mh', 'et', 'el', 'eml', 'en', 'myv', 'es', 'eo', 'ext', 'eu',
+            'ee', 'fa', 'hif', 'fo', 'fr', 'fy', 'ff', 'fur', 'ga', 'gv',
+            'gd', 'gl', 'gan', 'ki', 'glk', 'gu', 'got', 'hak', 'xal', 'ko',
+            'ha', 'haw', 'hy', 'hi', 'ho', 'hsb', 'hr', 'io', 'ig', 'ilo',
+            'bpy', 'id', 'ia', 'ie', 'iu', 'ik', 'os', 'xh', 'zu', 'is',
+            'it', 'he', 'jv', 'kl', 'kn', 'kr', 'pam', 'ka', 'ks', 'csb',
+            'kk', 'kw', 'rw', 'ky', 'rn', 'sw', 'kv', 'kg', 'ht', 'ku',
+            'kj', 'lad', 'lbe', 'lo', 'la', 'lv', 'lb', 'lt', 'lij', 'li',
+            'ln', 'jbo', 'lg', 'lmo', 'hu', 'mk', 'mg', 'ml', 'mt', 'mi',
+            'mr', 'arz', 'mzn', 'ms', 'cdo', 'mwl', 'mdf', 'mo', 'mn',
+            'mus', 'my', 'nah', 'na', 'fj', 'nl', 'nds-nl', 'cr', 'ne',
+            'new', 'ja', 'nap', 'ce', 'pih', 'no', 'nb', 'nn', 'nrm', 'nov',
+            'ii', 'oc', 'mhr', 'or', 'om', 'ng', 'hz', 'uz', 'pa', 'pnb',
+            'pi', 'pag', 'pap', 'ps', 'km', 'pms', 'tpi', 'nds', 'pl',
+            'tokipona', 'tp', 'pnt', 'pt', 'aa', 'kaa', 'crh', 'ty', 'ksh',
+            'ro', 'rmy', 'rm', 'qu', 'ru', 'sah', 'se', 'sm', 'sa', 'sg',
+            'sc', 'za', 'sco', 'stq', 'st', 'tn', 'sq', 'scn', 'si',
+            'simple', 'sd', 'ss', 'sk', 'cu', 'sl', 'szl', 'so', 'ckb',
+            'srn', 'sr', 'sh', 'su', 'fi', 'sv', 'tl', 'ta', 'kab',
+            'roa-tara', 'tt', 'te', 'tet', 'th', 'ti', 'tg', 'to', 'chr',
+            'chy', 've', 'tr', 'tk', 'tw', 'udm', 'bug', 'uk', 'ur', 'ug',
+            'vec', 'vi', 'vo', 'fiu-vro', 'wa', 'zh-classical', 'vls',
+            'war', 'wo', 'wuu', 'ts', 'yi', 'yo', 'zh-yue', 'diq', 'zea',
+            'bat-smg', 'zh', 'zh-tw', 'zh-cn'
         ]
 
         self.langs = {}
@@ -725,7 +728,7 @@
         'fi': [u'ohjaus', u'uudelleenohjaus'],
         'fiu-vro': [u'saadaq'],
         'fr': [u'redirection'],
-        'frp': [u'redirection'],
+        'frp': [u'redirèccion', u'redirection'],
         'fur': [u'rinvia', u'rinvio'],
         'ga': [u'athsheoladh'],
         'gag': [u'yönlendirme'],
@@ -753,7 +756,8 @@
         'kk-latn': [u'aýdaw', u'айдау'],
         'km': [u'\u1794\u1789\u17d2\u1787\u17bc\u1793\u1794\u1793\u17d2\u178f',
                u'\u1794\u17d2\u178f\u17bc\u179a\u1791\u17b8\u178f\u17b6\u17c6\u1784',
-               u'\u1794\u17d2\u178a\u17bc\u179a\u1785\u17c6\u178e\u1784\u1787\u17be\u1784'],
+               u'\u1794\u17d2\u178a\u17bc\u179a\u1785\u17c6\u178e\u1784\u1787\u17be\u1784',
+               u'ប្តូរទីតាំងទៅ'],
         'ko': [u'넘겨주기'],
         'ksh': [u'ömleidung'],
         'kv': [u'перенаправление', u'перенапр'],
@@ -778,6 +782,7 @@
         'myv': [u'перенаправление', u'перенапр'],
         'mzn': [u'تغییرمسیر'],
         'nah': [u'redirección'],
+        'nap': [u'rinvia'],
         'nds': [u'wiederleiden', u'weiterleitung'],
         'nds-nl': [u'deurverwiezing', u'doorverwijzing'],
         'new': [u'पुनर्निर्देश'],
@@ -830,7 +835,7 @@
         'vro': [u'saadaq', u'suuna'],
         'wa': [u'redirection'],
         'wo': [u'redirection'],
-        'yi': [u'הפניה', u'ווייטערפירן'],
+        'yi': [u'ווייטערפירן', u'הפניה'],
         'zea': [u'doorverwijzing']
     }
 
@@ -911,6 +916,8 @@
 
     def ssl_pathprefix(self, code):
         """The path prefix for secure.wikimedia.org access."""
+        # Override this ONLY if the wiki family uses a different path
+        # pattern than /familyname/languagecode
         return "/%s/%s" % (self.name, code)
 
     def path(self, code):


Property changes on: branches/rewrite/pywikibot/family.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/pywikipedia/family.py:6057-6972,6974-7067,7070-7175
   + /trunk/pywikipedia/family.py:6057-6972,6974-7067,7070-7175,7177-7274





More information about the Pywikipedia-svn mailing list