Revision: 8616 Author: xqt Date: 2010-10-06 16:04:42 +0000 (Wed, 06 Oct 2010)

Log Message: ----------- update from trunk r8614

Modified Paths: -------------- branches/rewrite/pywikibot/families/wikipedia_family.py branches/rewrite/pywikibot/families/wiktionary_family.py

Modified: branches/rewrite/pywikibot/families/wikipedia_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikipedia_family.py 2010-10-06 16:04:16 UTC (rev 8615) +++ branches/rewrite/pywikibot/families/wikipedia_family.py 2010-10-06 16:04:42 UTC (rev 8616) @@ -123,151 +123,94 @@ }

self.disambiguationTemplates = { - # set value to None, instead of a list, to retrieve names from - # the live wiki ([[MediaWiki:Disambiguationspage]] + # If no templates are given, retrieve names from the live wiki + # ([[MediaWiki:Disambiguationspage]]) '_default': [u'Disambig'], - 'af': None, - 'als': None, - 'an': None, - 'ang': [u'Disambig', u'Geodis'], - 'ar': None, + 'ang': [u'Geodis'], 'arc': [u'ܕ'], - 'arz': None, 'ast': [u'Dixebra'], 'av': [u'Неоднозначность'], 'ay': [u'Desambiguación'], 'az': [u'Dəqiqləşdirmə'], 'ba': [u'Күп мәғәнәлелек'], - 'bar': None, 'bcl': [u'Clarip'], - 'be': [u'Неадназначнасць', u'Disambig'], - 'be-x-old': [u'Неадназначнасьць', u'Disambig'], - 'bg': None, - 'bn': [u'দ্ব্যর্থতা নিরসন', u'Disambig'], - 'br': None, + 'be': [u'Неадназначнасць'], + 'be-x-old': [u'Неадназначнасьць'], + 'bn': [u'দ্ব্যর্থতা নিরসন'], 'bs': [u'Čvor'], - 'ca': None, - 'ceb': None, 'cdo': [u'Gì-ngiê'], - 'crh': [u'Çoq manalı', u'Disambig'], - 'cs': None, - 'cu': None, - 'cy': None, - 'da': None, - 'de': None, + 'crh': [u'Çoq manalı'], 'dsb': [u'Wěcejwóznamowosć'], - 'el': None, - 'en': None, - 'eo': None, - 'es': None, - 'et': None, - 'eu': None, 'ext': [u'Desambiguáncia'], - 'fa': None, - 'fi': None, 'fiu-vro': [u'Täpsüstüslehekülg'], 'fo': [u'Fleiri týdningar'], - 'fr': None, 'frp': [u'Homonimos'], - 'frr': None, - 'fur': [u'Disambiguazion', u'Disambig'], + 'fur': [u'Disambiguazion'], 'fy': [u'Tfs', u'Neibetsjuttings'], - 'ga': [u'Idirdhealú', u'Disambig'], - 'gan': [u'扤清楚', u'Disambig'], + 'ga': [u'Idirdhealú'], + 'gan': [u'扤清楚'], 'gd': [u'Soilleireachadh'], - 'gl': None, 'gv': [u'Reddaghey'], 'haw': [u'Huaʻōlelo puana like'], - 'he': None, - 'hi': [u'बहुविकल्पी शब्द', u'Disambig',], - 'hr': [u'Preusmjerenje u razdvojbu', u'Razdvojba', u'razdvojba1', u'Nova razdvojba'], - 'hsb': [u'Wjacezmyslnosć', u'Disambig'], - 'ht': [u'Menm non', u'Disambig'], - 'hu': [u'Egyert', u'Disambig', u'Egyért', u'Egyért-redir'], - 'hy': [u'Երկիմաստ', u'Բազմիմաստություն', u'Բազմանշանակ', u'Disambig'], - 'ia': [u'Disambiguation', u'Disambig'], - 'id': None, - 'io': [u'Homonimo', u'Disambig'], - 'is': None, - 'it': None, - 'ja': None, - 'ka': None, + 'hi': [u'बहुविकल्पी शब्द'], + 'hr': [u'Preusmjerenje u razdvojbu', u'Razdvojba', u'razdvojba1', + u'Nova razdvojba'], + 'hsb': [u'Wjacezmyslnosć'], + 'ht': [u'Menm non'], + 'hu': [u'Egyert', u'Egyért', u'Egyért-redir'], + 'hy': [u'Երկիմաստ', u'Բազմիմաստություն', u'Բազմանշանակ'], + 'ia': [u'Disambiguation'], + 'io': [u'Homonimo'], 'kab': [u'Asefham'], 'kg': [u'Bisongidila'], - 'kn': [u'ದ್ವಂದ್ವ ನಿವಾರಣೆ'], - 'ko': None, - 'krc': [u'Кёб магъаналы', u'Disambig'], - 'ksh': None, - 'ku': None, - 'kw': None, - 'la': None, - 'lb': [u'Homonymie', u'Disambig', u'Homonymie Ofkierzungen'], + 'krc': [u'Кёб магъаналы'], + 'lb': [u'Homonymie', u'Homonymie Ofkierzungen'], 'li': [u'Verdudeliking', u'Verdudelikingpazjena', u'Vp'], 'lmo': [u'Desambiguació', u'Dezambiguasiú', u'Desambiguazion', u'Desambiguassiú', u'Desambiguació'], - 'ln': None, - 'lt': None, - 'lv': [u'Nozīmju atdalīšana', u'Disambig'], - 'mk': [u'Појаснување', u'Disambig', u'Geodis'], - 'mn': [u'Салаа утгатай', u'Disambig'], - 'ms': [u'Nyahkekaburan', u'Disambig'], - 'mt': None, + 'lv': [u'Nozīmju atdalīšana'], + 'mk': [u'Појаснување', u'Geodis'], + 'mn': [u'Салаа утгатай'], + 'ms': [u'Nyahkekaburan'], 'mzn': [u'گجگجی بایری'], 'nap': [u'Disambigua'], - 'nds': [u'Mehrdüdig Begreep', 'Disambig'], - 'nds-nl': None, - 'nl': [u'Dp', u'DP', u'Dp2', u'Dpintro', u'Cognomen', u'Dp cognomen'], - 'nn': [u'Fleirtyding', u'Tobokstavforkorting', u'Pekerside', u'Peikar', u'Disambig'], - 'no': [u'Peker', u'Etternavn', u'Disambig', u'Tobokstavsforkortelse', + 'nds': [u'Mehrdüdig Begreep'], + 'nl': [u'Dp', u'DP', u'Dp2', u'Dpintro', u'Cognomen', + u'Dp cognomen'], + 'nn': [u'Fleirtyding', u'Tobokstavforkorting', u'Pekerside', + u'Peikar'], + 'no': [u'Peker', u'Etternavn' u'Tobokstavsforkortelse', u'Trebokstavsforkortelse', u'Flertydig', u'Pekerside'], 'nov': [u'Desambig'], - 'nv': None, 'nrm': [u'Page dé frouque'], - 'oc': [u'Omonimia', u'Disambig'], - 'pl': None, + 'oc': [u'Omonimia'], 'pms': [u'Gestion dij sinònim'], - 'pt': None, - 'qu': [u"Sut'ichana qillqa", u'Disambig', u'SJM'], + 'qu': [u"Sut'ichana qillqa", u'SJM'], 'rmy': [u'Dudalipen'], - 'ro': [u'Dezambiguizare', u'Disambig', u'Hndis', u'Dez', u'Dezamb'], - 'ru': None, + 'ro': [u'Dezambiguizare', u'Hndis', u'Dez', u'Dezamb'], 'sc': [u'Disambigua'], - 'scn': [u'Disambigua', u'Disambig', u'Sigla2', u'Sigla3'], - 'simple': None, - 'sh': None, - 'sk': [u'Disambig', u'Rozlišovacia stránka', u'Disambiguation'], - 'sl': None, - 'sq': [u'Kthjellim', u'Disambig'], - 'sr': None, + 'scn': [u'Disambigua', u'Sigla2', u'Sigla3'], + 'sk': [u'Rozlišovacia stránka', u'Disambiguation'], + 'sq': [u'Kthjellim'], 'srn': [u'Dp'], 'stq': [u'Begriepskläärenge'], - 'su': None, - 'sv': None, 'sw': [u'Maana'], - 'szl': [u'Disambig'], - 'ta': None, - 'te': None, - 'tg': [u'Ибҳомзудоӣ', u'Disambig', u'Рафъи ибҳом', u'Disambiguation'], - 'th': [u'แก้กำกวม', u'Disambig', u'คำกำกวม'], - 'tl': None, + 'tg': [u'Ибҳомзудоӣ', u'Рафъи ибҳом', u'Disambiguation'], + 'th': [u'แก้กำกวม', u'คำกำกวม'], 'to': [u'Fakaʻuhingakehe'], - 'tr': [u'Anlam ayrım', u'Disambig', u'Anlam ayrımı', - u'Kişi adları (anlam ayrımı)', u'Yerleşim yerleri (anlam ayrımı)', + 'tr': [u'Anlam ayrım', u'Anlam ayrımı', + u'Kişi adları (anlam ayrımı)', + u'Yerleşim yerleri (anlam ayrımı)', u'kısaltmalar (anlam ayrımı)'], - 'uk': None, 'vec': [u'Disanbigua', u'Disambigua'], - 'vi': None, 'vls': [u'Db', u'Dp', u'Dpintro'], - 'vo': None, - 'wa': None, - 'war': None, 'wo': [u'Bokktekki'], 'yi': [u'באדייטען'], 'zea': [u'dp', u'Deurverwiespagina'], - 'zh': [u'Disambig', u'消歧义', u'消歧义页', u'消歧義', u'消歧義頁', u'Letter disambig'], - 'zh-classical': [u'Disambig', u'釋義', u'消歧義'], - 'zh-min-nan': None, - 'zh-yue': [u'搞清楚', u'Disambig'], + 'zh': [u'消歧义', u'消歧义页', u'消歧義', u'消歧義頁', + u'Letter disambig'], + 'zh-classical': [u'釋義', u'消歧義'], + 'zh-yue': [u'搞清楚'], }

self.disambcatname = {

Modified: branches/rewrite/pywikibot/families/wiktionary_family.py =================================================================== --- branches/rewrite/pywikibot/families/wiktionary_family.py 2010-10-06 16:04:16 UTC (rev 8615) +++ branches/rewrite/pywikibot/families/wiktionary_family.py 2010-10-06 16:04:42 UTC (rev 8616) @@ -97,6 +97,7 @@ # after those, in code-alphabetical order.

self.interwiki_putfirst = { + 'da': self.alphabetic, 'en': self.alphabetic, 'et': self.alphabetic, 'fi': self.alphabetic,