Revision: 5727 Author: russblau Date: 2008-07-17 22:03:06 +0000 (Thu, 17 Jul 2008)
Log Message: ----------- merge families to trunk
Modified Paths: -------------- branches/rewrite/pywikibot/families/i18n_family.py branches/rewrite/pywikibot/families/wikibooks_family.py branches/rewrite/pywikibot/families/wikinews_family.py branches/rewrite/pywikibot/families/wikipedia_family.py branches/rewrite/pywikibot/families/wikiquote_family.py branches/rewrite/pywikibot/families/wikisource_family.py branches/rewrite/pywikibot/families/wiktionary_family.py
Modified: branches/rewrite/pywikibot/families/i18n_family.py =================================================================== --- branches/rewrite/pywikibot/families/i18n_family.py 2008-07-17 13:41:12 UTC (rev 5726) +++ branches/rewrite/pywikibot/families/i18n_family.py 2008-07-17 22:03:06 UTC (rev 5727) @@ -35,4 +35,4 @@ }
def version(self, code): - return "1.12alpha" + return "1.13alpha"
Modified: branches/rewrite/pywikibot/families/wikibooks_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikibooks_family.py 2008-07-17 13:41:12 UTC (rev 5726) +++ branches/rewrite/pywikibot/families/wikibooks_family.py 2008-07-17 22:03:06 UTC (rev 5727) @@ -111,7 +111,7 @@ 'he': u'שיחת ויקיספר', 'hi': u'Wikibooks वार्ता', 'hr': u'Razgovor Wikiknjige', - 'hu': u'Wikikönyvek vita', + 'hu': u'Wikikönyvek-vita', 'hy': u'Վիքիգրքերի քննարկում', 'ia': u'Discussion Wikibooks', 'id': u'Pembicaraan Wikibooks',
Modified: branches/rewrite/pywikibot/families/wikinews_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikinews_family.py 2008-07-17 13:41:12 UTC (rev 5726) +++ branches/rewrite/pywikibot/families/wikinews_family.py 2008-07-17 22:03:06 UTC (rev 5727) @@ -22,9 +22,12 @@ self.langs[lang] = '%s.wikinews.org' % lang
# Override defaults + self.namespaces[2]['cs'] = u'Redaktor' self.namespaces[2]['pl'] = u'Wikireporter' + self.namespaces[3]['cs'] = u'Redaktor diskuse' 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) @@ -62,7 +65,7 @@ 'fi': u'Keskustelu Wikiuutisista', 'fr': u'Discussion Wikinews', 'he': u'שיחת ויקיחדשות', - 'hu': u'Wikihírek vita', + 'hu': u'Wikihírek-vita', 'it': u'Discussioni Wikinotizie', 'ja': u'ウィキニュース‐ノート', 'nl': u'Overleg Wikinews',
Modified: branches/rewrite/pywikibot/families/wikipedia_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikipedia_family.py 2008-07-17 13:41:12 UTC (rev 5726) +++ branches/rewrite/pywikibot/families/wikipedia_family.py 2008-07-17 22:03:06 UTC (rev 5727) @@ -47,8 +47,6 @@ # Override defaults self.namespaces[2]['cs'] = u'Wikipedista' self.namespaces[3]['cs'] = u'Wikipedista diskuse' - self.namespaces[2]['hu'] = u'Szerkesztő' - self.namespaces[3]['hu'] = u'Szerkesztővita' self.namespaces[2]['pl'] = u'Wikipedysta' self.namespaces[3]['pl'] = u'Dyskusja wikipedysty'
@@ -144,6 +142,7 @@ 'als': u'Wikipedia Diskussion', 'an': u'Descusión Wikipedia', 'ar': u'نقاش ويكيبيديا', + 'as': u'Wikipedia वार्ता', 'ast': u'Uiquipedia alderique', 'av': u'Обсуждение Wikipedia', 'ay': u'Wikipedia Discusión', @@ -350,6 +349,7 @@ 'scn': u'Purtali', 'si': u'Portal', 'sk': u'Portál', + 'sl': u'Portal', 'sq': u'Portal', 'sr': u'Портал', 'su': u'Portal', @@ -418,6 +418,7 @@ 'scn': u'Discussioni purtali', 'si': u'Portal talk', 'sk': u'Diskusia k portálu', + 'sl': u'Pogovor o portalu', 'sq': u'Portal diskutim', 'sr': u'Разговор о порталу', 'su': u'Obrolan portal', @@ -513,6 +514,8 @@ }
self.disambiguationTemplates = { + # set value to None, instead of a list, to retrieve names from + # the live wiki ([[MediaWiki:Disambiguationspage]] '_default': [u'Disambig'], 'af': [u'Dubbelsinnig', u'Disambig'], 'als': [u'Begriffsklärung', u'Disambig'], @@ -536,12 +539,7 @@ 'da': [u'Flertydig'], 'de': [u'Begriffsklärung', u'BKS', u'Disambig'], 'el': [u'Disambig', u'Αποσαφ', u'Αποσαφήνιση'], - 'en': [u'Disambig', u'Disambiguation', u'2CC', u'2LC', - u'2LCdisambig', u'3CC', u'3LC', u'4CC', u'4LC', u'4LA', - u'5CC', u'TLAdisambig', u'Hndis', u'Numberdis', - u'Roadis', u'Roaddis', u'Geodis', u'TLA', u'Surname', - u'Dab', u'Disambig-cleanup', u'Disamb', u'letter disambig', - u'Schooldis', u'Shipindex', u'Songdis', u'4cc', u'3cc'], + 'en': None, 'eo': [u'Apartigilo', u'Disambig'], 'es': [u'Desambiguacion', u'Desambiguación', u'Desambig', u'Disambig',u'Des'], 'et': [u'Täpsustuslehekülg', u'Täpsustus', u'Disambig'], @@ -569,14 +567,14 @@ 'hr': [u'Disambig', u'Razdvojba'], 'hsb': [u'Wjacezmyslnosć', u'Disambig'], 'ht': [u'Menm non', u'Disambig'], - 'hu': [u'Egyert', u'Disambig', u'Egyért'], + 'hu': [u'Egyert', u'Disambig', u'Egyért', u'Egyért-redir'], 'hy': [u'Երկիմաստ', u'Disambig'], 'ia': [u'Disambiguation', u'Disambig'], - 'id': [u'Disingkat',u'Disambig', u'Disambig nama', u'disambig tempat', u'Disingkat'], + 'id': [u'Disingkat',u'Disambig', u'Disambig nama', u'Disambig tempat', u'Disambig-bandara', u'Disambiguasi', u'Disambig suku'], 'io': [u'Homonimo', u'Disambig'], 'is': [u'Aðgreining', u'Disambig'], 'it': [u'Disambigua', u'Sigla2', u'Sigla3', u'Sigla4', u'Cogni'], - 'ja': [u'Aimai', u'Disambig'], + 'ja': [u'Aimai', u'Dab', u'曖昧さ回避', u'Disambig'], 'ka': [u'მრავალმნიშვნელოვანი', u'მრავმნიშ'], 'kab': [u'Asefham'], 'kg': [u'Bisongidila'], @@ -585,7 +583,7 @@ 'ku': [u'Cudakirin'], 'kw': [u'Klerheans'], 'ksh': [u'Disambig', u'disambig'], - 'la': [u'Discretiva'], + 'la': [u'Discretiva', u'Disnomen'], 'lb': [u'Homonymie', u'Disambig'], 'li': [u'Verdudeliking', u'Verdudelikingpazjena', u'Vp'], 'lmo': [u'Desambiguació'], @@ -640,7 +638,7 @@ 'vo': [u'Telplänov'], 'wa': [u'Omonimeye', u'Disambig'], 'yi': [u'באדייטען'], - 'zea': [u'db'], + 'zea': [u'dp', u'Deurverwiespagina'], 'zh': [u'Disambig', u'消歧义', u'消歧义页', u'消歧義'], 'zh-classical': [u'Disambig', u'釋義', u'消歧義', u''], 'zh-min-nan': [u'Khu-pia̍t-ia̍h', 'KhPI', u'Disambig'], @@ -668,13 +666,14 @@ 'et': u'Täpsustusleheküljed', 'eu': u'Argipen orriak', 'fa': u'صفحات ابهامزدایی', - 'fi': u'Täsmennyssivu', + 'fi': u'Täsmennyssivut', 'fo': u'Fleiri týdningar', 'fr': u'Homonymie', 'fy': u'Trochferwiisside', 'ga': u'Idirdhealáin', 'gl': u'Homónimos', 'he': u'פירושונים', + 'hu': u'Egyértelműsítő lapok', 'ia': u'Disambiguation', 'id': u'Disambiguasi', 'io': u'Homonimi', @@ -716,6 +715,7 @@ 'vi': u'Trang định hướng', 'vo': u'Telplänovapads', 'wa': u'Omonimeye', + 'zea': u'Wikipedia:Deurverwiespagina', 'zh': u'消歧义', 'zh-min-nan': u'Khu-pia̍t-ia̍h', } @@ -838,6 +838,78 @@ 'id', 'lv', 'sw', 'tt', 'uk', 'vo', 'ga', 'na', 'es', 'nl', 'da', 'dk', 'sv', 'test']
+ self.crossnamespace[0] = { + '_default': { + 'pt': [102], + 'als': [104], + 'es': [104], + 'fr': [104], + 'lt': [104] + } + } + self.crossnamespace[1] = { + '_default': { + 'pt': [103], + 'als': [105], + 'es': [105], + 'fr': [105], + 'lt': [105] + } + } + self.crossnamespace[102] = { + 'pt': { + '_default': [0], + 'als': [0, 104], + 'es': [0, 104], + 'fr': [0, 104], + 'lt': [0, 104] + } + } + self.crossnamespace[103] = { + 'pt': { + '_default': [1], + 'als': [1, 105], + 'es': [1, 105], + 'fr': [1, 105], + 'lt': [1, 105] + } + } + self.crossnamespace[104] = { + 'als': { + '_default': [0], + 'pt': [0, 102] + }, + 'es': { + '_default': [0], + 'pt': [0, 102] + }, + 'fr': { + '_default': [0], + 'pt': [0, 102] + }, + 'lt': { + '_default': [0], + 'pt': [0, 102] + } + } + self.crossnamespace[105] = { + 'als': { + '_default': [1], + 'pt': [0, 103] + }, + 'es': { + '_default': [1], + 'pt': [0, 103] + }, + 'fr': { + '_default': [1], + 'pt': [0, 103] + }, + 'lt': { + '_default': [1], + 'pt': [0, 103] + } + } def get_known_families(self, site): # In Swedish Wikipedia 's:' is part of page title not a family # prefix for 'wikisource'.
Modified: branches/rewrite/pywikibot/families/wikiquote_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikiquote_family.py 2008-07-17 13:41:12 UTC (rev 5726) +++ branches/rewrite/pywikibot/families/wikiquote_family.py 2008-07-17 22:03:06 UTC (rev 5727) @@ -51,6 +51,7 @@ 'is': u'Wikivitnun', 'ka': [u'ვიკიციტატა', u'Wikiquote'], 'kk': u'Уикидәйек', + 'ko': u'위키인용집', 'la': u'Vicicitatio', 'ml': u'വിക്കി ചൊല്ലുകള്', 'pl': u'Wikicytaty', @@ -93,7 +94,7 @@ 'he': u'שיחת ויקיציטוט', 'hi': u'Wikiquote वार्ता', 'hr': u'Razgovor Wikicitat', - 'hu': u'Wikidézet vita', + 'hu': u'Wikidézet-vita', 'hy': u'Վիքիքաղվածքի քննարկում', 'id': u'Pembicaraan Wikiquote', 'is': u'Wikivitnunspjall', @@ -102,7 +103,7 @@ 'ka': [u'ვიკიციტატა განხილვა', u'Wikiquote განხილვა'], 'kk': u'Уикидәйек талқылауы', 'kn': u'Wikiquote ಚರ್ಚೆ', - 'ko': u'Wikiquote토론', + 'ko': u'위키인용집토론', 'ku': u'Wikiquote nîqaş', 'la': u'Disputatio Vicicitationis', 'lb': u'Wikiquote Diskussioun', @@ -231,17 +232,22 @@ 'bm': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Bam... 'cr': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Neh... 'dk': 'da', + 'ga': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Gae... 'jp': 'ja', + 'kr': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Kan... 'ks': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Kas... 'kw': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ker... 'minnan':'zh-min-nan', 'na': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Nau... 'nb': 'no', + 'nds': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Low... + 'qu': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Que... 'tk': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Tur... 'tokipona': None, 'tt': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Tat... 'ug': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Oyg... 'vo': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Vol... + 'za':None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Zhu... 'zh-tw': 'zh', 'zh-cn': 'zh' }
Modified: branches/rewrite/pywikibot/families/wikisource_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikisource_family.py 2008-07-17 13:41:12 UTC (rev 5726) +++ branches/rewrite/pywikibot/families/wikisource_family.py 2008-07-17 22:03:06 UTC (rev 5727) @@ -94,7 +94,7 @@ 'he': u'שיחת ויקיטקסט', 'hr': u'Razgovor o Wikizvoru', 'ht': u'Diskisyon Wikisòrs', - 'hu': u'Wikiforrás vita', + 'hu': u'Wikiforrás-vita', 'hy': u'Վիքիդարանի քննարկում', 'id': u'Pembicaraan Wikisource', 'is': u'Wikiheimildspjall', @@ -218,6 +218,7 @@ 'he': u'ביאור', 'hy': u'Ինդեքս', 'it': u'Portale', + 'la': u'Liber', 'pt': u'Página', 'sv': u'Författare', } @@ -227,6 +228,7 @@ 'he': u'שיחת ביאור', 'hy': u'Ինդեքսի քննարկում', 'it': u'Discussioni portale', + 'la': u'Disputatio Libri', 'pt': u'Página Discussão', 'sv': u'Författardiskussion', }
Modified: branches/rewrite/pywikibot/families/wiktionary_family.py =================================================================== --- branches/rewrite/pywikibot/families/wiktionary_family.py 2008-07-17 13:41:12 UTC (rev 5726) +++ branches/rewrite/pywikibot/families/wiktionary_family.py 2008-07-17 22:03:06 UTC (rev 5727) @@ -26,8 +26,8 @@ 'nah', 'eu', 'gd', 'lv', 'pa', 'zu', 'nn', 'ps', 'mi', 'so', 'tg', 'dv', 'bn', 'ka', 'mg', 'ha', 'kw', 'ss', 'na', 'sa', 'gv', 'ay', 'tpi', 'ne', 'jbo', 'jv', 'gn', 'uz', 'tn', 'mt', - 'sh', 'lb', 'ks', 'tk', 'sg', 'fj', 'als', 'ik', 'si', 'ln', - 'sm', 'za', 'roa-rup', 'yo', 'dz', 'my', 'wa', 'sc', + 'iu', 'sh', 'lb', 'ks', 'tk', 'sg', 'fj', 'als', 'ik', 'si', + 'ln', 'sm', 'za', 'roa-rup', 'dz', 'my', 'wa', ]
for lang in self.languages_by_size: @@ -50,6 +50,7 @@ 'ca': u'Viccionari', 'cs': u'Wikislovník', 'cy': u'Wiciadur', + 'el': u'Βικιλεξικό', 'eo': u'Vikivortaro', 'es': u'Wikcionario', 'et': u'Vikisõnaraamat', @@ -117,7 +118,7 @@ 'cy': u'Sgwrs Wiciadur', 'da': u'Wiktionary-diskussion', 'de': u'Wiktionary Diskussion', - 'el': u'Wiktionary συζήτηση', + 'el': u'Συζήτηση βικιλεξικού', 'eo': u'Vikivortaro diskuto', 'es': u'Wikcionario Discusión', 'et': u'Vikisõnaraamat arutelu', @@ -135,7 +136,7 @@ 'hi': u'विक्षनरी वार्ता', 'hr': u'Razgovor Wječnik', 'hsb': u'Wiktionary diskusija', - 'hu': u'Wikiszótár vita', + 'hu': u'Wikiszótár-vita', 'hy': u'Վիքիբառարանի քննարկում', 'ia': u'Discussion Wiktionary', 'id': u'Pembicaraan Wiktionary', @@ -206,9 +207,11 @@ 'bg': u'Словоформи', 'bs': u'Portal', 'cy': u'Atodiad', + 'el': u'Παράρτημα', 'en': u'Appendix', 'fi': u'Liite', 'fr': u'Annexe', + 'ga': u'Aguisín', 'he': u'נספח', 'it': u'Appendice', 'ko': u'부록', @@ -226,9 +229,11 @@ 'bg': u'Словоформи беседа', 'bs': u'Razgovor o Portalu', 'cy': u'Sgwrs Atodiad', + 'el': u'Συζήτηση παραρτήματος', 'en': u'Appendix talk', 'fi': u'Keskustelu liitteestä', 'fr': u'Discussion Annexe', + 'ga': u'Plé aguisín', 'he': u'שיחת נספח', 'it': u'Discussioni appendice', 'ko': u'부록 토론', @@ -361,7 +366,8 @@ 'ch': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Cha... 'cr': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Neh... 'dk': 'da', - 'iu': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Inu... + # Now *RESTORED*. Don't de-comment these two lines, thanks. + #'iu': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Inu... 'jp': 'ja', 'mh': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Mar... 'mo': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Mol... @@ -372,12 +378,14 @@ 'pi': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Pal... 'rm': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Rha... 'rn': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Kir... + 'sc': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Sar... 'sn': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Sho... 'to': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ton... 'tlh': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Kli... 'tw': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Twi... 'tokipona': None, - 'xh': None,# http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Xho... + 'xh': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Xho... + 'yo': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Yor... 'zh-tw': 'zh', 'zh-cn': 'zh' }