Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13423 discussions

[Gerrit] bug 57070 - syntax error in welcome.py - change (pywikibot/compat)
by Xqt (Code Review) 14 Nov '13

14 Nov '13

Xqt has submitted this change and it was merged. Change subject: bug 57070 - syntax error in welcome.py ...................................................................... bug 57070 - syntax error in welcome.py Change-Id: I7f9c2a149cbecc73238392b2e5f8abe2343389e3 --- M welcome.py 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/welcome.py b/welcome.py index 8ac323b..dd93700 100644 --- a/welcome.py +++ b/welcome.py @@ -586,8 +586,7 @@ % username) else: # Adding the log. - rep_text += pywikibot.translate(self.site, report_text) - % username + rep_text += pywikibot.translate(self.site, report_text) % username if self.site.lang == 'it': rep_text = "%s%s}}" % (rep_text, self.bname[username]) -- To view, visit https://gerrit.wikimedia.org/r/95549 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7f9c2a149cbecc73238392b2e5f8abe2343389e3 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] [PEP8]ify wikipedia.py - change (pywikibot/compat)
by Xqt (Code Review) 13 Nov '13

13 Nov '13

Xqt has submitted this change and it was merged. Change subject: [PEP8]ify wikipedia.py ...................................................................... [PEP8]ify wikipedia.py Change-Id: I39bdae87d2f8797bf09709d5b741b4388fc1a1e3 --- M wikipedia.py 1 file changed, 11 insertions(+), 16 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia.py b/wikipedia.py index a9d3a58..3179f1c 100644 --- a/wikipedia.py +++ b/wikipedia.py @@ -6545,18 +6545,14 @@ def _userIndex(self, sysop=False): """Returns the internal index of the user.""" - if sysop: - return 1 - else: - return 0 + return 1 if sysop else 0 def username(self, sysop=False): return self._userName[self._userIndex(sysop=sysop)] def sitename(self): """Return string representing this Site's name and code.""" - - return self.family.name+':'+self.code + return '%s:%s' % (self.family.name, self.code) def __repr__(self): return '%s:%s' % (self.family.name, self.code) @@ -7029,7 +7025,8 @@ raise except urllib2.HTTPError, e: if e.code in [401, 404]: - debug(u"Got HTTP/%i %s: \n %r" % (e.code, e.message, e.read())) + debug(u"Got HTTP/%i %s: \n %r" + % (e.code, e.message, e.read())) raise PageNotFound(u'Page %s could not be retrieved. Check ' u'your family file ?' % url) # just check for HTTP Status 500 (Internal Server Error)? @@ -8350,7 +8347,7 @@ fileext = None title = m.group('title') if extension: - fileext = title[len(title)-3:] + fileext = title[len(title) - 3:] if title not in seen and fileext == extension: ## Check whether the media is used in a Proofread page # code disabled because it slows this method down, and @@ -8635,7 +8632,6 @@ url += '&namespace=%s' % namespace parser_text = self.getUrl(url) while True: - # <li><a href="/wiki/Pagina_principale" title="Pagina principale">Pagina principale</a>‎ <small>(6.522 byte)</small> ‎(protetta)</li> m = re.findall( r'<li><a href=".*?" title=".*?">(.*?)</a>.*?<small>$(.*?)$' r'</small>.*?$(.*?)$</li>', parser_text) @@ -9613,7 +9609,7 @@ # the parameter moduleName is deprecated and should be left out. moduleName = moduleName or calledModuleName() try: - moduleName = moduleName[moduleName.rindex("\\")+1:] + moduleName = moduleName[moduleName.rindex("\\") + 1:] except ValueError: # There was no \ in the module name, so presumably no problem pass @@ -9695,8 +9691,8 @@ # TEST for bug #3081100 unicode_error = __import__('unicodedata').normalize( 'NFC', + u'\u092e\u093e\u0930\u094d\u0915 \u091c\u093c\u0941\u0915\u0947\u0930\u092c\u0930\u094d\u0917') != \ u'\u092e\u093e\u0930\u094d\u0915 \u091c\u093c\u0941\u0915\u0947\u0930\u092c\u0930\u094d\u0917' - ) != u'\u092e\u093e\u0930\u094d\u0915 \u091c\u093c\u0941\u0915\u0947\u0930\u092c\u0930\u094d\u0917' if unicode_error: print u'unicode test: triggers problem #3081100' @@ -9859,6 +9855,7 @@ CRITICAL - fatal error messages Accordingly, do ''not'' use print statements in bot code; instead, use pywikibot.output function. + """ # currently only the logger is initialized here # the handlers are initialized in setLogfileStatus @@ -9878,24 +9875,22 @@ nh = NullHandler() logger.addHandler(nh) - logger.setLevel(DEBUG+1) + logger.setLevel(DEBUG + 1) if hasattr(logger, 'captureWarnings'): logger.captureWarnings(True) # introduced in Python >= 2.7 logger = logging.getLogger('pywiki') logger.addHandler(nh) - logger.setLevel(DEBUG+1) - + logger.setLevel(DEBUG + 1) logger.propagate = True - - return def writelogheader(): """ Save additional version, system and status info to the logfile in use, so that the user can look it up later to track errors or report bugs. + """ output(u'=== Pywikipediabot framework v1.0 -- Logging header ===') -- To view, visit https://gerrit.wikimedia.org/r/95207 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I39bdae87d2f8797bf09709d5b741b4388fc1a1e3 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] [PEP8]ify date.py, update from core - change (pywikibot/compat)
by jenkins-bot (Code Review) 13 Nov '13

13 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: [PEP8]ify date.py, update from core ...................................................................... [PEP8]ify date.py, update from core Change-Id: I0f6b66a44acba89182a2dbd8eae34fa32a6b71b2 --- M date.py 1 file changed, 1,838 insertions(+), 1,275 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/date.py b/date.py index dea31e2..0286044 100644 --- a/date.py +++ b/date.py @@ -4,17 +4,18 @@ lists which are required by some other programs. """ # -# © Rob W.W. Hooft, 2003 -# © Daniel Herding, 2004 -# © Ævar Arnfjörð Bjarmason, 2004 -# © Andre Engels, 2004-2005 -# © Yuri Astrakhan, 2005-2006 FirstnameLastname(a)gmail.com +# (C) Rob W.W. Hooft, 2003 +# (C) Daniel Herding, 2004 +# (C) Ævar Arnfjörð Bjarmason, 2004 +# (C) Andre Engels, 2004-2005 +# (C) Yuri Astrakhan, 2005-2006 FirstnameLastname(a)gmail.com # (years/decades/centuries/millenniums str <=> int conversions) -# © Pywikipedia bot team, 2004-2012 +# (C) Pywikibot team, 2004-2013 # # Distributed under the terms of the MIT license. # __version__='$Id$' +# # used for date recognition import types @@ -24,25 +25,26 @@ # # Different collections of well known formats # -enMonthNames = [u'January', u'February', u'March', u'April', u'May', u'June', - u'July', u'August', u'September', u'October', u'November', - u'December'] -dayMnthFmts = ['Day_' + str(s) for s in enMonthNames] # e.g. 'Day_January' -yrMnthFmts = ['Year_' + str(s) for s in enMonthNames] # e.g. 'Year_January' +enMonthNames = [u'January', u'February', u'March', u'April', u'May', u'June', + u'July', u'August', u'September', u'October', u'November', + u'December'] +dayMnthFmts = ['Day_' + str(s) for s in enMonthNames] # e.g. 'Day_January' +yrMnthFmts = ['Year_' + str(s) for s in enMonthNames] # e.g. 'Year_January' # the order of these lists is important -adDateFormats = ['YearAD', 'DecadeAD', 'CenturyAD', 'MillenniumAD'] -bcDateFormats = ['YearBC', 'DecadeBC', 'CenturyBC', 'MillenniumBC'] +adDateFormats = ['YearAD', 'DecadeAD', 'CenturyAD', 'MillenniumAD'] +bcDateFormats = ['YearBC', 'DecadeBC', 'CenturyBC', 'MillenniumBC'] -dateFormats = bcDateFormats + adDateFormats -decadeFormats = ['DecadeAD', 'DecadeBC'] -centuryFormats = ['CenturyAD', 'CenturyBC'] -yearFormats = ['YearAD', 'YearBC'] -millFormats = ['MillenniumAD', 'MillenniumBC'] +dateFormats = bcDateFormats + adDateFormats +decadeFormats = ['DecadeAD', 'DecadeBC'] +centuryFormats = ['CenturyAD', 'CenturyBC'] +yearFormats = ['YearAD', 'YearBC'] +millFormats = ['MillenniumAD', 'MillenniumBC'] snglValsFormats = ['CurrEvents'] -def multi( value, tuplst ): + +def multi(value, tuplst): """This method is used when more than one pattern is used for the same entry. Example: 1st century, 2nd century, etc. The tuplst is a list of tupples. Each tupple must contain two functions: @@ -51,7 +53,7 @@ When the 2nd function evaluates to true, the 1st function is used. """ - if type(value) in _stringTypes: + if isinstance(value, basestring): # Try all functions, and test result against predicates for func, pred in tuplst: try: @@ -69,13 +71,15 @@ raise ValueError("could not find a matching function") + # # Helper functions that aid with single value no corrections encoding/decoding. # Various filters are item dependent. # def dh_noConv(value, pattern, limit): """decoding helper for a single integer value, no conversion, no rounding""" - return dh( value, pattern, encNoConv, decSinglVal, limit ) + return dh(value, pattern, encNoConv, decSinglVal, limit) + def dh_dayOfMnth(value, pattern): """decoding helper for a single integer value <=31, no conversion, @@ -85,12 +89,14 @@ # For now use January because it has all 31 days return dh_noConv(value, pattern, formatLimits[dayMnthFmts[0]][0]) + def dh_mnthOfYear(value, pattern): """decoding helper for a single integer value >=1000, no conversion, no rounding (used in month of the year) """ return dh_noConv(value, pattern, _formatLimit_MonthOfYear[0]) + def dh_decAD(value, pattern): """decoding helper for a single integer value, no conversion, @@ -99,12 +105,14 @@ """ return dh(value, pattern, encDec0, decSinglVal, formatLimits['DecadeAD'][0]) + def dh_decBC(value, pattern): """decoding helper for a single integer value, no conversion, round to decimals (used in decades) """ return dh(value, pattern, encDec0, decSinglVal, formatLimits['DecadeBC'][0]) + def dh_yearBC(value, pattern): """decoding helper for a year value, no conversion, no rounding, @@ -113,12 +121,14 @@ """ return dh_noConv(value, pattern, formatLimits['YearBC'][0]) + def dh_yearAD(value, pattern): """decoding helper for a year value, no conversion, no rounding, limits to 3000 """ return dh_noConv(value, pattern, formatLimits['YearAD'][0]) + def dh_simpleYearAD(value): """decoding helper for a single integer value representing a year with @@ -127,37 +137,51 @@ """ return dh_yearAD(value, u'%d') + def dh_number(value, pattern): return dh_noConv(value, pattern, formatLimits['Number'][0]) + + def dh_centuryAD(value, pattern): return dh_noConv(value, pattern, formatLimits['CenturyAD'][0]) + + def dh_centuryBC(value, pattern): return dh_noConv(value, pattern, formatLimits['CenturyBC'][0]) + + def dh_millenniumAD(value, pattern): return dh_noConv(value, pattern, formatLimits['MillenniumAD'][0]) + + def dh_millenniumBC(value, pattern): return dh_noConv(value, pattern, formatLimits['MillenniumBC'][0]) + def decSinglVal(v): return v[0] + def encNoConv(i): return i + def encDec0(i): # round to the nearest decade, decade starts with a '0'-ending year - return (i/10)*10 + return (i/10) * 10 + def encDec1(i): # round to the nearest decade, decade starts with a '1'-ending year - return encDec0(i)+1 + return encDec0(i) + 1 -def slh( value, lst ): + +def slh(value, lst): """This function helps in simple list value matching. !!!!! The index starts at 1, so 1st element has index 1, not 0 !!!!! Usually it will be used as a lambda call in a map: - lambda v: slh( v, [u'January',u'February',...] ) + lambda v: slh(v, [u'January',u'February',...]) Usage scenarios: formats['MonthName']['en'](1) => u'January' @@ -165,22 +189,24 @@ formats['MonthName']['en'](u'anything else') => raise ValueError """ - if type(value) in _stringTypes: - return lst.index(value)+1 + if isinstance(value, basestring): + return lst.index(value) + 1 else: - return lst[value-1] + return lst[value - 1] -def dh_singVal( value, match ): - return dh_constVal( value, 0, match ) -def dh_constVal( value, ind, match ): +def dh_singVal(value, match): + return dh_constVal(value, 0, match) + + +def dh_constVal(value, ind, match): """This function helps with matching a single value to a constant. formats['CurrEvents']['en'](ind) => u'Current Events' formats['CurrEvents']['en'](u'Current Events') => ind """ - if type(value) in _stringTypes: + if isinstance(value, basestring): if value == match: return ind else: @@ -191,12 +217,14 @@ else: raise ValueError("unknown value %d" % value) -def alwaysTrue( x ): - """This function always returns True - its used for multiple value selection function - to accept all other values + +def alwaysTrue(x): + """This function always returns True - its used for multiple value + selection function to accept all other values """ return True + def monthName(lang, ind): return formats['MonthName'][lang](ind) @@ -227,11 +255,13 @@ _guDigitsToLocal = dict([(ord(unicode(i)), _guDigits[i]) for i in xrange(10)]) _guLocalToDigits = dict([(ord(_guDigits[i]), unicode(i)) for i in xrange(10)]) -def intToLocalDigitsStr( value, digitsToLocalDict ): + +def intToLocalDigitsStr(value, digitsToLocalDict): # Encode an integer value into a textual form. return unicode(value).translate(digitsToLocalDict) -def localDigitsStrToInt( value, digitsToLocalDict, localToDigitsDict ): + +def localDigitsStrToInt(value, digitsToLocalDict, localToDigitsDict): # First make sure there are no real digits in the string tmp = value.translate(digitsToLocalDict) # Test if tmp == value: @@ -248,10 +278,12 @@ 'XIX', 'XX', 'XXI', 'XXII', 'XXIII', 'XXIV', 'XXV', 'XXVI', 'XXVII', 'XXVIII', 'XXIX', 'XXX'] + def intToRomanNum(i): if i >= len(_romanNumbers): raise IndexError(u'Roman value %i is not defined' % i) return _romanNumbers[i] + def romanNumToInt(v): return _romanNumbers.index(v) @@ -260,39 +292,44 @@ # (from int to a u-string) and decoder (from u-string to an int) _digitDecoders = { # %% is a % - '%' : u'%', + '%': u'%', # %d is a decimal - 'd' : ( _decimalDigits, unicode, int ), + 'd': (_decimalDigits, unicode, int), # %R is a roman numeral. This allows for only the simpliest linear # conversions based on a list of numbers - 'R' : ( u'IVX', intToRomanNum, romanNumToInt ), + 'R': (u'IVX', intToRomanNum, romanNumToInt), # %K is a number in KN:: - 'K' : ( _knDigits, lambda v: intToLocalDigitsStr(v, _knDigitsToLocal), lambda v: localDigitsStrToInt(v, _knDigitsToLocal, _knLocalToDigits) ), + 'K': (_knDigits, lambda v: intToLocalDigitsStr(v, _knDigitsToLocal), + lambda v: localDigitsStrToInt(v, _knDigitsToLocal, _knLocalToDigits)), # %F is a number in FA: - 'F' : ( _faDigits, lambda v: intToLocalDigitsStr(v, _faDigitsToLocal), lambda v: localDigitsStrToInt(v, _faDigitsToLocal, _faLocalToDigits) ), + 'F': (_faDigits, lambda v: intToLocalDigitsStr(v, _faDigitsToLocal), + lambda v: localDigitsStrToInt(v, _faDigitsToLocal, _faLocalToDigits)), # %H is a number in HI: - 'H' : ( _hiDigits, lambda v: intToLocalDigitsStr(v, _hiDigitsToLocal), lambda v: localDigitsStrToInt(v, _hiDigitsToLocal, _hiLocalToDigits) ), + 'H': (_hiDigits, lambda v: intToLocalDigitsStr(v, _hiDigitsToLocal), + lambda v: localDigitsStrToInt(v, _hiDigitsToLocal, _hiLocalToDigits)), # %B is a number in BN: - 'B' : ( _bnDigits, lambda v: intToLocalDigitsStr(v, _bnDigitsToLocal), lambda v: localDigitsStrToInt(v, _bnDigitsToLocal, _bnLocalToDigits) ), + 'B': (_bnDigits, lambda v: intToLocalDigitsStr(v, _bnDigitsToLocal), + lambda v: localDigitsStrToInt(v, _bnDigitsToLocal, _bnLocalToDigits)), # %G is a number in GU: - 'G' : ( _guDigits, lambda v: intToLocalDigitsStr(v, _guDigitsToLocal), lambda v: localDigitsStrToInt(v, _guDigitsToLocal, _guLocalToDigits) ), + 'G': (_guDigits, lambda v: intToLocalDigitsStr(v, _guDigitsToLocal), + lambda v: localDigitsStrToInt(v, _guDigitsToLocal, _guLocalToDigits)), # %T is a year in TH: -- all years are shifted: 2005 => 'พ.ศ. 2548' - 'T' : ( _decimalDigits, lambda v: unicode(v+543), lambda v: int(v)-543 ), + 'T': (_decimalDigits, lambda v: unicode(v+543), lambda v: int(v)-543), } # Allows to search for '(%%)|(%d)|(%R)|...", and allows one digit 1-9 to set # the size of zero-padding for numbers -_reParameters = re.compile(u'|'.join([ u'(%%[1-9]?%s)' % s for s in _digitDecoders.keys() ])) +_reParameters = re.compile(u'|'.join(u'(%%[1-9]?%s)' % s + for s in _digitDecoders)) # A map of sitecode+pattern to (re matching object and corresponding # decoders) _escPtrnCache2 = {} -# Allow both unicode and single-byte strings -_stringTypes = [unicode, str] -_listTypes = [tuple, list] +_listTypes = [list, tuple] -def escapePattern2( pattern ): + +def escapePattern2(pattern): """Converts a string pattern into a regex expression and cache. Allows matching of any _digitDecoders inside the string. Returns a compiled regex object and a list of digit decoders @@ -300,50 +337,57 @@ """ if pattern not in _escPtrnCache2: - newPattern = u'^' # begining of the string + newPattern = u'^' # begining of the string strPattern = u'' decoders = [] for s in _reParameters.split(pattern): if s is None: pass - elif len(s) in [2, 3] and s[0] == '%' and s[-1] in _digitDecoders and (len(s) == 2 or s[1] in _decimalDigits): + elif (len(s) in (2, 3) and s[0] == '%' and + s[-1] in _digitDecoders and + (len(s) == 2 or s[1] in _decimalDigits)): # Must match a "%2d" or "%d" style dec = _digitDecoders[s[-1]] - if type(dec) in _stringTypes: - # Special case for strings that are replaced instead of decoded - if len(s) == 3: raise AssertionError("Invalid pattern %s: Cannot use zero padding size in %s!" % (pattern, s)) - newPattern += re.escape( dec ) + if isinstance(dec, basestring): + # Special case for strings that are replaced instead of + # decoded + if len(s) == 3: + raise AssertionError( + "Invalid pattern %s: Cannot use zero padding size " + "in %s!" % (pattern, s)) + newPattern += re.escape(dec) strPattern += s # Keep the original text else: if len(s) == 3: # enforce mandatory field size newPattern += u'([%s]{%s})' % (dec[0], s[1]) - # add the number of required digits as the last (4th) part of the tuple + # add the number of required digits as the last (4th) + # part of the tuple dec += (int(s[1]),) else: newPattern += u'([%s]+)' % dec[0] - decoders.append( dec ) + decoders.append(dec) # All encoders produce a string # this causes problem with the zero padding. # Need to rethink strPattern += u'%s' else: - newPattern += re.escape( s ) + newPattern += re.escape(s) strPattern += s - newPattern += u'$' # end of the string - compiledPattern = re.compile( newPattern ) + newPattern += u'$' # end of the string + compiledPattern = re.compile(newPattern) _escPtrnCache2[pattern] = (compiledPattern, strPattern, decoders) return _escPtrnCache2[pattern] -def dh( value, pattern, encf, decf, filter = None ): +def dh(value, pattern, encf, decf, filter=None): """This function helps in year parsing. Usually it will be used as a lambda call in a map: - lambda v: dh( v, u'pattern string', encodingFunc, decodingFunc ) + lambda v: dh(v, u'pattern string', encodingFunc, decodingFunc) encodingFunc: Converts from an integer parameter to another integer or a tuple of @@ -364,24 +408,27 @@ """ compPattern, strPattern, decoders = escapePattern2(pattern) - if type(value) in _stringTypes: + if isinstance(value, basestring): m = compPattern.match(value) if m: # decode each found value using provided decoder - values = [ decoders[i][2](m.group(i+1)) for i in xrange(len(decoders))] - decValue = decf( values ) + values = [decoders[i][2](m.group(i + 1)) + for i in xrange(len(decoders))] + decValue = decf(values) - if decValue in _stringTypes: + if isinstance(decValue, basestring): raise AssertionError("Decoder must not return a string!") - # recursive call to re-encode and see if we get the original (may through filter exception) + # recursive call to re-encode and see if we get the original + # (may through filter exception) if value == dh(decValue, pattern, encf, decf, filter): return decValue raise ValueError("reverse encoding didn't match") else: # Encode an integer value into a textual form. - # This will be called from outside as well as recursivelly to verify parsed value + # This will be called from outside as well as recursivelly to verify + # parsed value if filter and not filter(value): raise ValueError("value %i is not allowed" % value) @@ -389,20 +436,27 @@ if type(params) in _listTypes: if len(params) != len(decoders): - raise AssertionError("parameter count (%d) does not match decoder count (%d)" % (len(params), len(decoders))) + raise AssertionError( + "parameter count (%d) does not match decoder count (%d)" + % (len(params), len(decoders))) # convert integer parameters into their textual representation - params = [ MakeParameter(decoders[i], params[i]) for i in xrange(len(params)) ] + params = [MakeParameter(decoders[i], params[i]) + for i in xrange(len(params))] return strPattern % tuple(params) else: if 1 != len(decoders): - raise AssertionError("A single parameter does not match %d decoders." % len(decoders)) + raise AssertionError( + "A single parameter does not match %d decoders." + % len(decoders)) # convert integer parameter into its textual representation return strPattern % MakeParameter(decoders[0], params) + def MakeParameter(decoder, param): newValue = decoder[1](param) if len(decoder) == 4 and len(newValue) < decoder[3]: - # force parameter length by taking the first digit in the list and repeating it required number of times + # force parameter length by taking the first digit in the list and + # repeating it required number of times # This converts "205" into "0205" for "%4d" newValue = decoder[0][0] * (decoder[3]-len(newValue)) + newValue return newValue @@ -410,1079 +464,1451 @@ # # All years/decades/centuries/millenniums are designed in such a way # as to allow for easy date to string and string to date conversion. -# For example, using any map with either an integer or a string will produce its oposite value: +# For example, using any map with either an integer or a string will produce +# its oposite value: # Usage scenarios: # formats['DecadeAD']['en'](1980) => u'1980s' # formats['DecadeAD']['en'](u'1980s') => 1980 -# formats['DecadeAD']['en'](u'anything else') => raise ValueError (or some other exception?) -# This is useful when trying to decide if a certain article is a localized date or not, or generating dates. +# formats['DecadeAD']['en'](u'anything else') => raise ValueError +# (or some other exception?) +# This is useful when trying to decide if a certain article is a localized date +# or not, or generating dates. # See dh() for additional information. # # # *********** ATTENTION! *********** # -# You must test this table before submitting it to CVS by calling date.test() method +# You must test this table before submitting it to CVS by calling +# date.test() method # formats = { 'MonthName': { - 'af' : lambda v: slh( v, [u"Januarie", u"Februarie", u"Maart", u"April", u"Mei", u"Junie", u"Julie", u"Augustus", u"September", u"Oktober", u"November", u"Desember"] ), - 'als': lambda v: slh( v, [u"Januar", u"Februar", u"März", u"April", u"Mai", u"Juni", u"Juli", u"August", u"September", u"Oktober", u"November", u"Dezember"] ), - 'an' : lambda v: slh( v, [u"chinero", u"frebero", u"marzo", u"abril", u"mayo", u"chunio", u"chulio", u"agosto", u"setiembre", u"otubre", u"nobiembre", u"abiento"] ), - 'ang': lambda v: slh( v, [u"Æfterra Gēola", u"Solmōnaþ", u"Hrēþmōnaþ", u"Ēastermōnaþ", u"Þrimilcemōnaþ", u"Sēremōnaþ", u"Mǣdmōnaþ", u"Wēodmōnaþ", u"Hāligmōnaþ", u"Winterfylleþ", u"Blōtmōnaþ", u"Gēolmōnaþ"] ), - 'ar' : lambda v: slh( v, [u"يناير", u"فبراير", u"مارس", u"أبريل", u"مايو", u"يونيو", u"يوليو", u"أغسطس", u"سبتمبر", u"أكتوبر", u"نوفمبر", u"ديسمبر"] ), - 'ast': lambda v: slh( v, [u"xineru", u"febreru", u"marzu", u"abril", u"mayu", u"xunu", u"xunetu", u"agostu", u"setiembre", u"ochobre", u"payares", u"avientu"] ), - 'be' : lambda v: slh( v, [u"студзень", u"люты", u"сакавік", u"красавік", u"травень", u"чэрвень", u"ліпень", u"жнівень", u"верасень", u"кастрычнік", u"лістапад", u"сьнежань"] ), - 'bg' : lambda v: slh( v, [u"януари", u"февруари", u"март", u"април", u"май", u"юни", u"юли", u"август", u"септември", u"октомври", u"ноември", u"декември"] ), - 'bn' : lambda v: slh( v, [u"জানুয়ারি", u"ফেব্রুয়ারি", u"মার্চ", u"এপ্রিল", u"মে", u"জুন", u"জুলাই", u"আগস্ট", u"সেপ্টেম্বর", u"অক্টোবর", u"নভেম্বর", u"ডিসেম্বর"] ), - 'br' : lambda v: slh( v, [u"Genver", u"C'hwevrer", u"Meurzh", u"Ebrel", u"Mae", u"Mezheven", u"Gouere", u"Eost", u"Gwengolo", u"Here", u"Du", u"Kerzu"] ), - 'bs' : lambda v: slh( v, [u"januar", u"februar", u"mart", u"april", u"maj", u"juni", u"juli", u"august", u"septembar", u"oktobar", u"novembar", u"decembar"] ), - 'ca' : lambda v: slh( v, [u"gener", u"febrer", u"març", u"abril", u"maig", u"juny", u"juliol", u"agost", u"setembre", u"octubre", u"novembre", u"desembre"] ), - 'ceb': lambda v: slh( v, [u"Enero", u"Pebrero", u"Marso", u"Abril", u"Mayo", u"Hunyo", u"Hulyo", u"Agosto", u"Septiyembre", u"Oktubre", u"Nobiyembre", u"Disyembre"] ), - 'co' : lambda v: slh( v, [u"ghjennaghju", u"frivaghju", u"marzu", u"aprile", u"maghju", u"ghjugnu", u"lugliu", u"aostu", u"settembre", u"uttrovi", u"nuvembri", u"decembre"] ), - 'cs' : lambda v: slh( v, [u"leden", u"únor", u"březen", u"duben", u"květen", u"červen", u"červenec", u"srpen", u"září", u"říjen", u"listopad", u"prosinec"] ), - 'csb': lambda v: slh( v, [u"stëcznik", u"gromicznik", u"strumiannik", u"łżëkwiôt", u"môj", u"czerwińc", u"lëpinc", u"zélnik", u"séwnik", u"rujan", u"lëstopadnik", u"gòdnik"] ), - 'cv' : lambda v: slh( v, [u"кăрлач", u"нарăс", u"Пуш", u"Ака", u"çу", u"çĕртме", u"утă", u"çурла", u"авăн", u"юпа", u"чӳк", u"раштав"] ), - 'cy' : lambda v: slh( v, [u"Ionawr", u"Chwefror", u"Mawrth", u"Ebrill", u"Mai", u"Mehefin", u"Gorffennaf", u"Awst", u"Medi", u"Hydref", u"Tachwedd", u"Rhagfyr"] ), - 'da' : lambda v: slh( v, [u"januar", u"februar", u"marts", u"april", u"maj", u"juni", u"juli", u"august", u"september", u"oktober", u"november", u"december"] ), - 'de' : lambda v: slh( v, [u"Januar", u"Februar", u"März", u"April", u"Mai", u"Juni", u"Juli", u"August", u"September", u"Oktober", u"November", u"Dezember"] ), - 'el' : lambda v: slh( v, [u"Ιανουάριος", u"Φεβρουάριος", u"Μάρτιος", u"Απρίλιος", u"Μάιος", u"Ιούνιος", u"Ιούλιος", u"Αύγουστος", u"Σεπτέμβριος", u"Οκτώβριος", u"Νοέμβριος", u"Δεκέμβριος"] ), - 'en' : lambda v: slh( v, enMonthNames ), - 'eo' : lambda v: slh( v, [u"Januaro", u"Februaro", u"Marto", u"Aprilo", u"Majo", u"Junio", u"Julio", u"Aŭgusto", u"Septembro", u"Oktobro", u"Novembro", u"Decembro"] ), - 'es' : lambda v: slh( v, [u"enero", u"febrero", u"marzo", u"abril", u"mayo", u"junio", u"julio", u"agosto", u"septiembre", u"octubre", u"noviembre", u"diciembre"] ), - 'et' : lambda v: slh( v, [u"jaanuar", u"veebruar", u"märts", u"aprill", u"mai", u"juuni", u"juuli", u"august", u"september", u"oktoober", u"november", u"detsember"] ), - 'eu' : lambda v: slh( v, [u"Urtarril", u"Otsail", u"Martxo", u"Apiril", u"Maiatz", u"Ekain", u"Uztail", u"Abuztu", u"Irail", u"Urri", u"Azaro", u"Abendu"] ), - 'fa' : lambda v: slh( v, [u"ژانویه", u"فوریه", u"مارس", u"آوریل", u"مه", u"ژوئن", u"ژوئیه", u"اوت", u"سپتامبر", u"اکتبر", u"نوامبر", u"دسامبر"] ), - 'fi' : lambda v: slh( v, [u"tammikuu", u"helmikuu", u"maaliskuu", u"huhtikuu", u"toukokuu", u"kesäkuu", u"heinäkuu", u"elokuu", u"syyskuu", u"lokakuu", u"marraskuu", u"joulukuu"] ), - 'fo' : lambda v: slh( v, [u"januar", u"februar", u"mars", u"apríl", u"mai", u"juni", u"juli", u"august", u"september", u"oktober", u"november", u"desember"] ), - 'fr' : lambda v: slh( v, [u"janvier", u"février", u"mars (mois)", u"avril", u"mai", u"juin", u"juillet", u"août", u"septembre", u"octobre", u"novembre", u"décembre"] ), - 'fur': lambda v: slh( v, [u"Zenâr", u"Fevrâr", u"Març", u"Avrîl", u"Mai", u"Jugn", u"Lui", u"Avost", u"Setembar", u"Otubar", u"Novembar", u"Dicembar"] ), - 'fy' : lambda v: slh( v, [u"jannewaris", u"febrewaris", u"maart", u"april", u"maaie", u"juny", u"july", u"augustus", u"septimber", u"oktober", u"novimber", u"desimber"] ), - 'ga' : lambda v: slh( v, [u"Eanáir", u"Feabhra", u"Márta", u"Aibreán", u"Bealtaine", u"Meitheamh", u"Iúil", u"Lúnasa", u"Meán Fómhair", u"Deireadh Fómhair", u"Samhain", u"Nollaig"] ), - 'gl' : lambda v: slh( v, [u"xaneiro", u"febreiro", u"marzo", u"abril", u"maio", u"xuño", u"xullo", u"agosto", u"setembro", u"outubro", u"novembro", u"decembro"] ), - 'he' : lambda v: slh( v, [u"ינואר", u"פברואר", u"מרץ", u"אפריל", u"מאי", u"יוני", u"יולי", u"אוגוסט", u"ספטמבר", u"אוקטובר", u"נובמבר", u"דצמבר"] ), - 'hi' : lambda v: slh( v, [u"जनवरी", u"फ़रवरी", u"मार्च", u"अप्रैल", u"मई", u"जून", u"जुलाई", u"अगस्त", u"सितम्बर", u"अक्टूबर", u"नवम्बर", u"दिसम्बर"] ), - 'hr' : lambda v: slh( v, [u"siječanj", u"veljača", u"ožujak", u"travanj", u"svibanj", u"lipanj", u"srpanj", u"kolovoz", u"rujan", u"listopad", u"studeni", u"prosinac"] ), - 'hu' : lambda v: slh( v, [u"január", u"február", u"március", u"április", u"május", u"június", u"július", u"augusztus", u"szeptember", u"október", u"november", u"december"] ), - 'ia' : lambda v: slh( v, [u"januario", u"februario", u"martio", u"april", u"maio", u"junio", u"julio", u"augusto", u"septembre", u"octobre", u"novembre", u"decembre"] ), - 'id' : lambda v: slh( v, [u"Januari", u"Februari", u"Maret", u"April", u"Mei", u"Juni", u"Juli", u"Agustus", u"September", u"Oktober", u"November", u"Desember"] ), - 'ie' : lambda v: slh( v, [u"januar", u"februar", u"marte", u"april", u"may", u"junio", u"juli", u"august", u"septembre", u"octobre", u"novembre", u"decembre"] ), - 'io' : lambda v: slh( v, [u"januaro", u"februaro", u"Marto", u"aprilo", u"mayo", u"junio", u"julio", u"agosto", u"septembro", u"oktobro", u"novembro", u"decembro"] ), - 'is' : lambda v: slh( v, [u"janúar", u"febrúar", u"mars (mánuður)", u"apríl", u"maí", u"júní", u"júlí", u"ágúst", u"september", u"október", u"nóvember", u"desember"] ), - 'it' : lambda v: slh( v, [u"gennaio", u"febbraio", u"marzo", u"aprile", u"maggio", u"giugno", u"luglio", u"agosto", u"settembre", u"ottobre", u"novembre", u"dicembre"] ), - 'ja' : lambda v: slh( v, makeMonthList( u"%d月" )), - 'jv' : lambda v: slh( v, [u"Januari", u"Februari", u"Maret", u"April", u"Mei", u"Juni", u"Juli", u"Agustus", u"September", u"Oktober", u"November", u"Desember"] ), - 'ka' : lambda v: slh( v, [u"იანვარი", u"თებერვალი", u"მარტი", u"აპრილი", u"მაისი", u"ივნისი", u"ივლისი", u"აგვისტო", u"სექტემბერი", u"ოქტომბერი", u"ნოემბერი", u"დეკემბერი"] ), - 'kn' : lambda v: slh( v, [u"ಜನವರಿ", u"ಫೆಬ್ರವರಿ", u"ಮಾರ್ಚಿ", u"ಎಪ್ರಿಲ್", u"ಮೇ", u"ಜೂನ", u"ಜುಲೈ", u"ಆಗಸ್ಟ್", u"ಸೆಪ್ಟೆಂಬರ್", u"ಅಕ್ಟೋಬರ್", u"ನವೆಂಬರ್", u"ಡಿಸೆಂಬರ್"] ), - 'ko' : lambda v: slh( v, makeMonthList( u"%d월" )), - 'ksh': lambda v: slh( v, [u'Jannowaa', u'Febrowaa', u'Mä', u'Apprill', u'Meij', u'Juuni', u'Juuli', u'Aujuß', u'Sepptäber', u'Oktoober', u'Novemmber', u'Dezemmber'] ), - 'ku' : lambda v: slh( v, [u"rêbendan", u"reşemî", u"adar", u"avrêl", u"gulan", u"pûşper", u"tîrmeh", u"gelawêj (meh)", u"rezber", u"kewçêr", u"sermawez", u"berfanbar"] ), - 'kw' : lambda v: slh( v, [u"Mys Genver", u"Mys Whevrer", u"Mys Merth", u"Mys Ebrel", u"Mys Me", u"Mys Metheven", u"Mys Gortheren", u"Mys Est", u"Mys Gwyngala", u"Mys Hedra", u"Mys Du", u"Mys Kevardhu"] ), - 'la' : lambda v: slh( v, [u"Ianuarius", u"Februarius", u"Martius", u"Aprilis", u"Maius", u"Iunius", u"Iulius", u"Augustus (mensis)", u"September", u"October", u"November", u"December"] ), - 'lb' : lambda v: slh( v, [u"Januar", u"Februar", u"Mäerz", u"Abrëll", u"Mee", u"Juni", u"Juli", u"August", u"September", u"Oktober", u"November", u"Dezember"] ), - 'li' : lambda v: slh( v, [u"jannewarie", u"fibberwarie", u"miert", u"april", u"mei", u"juni", u"juli", u"augustus (maond)", u"september", u"oktober", u"november", u"december"] ), - 'lt' : lambda v: slh( v, [u"Sausis", u"Vasaris", u"Kovas", u"Balandis", u"Gegužė", u"Birželis", u"Liepa", u"Rugpjūtis", u"Rugsėjis", u"Spalis", u"Lapkritis", u"Gruodis"] ), - 'lv' : lambda v: slh( v, [u"Janvāris", u"Februāris", u"Marts", u"Aprīlis", u"Maijs", u"Jūnijs", u"Jūlijs", u"Augusts", u"Septembris", u"Oktobris", u"Novembris", u"Decembris"] ), - 'mhr': lambda v: slh( v, [ u"шорыкйол", u"пургыж", u"ӱярня", u"вӱдшор", u"ага", u"пеледыш", u"сӱрем", u"сорла", u"идым", u"шыжа", u"кылме", u"декабрь"] ), - 'mi' : lambda v: slh( v, [u"Kohi-tātea", u"Hui-tanguru", u"Poutū-te-rangi", u"Paenga-whāwhā", u"Haratua", u"Pipiri", u"Hōngongoi", u"Here-turi-kōkā", u"Mahuru", u"Whiringa-ā-nuku", u"Whiringa-ā-rangi", u"Hakihea"] ), - 'ml' : lambda v: slh( v, [u"ജനുവരി", u"ഫെബ്രുവരി", u"മാര്ച്", u"ഏപ്രില്", u"മേയ്", u"ജൂണ്‍", u"ജൂലൈ", u"ആഗസ്റ്റ്‌", u"സപ്തന്പര്", u"ഒക്ടോബര്", u"നവന്പര്", u"ഡിസന്പര്"] ), - 'mr' : lambda v: slh( v, [u"जानेवारी", u"फेब्रुवारी", u"मार्च", u"एप्रिल", u"मे", u"जून", u"जुलै", u"ऑगस्ट", u"सप्टेंबर", u"ऑक्टोबर", u"नोव्हेंबर", u"डिसेंबर"] ), - 'ms' : lambda v: slh( v, [u"Januari", u"Februari", u"Mac", u"April", u"Mei", u"Jun", u"Julai", u"Ogos", u"September", u"Oktober", u"November", u"Disember"] ), - 'nap': lambda v: slh( v, [u"Jennaro", u"Frevaro", u"Màrzo", u"Abbrile", u"Maggio", u"Giùgno", u"Luglio", u"Aùsto", u"Settembre", u"Ottovre", u"Nuvembre", u"Dicembre"] ), - 'nds': lambda v: slh( v, [u"Januar", u"Februar", u"März", u"April", u"Mai", u"Juni", u"Juli", u"August", u"September", u"Oktober", u"November", u"Dezember"] ), - 'nl' : lambda v: slh( v, [u"januari", u"februari", u"maart", u"april", u"mei", u"juni", u"juli", u"augustus (maand)", u"september", u"oktober", u"november", u"december"] ), - 'nn' : lambda v: slh( v, [u"januar", u"februar", u"månaden mars", u"april", u"mai", u"juni", u"juli", u"august", u"september", u"oktober", u"november", u"desember"] ), - 'no' : lambda v: slh( v, [u"januar", u"februar", u"mars", u"april", u"mai", u"juni", u"juli", u"august", u"september", u"oktober", u"november", u"desember"] ), - 'oc' : lambda v: slh( v, [u"genièr", u"febrièr", u"març", u"abril", u"mai", u"junh", u"julhet", u"agost", u"setembre", u"octobre", u"novembre", u"decembre"] ), - 'os' : lambda v: slh( v, [u"январь", u"февраль", u"мартъи", u"апрель", u"май", u"июнь", u"июль", u"август", u"сентябрь", u"октябрь", u"ноябрь", u"декабрь"] ), - 'pdc' : lambda v: slh( v, [u'Yenner', u'Hanning', u'Matz', u'Abril', u'Moi', u'Yuni', u'Yuli', u'Aagscht', u'September', u'Oktower', u'Nowember', u'Disember'] ), - 'pl' : lambda v: slh( v, [u"styczeń", u"luty", u"marzec", u"kwiecień", u"maj", u"czerwiec", u"lipiec", u"sierpień", u"wrzesień", u"październik", u"listopad", u"grudzień"] ), - 'pt' : lambda v: slh( v, [u"Janeiro", u"Fevereiro", u"Março", u"Abril", u"Maio", u"Junho", u"Julho", u"Agosto", u"Setembro", u"Outubro", u"Novembro", u"Dezembro"] ), - 'ro' : lambda v: slh( v, [u"ianuarie", u"februarie", u"martie", u"aprilie", u"mai", u"iunie", u"iulie", u"august", u"septembrie", u"octombrie", u"noiembrie", u"decembrie"] ), - 'ru' : lambda v: slh( v, [u"январь", u"февраль", u"март", u"апрель", u"май", u"июнь", u"июль", u"август", u"сентябрь", u"октябрь", u"ноябрь", u"декабрь"] ), - 'sc' : lambda v: slh( v, [u"Ghennarzu", u"Frearzu", u"Martzu", u"Abrile", u"Maju", u"Làmpadas", u"Triulas", u"Aùstu", u"Cabudanni", u"Santugaìne", u"Santadria", u"Nadale"] ), - 'scn': lambda v: slh( v, [u"jinnaru", u"frivaru", u"marzu", u"aprili", u"maiu", u"giugnu", u"giugnettu", u"austu", u"sittèmmiru", u"uttùviru", u"nuvèmmiru", u"dicèmmiru"] ), - 'sco': lambda v: slh( v, [u"Januar", u"Februar", u"Mairch", u"Aprile", u"Mey", u"Juin", u"Julie", u"August", u"September", u"October", u"November", u"December"] ), - 'se' : lambda v: slh( v, [u"ođđajagimánnu", u"guovvamánnu", u"njukčamánnu", u"cuoŋománnu", u"miessemánnu", u"geassemánnu", u"suoidnemánnu", u"borgemánnu", u"čakčamánnu", u"golggotmánnu", u"skábmamánnu", u"juovlamánnu"] ), - 'simple': lambda v: slh( v, [u"January", u"February", u"March", u"April", u"May", u"June", u"July", u"August", u"September", u"October", u"November", u"December"] ), - 'sk' : lambda v: slh( v, [u"január", u"február", u"marec", u"apríl", u"máj", u"jún", u"júl", u"august", u"september", u"október", u"november", u"december"] ), - 'sl' : lambda v: slh( v, [u"januar", u"februar", u"marec", u"april", u"maj", u"junij", u"julij", u"avgust", u"september", u"oktober", u"november", u"december"] ), - 'sq' : lambda v: slh( v, [u"Janari", u"Shkurti", u"Marsi (muaj)", u"Prilli", u"Maji", u"Qershori", u"Korriku", u"Gushti", u"Shtatori", u"Tetori", u"Nëntori", u"Dhjetori"] ), - 'sr' : lambda v: slh( v, [u"јануар", u"фебруар", u"март", u"април", u"мај", u"јун", u"јул", u"август", u"септембар", u"октобар", u"новембар", u"децембар"] ), - 'su' : lambda v: slh( v, [u"Januari", u"Pébruari", u"Maret", u"April", u"Méi", u"Juni", u"Juli", u"Agustus", u"Séptémber", u"Oktober", u"Nopémber", u"Désémber"] ), - 'sv' : lambda v: slh( v, [u"januari", u"februari", u"mars", u"april", u"maj", u"juni", u"juli", u"augusti", u"september", u"oktober", u"november", u"december"] ), - 'ta' : lambda v: slh( v, [u"ஜனவரி", u"பிப்ரவரி", u"மார்ச்", u"ஏப்ரல்", u"மே", u"ஜூன்", u"ஜூலை", u"ஆகஸ்டு", u"செப்டம்பர்", u"அக்டோபர்", u"நவம்பர்", u"டிசம்பர்"] ), - 'te' : lambda v: slh( v, [u"జనవరి", u"ఫిబ్రవరి", u"మార్చి", u"ఏప్రిల్", u"మే", u"జూన్", u"జూలై", u"ఆగష్టు", u"సెప్టెంబర్", u"అక్టోబర్", u"నవంబర్", u"డిసెంబర్"] ), - 'th' : lambda v: slh( v, [u"มกราคม", u"กุมภาพันธ์", u"มีนาคม", u"เมษายน", u"พฤษภาคม", u"มิถุนายน", u"กรกฎาคม", u"สิงหาคม", u"กันยายน", u"ตุลาคม", u"พฤศจิกายน", u"ธันวาคม"] ), - 'tl' : lambda v: slh( v, [u"Enero", u"Pebrero", u"Marso", u"Abril", u"Mayo", u"Hunyo", u"Hulyo", u"Agosto", u"Setyembre", u"Oktubre", u"Nobyembre", u"Disyembre"] ), - 'tpi': lambda v: slh( v, [u"Janueri", u"Februeri", u"Mas", u"Epril", u"Me", u"Jun", u"Julai", u"Ogas", u"Septemba", u"Oktoba", u"Novemba", u"Disemba"] ), - 'tr' : lambda v: slh( v, [u"Ocak", u"Şubat", u"Mart", u"Nisan", u"Mayıs", u"Haziran", u"Temmuz", u"Ağustos", u"Eylül", u"Ekim", u"Kasım", u"Aralık"] ), - 'tt' : lambda v: slh( v, [u"Ğínwar", u"Febräl", u"Mart", u"Äpril", u"May", u"Yün", u"Yül", u"August", u"Sentäber", u"Öktäber", u"Nöyäber", u"Dekäber"] ), - 'uk' : lambda v: slh( v, [u"січень", u"лютий", u"березень", u"квітень", u"травень", u"червень", u"липень", u"серпень", u"вересень", u"жовтень", u"листопад", u"грудень"] ), - 'ur' : lambda v: slh( v, [u"جنوری", u"فروری", u"مارچ", u"اپريل", u"مئ", u"جون", u"جولائ", u"اگست", u"ستمبر", u"اکتوبر", u"نومبر", u"دسمبر"] ), - 'vec': lambda v: slh( v, [u"genaro", u"febraro", u"marzso", u"apriłe", u"majo", u"giugno", u"lujo", u"agosto", u"setenbre", u"otobre", u"novenbre", u"diçenbre"] ), - 'vi' : lambda v: slh( v, [u"tháng một", u"tháng hai", u"tháng ba", u"tháng tư", u"tháng năm", u"tháng sáu", u"tháng bảy", u"tháng tám", u"tháng chín", u"tháng mười", u"tháng mười một", u"tháng 12"] ), - 'vo' : lambda v: slh( v, [u"Yanul", u"Febul", u"Mäzul", u"Prilul", u"Mayul", u"Yunul", u"Yulul", u"Gustul", u"Setul", u"Tobul", u"Novul", u"Dekul"] ), - 'wa' : lambda v: slh( v, [u"djanvî", u"fevrî", u"Måss (moes)", u"avri", u"may", u"djun", u"djulete", u"awousse", u"setimbe", u"octôbe", u"nôvimbe", u"decimbe"] ), - 'zh' : lambda v: slh( v, makeMonthList( u"%d月" )), - 'zh-min-nan': lambda v: slh( v, [u"It-goe̍h", u"Jī-goe̍h", u"Saⁿ-goe̍h", u"Sì-goe̍h", u"Gō·-goe̍h", u"La̍k-goe̍h", u"Chhit-goe̍h", u"Peh-goe̍h", u"Káu-goe̍h", u"Cha̍p-goe̍h", u"Cha̍p-it-goe̍h", u"Cha̍p-jī-goe̍h"] ), + 'af': lambda v: slh(v, [u"Januarie", u"Februarie", u"Maart", u"April", + u"Mei", u"Junie", u"Julie", u"Augustus", + u"September", u"Oktober", u"November", + u"Desember"]), + 'als': lambda v: slh(v, [u"Januar", u"Februar", u"März", u"April", + u"Mai", u"Juni", u"Juli", u"August", + u"September", u"Oktober", u"November", + u"Dezember"]), + 'an': lambda v: slh(v, [u"chinero", u"frebero", u"marzo", u"abril", + u"mayo", u"chunio", u"chulio", u"agosto", + u"setiembre", u"otubre", u"nobiembre", + u"abiento"]), + 'ang': lambda v: slh(v, [u"Æfterra Gēola", u"Solmōnaþ", u"Hrēþmōnaþ", + u"Ēastermōnaþ", u"Þrimilcemōnaþ", u"Sēremōnaþ", + u"Mǣdmōnaþ", u"Wēodmōnaþ", u"Hāligmōnaþ", + u"Winterfylleþ", u"Blōtmōnaþ", u"Gēolmōnaþ"]), + 'ar': lambda v: slh(v, [u"يناير", u"فبراير", u"مارس", u"أبريل", u"مايو", + u"يونيو", u"يوليو", u"أغسطس", u"سبتمبر", + u"أكتوبر", u"نوفمبر", u"ديسمبر"]), + 'ast': lambda v: slh(v, [u"xineru", u"febreru", u"marzu", u"abril", + u"mayu", u"xunu", u"xunetu", u"agostu", + u"setiembre", u"ochobre", u"payares", + u"avientu"]), + 'be': lambda v: slh(v, [u"студзень", u"люты", u"сакавік", u"красавік", + u"травень", u"чэрвень", u"ліпень", u"жнівень", + u"верасень", u"кастрычнік", u"лістапад", + u"сьнежань"]), + 'bg': lambda v: slh(v, [u"януари", u"февруари", u"март", u"април", + u"май", u"юни", u"юли", u"август", u"септември", + u"октомври", u"ноември", u"декември"]), + 'bn': lambda v: slh(v, [u"জানুয়ারি", u"ফেব্রুয়ারি", u"মার্চ", u"এপ্রিল", u"মে", + u"জুন", u"জুলাই", u"আগস্ট", u"সেপ্টেম্বর", u"অক্টোবর", + u"নভেম্বর", u"ডিসেম্বর"]), + 'br': lambda v: slh(v, [u"Genver", u"C'hwevrer", u"Meurzh", u"Ebrel", + u"Mae", u"Mezheven", u"Gouere", u"Eost", + u"Gwengolo", u"Here", u"Du", u"Kerzu"]), + 'bs': lambda v: slh(v, [u"januar", u"februar", u"mart", u"april", + u"maj", u"juni", u"juli", u"august", + u"septembar", u"oktobar", u"novembar", + u"decembar"]), + 'ca': lambda v: slh(v, [u"gener", u"febrer", u"març", u"abril", u"maig", + u"juny", u"juliol", u"agost", u"setembre", + u"octubre", u"novembre", u"desembre"]), + 'ceb': lambda v: slh(v, [u"Enero", u"Pebrero", u"Marso", u"Abril", + u"Mayo", u"Hunyo", u"Hulyo", u"Agosto", + u"Septiyembre", u"Oktubre", u"Nobiyembre", + u"Disyembre"]), + 'co': lambda v: slh(v, [u"ghjennaghju", u"frivaghju", u"marzu", + u"aprile", u"maghju", u"ghjugnu", u"lugliu", + u"aostu", u"settembre", u"uttrovi", u"nuvembri", + u"decembre"]), + 'cs': lambda v: slh(v, [u"leden", u"únor", u"březen", u"duben", + u"květen", u"červen", u"červenec", u"srpen", + u"září", u"říjen", u"listopad", u"prosinec"]), + 'csb': lambda v: slh(v, [u"stëcznik", u"gromicznik", u"strumiannik", + u"łżëkwiôt", u"môj", u"czerwińc", u"lëpinc", + u"zélnik", u"séwnik", u"rujan", u"lëstopadnik", + u"gòdnik"]), + 'cv': lambda v: slh(v, [u"кăрлач", u"нарăс", u"Пуш", u"Ака", u"çу", + u"çĕртме", u"утă", u"çурла", u"авăн", u"юпа", + u"чӳк", u"раштав"]), + 'cy': lambda v: slh(v, [u"Ionawr", u"Chwefror", u"Mawrth", u"Ebrill", + u"Mai", u"Mehefin", u"Gorffennaf", u"Awst", + u"Medi", u"Hydref", u"Tachwedd", u"Rhagfyr"]), + 'da': lambda v: slh(v, [u"januar", u"februar", u"marts", u"april", + u"maj", u"juni", u"juli", u"august", + u"september", u"oktober", u"november", + u"december"]), + 'de': lambda v: slh(v, [u"Januar", u"Februar", u"März", u"April", + u"Mai", u"Juni", u"Juli", u"August", + u"September", u"Oktober", u"November", + u"Dezember"]), + 'el': lambda v: slh(v, [u"Ιανουάριος", u"Φεβρουάριος", u"Μάρτιος", + u"Απρίλιος", u"Μάιος", u"Ιούνιος", u"Ιούλιος", + u"Αύγουστος", u"Σεπτέμβριος", u"Οκτώβριος", + u"Νοέμβριος", u"Δεκέμβριος"]), + 'en': lambda v: slh(v, enMonthNames), + 'eo': lambda v: slh(v, [u"Januaro", u"Februaro", u"Marto", u"Aprilo", + u"Majo", u"Junio", u"Julio", u"Aŭgusto", + u"Septembro", u"Oktobro", u"Novembro", + u"Decembro"]), + 'es': lambda v: slh(v, [u"enero", u"febrero", u"marzo", u"abril", + u"mayo", u"junio", u"julio", u"agosto", + u"septiembre", u"octubre", u"noviembre", + u"diciembre"]), + 'et': lambda v: slh(v, [u"jaanuar", u"veebruar", u"märts", u"aprill", + u"mai", u"juuni", u"juuli", u"august", + u"september", u"oktoober", u"november", + u"detsember"]), + 'eu': lambda v: slh(v, [u"Urtarril", u"Otsail", u"Martxo", u"Apiril", + u"Maiatz", u"Ekain", u"Uztail", u"Abuztu", + u"Irail", u"Urri", u"Azaro", u"Abendu"]), + 'fa': lambda v: slh(v, [u"ژانویه", u"فوریه", u"مارس", u"آوریل", u"مه", + u"ژوئن", u"ژوئیه", u"اوت", u"سپتامبر", u"اکتبر", + u"نوامبر", u"دسامبر"]), + 'fi': lambda v: slh(v, [u"tammikuu", u"helmikuu", u"maaliskuu", + u"huhtikuu", u"toukokuu", u"kesäkuu", + u"heinäkuu", u"elokuu", u"syyskuu", u"lokakuu", + u"marraskuu", u"joulukuu"]), + 'fo': lambda v: slh(v, [u"januar", u"februar", u"mars", u"apríl", + u"mai", u"juni", u"juli", u"august", + u"september", u"oktober", u"november", + u"desember"]), + 'fr': lambda v: slh(v, [u"janvier", u"février", u"mars (mois)", + u"avril", u"mai", u"juin", u"juillet", u"août", + u"septembre", u"octobre", u"novembre", + u"décembre"]), + 'fur': lambda v: slh(v, [u"Zenâr", u"Fevrâr", u"Març", u"Avrîl", u"Mai", + u"Jugn", u"Lui", u"Avost", u"Setembar", + u"Otubar", u"Novembar", u"Dicembar"]), + 'fy': lambda v: slh(v, [u"jannewaris", u"febrewaris", u"maart", + u"april", u"maaie", u"juny", u"july", + u"augustus", u"septimber", u"oktober", + u"novimber", u"desimber"]), + 'ga': lambda v: slh(v, [u"Eanáir", u"Feabhra", u"Márta", u"Aibreán", + u"Bealtaine", u"Meitheamh", u"Iúil", u"Lúnasa", + u"Meán Fómhair", u"Deireadh Fómhair", + u"Samhain", u"Nollaig"]), + 'gl': lambda v: slh(v, [u"xaneiro", u"febreiro", u"marzo", u"abril", + u"maio", u"xuño", u"xullo", u"agosto", + u"setembro", u"outubro", u"novembro", + u"decembro"]), + 'he': lambda v: slh(v, [u"ינואר", u"פברואר", u"מרץ", u"אפריל", u"מאי", + u"יוני", u"יולי", u"אוגוסט", u"ספטמבר", + u"אוקטובר", u"נובמבר", u"דצמבר"]), + 'hi': lambda v: slh(v, [u"जनवरी", u"फ़रवरी", u"मार्च", u"अप्रैल", u"मई", u"जून", + u"जुलाई", u"अगस्त", u"सितम्बर", u"अक्टूबर", u"नवम्बर", + u"दिसम्बर"]), + 'hr': lambda v: slh(v, [u"siječanj", u"veljača", u"ožujak", u"travanj", + u"svibanj", u"lipanj", u"srpanj", u"kolovoz", + u"rujan", u"listopad", u"studeni", + u"prosinac"]), + 'hu': lambda v: slh(v, [u"január", u"február", u"március", u"április", + u"május", u"június", u"július", u"augusztus", + u"szeptember", u"október", u"november", + u"december"]), + 'ia': lambda v: slh(v, [u"januario", u"februario", u"martio", u"april", + u"maio", u"junio", u"julio", u"augusto", + u"septembre", u"octobre", u"novembre", + u"decembre"]), + 'id': lambda v: slh(v, [u"Januari", u"Februari", u"Maret", u"April", + u"Mei", u"Juni", u"Juli", u"Agustus", + u"September", u"Oktober", u"November", + u"Desember"]), + 'ie': lambda v: slh(v, [u"januar", u"februar", u"marte", u"april", + u"may", u"junio", u"juli", u"august", + u"septembre", u"octobre", u"novembre", + u"decembre"]), + 'io': lambda v: slh(v, [u"januaro", u"februaro", u"Marto", u"aprilo", + u"mayo", u"junio", u"julio", u"agosto", + u"septembro", u"oktobro", u"novembro", + u"decembro"]), + 'is': lambda v: slh(v, [u"janúar", u"febrúar", u"mars (mánuður)", + u"apríl", u"maí", u"júní", u"júlí", u"ágúst", + u"september", u"október", u"nóvember", + u"desember"]), + 'it': lambda v: slh(v, [u"gennaio", u"febbraio", u"marzo", u"aprile", + u"maggio", u"giugno", u"luglio", u"agosto", + u"settembre", u"ottobre", u"novembre", + u"dicembre"]), + 'ja': lambda v: slh(v, makeMonthList(u"%d月")), + 'jv': lambda v: slh(v, [u"Januari", u"Februari", u"Maret", u"April", + u"Mei", u"Juni", u"Juli", u"Agustus", + u"September", u"Oktober", u"November", + u"Desember"]), + 'ka': lambda v: slh(v, [u"იანვარი", u"თებერვალი", u"მარტი", u"აპრილი", + u"მაისი", u"ივნისი", u"ივლისი", u"აგვისტო", + u"სექტემბერი", u"ოქტომბერი", u"ნოემბერი", + u"დეკემბერი"]), + 'kn': lambda v: slh(v, [u"ಜನವರಿ", u"ಫೆಬ್ರವರಿ", u"ಮಾರ್ಚಿ", u"ಎಪ್ರಿಲ್", u"ಮೇ", + u"ಜೂನ", u"ಜುಲೈ", u"ಆಗಸ್ಟ್", u"ಸೆಪ್ಟೆಂಬರ್", u"ಅಕ್ಟೋಬರ್", + u"ನವೆಂಬರ್", u"ಡಿಸೆಂಬರ್"]), + 'ko': lambda v: slh(v, makeMonthList(u"%d월")), + 'ksh': lambda v: slh(v, [u'Jannowaa', u'Febrowaa', u'Mä', u'Apprill', + u'Meij', u'Juuni', u'Juuli', u'Aujuß', + u'Sepptäber', u'Oktoober', u'Novemmber', + u'Dezemmber']), + 'ku': lambda v: slh(v, [u"rêbendan", u"reşemî", u"adar", u"avrêl", + u"gulan", u"pûşper", u"tîrmeh", + u"gelawêj (meh)", u"rezber", u"kewçêr", + u"sermawez", u"berfanbar"]), + 'kw': lambda v: slh(v, [u"Mys Genver", u"Mys Whevrer", u"Mys Merth", + u"Mys Ebrel", u"Mys Me", u"Mys Metheven", + u"Mys Gortheren", u"Mys Est", u"Mys Gwyngala", + u"Mys Hedra", u"Mys Du", u"Mys Kevardhu"]), + 'la': lambda v: slh(v, [u"Ianuarius", u"Februarius", u"Martius", + u"Aprilis", u"Maius", u"Iunius", u"Iulius", + u"Augustus (mensis)", u"September", u"October", + u"November", u"December"]), + 'lb': lambda v: slh(v, [u"Januar", u"Februar", u"Mäerz", u"Abrëll", + u"Mee", u"Juni", u"Juli", u"August", + u"September", u"Oktober", u"November", + u"Dezember"]), + 'li': lambda v: slh(v, [u"jannewarie", u"fibberwarie", u"miert", + u"april", u"mei", u"juni", u"juli", + u"augustus (maond)", u"september", u"oktober", + u"november", u"december"]), + 'lt': lambda v: slh(v, [u"Sausis", u"Vasaris", u"Kovas", u"Balandis", + u"Gegužė", u"Birželis", u"Liepa", u"Rugpjūtis", + u"Rugsėjis", u"Spalis", u"Lapkritis", + u"Gruodis"]), + 'lv': lambda v: slh(v, [u"Janvāris", u"Februāris", u"Marts", u"Aprīlis", + u"Maijs", u"Jūnijs", u"Jūlijs", u"Augusts", + u"Septembris", u"Oktobris", u"Novembris", + u"Decembris"]), + 'mhr': lambda v: slh(v, [u"шорыкйол", u"пургыж", u"ӱярня", u"вӱдшор", + u"ага", u"пеледыш", u"сӱрем", u"сорла", + u"идым", u"шыжа", u"кылме", u"декабрь"]), + 'mi': lambda v: slh(v, [u"Kohi-tātea", u"Hui-tanguru", + u"Poutū-te-rangi", u"Paenga-whāwhā", u"Haratua", + u"Pipiri", u"Hōngongoi", u"Here-turi-kōkā", + u"Mahuru", u"Whiringa-ā-nuku", + u"Whiringa-ā-rangi", u"Hakihea"]), + 'ml': lambda v: slh(v, [u"ജനുവരി", u"ഫെബ്രുവരി", u"മാര്ച്", + u"ഏപ്രില്", u"മേയ്", u"ജൂണ്‍", u"ജൂലൈ", + u"ആഗസ്റ്റ്‌", u"സപ്തന്പര്", u"ഒക്ടോബര്", + u"നവന്പര്", u"ഡിസന്പര്"]), + 'mr': lambda v: slh(v, [u"जानेवारी", u"फेब्रुवारी", u"मार्च", u"एप्रिल", u"मे", + u"जून", u"जुलै", u"ऑगस्ट", u"सप्टेंबर", u"ऑक्टोबर", + u"नोव्हेंबर", u"डिसेंबर"]), + 'ms': lambda v: slh(v, [u"Januari", u"Februari", u"Mac", u"April", + u"Mei", u"Jun", u"Julai", u"Ogos", u"September", + u"Oktober", u"November", u"Disember"]), + 'nap': lambda v: slh(v, [u"Jennaro", u"Frevaro", u"Màrzo", u"Abbrile", + u"Maggio", u"Giùgno", u"Luglio", u"Aùsto", + u"Settembre", u"Ottovre", u"Nuvembre", + u"Dicembre"]), + 'nds': lambda v: slh(v, [u"Januar", u"Februar", u"März", u"April", + u"Mai", u"Juni", u"Juli", u"August", + u"September", u"Oktober", u"November", + u"Dezember"]), + 'nl': lambda v: slh(v, [u"januari", u"februari", u"maart", u"april", + u"mei", u"juni", u"juli", u"augustus (maand)", + u"september", u"oktober", u"november", + u"december"]), + 'nn': lambda v: slh(v, [u"januar", u"februar", u"månaden mars", + u"april", u"mai", u"juni", u"juli", u"august", + u"september", u"oktober", u"november", + u"desember"]), + 'no': lambda v: slh(v, [u"januar", u"februar", u"mars", u"april", + u"mai", u"juni", u"juli", u"august", + u"september", u"oktober", u"november", + u"desember"]), + 'oc': lambda v: slh(v, [u"genièr", u"febrièr", u"març", u"abril", + u"mai", u"junh", u"julhet", u"agost", + u"setembre", u"octobre", u"novembre", + u"decembre"]), + 'os': lambda v: slh(v, [u"январь", u"февраль", u"мартъи", u"апрель", + u"май", u"июнь", u"июль", u"август", + u"сентябрь", u"октябрь", u"ноябрь", + u"декабрь"]), + 'pdc': lambda v: slh(v, [u'Yenner', u'Hanning', u'Matz', u'Abril', + u'Moi', u'Yuni', u'Yuli', u'Aagscht', + u'September', u'Oktower', u'Nowember', + u'Disember']), + 'pl': lambda v: slh(v, [u"styczeń", u"luty", u"marzec", u"kwiecień", + u"maj", u"czerwiec", u"lipiec", u"sierpień", + u"wrzesień", u"październik", u"listopad", + u"grudzień"]), + 'pt': lambda v: slh(v, [u"Janeiro", u"Fevereiro", u"Março", u"Abril", + u"Maio", u"Junho", u"Julho", u"Agosto", + u"Setembro", u"Outubro", u"Novembro", + u"Dezembro"]), + 'ro': lambda v: slh(v, [u"ianuarie", u"februarie", u"martie", + u"aprilie", u"mai", u"iunie", u"iulie", + u"august", u"septembrie", u"octombrie", + u"noiembrie", u"decembrie"]), + 'ru': lambda v: slh(v, [u"январь", u"февраль", u"март", u"апрель", + u"май", u"июнь", u"июль", u"август", + u"сентябрь", u"октябрь", u"ноябрь", + u"декабрь"]), + 'sc': lambda v: slh(v, [u"Ghennarzu", u"Frearzu", u"Martzu", + u"Abrile", u"Maju", u"Làmpadas", u"Triulas", + u"Aùstu", u"Cabudanni", u"Santugaìne", + u"Santadria", u"Nadale"]), + 'scn': lambda v: slh(v, [u"jinnaru", u"frivaru", u"marzu", u"aprili", + u"maiu", u"giugnu", u"giugnettu", u"austu", + u"sittèmmiru", u"uttùviru", u"nuvèmmiru", + u"dicèmmiru"]), + 'sco': lambda v: slh(v, [u"Januar", u"Februar", u"Mairch", u"Aprile", + u"Mey", u"Juin", u"Julie", u"August", + u"September", u"October", u"November", + u"December"]), + 'se': lambda v: slh(v, [u"ođđajagimánnu", u"guovvamánnu", + u"njukčamánnu", u"cuoŋománnu", u"miessemánnu", + u"geassemánnu", u"suoidnemánnu", u"borgemánnu", + u"čakčamánnu", u"golggotmánnu", u"skábmamánnu", + u"juovlamánnu"]), + 'simple': lambda v: slh(v, [u"January", u"February", u"March", + u"April", u"May", u"June", u"July", + u"August", u"September", u"October", + u"November", u"December"]), + 'sk': lambda v: slh(v, [u"január", u"február", u"marec", u"apríl", + u"máj", u"jún", u"júl", u"august", u"september", + u"október", u"november", u"december"]), + 'sl': lambda v: slh(v, [u"januar", u"februar", u"marec", u"april", + u"maj", u"junij", u"julij", u"avgust", + u"september", u"oktober", u"november", + u"december"]), + 'sq': lambda v: slh(v, [u"Janari", u"Shkurti", u"Marsi (muaj)", + u"Prilli", u"Maji", u"Qershori", u"Korriku", + u"Gushti", u"Shtatori", u"Tetori", u"Nëntori", + u"Dhjetori"]), + 'sr': lambda v: slh(v, [u"јануар", u"фебруар", u"март", u"април", + u"мај", u"јун", u"јул", u"август", u"септембар", + u"октобар", u"новембар", u"децембар"]), + 'su': lambda v: slh(v, [u"Januari", u"Pébruari", u"Maret", u"April", + u"Méi", u"Juni", u"Juli", u"Agustus", + u"Séptémber", u"Oktober", u"Nopémber", + u"Désémber"]), + 'sv': lambda v: slh(v, [u"januari", u"februari", u"mars", u"april", + u"maj", u"juni", u"juli", u"augusti", + u"september", u"oktober", u"november", + u"december"]), + 'ta': lambda v: slh(v, [u"ஜனவரி", u"பிப்ரவரி", u"மார்ச்", u"ஏப்ரல்", + u"மே", u"ஜூன்", u"ஜூலை", u"ஆகஸ்டு", + u"செப்டம்பர்", u"அக்டோபர்", u"நவம்பர்", + u"டிசம்பர்"]), + 'te': lambda v: slh(v, [u"జనవరి", u"ఫిబ్రవరి", u"మార్చి", u"ఏప్రిల్", u"మే", + u"జూన్", u"జూలై", u"ఆగష్టు", u"సెప్టెంబర్", u"అక్టోబర్", + u"నవంబర్", u"డిసెంబర్"]), + 'th': lambda v: slh(v, [u"มกราคม", u"กุมภาพันธ์", u"มีนาคม", u"เมษายน", + u"พฤษภาคม", u"มิถุนายน", u"กรกฎาคม", u"สิงหาคม", + u"กันยายน", u"ตุลาคม", u"พฤศจิกายน", u"ธันวาคม"]), + 'tl': lambda v: slh(v, [u"Enero", u"Pebrero", u"Marso", u"Abril", + u"Mayo", u"Hunyo", u"Hulyo", u"Agosto", + u"Setyembre", u"Oktubre", u"Nobyembre", + u"Disyembre"]), + 'tpi': lambda v: slh(v, [u"Janueri", u"Februeri", u"Mas", u"Epril", + u"Me", u"Jun", u"Julai", u"Ogas", u"Septemba", + u"Oktoba", u"Novemba", u"Disemba"]), + 'tr': lambda v: slh(v, [u"Ocak", u"Şubat", u"Mart", u"Nisan", u"Mayıs", + u"Haziran", u"Temmuz", u"Ağustos", u"Eylül", + u"Ekim", u"Kasım", u"Aralık"]), + 'tt': lambda v: slh(v, [u"Ğínwar", u"Febräl", u"Mart", u"Äpril", u"May", + u"Yün", u"Yül", u"August", u"Sentäber", + u"Öktäber", u"Nöyäber", u"Dekäber"]), + 'uk': lambda v: slh(v, [u"січень", u"лютий", u"березень", u"квітень", + u"травень", u"червень", u"липень", u"серпень", + u"вересень", u"жовтень", u"листопад", + u"грудень"]), + 'ur': lambda v: slh(v, [u"جنوری", u"فروری", u"مارچ", u"اپريل", u"مئ", + u"جون", u"جولائ", u"اگست", u"ستمبر", u"اکتوبر", + u"نومبر", u"دسمبر"]), + 'vec': lambda v: slh(v, [u"genaro", u"febraro", u"marzso", u"apriłe", + u"majo", u"giugno", u"lujo", u"agosto", + u"setenbre", u"otobre", u"novenbre", + u"diçenbre"]), + 'vi': lambda v: slh(v, [u"tháng một", u"tháng hai", u"tháng ba", + u"tháng tư", u"tháng năm", u"tháng sáu", + u"tháng bảy", u"tháng tám", u"tháng chín", + u"tháng mười", u"tháng mười một", u"tháng 12"]), + 'vo': lambda v: slh(v, [u"Yanul", u"Febul", u"Mäzul", u"Prilul", + u"Mayul", u"Yunul", u"Yulul", u"Gustul", + u"Setul", u"Tobul", u"Novul", u"Dekul"]), + 'wa': lambda v: slh(v, [u"djanvî", u"fevrî", u"Måss (moes)", u"avri", + u"may", u"djun", u"djulete", u"awousse", + u"setimbe", u"octôbe", u"nôvimbe", u"decimbe"]), + 'zh': lambda v: slh(v, makeMonthList(u"%d月")), + 'zh-min-nan': lambda v: slh(v, [u"It-goe̍h", u"Jī-goe̍h", u"Saⁿ-goe̍h", + u"Sì-goe̍h", u"Gō·-goe̍h", + u"La̍k-goe̍h", u"Chhit-goe̍h", + u"Peh-goe̍h", u"Káu-goe̍h", + u"Cha̍p-goe̍h", u"Cha̍p-it-goe̍h", + u"Cha̍p-jī-goe̍h"]), }, 'Number': { - 'ar' : lambda v: dh_number( v, u'%d (عدد)' ), - 'be' : lambda v: dh_number( v, u'%d (лік)' ), - 'bg' : lambda v: dh_number( v, u'%d (число)' ), - 'bs' : lambda v: dh_number( v, u'%d (broj)' ), - 'cs' : lambda v: dh_number( v, u'%d (číslo)' ), - 'da' : lambda v: dh_number( v, u'%d (tal)' ), - 'en' : lambda v: dh_number( v, u'%d (number)' ), - 'fa' : lambda v: dh_number( v, u'%d (عدد)' ), - 'fi' : lambda v: dh_number( v, u'%d (luku)' ), - 'fr' : lambda v: dh_number( v, u'%d (nombre)' ), - 'he' : lambda v: dh_number( v, u'%d (מספר)' ), - 'hu' : lambda v: dh_number( v, u'%d (szám)' ), - 'ia' : lambda v: dh_number( v, u'%d (numero)' ), - 'ja' : lambda v: dh_number( v, u'%d' ), - 'ko' : lambda v: dh_number( v, u'%d' ), - 'ksh': lambda v: dh_number( v, u'%d (Zahl)' ), - 'la' : lambda v: dh_number( v, u'%d' ), - 'lt' : lambda v: dh_number( v, u'%d (skaičius)' ), - 'nds': lambda v: dh_number( v, u'%d (Tall)' ), - 'nl' : lambda v: dh_number( v, u'%d (getal)' ), - 'nn' : lambda v: dh_number( v, u'Talet %d' ), - 'no' : lambda v: dh_number( v, u'%d (tall)' ), - 'nso' : lambda v: dh_number( v, u'%d (nomoro)' ), - 'pl' : lambda v: dh_number( v, u'%d (liczba)' ), - 'ro' : lambda v: dh_number( v, u'%d (cifră)' ), - 'ru' : lambda v: dh_number( v, u'%d (число)' ), - 'sk' : lambda v: dh_number( v, u'%d (číslo)' ), - 'sl' : lambda v: dh_number( v, u'%d (število)' ), - 'sr' : lambda v: dh_number( v, u'%d (број)' ), - 'sv' : lambda v: dh_number( v, u'%d (tal)' ), - 'th' : lambda v: dh_number( v, u'%d' ), # was %d (จำนวน) - 'tl' : lambda v: dh_number( v, u'%d (bilang)' ), - 'tr' : lambda v: dh_number( v, u'%d (sayı)' ), - 'zh' : lambda v: dh_number( v, u'%d' ), + 'ar': lambda v: dh_number(v, u'%d (عدد)'), + 'be': lambda v: dh_number(v, u'%d (лік)'), + 'bg': lambda v: dh_number(v, u'%d (число)'), + 'bs': lambda v: dh_number(v, u'%d (broj)'), + 'cs': lambda v: dh_number(v, u'%d (číslo)'), + 'da': lambda v: dh_number(v, u'%d (tal)'), + 'en': lambda v: dh_number(v, u'%d (number)'), + 'fa': lambda v: dh_number(v, u'%d (عدد)'), + 'fi': lambda v: dh_number(v, u'%d (luku)'), + 'fr': lambda v: dh_number(v, u'%d (nombre)'), + 'he': lambda v: dh_number(v, u'%d (מספר)'), + 'hu': lambda v: dh_number(v, u'%d (szám)'), + 'ia': lambda v: dh_number(v, u'%d (numero)'), + 'ja': lambda v: dh_number(v, u'%d'), + 'ko': lambda v: dh_number(v, u'%d'), + 'ksh': lambda v: dh_number(v, u'%d (Zahl)'), + 'la': lambda v: dh_number(v, u'%d'), + 'lt': lambda v: dh_number(v, u'%d (skaičius)'), + 'nds': lambda v: dh_number(v, u'%d (Tall)'), + 'nl': lambda v: dh_number(v, u'%d (getal)'), + 'nn': lambda v: dh_number(v, u'Talet %d'), + 'no': lambda v: dh_number(v, u'%d (tall)'), + 'nso': lambda v: dh_number(v, u'%d (nomoro)'), + 'pl': lambda v: dh_number(v, u'%d (liczba)'), + 'ro': lambda v: dh_number(v, u'%d (cifră)'), + 'ru': lambda v: dh_number(v, u'%d (число)'), + 'sk': lambda v: dh_number(v, u'%d (číslo)'), + 'sl': lambda v: dh_number(v, u'%d (število)'), + 'sr': lambda v: dh_number(v, u'%d (број)'), + 'sv': lambda v: dh_number(v, u'%d (tal)'), + 'th': lambda v: dh_number(v, u'%d'), # was %d (จำนวน) + 'tl': lambda v: dh_number(v, u'%d (bilang)'), + 'tr': lambda v: dh_number(v, u'%d (sayı)'), + 'zh': lambda v: dh_number(v, u'%d'), }, 'YearAD': { - 'af' : dh_simpleYearAD, - 'als': dh_simpleYearAD, - 'an' : dh_simpleYearAD, - 'ang': dh_simpleYearAD, - 'ar' : dh_simpleYearAD, - 'ast': dh_simpleYearAD, - 'az' : dh_simpleYearAD, - 'be' : dh_simpleYearAD, - 'bg' : dh_simpleYearAD, - 'bn' : lambda v: dh_yearAD( v, u'%B' ), - 'br' : dh_simpleYearAD, - 'bs' : dh_simpleYearAD, - 'ca' : dh_simpleYearAD, - 'ceb': dh_simpleYearAD, - 'cs' : dh_simpleYearAD, - 'csb': dh_simpleYearAD, - 'cv' : dh_simpleYearAD, - 'cy' : dh_simpleYearAD, - 'da' : dh_simpleYearAD, - 'de' : dh_simpleYearAD, - 'el' : dh_simpleYearAD, - 'en' : dh_simpleYearAD, - 'eo' : dh_simpleYearAD, - 'es' : dh_simpleYearAD, - 'et' : dh_simpleYearAD, - 'eu' : dh_simpleYearAD, - 'fa' : lambda v: dh_yearAD( v, u'%F (میلادی)' ), - 'fi' : dh_simpleYearAD, - 'fo' : dh_simpleYearAD, - 'fr' : dh_simpleYearAD, - 'fur': dh_simpleYearAD, - 'fy' : dh_simpleYearAD, - 'ga' : dh_simpleYearAD, - 'gan' : lambda v: dh_yearAD( v, u'%d年' ), - 'gd' : dh_simpleYearAD, - 'gl' : dh_simpleYearAD, - 'gu' : lambda v: dh_yearAD( v, u'%G' ), - 'he' : dh_simpleYearAD, - 'hi' : lambda v: dh_yearAD( v, u'%H' ), - 'hr' : lambda v: dh_yearAD( v, u'%d.' ), - 'hu' : dh_simpleYearAD, - 'hy' : dh_simpleYearAD, - 'ia' : dh_simpleYearAD, - 'id' : dh_simpleYearAD, - 'ie' : dh_simpleYearAD, - 'ilo': dh_simpleYearAD, - 'io' : dh_simpleYearAD, - 'is' : dh_simpleYearAD, - 'it' : dh_simpleYearAD, - 'ja' : lambda v: dh_yearAD( v, u'%d年' ), - 'jbo': lambda v: dh_yearAD( v, u'%dmoi nanca' ), - 'ka' : dh_simpleYearAD, - 'kn' : lambda v: dh_yearAD( v, u'%K' ), - 'ko' : lambda v: dh_yearAD( v, u'%d년' ), - 'ksh': lambda v: dh_yearAD( v, u'Joohr %d' ), - 'ku' : dh_simpleYearAD, - 'kw' : dh_simpleYearAD, - 'la' : dh_simpleYearAD, - 'lb' : dh_simpleYearAD, - 'li' : dh_simpleYearAD, - 'lt' : dh_simpleYearAD, - 'lv' : dh_simpleYearAD, - 'mi' : dh_simpleYearAD, - 'mhr': dh_simpleYearAD, - 'mk' : dh_simpleYearAD, - 'ml' : dh_simpleYearAD, - 'mo' : dh_simpleYearAD, - 'mr' : lambda v: dh_yearAD( v, u'ई.स. %H' ), - 'ms' : dh_simpleYearAD, - 'na' : dh_simpleYearAD, - 'nap': dh_simpleYearAD, - 'nds': dh_simpleYearAD, - 'nl' : dh_simpleYearAD, - 'nn' : dh_simpleYearAD, - 'no' : dh_simpleYearAD, - 'nso' : dh_simpleYearAD, - 'oc' : dh_simpleYearAD, - 'os' : dh_simpleYearAD, - 'pdc' : dh_simpleYearAD, - 'pl' : dh_simpleYearAD, - 'pt' : dh_simpleYearAD, - 'rm' : dh_simpleYearAD, - 'ro' : dh_simpleYearAD, - 'roa-rup' : dh_simpleYearAD, - 'ru' : lambda v: dh_yearAD( v, u'%d год' ), - 'sco': dh_simpleYearAD, - 'scn': dh_simpleYearAD, - 'se' : dh_simpleYearAD, - 'sh' : dh_simpleYearAD, - 'simple' : dh_simpleYearAD, - 'sk' : dh_simpleYearAD, - 'sl' : dh_simpleYearAD, - 'sm' : dh_simpleYearAD, - 'sq' : dh_simpleYearAD, - 'sr' : dh_simpleYearAD, - 'sv' : dh_simpleYearAD, - 'su' : dh_simpleYearAD, - 'ta' : dh_simpleYearAD, - 'te' : dh_simpleYearAD, + 'af': dh_simpleYearAD, + 'als': dh_simpleYearAD, + 'an': dh_simpleYearAD, + 'ang': dh_simpleYearAD, + 'ar': dh_simpleYearAD, + 'ast': dh_simpleYearAD, + 'az': dh_simpleYearAD, + 'be': dh_simpleYearAD, + 'bg': dh_simpleYearAD, + 'bn': lambda v: dh_yearAD(v, u'%B'), + 'br': dh_simpleYearAD, + 'bs': dh_simpleYearAD, + 'ca': dh_simpleYearAD, + 'ceb': dh_simpleYearAD, + 'cs': dh_simpleYearAD, + 'csb': dh_simpleYearAD, + 'cv': dh_simpleYearAD, + 'cy': dh_simpleYearAD, + 'da': dh_simpleYearAD, + 'de': dh_simpleYearAD, + 'el': dh_simpleYearAD, + 'en': dh_simpleYearAD, + 'eo': dh_simpleYearAD, + 'es': dh_simpleYearAD, + 'et': dh_simpleYearAD, + 'eu': dh_simpleYearAD, + 'fa': lambda v: dh_yearAD(v, u'%F (میلادی)'), + 'fi': dh_simpleYearAD, + 'fo': dh_simpleYearAD, + 'fr': dh_simpleYearAD, + 'fur': dh_simpleYearAD, + 'fy': dh_simpleYearAD, + 'ga': dh_simpleYearAD, + 'gan': lambda v: dh_yearAD(v, u'%d年'), + 'gd': dh_simpleYearAD, + 'gl': dh_simpleYearAD, + 'gu': lambda v: dh_yearAD(v, u'%G'), + 'he': dh_simpleYearAD, + 'hi': lambda v: dh_yearAD(v, u'%H'), + 'hr': lambda v: dh_yearAD(v, u'%d.'), + 'hu': dh_simpleYearAD, + 'hy': dh_simpleYearAD, + 'ia': dh_simpleYearAD, + 'id': dh_simpleYearAD, + 'ie': dh_simpleYearAD, + 'ilo': dh_simpleYearAD, + 'io': dh_simpleYearAD, + 'is': dh_simpleYearAD, + 'it': dh_simpleYearAD, + 'ja': lambda v: dh_yearAD(v, u'%d年'), + 'jbo': lambda v: dh_yearAD(v, u'%dmoi nanca'), + 'ka': dh_simpleYearAD, + 'kn': lambda v: dh_yearAD(v, u'%K'), + 'ko': lambda v: dh_yearAD(v, u'%d년'), + 'ksh': lambda v: dh_yearAD(v, u'Joohr %d'), + 'ku': dh_simpleYearAD, + 'kw': dh_simpleYearAD, + 'la': dh_simpleYearAD, + 'lb': dh_simpleYearAD, + 'li': dh_simpleYearAD, + 'lt': dh_simpleYearAD, + 'lv': dh_simpleYearAD, + 'mi': dh_simpleYearAD, + 'mhr': dh_simpleYearAD, + 'mk': dh_simpleYearAD, + 'ml': dh_simpleYearAD, + 'mo': dh_simpleYearAD, + 'mr': lambda v: dh_yearAD(v, u'ई.स. %H'), + 'ms': dh_simpleYearAD, + 'na': dh_simpleYearAD, + 'nap': dh_simpleYearAD, + 'nds': dh_simpleYearAD, + 'nl': dh_simpleYearAD, + 'nn': dh_simpleYearAD, + 'no': dh_simpleYearAD, + 'nso': dh_simpleYearAD, + 'oc': dh_simpleYearAD, + 'os': dh_simpleYearAD, + 'pdc': dh_simpleYearAD, + 'pl': dh_simpleYearAD, + 'pt': dh_simpleYearAD, + 'rm': dh_simpleYearAD, + 'ro': dh_simpleYearAD, + 'roa-rup': dh_simpleYearAD, + 'ru': lambda v: dh_yearAD(v, u'%d год'), + 'sco': dh_simpleYearAD, + 'scn': dh_simpleYearAD, + 'se': dh_simpleYearAD, + 'sh': dh_simpleYearAD, + 'simple': dh_simpleYearAD, + 'sk': dh_simpleYearAD, + 'sl': dh_simpleYearAD, + 'sm': dh_simpleYearAD, + 'sq': dh_simpleYearAD, + 'sr': dh_simpleYearAD, + 'sv': dh_simpleYearAD, + 'su': dh_simpleYearAD, + 'ta': dh_simpleYearAD, + 'te': dh_simpleYearAD, #2005 => 'พ.ศ. 2548' - 'th' : lambda v: dh_yearAD( v, u'พ.ศ. %T' ), - 'tl' : dh_simpleYearAD, - 'tpi': dh_simpleYearAD, - 'tr' : dh_simpleYearAD, - 'tt' : dh_simpleYearAD, - 'uk' : dh_simpleYearAD, - 'ur' : lambda v: dh_yearAD( v, u'%dسبم' ), - 'uz' : dh_simpleYearAD, - 'vec': dh_simpleYearAD, - 'vi' : dh_simpleYearAD, - 'vo' : dh_simpleYearAD, - 'wa' : dh_simpleYearAD, - 'zh' : lambda v: dh_yearAD( v, u'%d年' ), - 'zh-min-nan' : lambda v: dh_yearAD( v, u'%d nî' ), + 'th': lambda v: dh_yearAD(v, u'พ.ศ. %T'), + 'tl': dh_simpleYearAD, + 'tpi': dh_simpleYearAD, + 'tr': dh_simpleYearAD, + 'tt': dh_simpleYearAD, + 'uk': dh_simpleYearAD, + 'ur': lambda v: dh_yearAD(v, u'%dسبم'), + 'uz': dh_simpleYearAD, + 'vec': dh_simpleYearAD, + 'vi': dh_simpleYearAD, + 'vo': dh_simpleYearAD, + 'wa': dh_simpleYearAD, + 'zh': lambda v: dh_yearAD(v, u'%d年'), + 'zh-min-nan': lambda v: dh_yearAD(v, u'%d nî'), }, 'YearBC': { - 'af' : lambda v: dh_yearBC( v, u'%d v.C.' ), - 'ast': lambda v: dh_yearBC( v, u'%d edC' ), - 'be' : lambda v: dh_yearBC( v, u'%d да н.э.' ), - 'bg' : lambda v: dh_yearBC( v, u'%d г. пр.н.е.' ), - 'bs' : lambda v: dh_yearBC( v, u'%d p.n.e.' ), - 'ca' : lambda v: dh_yearBC( v, u'%d aC' ), - 'cs' : lambda v: dh_yearBC( v, u'%d př. n. l.' ), - 'cy' : lambda v: dh_yearBC( v, u'%d CC' ), - 'da' : lambda v: dh_yearBC( v, u'%d f.Kr.' ), - 'de' : lambda v: dh_yearBC( v, u'%d v. Chr.' ), - 'el' : lambda v: dh_yearBC( v, u'%d π.Χ.' ), - 'en' : lambda v: dh_yearBC( v, u'%d BC' ), - 'eo' : lambda v: dh_yearBC( v, u'-%d' ), - 'es' : lambda v: dh_yearBC( v, u'%d a. C.' ), - 'et' : lambda v: dh_yearBC( v, u'%d eKr' ), - 'eu' : lambda v: dh_yearBC( v, u'K. a. %d' ), - 'fa' : lambda v: dh_yearBC( v, u'%d (پیش از میلاد)' ), - 'fi' : lambda v: dh_yearBC( v, u'%d eaa.' ), - 'fo' : lambda v: dh_yearBC( v, u'%d f. Kr.' ), - 'fr' : lambda v: dh_yearBC( v, u'%d av. J.-C.'), - 'gl' : lambda v: dh_yearBC( v, u'-%d' ), - 'he' : lambda v: dh_yearBC( v, u'%d לפני הספירה' ), - 'hr' : lambda v: dh_yearBC( v, u'%d. pr. Kr.' ), - 'hu' : lambda v: dh_yearBC( v, u'I. e. %d' ), - 'id' : lambda v: dh_yearBC( v, u'%d SM' ), - 'io' : lambda v: dh_yearBC( v, u'%d aK' ), - 'is' : lambda v: dh_yearBC( v, u'%d f. Kr.' ), - 'it' : lambda v: dh_yearBC( v, u'%d a.C.' ), - 'ka' : lambda v: dh_yearBC( v, u'ძვ. წ. %d' ), - 'ko' : lambda v: dh_yearBC( v, u'기원전 %d년' ), - 'ksh': lambda v: dh_yearBC( v, u'Joohr %d füür Krėßtůß'), - 'la' : lambda v: dh_yearBC( v, u'%d a.C.n.' ), - 'lb' : lambda v: dh_yearBC( v, u'-%d' ), - 'lt' : lambda v: dh_yearBC( v, u'%d m. pr. m. e.'), - 'lv' : lambda v: dh_yearBC( v, u'%d p.m.ē.'), - 'mk' : lambda v: dh_yearBC( v, u'%d п.н.е.'), - 'ms' : lambda v: dh_yearBC( v, u'%d SM' ), - 'nap': lambda v: dh_yearBC( v, u'%d AC' ), - 'nds': lambda v: dh_yearBC( v, u'%d v. Chr.' ), - 'nl' : lambda v: dh_yearBC( v, u'%d v.Chr.' ), - 'nn' : lambda v: dh_yearBC( v, u'-%d' ), - 'no' : lambda v: dh_yearBC( v, u'%d f.Kr.' ), - 'oc' : lambda v: dh_yearBC( v, u'-%d' ), - 'pl' : lambda v: dh_yearBC( v, u'%d p.n.e.' ), - 'pt' : lambda v: dh_yearBC( v, u'%d a.C.' ), - 'ro' : lambda v: dh_yearBC( v, u'%d î.Hr.' ), - 'ru' : lambda v: dh_yearBC( v, u'%d год до н. э.' ), - 'scn': lambda v: dh_yearBC( v, u'%d a.C.' ), - 'simple' : lambda v: dh_yearBC( v, u'%d BC' ), - 'sk' : lambda v: dh_yearBC( v, u'%d pred Kr.' ), - 'sl' : lambda v: dh_yearBC( v, u'%d pr. n. št.' ), - 'sq' : lambda v: dh_yearBC( v, u'%d p.e.s.' ), - 'sr' : lambda v: dh_yearBC( v, u'%d. п. н. е.' ), - 'sv' : lambda v: dh_yearBC( v, u'%d f.Kr.' ), - 'sw' : lambda v: dh_yearBC( v, u'%d KK' ), - 'ta' : lambda v: dh_yearBC( v, u'கி.மு %d' ), - 'tr' : lambda v: dh_yearBC( v, u'M.Ö. %d' ), - 'tt' : lambda v: dh_yearBC( v, u'MA %d' ), - 'uk' : lambda v: dh_yearBC( v, u'%d до н. е.' ), - 'uz' : lambda v: dh_yearBC( v, u'Mil. av. %d' ), - 'vec': lambda v: dh_yearBC( v, u'%d a.C.' ), - 'vo' : lambda v: dh_yearBC( v, u'%d b.K.' ), - 'zh' : lambda v: dh_yearBC( v, u'前%d年' ), + 'af': lambda v: dh_yearBC(v, u'%d v.C.'), + 'ast': lambda v: dh_yearBC(v, u'%d edC'), + 'be': lambda v: dh_yearBC(v, u'%d да н.э.'), + 'bg': lambda v: dh_yearBC(v, u'%d г. пр.н.е.'), + 'bs': lambda v: dh_yearBC(v, u'%d p.n.e.'), + 'ca': lambda v: dh_yearBC(v, u'%d aC'), + 'cs': lambda v: dh_yearBC(v, u'%d př. n. l.'), + 'cy': lambda v: dh_yearBC(v, u'%d CC'), + 'da': lambda v: dh_yearBC(v, u'%d f.Kr.'), + 'de': lambda v: dh_yearBC(v, u'%d v. Chr.'), + 'el': lambda v: dh_yearBC(v, u'%d π.Χ.'), + 'en': lambda v: dh_yearBC(v, u'%d BC'), + 'eo': lambda v: dh_yearBC(v, u'-%d'), + 'es': lambda v: dh_yearBC(v, u'%d a. C.'), + 'et': lambda v: dh_yearBC(v, u'%d eKr'), + 'eu': lambda v: dh_yearBC(v, u'K. a. %d'), + 'fa': lambda v: dh_yearBC(v, u'%d (پیش از میلاد)'), + 'fi': lambda v: dh_yearBC(v, u'%d eaa.'), + 'fo': lambda v: dh_yearBC(v, u'%d f. Kr.'), + 'fr': lambda v: dh_yearBC(v, u'%d av. J.-C.'), + 'gl': lambda v: dh_yearBC(v, u'-%d'), + 'he': lambda v: dh_yearBC(v, u'%d לפני הספירה'), + 'hr': lambda v: dh_yearBC(v, u'%d. pr. Kr.'), + 'hu': lambda v: dh_yearBC(v, u'I. e. %d'), + 'id': lambda v: dh_yearBC(v, u'%d SM'), + 'io': lambda v: dh_yearBC(v, u'%d aK'), + 'is': lambda v: dh_yearBC(v, u'%d f. Kr.'), + 'it': lambda v: dh_yearBC(v, u'%d a.C.'), + 'ka': lambda v: dh_yearBC(v, u'ძვ. წ. %d'), + 'ko': lambda v: dh_yearBC(v, u'기원전 %d년'), + 'ksh': lambda v: dh_yearBC(v, u'Joohr %d füür Krėßtůß'), + 'la': lambda v: dh_yearBC(v, u'%d a.C.n.'), + 'lb': lambda v: dh_yearBC(v, u'-%d'), + 'lt': lambda v: dh_yearBC(v, u'%d m. pr. m. e.'), + 'lv': lambda v: dh_yearBC(v, u'%d p.m.ē.'), + 'mk': lambda v: dh_yearBC(v, u'%d п.н.е.'), + 'ms': lambda v: dh_yearBC(v, u'%d SM'), + 'nap': lambda v: dh_yearBC(v, u'%d AC'), + 'nds': lambda v: dh_yearBC(v, u'%d v. Chr.'), + 'nl': lambda v: dh_yearBC(v, u'%d v.Chr.'), + 'nn': lambda v: dh_yearBC(v, u'-%d'), + 'no': lambda v: dh_yearBC(v, u'%d f.Kr.'), + 'oc': lambda v: dh_yearBC(v, u'-%d'), + 'pl': lambda v: dh_yearBC(v, u'%d p.n.e.'), + 'pt': lambda v: dh_yearBC(v, u'%d a.C.'), + 'ro': lambda v: dh_yearBC(v, u'%d î.Hr.'), + 'ru': lambda v: dh_yearBC(v, u'%d год до н. э.'), + 'scn': lambda v: dh_yearBC(v, u'%d a.C.'), + 'simple': lambda v: dh_yearBC(v, u'%d BC'), + 'sk': lambda v: dh_yearBC(v, u'%d pred Kr.'), + 'sl': lambda v: dh_yearBC(v, u'%d pr. n. št.'), + 'sq': lambda v: dh_yearBC(v, u'%d p.e.s.'), + 'sr': lambda v: dh_yearBC(v, u'%d. п. н. е.'), + 'sv': lambda v: dh_yearBC(v, u'%d f.Kr.'), + 'sw': lambda v: dh_yearBC(v, u'%d KK'), + 'ta': lambda v: dh_yearBC(v, u'கி.மு %d'), + 'tr': lambda v: dh_yearBC(v, u'M.Ö. %d'), + 'tt': lambda v: dh_yearBC(v, u'MA %d'), + 'uk': lambda v: dh_yearBC(v, u'%d до н. е.'), + 'uz': lambda v: dh_yearBC(v, u'Mil. av. %d'), + 'vec': lambda v: dh_yearBC(v, u'%d a.C.'), + 'vo': lambda v: dh_yearBC(v, u'%d b.K.'), + 'zh': lambda v: dh_yearBC(v, u'前%d年'), }, 'DecadeAD': { - 'als': lambda v: dh_decAD( v, u'%der' ), - 'ar' : lambda v: dh_decAD( v, u'%d عقد' ), - 'ast': lambda v: dh_decAD( v, u'Años %d' ), - 'ang': lambda v: dh_decAD( v, u'%de' ), - 'ast': lambda v: dh_decAD( v, u'Años %d' ), - 'bg' : lambda v: dh_decAD( v, u'%d-те' ), - 'br' : lambda v: dh_decAD( v, u'Bloavezhioù %d' ), - 'bs' : lambda v: dh_decAD( v, u'%dte' ), + 'als': lambda v: dh_decAD(v, u'%der'), + 'ar': lambda v: dh_decAD(v, u'%d عقد'), + 'ast': lambda v: dh_decAD(v, u'Años %d'), + 'ang': lambda v: dh_decAD(v, u'%de'), + 'ast': lambda v: dh_decAD(v, u'Años %d'), + 'bg': lambda v: dh_decAD(v, u'%d-те'), + 'br': lambda v: dh_decAD(v, u'Bloavezhioù %d'), + 'bs': lambda v: dh_decAD(v, u'%dte'), # Unknown what the pattern is, but 1970 is different - 'ca' : lambda m: multi( m, [ - (lambda v: dh_decAD( v, u'Dècada de %d' ), lambda p: p == 1970), - (lambda v: dh_decAD( v, u'Dècada del %d' ), alwaysTrue)]), + 'ca': lambda m: multi(m, [ + (lambda v: dh_decAD(v, u'Dècada de %d'), lambda p: p == 1970), + (lambda v: dh_decAD(v, u'Dècada del %d'), alwaysTrue)]), - #1970s => '1970-1979' - 'cs' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 1, u'1-9'), lambda p: p == 1), - (lambda v: dh( v, u'%d-%d', lambda i: (encDec0(i),encDec0(i)+9), decSinglVal ), alwaysTrue)]), - - 'cy' : lambda v: dh_decAD( v, u'%dau' ), - 'da' : lambda v: dh_decAD( v, u"%d'erne" ), - 'de' : lambda v: dh_decAD( v, u'%der' ), - 'el' : lambda v: dh_decAD( v, u'Δεκαετία %d' ), - 'en' : lambda v: dh_decAD( v, u'%ds' ), - 'eo' : lambda v: dh_decAD( v, u'%d-aj jaroj' ), - 'es' : lambda v: dh_decAD( v, u'Años %d' ), - 'et' : lambda v: dh_decAD( v, u'%d. aastad' ), - 'fa' : lambda v: dh_decAD( v, u'دهه %d (میلادی)' ), + # 1970s => '1970-1979' + 'cs': lambda m: multi(m, [ + (lambda v: dh_constVal(v, 1, u'1-9'), lambda p: p == 1), + (lambda v: dh(v, u'%d-%d', + lambda i: (encDec0(i), encDec0(i) + 9), decSinglVal), + alwaysTrue)]), + 'cy': lambda v: dh_decAD(v, u'%dau'), + 'da': lambda v: dh_decAD(v, u"%d'erne"), + 'de': lambda v: dh_decAD(v, u'%der'), + 'el': lambda v: dh_decAD(v, u'Δεκαετία %d'), + 'en': lambda v: dh_decAD(v, u'%ds'), + 'eo': lambda v: dh_decAD(v, u'%d-aj jaroj'), + 'es': lambda v: dh_decAD(v, u'Años %d'), + 'et': lambda v: dh_decAD(v, u'%d. aastad'), + 'fa': lambda v: dh_decAD(v, u'دهه %d (میلادی)'), # decades ending in 00 are spelled differently - 'fi' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 0, u'Ensimmäinen vuosikymmen'), lambda p: p == 0), - (lambda v: dh_decAD( v, u'%d-luku' ), lambda p: (p % 100 != 0)), - (lambda v: dh_decAD( v, u'%d-vuosikymmen' ), alwaysTrue)]), + 'fi': lambda m: multi(m, [ + (lambda v: dh_constVal(v, 0, u'Ensimmäinen vuosikymmen'), + lambda p: p == 0), + (lambda v: dh_decAD(v, u'%d-luku'), lambda p: (p % 100 != 0)), + (lambda v: dh_decAD(v, u'%d-vuosikymmen'), alwaysTrue)]), - 'fo' : lambda v: dh_decAD( v, u'%d-árini' ), - 'fr' : lambda v: dh_decAD( v, u'Années %d' ), - 'ga' : lambda v: dh_decAD( v, u'%didí' ), - 'gan': lambda v: dh_decAD( v, u'%d年代' ), - 'he' : lambda m: multi( m, [ - (lambda v: dh( v, u'שנות ה־%d', lambda i: encDec0(i)%100, lambda ii: 1900 + ii[0] ), lambda p: p >= 1900 and p < 2000), + 'fo': lambda v: dh_decAD(v, u'%d-árini'), + 'fr': lambda v: dh_decAD(v, u'Années %d'), + 'ga': lambda v: dh_decAD(v, u'%didí'), + 'gan': lambda v: dh_decAD(v, u'%d年代'), + 'he': lambda m: multi(m, [ + (lambda v: dh(v, u'שנות ה־%d', + lambda i: encDec0(i) % 100, + lambda ii: 1900 + ii[0]), + lambda p: p >= 1900 and p < 2000), # This is a dummy value, just to avoid validation testing. - (lambda v: dh_decAD( v, u'%dth decade' ), alwaysTrue)]), # ********** ERROR!!! + (lambda v: dh_decAD(v, u'%dth decade'), + alwaysTrue)]), # ********** ERROR!!! + 'hi': lambda v: dh_decAD(v, u'%H का दशक'), - 'hi' : lambda v: dh_decAD( v, u'%H का दशक' ), + # 1970s => 1970-1979 + 'hr': lambda m: multi(m, [ + (lambda v: dh_constVal(v, 1, u'1-9'), lambda p: p == 1), + (lambda v: dh(v, u'%d-%d', + lambda i: (encDec0(i), encDec0(i) + 9), + lambda ii: ii[0]), alwaysTrue)]), + 'hu': lambda m: multi(m, [ + (lambda v: dh_constVal(v, 1, u'0-s évek'), lambda p: p == 1), + (lambda v: dh_decAD(v, u'%d-as évek'), + lambda p: (p % 100 / 10) in (0, 2, 3, 6, 8)), + (lambda v: dh_decAD(v, u'%d-es évek'), alwaysTrue)]), + 'io': lambda v: dh_decAD(v, u'%da yari'), - #1970s => 1970-1979 - 'hr' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 1, u'1-9'), lambda p: p == 1), - (lambda v: dh( v, u'%d-%d', lambda i: (encDec0(i),encDec0(i)+9), lambda ii: ii[0] ), alwaysTrue)]), + # 1970s => '1971–1980' + 'is': lambda v: dh(v, u'%d–%d', + lambda i: (encDec1(i), encDec1(i) + 9), + lambda ii: ii[0] - 1), + 'it': lambda v: dh_decAD(v, u'Anni %d'), + 'ja': lambda v: dh_decAD(v, u'%d年代'), + 'ka': lambda v: dh_decAD(v, u'%d-ები‎'), + 'ko': lambda v: dh_decAD(v, u'%d년대'), + 'ksh': lambda v: dh_decAD(v, u'%d-er Joohre'), - 'hu' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 1, u'0-s évek'), lambda p: p == 1), - (lambda v: dh_decAD( v, u'%d-as évek' ), lambda p: (p % 100 / 10) in [0,2,3,6,8]), - (lambda v: dh_decAD( v, u'%d-es évek' ), alwaysTrue)]), + # 1970s => 'Decennium 198' (1971-1980) + 'la': lambda v: dh(v, u'Decennium %d', + lambda i: encDec1(i)/10 + 1, + lambda ii: (ii[0]-1) * 10), - 'io' : lambda v: dh_decAD( v, u'%da yari' ), + # 1970s => 'XX amžiaus 8-as dešimtmetis' (1971-1980) + 'lt': lambda v: dh(v, u'%R amžiaus %d-as dešimtmetis', + lambda i: (encDec1(i)/100 + 1, + encDec1(i) % 100/10 + 1), + lambda v: (v[0]-1)*100 + (v[1]-1)*10), - #1970s => '1971–1980' - 'is' : lambda v: dh( v, u'%d–%d', lambda i: (encDec1(i),encDec1(i)+9), lambda ii: ii[0]-1 ), - 'it' : lambda v: dh_decAD( v, u'Anni %d' ), - 'ja' : lambda v: dh_decAD( v, u'%d年代' ), - 'ka' : lambda v: dh_decAD( v, u'%d-ები‎' ), - 'ko' : lambda v: dh_decAD( v, u'%d년대' ), - 'ksh': lambda v: dh_decAD( v, u'%d-er Joohre' ), + # 1970s => 'Ngahurutanga 198' (1971-1980) + 'mi': lambda v: dh(v, u'Ngahurutanga %d', + lambda i: encDec0(i)/10 + 1, + lambda ii: (ii[0]-1) * 10), - #1970s => 'Decennium 198' (1971-1980) - 'la' : lambda v: dh( v, u'Decennium %d', lambda i: encDec1(i)/10+1, lambda ii: (ii[0]-1)*10 ), + 'mhr': lambda v: dh_decAD(v, u'%d ийла'), - #1970s => 'XX amžiaus 8-as dešimtmetis' (1971-1980) - 'lt' : lambda v: dh( v, u'%R amžiaus %d-as dešimtmetis', - lambda i: (encDec1(i)/100+1, encDec1(i)%100/10+1), - lambda v: (v[0]-1)*100 + (v[1]-1)*10 ), + # 1970s => '1970-1979' + 'nl': lambda m: multi(m, [ + (lambda v: dh_constVal(v, 1, u'1-9'), lambda p: p == 1), + (lambda v: dh(v, u'%d-%d', + lambda i: (encDec0(i), encDec0(i) + 9), decSinglVal), + alwaysTrue)]), + 'nn': lambda v: dh_decAD(v, u'%d0-åra'), # FIXME: not sure of this one + 'no': lambda v: dh_decAD(v, u'%d-årene'), + 'os': lambda v: dh_decAD(v, u'%d-тæ'), - #1970s => 'Ngahurutanga 198' (1971-1980) - 'mi' : lambda v: dh( v, u'Ngahurutanga %d', lambda i: encDec0(i)/10+1, lambda ii: (ii[0]-1)*10 ), - - 'mhr': lambda v: dh_decAD( v, u'%d ийла' ), - - #1970s => '1970-1979' - 'nl' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 1, u'1-9'), lambda p: p == 1), - (lambda v: dh( v, u'%d-%d', lambda i: (encDec0(i),encDec0(i)+9), decSinglVal ), alwaysTrue)]), - - 'nn' : lambda v: dh_decAD( v, u'%d0-åra' ), # FIXME: not sure of this one - 'no' : lambda v: dh_decAD( v, u'%d-årene' ), - 'os' : lambda v: dh_decAD( v, u'%d-тæ' ), - - #1970s => 'Lata 70. XX wieku' for anything except 1900-1919, 2000-2019, etc, in which case its 'Lata 1900-1909' - 'pl' : lambda m: multi( m, [ - (lambda v: dh( v, u'Lata %d-%d', lambda i: (encDec0(i),encDec0(i)+9), decSinglVal ), - lambda p: p%100 >= 0 and p%100 < 20 ), - (lambda v: dh( v, u'Lata %d. %R wieku', lambda i: (encDec0(i)%100, encDec0(i)/100+1 ), lambda ii: (ii[1]-1)*100 + ii[0] ), - alwaysTrue)]), - - 'pt' : lambda v: dh_decAD( v, u'Década de %d' ), - 'ro' : lambda v: dh_decAD( v, u'Anii %d' ), - 'ro' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 0, u'Primul deceniu d.Hr.'), lambda p: p == 0), - (lambda v: dh_decAD( v, u'Anii %d' ), alwaysTrue)]), - 'ru' : lambda v: dh_decAD( v, u'%d-е' ), - 'scn': lambda v: dh_decAD( v, u'%dini' ), - 'simple' : lambda v: dh_decAD( v, u'%ds' ), + # 1970s => 'Lata 70. XX wieku' for anything except 1900-1919, 2000-2019, + # etc, in which case its 'Lata 1900-1909' + 'pl': lambda m: multi(m, [ + (lambda v: dh(v, u'Lata %d-%d', + lambda i: (encDec0(i), encDec0(i) + 9), decSinglVal), + lambda p: p % 100 >= 0 and p % 100 < 20), + (lambda v: dh(v, u'Lata %d. %R wieku', + lambda i: (encDec0(i) % 100, encDec0(i)/100 + 1), + lambda ii: (ii[1]-1)*100 + ii[0]), + alwaysTrue)]), + 'pt': lambda v: dh_decAD(v, u'Década de %d'), + 'ro': lambda v: dh_decAD(v, u'Anii %d'), + 'ro': lambda m: multi(m, [ + (lambda v: dh_constVal(v, 0, u'Primul deceniu d.Hr.'), + lambda p: p == 0), + (lambda v: dh_decAD(v, u'Anii %d'), alwaysTrue)]), + 'ru': lambda v: dh_decAD(v, u'%d-е'), + 'scn': lambda v: dh_decAD(v, u'%dini'), + 'simple': lambda v: dh_decAD(v, u'%ds'), # 1970 => '70. roky 20. storočia' - 'sk' : lambda v: dh( v, u'%d. roky %d. storočia', - lambda i: (encDec0(i)%100, encDec0(i)/100+1), - lambda ii: (ii[1]-1)*100 + ii[0] ), + 'sk': lambda v: dh(v, u'%d. roky %d. storočia', + lambda i: (encDec0(i) % 100, encDec0(i)/100 + 1), + lambda ii: (ii[1]-1) * 100 + ii[0]), - 'sl' : lambda v: dh_decAD( v, u'%d.' ), - 'sq' : lambda v: dh_decAD( v, u'Vitet %d' ), - 'sr' : lambda v: dh_decAD( v, u'%dе' ), - - 'sv' : lambda m: multi( m, [ - (lambda v: dh_decAD( v, u'%d-talet (decennium)' ), lambda p: (p % 100 == 0)), - (lambda v: dh_decAD( v, u'%d-talet' ), alwaysTrue)]), - - 'tt' : lambda v: dh_decAD( v, u'%d. yıllar' ), - - 'uk' : lambda m: multi( m, [ - (lambda v: dh_decAD( v, u'%d-ві' ), lambda p: p == 0 or (p % 100 == 40)), - (lambda v: dh_decAD( v, u'%d-ні' ), lambda p: p % 1000 == 0), - (lambda v: dh_decAD( v, u'%d-ті' ), alwaysTrue)]), - 'ur' : lambda v: dh_decAD( v, u'%dدبم' ), - 'wa' : lambda v: dh_decAD( v, u'Anêyes %d' ), - 'zh' : lambda v: dh_decAD( v, u'%d年代' ), - 'zh-min-nan' : lambda v: dh_decAD( v, u'%d nî-tāi' ), + 'sl': lambda v: dh_decAD(v, u'%d.'), + 'sq': lambda v: dh_decAD(v, u'Vitet %d'), + 'sr': lambda v: dh_decAD(v, u'%dе'), + 'sv': lambda m: multi(m, [ + (lambda v: dh_decAD(v, u'%d-talet (decennium)'), + lambda p: (p % 100 == 0)), + (lambda v: dh_decAD(v, u'%d-talet'), alwaysTrue)]), + 'tt': lambda v: dh_decAD(v, u'%d. yıllar'), + 'uk': lambda m: multi(m, [ + (lambda v: dh_decAD(v, u'%d-ві'), + lambda p: p == 0 or (p % 100 == 40)), + (lambda v: dh_decAD(v, u'%d-ні'), lambda p: p % 1000 == 0), + (lambda v: dh_decAD(v, u'%d-ті'), alwaysTrue)]), + 'ur': lambda v: dh_decAD(v, u'%dدبم'), + 'wa': lambda v: dh_decAD(v, u'Anêyes %d'), + 'zh': lambda v: dh_decAD(v, u'%d年代'), + 'zh-min-nan': lambda v: dh_decAD(v, u'%d nî-tāi'), }, 'DecadeBC': { - 'de' : lambda v: dh_decBC( v, u'%der v. Chr.' ), - 'da' : lambda v: dh_decBC( v, u"%d'erne f.Kr." ), - 'en' : lambda v: dh_decBC( v, u'%ds BC' ), - 'es' : lambda v: dh_decBC( v, u'Años %d adC' ), - 'et' : lambda v: dh_decBC( v, u'%d. aastad eKr' ), - 'eu' : lambda v: dh_decBC( v, u'K. a. %dko hamarkada' ), + 'de': lambda v: dh_decBC(v, u'%der v. Chr.'), + 'da': lambda v: dh_decBC(v, u"%d'erne f.Kr."), + 'en': lambda v: dh_decBC(v, u'%ds BC'), + 'es': lambda v: dh_decBC(v, u'Años %d adC'), + 'et': lambda v: dh_decBC(v, u'%d. aastad eKr'), + 'eu': lambda v: dh_decBC(v, u'K. a. %dko hamarkada'), # decades ending in 00 are spelled differently - 'fi' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 0, u'Ensimmäinen vuosikymmen eaa.'), lambda p: p == 0), - (lambda v: dh_decBC( v, u'%d-luku eaa.' ), lambda p: (p % 100 != 0)), - (lambda v: dh_decBC( v, u'%d-vuosikymmen eaa.' ), alwaysTrue)]), + 'fi': lambda m: multi(m, [ + (lambda v: dh_constVal(v, 0, u'Ensimmäinen vuosikymmen eaa.'), + lambda p: p == 0), + (lambda v: dh_decBC(v, u'%d-luku eaa.'), lambda p: (p % 100 != 0)), + (lambda v: dh_decBC(v, u'%d-vuosikymmen eaa.'), alwaysTrue)]), - 'fr' : lambda v: dh_decBC( v, u'Années -%d' ), - 'he' : lambda v: dh_decBC( v, u'שנות ה־%d לפני הספירה' ), - 'hr' : lambda v: dh_decBC( v, u'%dih p.n.e.' ), + 'fr': lambda v: dh_decBC(v, u'Années -%d'), + 'he': lambda v: dh_decBC(v, u'שנות ה־%d לפני הספירה'), + 'hr': lambda v: dh_decBC(v, u'%dih p.n.e.'), - 'hu' : lambda m: multi(m, [ + 'hu': lambda m: multi(m, [ (lambda v: dh_constVal(v, 0, u'i. e. 0-s évek'), lambda p: p == 0), - (lambda v: dh_decBC(v, u'i. e. %d-as évek' ), - lambda p: (p % 100 / 10) in [0,2,3,6,8]), + (lambda v: dh_decBC(v, u'i. e. %d-as évek'), + lambda p: (p % 100 / 10) in (0, 2, 3, 6, 8)), (lambda v: dh_decBC(v, u'i. e. %d-es évek'), alwaysTrue)]), - - 'it' : lambda v: dh_decBC( v, u'Anni %d a.C.' ), - - 'ka' : lambda v: dh_decBC( v, u'ძვ. წ. %d-ები' ), - 'ksh': lambda v: dh_decBC( v, u'%d-er Joohre füür Krėßtůß'), # uncertain if that's right. might go to redirect. + 'it': lambda v: dh_decBC(v, u'Anni %d a.C.'), + 'ka': lambda v: dh_decBC(v, u'ძვ. წ. %d-ები'), + 'ksh': lambda v: dh_decBC(v, u'%d-er Joohre füür Krėßtůß'), # uncertain if that's right. might go to redirect. # '19-10 v. Chr.' - 'nl' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 1, u'9-1 v.Chr.'), lambda p: p == 1), - (lambda v: dh( v, u'%d-%d v.Chr.', lambda i: (encDec0(i)+9,encDec0(i)), lambda ii: ii[1] ), alwaysTrue)]), + 'nl': lambda m: multi(m, [ + (lambda v: dh_constVal(v, 1, u'9-1 v.Chr.'), lambda p: p == 1), + (lambda v: dh(v, u'%d-%d v.Chr.', + lambda i: (encDec0(i) + 9, encDec0(i)), + lambda ii: ii[1]), alwaysTrue)]), + 'pt': lambda v: dh_decBC(v, u'Década de %d a.C.'), + 'ro': lambda m: multi(m, [ + (lambda v: dh_constVal(v, 0, u'Primul deceniu î.Hr.'), + lambda p: p == 0), + (lambda v: dh_decBC(v, u'Anii %d î.Hr.'), alwaysTrue)]), - 'pt' : lambda v: dh_decBC( v, u'Década de %d a.C.' ), + 'ru': lambda v: dh_decBC(v, u'%d-е до н. э.'), + 'sl': lambda v: dh_decBC(v, u'%d. pr. n. št.'), - 'ro' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 0, u'Primul deceniu î.Hr.'), lambda p: p == 0), - (lambda v: dh_decBC( v, u'Anii %d î.Hr.' ), alwaysTrue)]), + 'sv': lambda m: multi(m, [ + (lambda v: dh_decBC(v, u'%d-talet f.Kr. (decennium)'), + lambda p: (p % 100 == 0)), + (lambda v: dh_decBC(v, u'%d-talet f.Kr.'), alwaysTrue)]), - 'ru' : lambda v: dh_decBC( v, u'%d-е до н. э.' ), - 'sl' : lambda v: dh_decBC( v, u'%d. pr. n. št.' ), - - 'sv' : lambda m: multi( m, [ - (lambda v: dh_decBC( v, u'%d-talet f.Kr. (decennium)' ), lambda p: (p % 100 == 0)), - (lambda v: dh_decBC( v, u'%d-talet f.Kr.' ), alwaysTrue)]), - - 'tt' : lambda v: dh_decBC( v, u'MA %d. yıllar' ), - 'uk' : lambda m: multi( m, [ - (lambda v: dh_decBC( v, u'%d-ві до Р.Х.' ), lambda p: p == 0 or (p % 100 == 40)), - (lambda v: dh_decBC( v, u'%d-ті до Р.Х.' ), alwaysTrue)]), - 'zh' : lambda v: dh_decBC( v, u'前%d年代' ), + 'tt': lambda v: dh_decBC(v, u'MA %d. yıllar'), + 'uk': lambda m: multi(m, [ + (lambda v: dh_decBC(v, u'%d-ві до Р.Х.'), + lambda p: p == 0 or (p % 100 == 40)), + (lambda v: dh_decBC(v, u'%d-ті до Р.Х.'), alwaysTrue)]), + 'zh': lambda v: dh_decBC(v, u'前%d年代'), }, 'CenturyAD': { - 'af' : lambda m: multi( m, [ - (lambda v: dh_centuryAD( v, u'%dste eeu' ), lambda p: p in [1,8] or (p >= 20)), - (lambda v: dh_centuryAD( v, u'%dde eeu' ), alwaysTrue)]), - 'als': lambda v: dh_centuryAD( v, u'%d. Jahrhundert' ), - 'ang': lambda v: dh_centuryAD( v, u'%de gēarhundred' ), - 'ar' : lambda v: dh_centuryAD( v, u'قرن %d' ), - 'ast': lambda v: dh_centuryAD( v, u'Sieglu %R' ), - 'be' : lambda v: dh_centuryAD( v, u'%d стагодзьдзе' ), - 'bg' : lambda v: dh_centuryAD( v, u'%d век' ), - 'br' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 1, u'Iañ kantved'), lambda p: p == 1), - (lambda v: dh_constVal( v, 2, u'Eil kantved'), lambda p: p == 2), - (lambda v: dh_centuryAD( v, u'%Re kantved' ), lambda p: p in [2,3]), - (lambda v: dh_centuryAD( v, u'%Rvet kantved' ), alwaysTrue)]), - 'bs' : lambda v: dh_centuryAD( v, u'%d. vijek' ), - 'ca' : lambda v: dh_centuryAD( v, u'Segle %R' ), - 'cs' : lambda v: dh_centuryAD( v, u'%d. století' ), - 'cv' : lambda v: dh_centuryAD( v, u'%R ĕмĕр' ), - 'cy' : lambda m: multi( m, [ - (lambda v: dh_centuryAD( v, u'%deg ganrif' ), lambda p: p in [17,19]), - (lambda v: dh_centuryAD( v, u'%dain ganrif' ), lambda p: p == 21), - (lambda v: dh_centuryAD( v, u'%dfed ganrif' ), alwaysTrue)]), - 'da' : lambda v: dh_centuryAD( v, u'%d00-tallet' ), - 'de' : lambda v: dh_centuryAD( v, u'%d. Jahrhundert' ), - 'el' : lambda m: multi( m, [ - (lambda v: dh_centuryAD( v, u'%dός αιώνας' ), lambda p: p == 20), - (lambda v: dh_centuryAD( v, u'%dος αιώνας' ), alwaysTrue)]), - 'en' : lambda m: multi( m, [ - (lambda v: dh_centuryAD( v, u'%dst century' ), lambda p: p == 1 or (p > 20 and p%10 == 1)), - (lambda v: dh_centuryAD( v, u'%dnd century' ), lambda p: p == 2 or (p > 20 and p%10 == 2)), - (lambda v: dh_centuryAD( v, u'%drd century' ), lambda p: p == 3 or (p > 20 and p%10 == 3)), - (lambda v: dh_centuryAD( v, u'%dth century' ), alwaysTrue)]), - 'eo' : lambda v: dh_centuryAD( v, u'%d-a jarcento' ), - 'es' : lambda v: dh_centuryAD( v, u'Siglo %R' ), - 'et' : lambda v: dh_centuryAD( v, u'%d. sajand' ), - 'eu' : lambda v: dh_centuryAD( v, u'%R. mendea' ), # %R. mende - 'fa' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 20, u'سده ۲۰ (میلادی)'), lambda p: p == 20), - # This is a dummy value, just to avoid validation testing. Later, it should be replaced with a proper 'fa' titles - (lambda v: dh_centuryAD( v, u'سده %d (میلادی)' ), alwaysTrue)]), # ********** ERROR!!! - 'fi' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 1, u'Ensimmäinen vuosisata'), lambda p: p == 1), - (lambda v: dh( v, u'%d00-luku', lambda i: i-1, lambda ii: ii[0]+1 ), alwaysTrue)]), - 'fo' : lambda v: dh_centuryAD( v, u'%d. øld' ), - 'fr' : lambda m: multi( m, [ - (lambda v: dh_centuryAD( v, u'%Rer siècle' ), lambda p: p == 1), - (lambda v: dh_centuryAD( v, u'%Re siècle' ), alwaysTrue)]), - 'fy' : lambda v: dh_centuryAD( v, u'%de ieu' ), - 'ga' : lambda v: dh_centuryAD( v, u'%dú haois' ), - 'gl' : lambda v: dh_centuryAD( v, u'Século %R' ), - 'he' : lambda v: dh_centuryAD( v, u'המאה ה־%d' ), - 'hi' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 20, u'बीसवी शताब्दी'), lambda p: p == 20), - # This is a dummy value, just to avoid validation testing. Later, it should be replaced with a proper 'fa' titles - (lambda v: dh_centuryAD( v, u'%dth century' ), alwaysTrue)]), # ********** ERROR!!! - 'hr' : lambda v: dh_centuryAD( v, u'%d. stoljeće' ), - 'hu' : lambda v: dh_centuryAD( v, u'%d. század' ), - 'id' : lambda v: dh_centuryAD( v, u'Abad ke-%d' ), - 'io' : lambda v: dh_centuryAD( v, u'%dma yar-cento' ), - 'it' : lambda v: dh_centuryAD( v, u'%R secolo' ), - 'is' : lambda v: dh_centuryAD( v, u'%d. öldin' ), - 'ja' : lambda v: dh_centuryAD( v, u'%d世紀' ), - 'jv' : lambda v: dh_centuryAD( v, u'Abad kaping %d' ), - 'ka' : lambda v: dh_centuryAD( v, u'%R საუკუნე' ), - 'ko' : lambda v: dh_centuryAD( v, u'%d세기' ), - 'ku' : lambda v: dh_centuryAD( v, u"Sedsala %d'an" ), - 'kw' : lambda m: multi( m, [ - (lambda v: dh_centuryAD( v, u'%dsa kansblydhen' ), lambda p: p <= 3), - (lambda v: dh_centuryAD( v, u'%da kansblydhen' ), lambda p: p == 4), - (lambda v: dh_centuryAD( v, u'%des kansblydhen' ), lambda p: p == 5), - (lambda v: dh_centuryAD( v, u'%dns kansblydhen' ), lambda p: p >= 20), - (lambda v: dh_centuryAD( v, u'%dves kansblydhen' ), alwaysTrue)]), - 'ksh': lambda v: dh_centuryAD( v, u'%d. Joohunndot'), - 'la' : lambda v: dh_centuryAD( v, u'Saeculum %d' ), - 'lb' : lambda v: dh_centuryAD( v, u'%d. Joerhonnert' ), + 'af': lambda m: multi(m, [ + (lambda v: dh_centuryAD(v, u'%dste eeu'), + lambda p: p in (1, 8) or (p >= 20)), + (lambda v: dh_centuryAD(v, u'%dde eeu'), alwaysTrue)]), + 'als': lambda v: dh_centuryAD(v, u'%d. Jahrhundert'), + 'ang': lambda v: dh_centuryAD(v, u'%de gēarhundred'), + 'ar': lambda v: dh_centuryAD(v, u'قرن %d'), + 'ast': lambda v: dh_centuryAD(v, u'Sieglu %R'), + 'be': lambda v: dh_centuryAD(v, u'%d стагодзьдзе'), + 'bg': lambda v: dh_centuryAD(v, u'%d век'), + 'br': lambda m: multi(m, [ + (lambda v: dh_constVal(v, 1, u'Iañ kantved'), lambda p: p == 1), + (lambda v: dh_constVal(v, 2, u'Eil kantved'), lambda p: p == 2), + (lambda v: dh_centuryAD(v, u'%Re kantved'), lambda p: p in (2, 3)), + (lambda v: dh_centuryAD(v, u'%Rvet kantved'), alwaysTrue)]), + 'bs': lambda v: dh_centuryAD(v, u'%d. vijek'), + 'ca': lambda v: dh_centuryAD(v, u'Segle %R'), + 'cs': lambda v: dh_centuryAD(v, u'%d. století'), + 'cv': lambda v: dh_centuryAD(v, u'%R ĕмĕр'), + 'cy': lambda m: multi(m, [ + (lambda v: dh_centuryAD(v, u'%deg ganrif'), + lambda p: p in (17, 19)), + (lambda v: dh_centuryAD(v, u'%dain ganrif'), lambda p: p == 21), + (lambda v: dh_centuryAD(v, u'%dfed ganrif'), alwaysTrue)]), + 'da': lambda v: dh_centuryAD(v, u'%d00-tallet'), + 'de': lambda v: dh_centuryAD(v, u'%d. Jahrhundert'), + 'el': lambda m: multi(m, [ + (lambda v: dh_centuryAD(v, u'%dός αιώνας'), lambda p: p == 20), + (lambda v: dh_centuryAD(v, u'%dος αιώνας'), alwaysTrue)]), + 'en': lambda m: multi(m, [ + (lambda v: dh_centuryAD(v, u'%dst century'), + lambda p: p == 1 or (p > 20 and p % 10 == 1)), + (lambda v: dh_centuryAD(v, u'%dnd century'), + lambda p: p == 2 or (p > 20 and p % 10 == 2)), + (lambda v: dh_centuryAD(v, u'%drd century'), + lambda p: p == 3 or (p > 20 and p % 10 == 3)), + (lambda v: dh_centuryAD(v, u'%dth century'), alwaysTrue)]), + 'eo': lambda v: dh_centuryAD(v, u'%d-a jarcento'), + 'es': lambda v: dh_centuryAD(v, u'Siglo %R'), + 'et': lambda v: dh_centuryAD(v, u'%d. sajand'), + 'eu': lambda v: dh_centuryAD(v, u'%R. mendea'), # %R. mende + 'fa': lambda m: multi(m, [ + (lambda v: dh_constVal(v, 20, u'سده ۲۰ (میلادی)'), + lambda p: p == 20), + # This is a dummy value, just to avoid validation testing. + # Later, it should be replaced with a proper 'fa' titles + (lambda v: dh_centuryAD(v, u'سده %d (میلادی)'), + alwaysTrue)]), # ********** ERROR!!! + 'fi': lambda m: multi(m, [ + (lambda v: dh_constVal(v, 1, u'Ensimmäinen vuosisata'), + lambda p: p == 1), + (lambda v: dh(v, u'%d00-luku', + lambda i: i - 1, + lambda ii: ii[0] + 1), alwaysTrue)]), + 'fo': lambda v: dh_centuryAD(v, u'%d. øld'), + 'fr': lambda m: multi(m, [ + (lambda v: dh_centuryAD(v, u'%Rer siècle'), lambda p: p == 1), + (lambda v: dh_centuryAD(v, u'%Re siècle'), alwaysTrue)]), + 'fy': lambda v: dh_centuryAD(v, u'%de ieu'), + 'ga': lambda v: dh_centuryAD(v, u'%dú haois'), + 'gl': lambda v: dh_centuryAD(v, u'Século %R'), + 'he': lambda v: dh_centuryAD(v, u'המאה ה־%d'), + 'hi': lambda m: multi(m, [ + (lambda v: dh_constVal(v, 20, u'बीसवी शताब्दी'), lambda p: p == 20), + # This is a dummy value, just to avoid validation testing. + # Later, it should be replaced with a proper 'fa' titles + (lambda v: dh_centuryAD(v, u'%dth century'), + alwaysTrue)]), # ********** ERROR!!! + 'hr': lambda v: dh_centuryAD(v, u'%d. stoljeće'), + 'hu': lambda v: dh_centuryAD(v, u'%d. század'), + 'id': lambda v: dh_centuryAD(v, u'Abad ke-%d'), + 'io': lambda v: dh_centuryAD(v, u'%dma yar-cento'), + 'it': lambda v: dh_centuryAD(v, u'%R secolo'), + 'is': lambda v: dh_centuryAD(v, u'%d. öldin'), + 'ja': lambda v: dh_centuryAD(v, u'%d世紀'), + 'jv': lambda v: dh_centuryAD(v, u'Abad kaping %d'), + 'ka': lambda v: dh_centuryAD(v, u'%R საუკუნე'), + 'ko': lambda v: dh_centuryAD(v, u'%d세기'), + 'ku': lambda v: dh_centuryAD(v, u"Sedsala %d'an"), + 'kw': lambda m: multi(m, [ + (lambda v: dh_centuryAD(v, u'%dsa kansblydhen'), lambda p: p <= 3), + (lambda v: dh_centuryAD(v, u'%da kansblydhen'), lambda p: p == 4), + (lambda v: dh_centuryAD(v, u'%des kansblydhen'), lambda p: p == 5), + (lambda v: dh_centuryAD(v, u'%dns kansblydhen'), lambda p: p >= 20), + (lambda v: dh_centuryAD(v, u'%dves kansblydhen'), alwaysTrue)]), + 'ksh': lambda v: dh_centuryAD(v, u'%d. Joohunndot'), + 'la': lambda v: dh_centuryAD(v, u'Saeculum %d'), + 'lb': lambda v: dh_centuryAD(v, u'%d. Joerhonnert'), # Limburgish (li) have individual names for each century - 'li' : lambda v: slh( v, [u'Ierste iew', u'Twiede iew', u'Derde iew', u'Veerde iew', u'Viefde iew', u'Zesde iew', u'Zevende iew', u'Achste iew', u'Negende iew', u'Tiende iew', u'Elfde iew', u'Twelfde iew', u'Dertiende iew', u'Veertiende iew', u'Vieftiende iew', u'Zestiende iew', u'Zeventiende iew', u'Achtiende iew', u'Negentiende iew', u'Twintegste iew', u'Einentwintegste iew', u'Twieëntwintegste iew',] ), + 'li': lambda v: slh(v, [u'Ierste iew', u'Twiede iew', u'Derde iew', + u'Veerde iew', u'Viefde iew', u'Zesde iew', + u'Zevende iew', u'Achste iew', + u'Negende iew', u'Tiende iew', + u'Elfde iew', u'Twelfde iew', + u'Dertiende iew', u'Veertiende iew', + u'Vieftiende iew', u'Zestiende iew', + u'Zeventiende iew', u'Achtiende iew', + u'Negentiende iew', u'Twintegste iew', + u'Einentwintegste iew', + u'Twieëntwintegste iew']), - 'lt' : lambda v: dh_centuryAD( v, u'%R amžius' ), - 'lv' : lambda v: dh_centuryAD( v, u'%d. gadsimts' ), - 'mi' : lambda v: dh_centuryAD( v, u'Tua %d rau tau' ), - 'mk' : lambda v: dh_centuryAD( v, u'%d век' ), - 'nds': lambda v: dh_centuryAD( v, u'%d. Johrhunnert' ), - 'nl' : lambda v: dh_centuryAD( v, u'%de eeuw' ), - 'nn' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 1, u'1. århundret'), lambda p: p == 1), - (lambda v: dh( v, u'%d00-talet', lambda i: i-1, lambda ii: ii[0]+1 ), alwaysTrue)]), - 'no' : lambda v: dh_centuryAD( v, u'%d. århundre' ), - 'os' : lambda v: dh_centuryAD( v, u'%R æнус' ), - 'pl' : lambda v: dh_centuryAD( v, u'%R wiek' ), - 'pt' : lambda v: dh_centuryAD( v, u'Século %R' ), - 'ro' : lambda v: dh_centuryAD( v, u'Secolul %R' ), - 'ru' : lambda v: dh_centuryAD( v, u'%R век' ), - 'scn': lambda v: dh_centuryAD( v, u'Sèculu %R' ), - 'simple' : lambda m: multi( m, [ - (lambda v: dh_centuryAD( v, u'%dst century' ), lambda p: p == 1 or (p > 20 and p%10 == 1)), - (lambda v: dh_centuryAD( v, u'%dnd century' ), lambda p: p == 2 or (p > 20 and p%10 == 2)), - (lambda v: dh_centuryAD( v, u'%drd century' ), lambda p: p == 3 or (p > 20 and p%10 == 3)), - (lambda v: dh_centuryAD( v, u'%dth century' ), alwaysTrue)]), - 'sk' : lambda v: dh_centuryAD( v, u'%d. storočie' ), - 'sl' : lambda v: dh_centuryAD( v, u'%d. stoletje' ), - 'sr' : lambda v: dh_centuryAD( v, u'%d. век' ), - 'sq' : lambda v: dh_centuryAD( v, u'Shekulli %R' ), - 'sv' : lambda v: dh( v, u'%d00-talet', lambda i: i-1, lambda ii: ii[0]+1 ), - 'su' : lambda v: dh_centuryAD( v, u'Abad ka-%d' ), - 'th' : lambda v: dh_centuryAD( v, u'คริสต์ศตวรรษที่ %d' ), - 'tr' : lambda v: dh_centuryAD( v, u'%d. yüzyıl' ), - 'tt' : lambda v: dh_centuryAD( v, u'%d. yöz' ), - 'uk' : lambda v: dh_centuryAD( v, u'%d століття' ), - 'ur' : lambda v: dh_centuryAD( v, u'%2d00صبم' ), - 'vi' : lambda v: dh_centuryAD( v, u'Thế kỷ %d' ), - 'wa' : lambda v: dh_centuryAD( v, u'%dinme sieke' ), - 'zh' : lambda v: dh_centuryAD( v, u'%d世纪' ), - 'zh-min-nan' : lambda v: dh_centuryAD( v, u'%d sè-kí' ), + 'lt': lambda v: dh_centuryAD(v, u'%R amžius'), + 'lv': lambda v: dh_centuryAD(v, u'%d. gadsimts'), + 'mi': lambda v: dh_centuryAD(v, u'Tua %d rau tau'), + 'mk': lambda v: dh_centuryAD(v, u'%d век'), + 'nds': lambda v: dh_centuryAD(v, u'%d. Johrhunnert'), + 'nl': lambda v: dh_centuryAD(v, u'%de eeuw'), + 'nn': lambda m: multi(m, [ + (lambda v: dh_constVal(v, 1, u'1. århundret'), lambda p: p == 1), + (lambda v: dh(v, u'%d00-talet', + lambda i: i - 1, lambda ii: ii[0] + 1), alwaysTrue)]), + 'no': lambda v: dh_centuryAD(v, u'%d. århundre'), + 'os': lambda v: dh_centuryAD(v, u'%R æнус'), + 'pl': lambda v: dh_centuryAD(v, u'%R wiek'), + 'pt': lambda v: dh_centuryAD(v, u'Século %R'), + 'ro': lambda v: dh_centuryAD(v, u'Secolul %R'), + 'ru': lambda v: dh_centuryAD(v, u'%R век'), + 'scn': lambda v: dh_centuryAD(v, u'Sèculu %R'), + 'simple': lambda m: multi(m, [ + (lambda v: dh_centuryAD(v, u'%dst century'), + lambda p: p == 1 or (p > 20 and p % 10 == 1)), + (lambda v: dh_centuryAD(v, u'%dnd century'), + lambda p: p == 2 or (p > 20 and p % 10 == 2)), + (lambda v: dh_centuryAD(v, u'%drd century'), + lambda p: p == 3 or (p > 20 and p % 10 == 3)), + (lambda v: dh_centuryAD(v, u'%dth century'), alwaysTrue)]), + 'sk': lambda v: dh_centuryAD(v, u'%d. storočie'), + 'sl': lambda v: dh_centuryAD(v, u'%d. stoletje'), + 'sr': lambda v: dh_centuryAD(v, u'%d. век'), + 'sq': lambda v: dh_centuryAD(v, u'Shekulli %R'), + 'sv': lambda v: dh(v, u'%d00-talet', + lambda i: i - 1, lambda ii: ii[0] + 1), + 'su': lambda v: dh_centuryAD(v, u'Abad ka-%d'), + 'th': lambda v: dh_centuryAD(v, u'คริสต์ศตวรรษที่ %d'), + 'tr': lambda v: dh_centuryAD(v, u'%d. yüzyıl'), + 'tt': lambda v: dh_centuryAD(v, u'%d. yöz'), + 'uk': lambda v: dh_centuryAD(v, u'%d століття'), + 'ur': lambda v: dh_centuryAD(v, u'%2d00صبم'), + 'vi': lambda v: dh_centuryAD(v, u'Thế kỷ %d'), + 'wa': lambda v: dh_centuryAD(v, u'%dinme sieke'), + 'zh': lambda v: dh_centuryAD(v, u'%d世纪'), + 'zh-min-nan': lambda v: dh_centuryAD(v, u'%d sè-kí'), }, 'CenturyBC': { - 'af' : lambda m: multi( m, [ - (lambda v: dh_centuryBC( v, u'%dste eeu v.C.' ), lambda p: p in [1,8] or (p >= 20)), - (lambda v: dh_centuryBC( v, u'%dde eeu v.C.' ), alwaysTrue)]), - 'bg' : lambda v: dh_centuryBC( v, u'%d век пр.н.е.' ), - 'br' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 1, u'Iañ kantved kt JK'), lambda p: p == 1), - (lambda v: dh_constVal( v, 2, u'Eil kantved kt JK'), lambda p: p == 2), - (lambda v: dh_centuryBC( v, u'%Re kantved kt JK'), lambda p: p in [2,3]), - (lambda v: dh_centuryBC( v, u'%Rvet kantved kt JK'), alwaysTrue)]), - 'ca' : lambda v: dh_centuryBC( v, u'Segle %R aC' ), - 'cs' : lambda v: dh_centuryBC( v, u'%d. století př. n. l.' ), - 'da' : lambda v: dh_centuryBC( v, u'%d. århundrede f.Kr.' ), - 'de' : lambda v: dh_centuryBC( v, u'%d. Jahrhundert v. Chr.' ), - 'el' : lambda v: dh_centuryBC( v, u'%dος αιώνας π.Χ.' ), - 'en' : lambda m: multi( m, [ - (lambda v: dh_centuryBC( v, u'%dst century BC' ), lambda p: p == 1 or (p > 20 and p%10 == 1)), - (lambda v: dh_centuryBC( v, u'%dnd century BC' ), lambda p: p == 2 or (p > 20 and p%10 == 2)), - (lambda v: dh_centuryBC( v, u'%drd century BC' ), lambda p: p == 3 or (p > 20 and p%10 == 3)), - (lambda v: dh_centuryBC( v, u'%dth century BC' ), alwaysTrue)]), - 'eo' : lambda v: dh_centuryBC( v, u'%d-a jarcento a.K.' ), - 'es' : lambda v: dh_centuryBC( v, u'Siglo %R adC' ), - 'et' : lambda v: dh_centuryBC( v, u'%d. aastatuhat eKr' ), - 'fi' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 1, u'Ensimmäinen vuosisata eaa.'), lambda p: p == 1), - (lambda v: dh( v, u'%d00-luku eaa.', lambda i: i-1, lambda ii: ii[0]+1 ), alwaysTrue)]), - 'fr' : lambda m: multi( m, [ - (lambda v: dh_centuryBC( v, u'%Rer siècle av. J.-C.' ), lambda p: p == 1), - (lambda v: dh_centuryBC( v, u'%Re siècle av. J.-C.' ), alwaysTrue)]), - 'he' : lambda v: dh_centuryBC( v, u'המאה ה־%d לפני הספירה' ), - 'hr' : lambda v: dh_centuryBC( v, u'%d. stoljeće p.n.e.' ), - 'id' : lambda v: dh_centuryBC( v, u'Abad ke-%d SM' ), - 'io' : lambda v: dh_centuryBC( v, u'%dma yar-cento aK' ), - 'it' : lambda v: dh_centuryBC( v, u'%R secolo AC' ), - 'ja' : lambda v: dh_centuryBC( v, u'紀元前%d世紀' ), - 'ka' : lambda v: dh_centuryBC( v, u'ძვ. წ. %R საუკუნე' ), - 'ko' : lambda v: dh_centuryBC( v, u'기원전 %d세기' ), - 'ksh': lambda v: dh_centuryBC( v, u'%d. Joohunndot füür Kreůßtůß'), # uncertain if that's right. might go to redirect. - 'la' : lambda v: dh_centuryBC( v, u'Saeculum %d a.C.n.' ), - 'lb' : lambda v: dh_centuryBC( v, u'%d. Joerhonnert v. Chr.' ), - 'nl' : lambda v: dh_centuryBC( v, u'%de eeuw v.Chr.' ), - 'nn' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 1, u'1. århundret fvt.'), lambda p: p == 1), - (lambda v: dh( v, u'%d00-talet fvt.', lambda i: i-1, lambda ii: ii[0]+1 ), alwaysTrue)]), - 'no' : lambda v: dh_centuryBC( v, u'%d. århundre f.Kr.' ), - 'pl' : lambda v: dh_centuryBC( v, u'%R wiek p.n.e.' ), - 'pt' : lambda v: dh_centuryBC( v, u'Século %R a.C.' ), - 'ro' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 1, u'Secolul I î.Hr.'), lambda p: p == 1), - (lambda v: dh_centuryBC( v, u'Secolul al %R-lea î.Hr.' ), alwaysTrue)]), - 'ru' : lambda v: dh_centuryBC( v, u'%R век до н. э.' ), - 'scn': lambda v: dh_centuryBC( v, u'Sèculu %R a.C.' ), - 'sk' : lambda v: dh_centuryBC( v, u'%d. storočie pred Kr.' ), - 'sl' : lambda v: dh_centuryBC( v, u'%d. stoletje pr. n. št.' ), - 'sq' : lambda v: dh_centuryBC( v, u'Shekulli %R p.e.s.' ), - 'sr' : lambda v: dh_centuryBC( v, u'%d. век пне.' ), - 'sv' : lambda v: dh( v, u'%d00-talet f.Kr.', lambda i: i-1, lambda ii: ii[0]+1 ), - 'tr' : lambda v: dh_centuryBC( v, u'MÖ %d. yüzyıl' ), - 'tt' : lambda v: dh_centuryBC( v, u'MA %d. yöz' ), - 'uk' : lambda v: dh_centuryBC( v, u'%d століття до Р.Х.' ), - 'zh' : lambda m: multi( m, [ - (lambda v: dh_centuryBC( v, u'前%d世纪' ), lambda p: p < 4), - (lambda v: dh_centuryBC( v, u'前%d世紀' ), alwaysTrue)]), + 'af': lambda m: multi(m, [ + (lambda v: dh_centuryBC(v, u'%dste eeu v.C.'), + lambda p: p in (1, 8) or (p >= 20)), + (lambda v: dh_centuryBC(v, u'%dde eeu v.C.'), alwaysTrue)]), + 'bg': lambda v: dh_centuryBC(v, u'%d век пр.н.е.'), + 'br': lambda m: multi(m, [ + (lambda v: dh_constVal(v, 1, u'Iañ kantved kt JK'), + lambda p: p == 1), + (lambda v: dh_constVal(v, 2, u'Eil kantved kt JK'), + lambda p: p == 2), + (lambda v: dh_centuryBC(v, u'%Re kantved kt JK'), + lambda p: p in (2, 3)), + (lambda v: dh_centuryBC(v, u'%Rvet kantved kt JK'), alwaysTrue)]), + 'ca': lambda v: dh_centuryBC(v, u'Segle %R aC'), + 'cs': lambda v: dh_centuryBC(v, u'%d. století př. n. l.'), + 'da': lambda v: dh_centuryBC(v, u'%d. århundrede f.Kr.'), + 'de': lambda v: dh_centuryBC(v, u'%d. Jahrhundert v. Chr.'), + 'el': lambda v: dh_centuryBC(v, u'%dος αιώνας π.Χ.'), + 'en': lambda m: multi(m, [ + (lambda v: dh_centuryBC(v, u'%dst century BC'), + lambda p: p == 1 or (p > 20 and p % 10 == 1)), + (lambda v: dh_centuryBC(v, u'%dnd century BC'), + lambda p: p == 2 or (p > 20 and p % 10 == 2)), + (lambda v: dh_centuryBC(v, u'%drd century BC'), + lambda p: p == 3 or (p > 20 and p % 10 == 3)), + (lambda v: dh_centuryBC(v, u'%dth century BC'), alwaysTrue)]), + 'eo': lambda v: dh_centuryBC(v, u'%d-a jarcento a.K.'), + 'es': lambda v: dh_centuryBC(v, u'Siglo %R adC'), + 'et': lambda v: dh_centuryBC(v, u'%d. aastatuhat eKr'), + 'fi': lambda m: multi(m, [ + (lambda v: dh_constVal(v, 1, u'Ensimmäinen vuosisata eaa.'), + lambda p: p == 1), + (lambda v: dh(v, u'%d00-luku eaa.', + lambda i: i - 1, lambda ii: ii[0] + 1), alwaysTrue)]), + 'fr': lambda m: multi(m, [ + (lambda v: dh_centuryBC(v, u'%Rer siècle av. J.-C.'), + lambda p: p == 1), + (lambda v: dh_centuryBC(v, u'%Re siècle av. J.-C.'), + alwaysTrue)]), + 'he': lambda v: dh_centuryBC(v, u'המאה ה־%d לפני הספירה'), + 'hr': lambda v: dh_centuryBC(v, u'%d. stoljeće p.n.e.'), + 'id': lambda v: dh_centuryBC(v, u'Abad ke-%d SM'), + 'io': lambda v: dh_centuryBC(v, u'%dma yar-cento aK'), + 'it': lambda v: dh_centuryBC(v, u'%R secolo AC'), + 'ja': lambda v: dh_centuryBC(v, u'紀元前%d世紀'), + 'ka': lambda v: dh_centuryBC(v, u'ძვ. წ. %R საუკუნე'), + 'ko': lambda v: dh_centuryBC(v, u'기원전 %d세기'), + 'ksh': lambda v: dh_centuryBC(v, u'%d. Joohunndot füür Kreůßtůß'), # uncertain if that's right. might go to redirect. + 'la': lambda v: dh_centuryBC(v, u'Saeculum %d a.C.n.'), + 'lb': lambda v: dh_centuryBC(v, u'%d. Joerhonnert v. Chr.'), + 'nl': lambda v: dh_centuryBC(v, u'%de eeuw v.Chr.'), + 'nn': lambda m: multi(m, [ + (lambda v: dh_constVal(v, 1, u'1. århundret fvt.'), + lambda p: p == 1), + (lambda v: dh(v, u'%d00-talet fvt.', + lambda i: i - 1, lambda ii: ii[0] + 1), alwaysTrue)]), + 'no': lambda v: dh_centuryBC(v, u'%d. århundre f.Kr.'), + 'pl': lambda v: dh_centuryBC(v, u'%R wiek p.n.e.'), + 'pt': lambda v: dh_centuryBC(v, u'Século %R a.C.'), + 'ro': lambda m: multi(m, [ + (lambda v: dh_constVal(v, 1, u'Secolul I î.Hr.'), lambda p: p == 1), + (lambda v: dh_centuryBC(v, u'Secolul al %R-lea î.Hr.'), + alwaysTrue)]), + 'ru': lambda v: dh_centuryBC(v, u'%R век до н. э.'), + 'scn': lambda v: dh_centuryBC(v, u'Sèculu %R a.C.'), + 'sk': lambda v: dh_centuryBC(v, u'%d. storočie pred Kr.'), + 'sl': lambda v: dh_centuryBC(v, u'%d. stoletje pr. n. št.'), + 'sq': lambda v: dh_centuryBC(v, u'Shekulli %R p.e.s.'), + 'sr': lambda v: dh_centuryBC(v, u'%d. век пне.'), + 'sv': lambda v: dh(v, u'%d00-talet f.Kr.', + lambda i: i - 1, lambda ii: ii[0] + 1), + 'tr': lambda v: dh_centuryBC(v, u'MÖ %d. yüzyıl'), + 'tt': lambda v: dh_centuryBC(v, u'MA %d. yöz'), + 'uk': lambda v: dh_centuryBC(v, u'%d століття до Р.Х.'), + 'zh': lambda m: multi(m, [ + (lambda v: dh_centuryBC(v, u'前%d世纪'), lambda p: p < 4), + (lambda v: dh_centuryBC(v, u'前%d世紀'), alwaysTrue)]), }, - 'CenturyAD_Cat':{ - 'cs' : lambda v: dh_centuryAD( v, u'%d. století' ), - 'da' : lambda v: dh_centuryAD( v, u'%d. århundrede' ), - 'no' : lambda v: dh( v, u'%d-tallet', lambda i: (i-1)*100, lambda ii: ii[0]/100+1 ), + 'CenturyAD_Cat': { + 'cs': lambda v: dh_centuryAD(v, u'%d. století'), + 'da': lambda v: dh_centuryAD(v, u'%d. århundrede'), + 'no': lambda v: dh(v, u'%d-tallet', + lambda i: (i-1) * 100, lambda ii: ii[0]/100 + 1), }, - 'CenturyBC_Cat':{ - 'cs' : lambda v: dh_centuryBC( v, u'%d. století př. n. l.' ), - 'de' : lambda v: dh_centuryBC( v, u'Jahr (%d. Jh. v. Chr.)' ), - 'no' : lambda v: dh( v, u'%d-tallet f.Kr.', lambda i: (i-1)*100, lambda ii: ii[0]/100+1 ), + 'CenturyBC_Cat': { + 'cs': lambda v: dh_centuryBC(v, u'%d. století př. n. l.'), + 'de': lambda v: dh_centuryBC(v, u'Jahr (%d. Jh. v. Chr.)'), + 'no': lambda v: dh(v, u'%d-tallet f.Kr.', + lambda i: (i-1) * 100, lambda ii: ii[0]/100 + 1), }, 'MillenniumAD': { - 'bg' : lambda v: dh_millenniumAD( v, u'%d хилядолетие' ), - 'ca' : lambda v: dh_millenniumAD( v, u'Mil·lenni %R' ), - 'cs' : lambda v: dh_millenniumAD( v, u'%d. tisíciletí' ), - 'de' : lambda v: dh_millenniumAD( v, u'%d. Jahrtausend' ), - 'el' : lambda v: dh_millenniumAD( v, u'%dη χιλιετία' ), - 'en' : lambda m: multi( m, [ - (lambda v: dh_millenniumAD( v, u'%dst millennium' ), lambda p: p == 1 or (p > 20 and p%10 == 1)), - (lambda v: dh_millenniumAD( v, u'%dnd millennium' ), lambda p: p == 2 or (p > 20 and p%10 == 2)), - (lambda v: dh_millenniumAD( v, u'%drd millennium' ), lambda p: p == 3 or (p > 20 and p%10 == 3)), - (lambda v: dh_millenniumAD( v, u'%dth millennium' ), alwaysTrue)]), - 'es' : lambda v: dh_millenniumAD( v, u'%R milenio' ), + 'bg': lambda v: dh_millenniumAD(v, u'%d хилядолетие'), + 'ca': lambda v: dh_millenniumAD(v, u'Mil·lenni %R'), + 'cs': lambda v: dh_millenniumAD(v, u'%d. tisíciletí'), + 'de': lambda v: dh_millenniumAD(v, u'%d. Jahrtausend'), + 'el': lambda v: dh_millenniumAD(v, u'%dη χιλιετία'), + 'en': lambda m: multi(m, [ + (lambda v: dh_millenniumAD(v, u'%dst millennium'), + lambda p: p == 1 or (p > 20 and p % 10 == 1)), + (lambda v: dh_millenniumAD(v, u'%dnd millennium'), + lambda p: p == 2 or (p > 20 and p % 10 == 2)), + (lambda v: dh_millenniumAD(v, u'%drd millennium'), + lambda p: p == 3 or (p > 20 and p % 10 == 3)), + (lambda v: dh_millenniumAD(v, u'%dth millennium'), + alwaysTrue)]), + 'es': lambda v: dh_millenniumAD(v, u'%R milenio'), - 'fa' : lambda v: dh_millenniumAD( v, u'هزاره %R (میلادی)' ), - 'fi' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 1, u'Ensimmäinen vuosituhat'), lambda p: p == 1), - (lambda v: dh_constVal( v, 2, u'Toinen vuosituhat'), lambda p: p == 2), - (lambda v: dh_constVal( v, 3, u'Kolmas vuosituhat'), lambda p: p == 3), - (lambda v: dh_constVal( v, 4, u'Neljäs vuosituhat'), lambda p: p == 4), - (lambda v: dh_constVal( v, 5, u'Viides vuosituhat'), lambda p: p == 5), - (lambda v: dh( v, u'%d000-vuosituhat', lambda i: i-1, lambda ii: ii[0]+1 ), alwaysTrue)]), + 'fa': lambda v: dh_millenniumAD(v, u'هزاره %R (میلادی)'), + 'fi': lambda m: multi(m, [ + (lambda v: dh_constVal(v, 1, u'Ensimmäinen vuosituhat'), + lambda p: p == 1), + (lambda v: dh_constVal(v, 2, u'Toinen vuosituhat'), + lambda p: p == 2), + (lambda v: dh_constVal(v, 3, u'Kolmas vuosituhat'), + lambda p: p == 3), + (lambda v: dh_constVal(v, 4, u'Neljäs vuosituhat'), + lambda p: p == 4), + (lambda v: dh_constVal(v, 5, u'Viides vuosituhat'), + lambda p: p == 5), + (lambda v: dh(v, u'%d000-vuosituhat', + lambda i: i - 1, lambda ii: ii[0]+1), alwaysTrue)]), - 'fr' : lambda m: multi( m, [ - (lambda v: dh_millenniumAD( v, u'%Rer millénaire' ), lambda p: p == 1), - (lambda v: dh_millenniumAD( v, u'%Re millénaire' ), alwaysTrue)]), - 'he' : lambda m: multi( m, [ - (lambda v: dh_millenniumAD( v, u'האלף הראשון %d' ), lambda p: p == 1), - (lambda v: dh_millenniumAD( v, u'האלף השני %d' ), lambda p: p == 2), - (lambda v: dh_millenniumAD( v, u'האלף השלישי %d' ), lambda p: p == 3), - (lambda v: dh_millenniumAD( v, u'האלף הרביעי %d' ), lambda p: p == 4), - (lambda v: dh_millenniumAD( v, u'האלף החמישי %d ' ), lambda p: p == 5), - (lambda v: dh_millenniumAD( v, u'האלף השישי %d' ), lambda p: p == 6), - (lambda v: dh_millenniumAD( v, u'האלף השביעי %d' ), lambda p: p == 7), - (lambda v: dh_millenniumAD( v, u'האלף השמיני %d' ), lambda p: p == 8), - (lambda v: dh_millenniumAD( v, u'האלף התשיעי %d' ), lambda p: p == 9), - (lambda v: dh_millenniumAD( v, u'האלף העשירי %d' ), lambda p: p == 10), - (lambda v: dh_millenniumAD( v, u'האלף ה־%d' ), alwaysTrue)]), - 'hu' : lambda v: dh_millenniumAD( v, u'%d. évezred' ), - 'it' : lambda v: dh_millenniumAD( v, u'%R millennio' ), - 'ja' : lambda v: dh_millenniumAD( v, u'%d千年紀' ), - 'ka' : lambda v: dh_millenniumAD( v, u'%R ათასწლეული' ), - 'ksh': lambda m: multi( m, [ - (lambda v: dh_constVal( v, 1, u'Eetße Johdousend'), lambda p: p == 1), - (lambda v: dh_constVal( v, 2, u'Zweijte Johdousend'), lambda p: p == 2), - (lambda v: dh_constVal( v, 3, u'Drette Johdousend'), lambda p: p == 3), - (lambda v: dh_constVal( v, 4, u'Veete Johdousend'), lambda p: p == 4), - (lambda v: dh_constVal( v, 5, u'Föfte Johdousend'), lambda p: p == 5), - (lambda v: dh_milleniumAD( v, u'%d. Johdousend'), alwaysTrue)]), - 'lb' : lambda v: dh_millenniumAD( v, u'%d. Joerdausend' ), - 'mhr': lambda v: dh_millenniumAD( v, u'%R. курым — ' ), - 'lt' : lambda v: dh_millenniumAD( v, u'%d tūkstantmetis' ), - 'pt' : lambda v: slh( v, [u'Primeiro milénio d.C.', u'Segundo milénio d.C.', u'Terceiro milénio d.C.', u'Quarto milénio d.C.'] ), - 'ro' : lambda v: slh( v, [u'Mileniul I', u'Mileniul al II-lea', u'Mileniul III'] ), - 'ru' : lambda v: dh_millenniumAD( v, u'%d тысячелетие' ), - 'sk' : lambda v: dh_millenniumAD( v, u'%d. tisícročie' ), - 'sl' : lambda v: dh_millenniumAD( v, u'%d. tisočletje' ), - 'sv' : lambda v: dh( v, u'%d000-talet (millennium)', lambda i: i-1, lambda ii: ii[0]+1 ), - 'tt' : lambda v: dh_millenniumAD( v, u'%d. meñyıllıq' ), - 'ur' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 0, u'0000مبم'), lambda p: p == 0), - (lambda v: dh_millenniumAD( v, u'%d000مبم' ), alwaysTrue)]), + 'fr': lambda m: multi(m, [ + (lambda v: dh_millenniumAD(v, u'%Rer millénaire'), + lambda p: p == 1), + (lambda v: dh_millenniumAD(v, u'%Re millénaire'), alwaysTrue)]), + 'he': lambda m: multi(m, [ + (lambda v: dh_millenniumAD(v, u'האלף הראשון %d'), lambda p: p == 1), + (lambda v: dh_millenniumAD(v, u'האלף השני %d'), lambda p: p == 2), + (lambda v: dh_millenniumAD(v, u'האלף השלישי %d'), lambda p: p == 3), + (lambda v: dh_millenniumAD(v, u'האלף הרביעי %d'), lambda p: p == 4), + (lambda v: dh_millenniumAD(v, u'האלף החמישי %d '), + lambda p: p == 5), + (lambda v: dh_millenniumAD(v, u'האלף השישי %d'), lambda p: p == 6), + (lambda v: dh_millenniumAD(v, u'האלף השביעי %d'), lambda p: p == 7), + (lambda v: dh_millenniumAD(v, u'האלף השמיני %d'), lambda p: p == 8), + (lambda v: dh_millenniumAD(v, u'האלף התשיעי %d'), lambda p: p == 9), + (lambda v: dh_millenniumAD(v, u'האלף העשירי %d'), + lambda p: p == 10), + (lambda v: dh_millenniumAD(v, u'האלף ה־%d'), alwaysTrue)]), + 'hu': lambda v: dh_millenniumAD(v, u'%d. évezred'), + 'it': lambda v: dh_millenniumAD(v, u'%R millennio'), + 'ja': lambda v: dh_millenniumAD(v, u'%d千年紀'), + 'ka': lambda v: dh_millenniumAD(v, u'%R ათასწლეული'), + 'ksh': lambda m: multi(m, [ + (lambda v: dh_constVal(v, 1, u'Eetße Johdousend'), + lambda p: p == 1), + (lambda v: dh_constVal(v, 2, u'Zweijte Johdousend'), + lambda p: p == 2), + (lambda v: dh_constVal(v, 3, u'Drette Johdousend'), + lambda p: p == 3), + (lambda v: dh_constVal(v, 4, u'Veete Johdousend'), + lambda p: p == 4), + (lambda v: dh_constVal(v, 5, u'Föfte Johdousend'), + lambda p: p == 5), + (lambda v: dh_milleniumAD(v, u'%d. Johdousend'), alwaysTrue)]), + 'lb': lambda v: dh_millenniumAD(v, u'%d. Joerdausend'), + 'mhr': lambda v: dh_millenniumAD(v, u'%R. курым — '), + 'lt': lambda v: dh_millenniumAD(v, u'%d tūkstantmetis'), + 'pt': lambda v: slh(v, [ + u'Primeiro milénio d.C.', u'Segundo milénio d.C.', + u'Terceiro milénio d.C.', u'Quarto milénio d.C.']), + 'ro': lambda v: slh(v, [u'Mileniul I', u'Mileniul al II-lea', + u'Mileniul III']), + 'ru': lambda v: dh_millenniumAD(v, u'%d тысячелетие'), + 'sk': lambda v: dh_millenniumAD(v, u'%d. tisícročie'), + 'sl': lambda v: dh_millenniumAD(v, u'%d. tisočletje'), + 'sv': lambda v: dh(v, u'%d000-talet (millennium)', + lambda i: i - 1, lambda ii: ii[0] + 1), + 'tt': lambda v: dh_millenniumAD(v, u'%d. meñyıllıq'), + 'ur': lambda m: multi(m, [ + (lambda v: dh_constVal(v, 0, u'0000مبم'), lambda p: p == 0), + (lambda v: dh_millenniumAD(v, u'%d000مبم'), alwaysTrue)]), }, 'MillenniumBC': { - 'bg' : lambda v: dh_millenniumBC( v, u'%d хилядолетие пр.н.е.' ), - 'ca' : lambda v: dh_millenniumBC( v, u'Mil·lenni %R aC' ), - 'cs' : lambda v: dh_millenniumBC( v, u'%d. tisíciletí př. n. l.' ), - 'da' : lambda v: dh_millenniumBC( v, u'%d. årtusinde f.Kr.' ), - 'de' : lambda v: dh_millenniumBC( v, u'%d. Jahrtausend v. Chr.' ), - 'el' : lambda v: dh_millenniumBC( v, u'%dη χιλιετία π.Χ.' ), - 'en' : lambda v: dh_millenniumBC( v, u'%dst millennium BC' ), - 'es' : lambda v: dh_millenniumBC( v, u'%R milenio adC' ), - 'fi' : lambda m: multi( m, [ - (lambda v: dh_constVal( v, 1, u'Ensimmäinen vuosituhat eaa.'), lambda p: p == 1), - (lambda v: dh( v, u'%d000-vuosituhat eaa.', lambda i: i-1, lambda ii: ii[0]+1 ), alwaysTrue)]), - 'fr' : lambda v: dh_millenniumBC( v, u'%Rer millénaire av. J.-C.' ), - 'he' : lambda m: multi( m, [ - (lambda v: dh_millenniumAD( v, u'האלף הראשון %d לפני הספירה' ), lambda p: p == 1), - (lambda v: dh_millenniumAD( v, u'האלף השני %d לפני הספירה' ), lambda p: p == 2), - (lambda v: dh_millenniumAD( v, u'האלף השלישי %d לפני הספירה' ), lambda p: p == 3), - (lambda v: dh_millenniumAD( v, u'האלף הרביעי %d לפני הספירה' ), lambda p: p == 4), - (lambda v: dh_millenniumAD( v, u'האלף החמישי %d לפני הספירה' ), lambda p: p == 5), - (lambda v: dh_millenniumAD( v, u'האלף השישי %d לפני הספירה' ), lambda p: p == 6), - (lambda v: dh_millenniumAD( v, u'האלף השביעי %d לפני הספירה' ), lambda p: p == 7), - (lambda v: dh_millenniumAD( v, u'האלף השמיני %d לפני הספירה' ), lambda p: p == 8), - (lambda v: dh_millenniumAD( v, u'האלף התשיעי %d לפני הספירה' ), lambda p: p == 9), - (lambda v: dh_millenniumAD( v, u'האלף העשירי %d לפני הספירה' ), lambda p: p == 10), - (lambda v: dh_millenniumAD( v, u'האלף ה־%d לפני הספירה' ), alwaysTrue)]), - 'hu' : lambda v: dh_millenniumBC( v, u'I. e. %d. évezred' ), - 'it' : lambda v: dh_millenniumBC( v, u'%R millennio AC' ), - 'ja' : lambda v: dh_millenniumBC( v, u'紀元前%d千年紀' ), - 'ka' : lambda v: dh_millenniumBC( v, u'ძვ. წ. %R ათასწლეული' ), - 'lb' : lambda v: dh_millenniumBC( v, u'%d. Joerdausend v. Chr.' ), - 'nl' : lambda v: dh_millenniumBC( v, u'%de millennium v.Chr.' ), - 'pt' : lambda v: slh( v, [u'Primeiro milénio a.C.', u'Segundo milénio a.C.', u'Terceiro milénio a.C.', u'Quarto milénio a.C.'] ), - 'ro' : lambda v: dh_millenniumBC( v, u'Mileniul %R î.Hr.' ), - 'ru' : lambda v: dh_millenniumBC( v, u'%d тысячелетие до н. э.' ), - 'sv' : lambda v: dh( v, u'%d000-talet f.Kr. (millennium)', lambda i: i-1, lambda ii: ii[0]+1 ), - 'tt' : lambda v: dh_millenniumBC( v, u'MA %d. meñyıllıq' ), - 'zh' : lambda v: dh_millenniumBC( v, u'前%d千年' ), + 'bg': lambda v: dh_millenniumBC(v, u'%d хилядолетие пр.н.е.'), + 'ca': lambda v: dh_millenniumBC(v, u'Mil·lenni %R aC'), + 'cs': lambda v: dh_millenniumBC(v, u'%d. tisíciletí př. n. l.'), + 'da': lambda v: dh_millenniumBC(v, u'%d. årtusinde f.Kr.'), + 'de': lambda v: dh_millenniumBC(v, u'%d. Jahrtausend v. Chr.'), + 'el': lambda v: dh_millenniumBC(v, u'%dη χιλιετία π.Χ.'), + 'en': lambda v: dh_millenniumBC(v, u'%dst millennium BC'), + 'es': lambda v: dh_millenniumBC(v, u'%R milenio adC'), + 'fi': lambda m: multi(m, [ + (lambda v: dh_constVal(v, 1, u'Ensimmäinen vuosituhat eaa.'), + lambda p: p == 1), + (lambda v: dh(v, u'%d000-vuosituhat eaa.', + lambda i: i - 1, lambda ii: ii[0] + 1), alwaysTrue)]), + 'fr': lambda v: dh_millenniumBC(v, u'%Rer millénaire av. J.-C.'), + 'he': lambda m: multi(m, [ + (lambda v: dh_millenniumAD(v, u'האלף הראשון %d לפני הספירה'), + lambda p: p == 1), + (lambda v: dh_millenniumAD(v, u'האלף השני %d לפני הספירה'), + lambda p: p == 2), + (lambda v: dh_millenniumAD(v, u'האלף השלישי %d לפני הספירה'), + lambda p: p == 3), + (lambda v: dh_millenniumAD(v, u'האלף הרביעי %d לפני הספירה'), + lambda p: p == 4), + (lambda v: dh_millenniumAD(v, u'האלף החמישי %d לפני הספירה'), + lambda p: p == 5), + (lambda v: dh_millenniumAD(v, u'האלף השישי %d לפני הספירה'), + lambda p: p == 6), + (lambda v: dh_millenniumAD(v, u'האלף השביעי %d לפני הספירה'), + lambda p: p == 7), + (lambda v: dh_millenniumAD(v, u'האלף השמיני %d לפני הספירה'), + lambda p: p == 8), + (lambda v: dh_millenniumAD(v, u'האלף התשיעי %d לפני הספירה'), + lambda p: p == 9), + (lambda v: dh_millenniumAD(v, u'האלף העשירי %d לפני הספירה'), + lambda p: p == 10), + (lambda v: dh_millenniumAD(v, u'האלף ה־%d לפני הספירה'), + alwaysTrue)]), + 'hu': lambda v: dh_millenniumBC(v, u'I. e. %d. évezred'), + 'it': lambda v: dh_millenniumBC(v, u'%R millennio AC'), + 'ja': lambda v: dh_millenniumBC(v, u'紀元前%d千年紀'), + 'ka': lambda v: dh_millenniumBC(v, u'ძვ. წ. %R ათასწლეული'), + 'lb': lambda v: dh_millenniumBC(v, u'%d. Joerdausend v. Chr.'), + 'nl': lambda v: dh_millenniumBC(v, u'%de millennium v.Chr.'), + 'pt': lambda v: slh(v, [u'Primeiro milénio a.C.', + u'Segundo milénio a.C.', + u'Terceiro milénio a.C.', + u'Quarto milénio a.C.']), + 'ro': lambda v: dh_millenniumBC(v, u'Mileniul %R î.Hr.'), + 'ru': lambda v: dh_millenniumBC(v, u'%d тысячелетие до н. э.'), + 'sv': lambda v: dh(v, u'%d000-talet f.Kr. (millennium)', + lambda i: i - 1, lambda ii: ii[0] + 1), + 'tt': lambda v: dh_millenniumBC(v, u'MA %d. meñyıllıq'), + 'zh': lambda v: dh_millenniumBC(v, u'前%d千年'), }, 'Cat_Year_MusicAlbums': { - 'cs' : lambda v: dh_yearAD( v, u'Alba roku %d' ), - 'en' : lambda v: dh_yearAD( v, u'%d albums' ), - 'fa' : lambda v: dh_yearAD( v, u'آلبوم‌های %d (میلادی)'), - 'fi' : lambda v: dh_yearAD( v, u'Vuoden %d albumit' ), - 'fr' : lambda v: dh_yearAD( v, u'Album musical sorti en %d' ), - 'he' : lambda v: dh_yearAD( v, u'אלבומי %d' ), - 'no' : lambda v: dh_yearAD( v, u'Musikkalbum fra %d' ), - 'pl' : lambda v: dh_yearAD( v, u'Albumy muzyczne wydane w roku %d' ), - 'sl' : lambda v: dh_yearAD( v, u'Albumi iz %d' ), - 'sv' : lambda v: dh_yearAD( v, u'%d års musikalbum' ), + 'cs': lambda v: dh_yearAD(v, u'Alba roku %d'), + 'en': lambda v: dh_yearAD(v, u'%d albums'), + 'fa': lambda v: dh_yearAD(v, u'آلبوم‌های %d (میلادی)'), + 'fi': lambda v: dh_yearAD(v, u'Vuoden %d albumit'), + 'fr': lambda v: dh_yearAD(v, u'Album musical sorti en %d'), + 'he': lambda v: dh_yearAD(v, u'אלבומי %d'), + 'no': lambda v: dh_yearAD(v, u'Musikkalbum fra %d'), + 'pl': lambda v: dh_yearAD(v, u'Albumy muzyczne wydane w roku %d'), + 'sl': lambda v: dh_yearAD(v, u'Albumi iz %d'), + 'sv': lambda v: dh_yearAD(v, u'%d års musikalbum'), }, 'Cat_BirthsAD': { - 'an' : lambda v: dh_yearAD( v, u'%d (naixencias)' ), - 'ar' : lambda v: dh_yearAD( v, u'مواليد %d' ), - 'arz' : lambda v: dh_yearAD( v, u'مواليد %d'), - 'bar' : lambda v: dh_yearAD( v, u'Geboren %d' ), - 'be' : lambda v: dh_yearAD( v, u'Нарадзіліся ў %d годзе' ), - 'be-x-old' : lambda v: dh_yearAD( v, u'Нарадзіліся ў %d годзе' ), - 'bg' : lambda v: dh_yearAD( v, u'Родени през %d година' ), - 'bjn' : lambda v: dh_yearAD( v, u'Kalahiran %d' ), - 'bn' : lambda v: dh_yearAD( v, u'%B-এ জন্ম' ), - 'bpy' : lambda v: dh_yearAD( v, u'মারি %B-এ উজ্জিসিতা' ), - 'br' : lambda v: dh_yearAD( v, u'Ganedigezhioù %d' ), - 'bs' : lambda v: dh_yearAD( v, u'%d rođenja' ), - 'cbk-zam' : lambda v: dh_yearAD( v, u'Nacidos en %d' ), - 'crh' : lambda v: dh_yearAD( v, u'%d senesinde doğğanlar' ), - 'cs' : lambda v: dh_yearAD( v, u'Narození %d' ), - 'cy' : lambda v: dh_yearAD( v, u'Genedigaethau %d' ), - 'da' : lambda v: dh_yearAD( v, u'Født i %d' ), - 'de' : lambda v: dh_yearAD( v, u'Geboren %d' ), - 'dsb' : lambda v: dh_yearAD( v, u'Roź. %d' ), - 'el' : lambda v: dh_yearAD( v, u'Γεννήσεις το %d' ), - 'en' : lambda v: dh_yearAD( v, u'%d births' ), - 'eo' : lambda v: dh_yearAD( v, u'Naskiĝintoj en %d' ), - 'es' : lambda v: dh_yearAD( v, u'Nacidos en %d' ), - 'et' : lambda v: dh_yearAD( v, u'Sündinud %d' ), - 'eu' : lambda v: dh_yearAD( v, u'%dko jaiotzak' ), - 'fi' : lambda v: dh_yearAD( v, u'Vuonna %d syntyneet' ), - 'fa' : lambda v: dh_yearAD( v, u'زادگان %F (میلادی)' ), - 'fr' : lambda v: dh_yearAD( v, u'Naissance en %d' ), - 'ga' : lambda v: dh_yearAD( v, u'Daoine a rugadh i %d' ), - 'gan' : lambda v: dh_yearAD( v, u'%d年出世' ), - 'gv' : lambda v: dh_yearAD( v, u'Ruggyryn \'sy vlein %d' ), - 'hsb' : lambda v: dh_yearAD( v, u'Rodź. %d' ), - 'hy' : lambda v: dh_yearAD( v, u'%d ծնունդներ' ), - 'id' : lambda v: dh_yearAD( v, u'Kelahiran %d' ), - 'is' : lambda v: dh_yearAD( v, u'Fólk fætt árið %d' ), - 'it' : lambda v: dh_yearAD( v, u'Nati nel %d' ), - 'ja' : lambda v: dh_yearAD( v, u'%d年生' ), - 'jv' : lambda v: dh_yearAD( v, u'Lair %d' ), - 'ka' : lambda v: dh_yearAD( v, u'დაბადებული %d' ), - 'kk' : lambda v: dh_yearAD( v, u'%d жылы туғандар' ), - 'ko' : lambda v: dh_yearAD( v, u'%d년 태어남' ), - 'la' : lambda v: dh_yearAD( v, u'Nati %d' ), - 'lb' : lambda v: dh_yearAD( v, u'Gebuer %d' ), - 'lv' : lambda v: dh_yearAD( v, u'%d. gadā dzimušiel' ), - 'mk' : lambda v: dh_yearAD( v, u'Родени во %d година' ), - 'ml' : lambda v: dh_yearAD( v, u'%d-ൽ ജനിച്ചവർ' ), - 'mn' : lambda v: dh_yearAD( v, u'%d онд төрөгсөд' ), - 'mr' : lambda v: dh_yearAD( v, u'इ.स. %H मधील जन्म' ), - 'ms' : lambda v: dh_yearAD( v, u'Kelahiran %d' ), - 'mt' : lambda v: dh_yearAD( v, u'Twieldu fl-%d' ), - 'nah' : lambda v: dh_yearAD( v, u'Ōtlācatqueh xiuhpan %d' ), - 'new' : lambda v: dh_yearAD( v, u'%Hय् बुगु' ), - 'nn' : lambda v: dh_yearAD( v, u'Fødde i %d' ), - 'no' : lambda v: dh_yearAD( v, u'Fødsler i %d' ), - 'oc' : lambda v: dh_yearAD( v, u'Naissença en %d' ), - 'pdc' : lambda v: dh_yearAD( v, u'Gebore %d' ), - 'pl' : lambda v: dh_yearAD( v, u'Urodzeni w %d' ), - 'qu' : lambda v: dh_yearAD( v, u'Paqarisqa %d' ), - 'ro' : lambda v: dh_yearAD( v, u'Nașteri în %d' ), - 'ru' : lambda v: dh_yearAD( v, u'Родившиеся в %d году' ), - 'sah' : lambda v: dh_yearAD( v, u'%d сыллаахха төрөөбүттэр' ), - 'se' : lambda v: dh_yearAD( v, u'Riegádeamit %d' ), - 'sh' : lambda v: dh_yearAD( v, u'Rođeni %d.' ), - 'simple' : lambda v: dh_yearAD( v, u'%d births' ), - 'sk' : lambda v: dh_yearAD( v, u'Narodenia v %d' ), - 'sl' : lambda v: dh_yearAD( v, u'Rojeni leta %d' ), - 'sq' : lambda v: dh_yearAD( v, u'Lindje %d' ), - 'sr' : lambda v: dh_yearAD( v, u'Рођени %d.' ), - 'sv' : lambda v: dh_yearAD( v, u'Födda %d' ), - 'sw' : lambda v: dh_yearAD( v, u'Waliozaliwa %d' ), - 'szl' : lambda v: dh_yearAD( v, u'Rodzyńi we %d' ), - 'ta' : lambda v: dh_yearAD( v, u'%d பிறப்புகள்' ), - 'te' : lambda v: dh_yearAD( v, u'%d జననాలు' ), - 'th' : lambda v: dh_yearAD( v, u'บุคคลที่เกิดในปี พ.ศ. %T' ), - 'tl' : lambda v: dh_yearAD( v, u'Ipinanganak noong %d' ), - 'tr' : lambda v: dh_yearAD( v, u'%d doğumlular' ), - 'tt' : lambda v: dh_yearAD( v, u'%d елда туганнар' ), - 'uk' : lambda v: dh_yearAD( v, u'Народились %d' ), - 'vi' : lambda v: dh_yearAD( v, u'Sinh %d' ), - 'war' : lambda v: dh_yearAD( v, u'Mga natawo han %d' ), - 'yo' : lambda v: dh_yearAD( v, u'Àwọn ọjọ́ìbí ní %d' ), - 'zh' : lambda v: dh_yearAD( v, u'%d年出生' ), - 'zh-yue' : lambda v: dh_yearAD( v, u'%d年出世' ), + 'an': lambda v: dh_yearAD(v, u'%d (naixencias)'), + 'ar': lambda v: dh_yearAD(v, u'مواليد %d'), + 'arz': lambda v: dh_yearAD(v, u'مواليد %d'), + 'bar': lambda v: dh_yearAD(v, u'Geboren %d'), + 'be': lambda v: dh_yearAD(v, u'Нарадзіліся ў %d годзе'), + 'be-x-old': lambda v: dh_yearAD(v, u'Нарадзіліся ў %d годзе'), + 'bg': lambda v: dh_yearAD(v, u'Родени през %d година'), + 'bjn': lambda v: dh_yearAD(v, u'Kalahiran %d'), + 'bn': lambda v: dh_yearAD(v, u'%B-এ জন্ম'), + 'bpy': lambda v: dh_yearAD(v, u'মারি %B-এ উজ্জিসিতা'), + 'br': lambda v: dh_yearAD(v, u'Ganedigezhioù %d'), + 'bs': lambda v: dh_yearAD(v, u'%d rođenja'), + 'cbk-zam': lambda v: dh_yearAD(v, u'Nacidos en %d'), + 'crh': lambda v: dh_yearAD(v, u'%d senesinde doğğanlar'), + 'cs': lambda v: dh_yearAD(v, u'Narození %d'), + 'cy': lambda v: dh_yearAD(v, u'Genedigaethau %d'), + 'da': lambda v: dh_yearAD(v, u'Født i %d'), + 'de': lambda v: dh_yearAD(v, u'Geboren %d'), + 'dsb': lambda v: dh_yearAD(v, u'Roź. %d'), + 'el': lambda v: dh_yearAD(v, u'Γεννήσεις το %d'), + 'en': lambda v: dh_yearAD(v, u'%d births'), + 'eo': lambda v: dh_yearAD(v, u'Naskiĝintoj en %d'), + 'es': lambda v: dh_yearAD(v, u'Nacidos en %d'), + 'et': lambda v: dh_yearAD(v, u'Sündinud %d'), + 'eu': lambda v: dh_yearAD(v, u'%dko jaiotzak'), + 'fi': lambda v: dh_yearAD(v, u'Vuonna %d syntyneet'), + 'fa': lambda v: dh_yearAD(v, u'زادگان %F (میلادی)'), + 'fr': lambda v: dh_yearAD(v, u'Naissance en %d'), + 'ga': lambda v: dh_yearAD(v, u'Daoine a rugadh i %d'), + 'gan': lambda v: dh_yearAD(v, u'%d年出世'), + 'gv': lambda v: dh_yearAD(v, u'Ruggyryn \'sy vlein %d'), + 'hsb': lambda v: dh_yearAD(v, u'Rodź. %d'), + 'hy': lambda v: dh_yearAD(v, u'%d ծնունդներ'), + 'id': lambda v: dh_yearAD(v, u'Kelahiran %d'), + 'is': lambda v: dh_yearAD(v, u'Fólk fætt árið %d'), + 'it': lambda v: dh_yearAD(v, u'Nati nel %d'), + 'ja': lambda v: dh_yearAD(v, u'%d年生'), + 'jv': lambda v: dh_yearAD(v, u'Lair %d'), + 'ka': lambda v: dh_yearAD(v, u'დაბადებული %d'), + 'kk': lambda v: dh_yearAD(v, u'%d жылы туғандар'), + 'ko': lambda v: dh_yearAD(v, u'%d년 태어남'), + 'la': lambda v: dh_yearAD(v, u'Nati %d'), + 'lb': lambda v: dh_yearAD(v, u'Gebuer %d'), + 'lv': lambda v: dh_yearAD(v, u'%d. gadā dzimušiel'), + 'mk': lambda v: dh_yearAD(v, u'Родени во %d година'), + 'ml': lambda v: dh_yearAD(v, u'%d-ൽ ജനിച്ചവർ'), + 'mn': lambda v: dh_yearAD(v, u'%d онд төрөгсөд'), + 'mr': lambda v: dh_yearAD(v, u'इ.स. %H मधील जन्म'), + 'ms': lambda v: dh_yearAD(v, u'Kelahiran %d'), + 'mt': lambda v: dh_yearAD(v, u'Twieldu fl-%d'), + 'nah': lambda v: dh_yearAD(v, u'Ōtlācatqueh xiuhpan %d'), + 'new': lambda v: dh_yearAD(v, u'%Hय् बुगु'), + 'nn': lambda v: dh_yearAD(v, u'Fødde i %d'), + 'no': lambda v: dh_yearAD(v, u'Fødsler i %d'), + 'oc': lambda v: dh_yearAD(v, u'Naissença en %d'), + 'pdc': lambda v: dh_yearAD(v, u'Gebore %d'), + 'pl': lambda v: dh_yearAD(v, u'Urodzeni w %d'), + 'qu': lambda v: dh_yearAD(v, u'Paqarisqa %d'), + 'ro': lambda v: dh_yearAD(v, u'Nașteri în %d'), + 'ru': lambda v: dh_yearAD(v, u'Родившиеся в %d году'), + 'sah': lambda v: dh_yearAD(v, u'%d сыллаахха төрөөбүттэр'), + 'se': lambda v: dh_yearAD(v, u'Riegádeamit %d'), + 'sh': lambda v: dh_yearAD(v, u'Rođeni %d.'), + 'simple': lambda v: dh_yearAD(v, u'%d births'), + 'sk': lambda v: dh_yearAD(v, u'Narodenia v %d'), + 'sl': lambda v: dh_yearAD(v, u'Rojeni leta %d'), + 'sq': lambda v: dh_yearAD(v, u'Lindje %d'), + 'sr': lambda v: dh_yearAD(v, u'Рођени %d.'), + 'sv': lambda v: dh_yearAD(v, u'Födda %d'), + 'sw': lambda v: dh_yearAD(v, u'Waliozaliwa %d'), + 'szl': lambda v: dh_yearAD(v, u'Rodzyńi we %d'), + 'ta': lambda v: dh_yearAD(v, u'%d பிறப்புகள்'), + 'te': lambda v: dh_yearAD(v, u'%d జననాలు'), + 'th': lambda v: dh_yearAD(v, u'บุคคลที่เกิดในปี พ.ศ. %T'), + 'tl': lambda v: dh_yearAD(v, u'Ipinanganak noong %d'), + 'tr': lambda v: dh_yearAD(v, u'%d doğumlular'), + 'tt': lambda v: dh_yearAD(v, u'%d елда туганнар'), + 'uk': lambda v: dh_yearAD(v, u'Народились %d'), + 'vi': lambda v: dh_yearAD(v, u'Sinh %d'), + 'war': lambda v: dh_yearAD(v, u'Mga natawo han %d'), + 'yo': lambda v: dh_yearAD(v, u'Àwọn ọjọ́ìbí ní %d'), + 'zh': lambda v: dh_yearAD(v, u'%d年出生'), + 'zh-yue': lambda v: dh_yearAD(v, u'%d年出世'), }, 'Cat_DeathsAD': { - 'an' : lambda v: dh_yearAD( v, u'%d (muertes)' ), - 'ay' : lambda v: dh_yearAD( v, u'Jiwäwi %d' ), - 'ar' : lambda v: dh_yearAD( v, u'وفيات %d' ), - 'ba' : lambda v: dh_yearAD( v, u'%d йылда үлгәндәр' ), - 'bar' : lambda v: dh_yearAD( v, u'Gestorben %d' ), - 'be' : lambda v: dh_yearAD( v, u'Памерлі ў %d годзе' ), - 'be-x-old' : lambda v: dh_yearAD( v, u'Памерлі ў %d годзе' ), - 'bg' : lambda v: dh_yearAD( v, u'Починали през %d година' ), - 'bn' : lambda v: dh_yearAD( v, u'%B-এ মৃত্যু' ), - 'br' : lambda v: dh_yearAD( v, u'Marvioù %d' ), - 'bs' : lambda v: dh_yearAD( v, u'%d smrti' ), - 'crh' : lambda v: dh_yearAD( v, u'%d senesinde ölgenler' ), - 'cs' : lambda v: dh_yearAD( v, u'Úmrtí %d' ), - 'cy' : lambda v: dh_yearAD( v, u'Marwolaethau %d' ), - 'da' : lambda v: dh_yearAD( v, u'Døde i %d' ), - 'de' : lambda v: dh_yearAD( v, u'Gestorben %d' ), - 'dsb' : lambda v: dh_yearAD( v, u'Wum. %d' ), - 'el' : lambda v: dh_yearAD( v, u'Θάνατοι το %d' ), - 'en' : lambda v: dh_yearAD( v, u'%d deaths' ), - 'eo' : lambda v: dh_yearAD( v, u'Mortintoj en %d' ), - 'es' : lambda v: dh_yearAD( v, u'Fallecidos en %d' ), - 'et' : lambda v: dh_yearAD( v, u'Surnud %d' ), - 'eu' : lambda v: dh_yearAD( v, u'%deko heriotzak' ), - 'fa' : lambda v: dh_yearAD( v, u'درگذشتگان %F (میلادی)' ), - 'fi' : lambda v: dh_yearAD( v, u'Vuonna %d kuolleet' ), - 'fr' : lambda v: dh_yearAD( v, u'Décès en %d' ), - 'ga' : lambda v: dh_yearAD( v, u'Básanna i %d' ), - 'gan' : lambda v: dh_yearAD( v, u'%d年過世' ), - 'gv' : lambda v: dh_yearAD( v, u'Baaseyn \'sy vlein %d' ), - 'hif' : lambda v: dh_yearAD( v, u'%d maut' ), - 'hsb' : lambda v: dh_yearAD( v, u'Zemr. %d' ), - 'hy' : lambda v: dh_yearAD( v, u'%d մահեր' ), - 'id' : lambda v: dh_yearAD( v, u'Kematian %d' ), - 'is' : lambda v: dh_yearAD( v, u'Fólk dáið árið %d' ), - 'it' : lambda v: dh_yearAD( v, u'Morti nel %d' ), - 'ja' : lambda v: dh_yearAD( v, u'%d年没' ), - 'jv' : lambda v: dh_yearAD( v, u'Pati %d' ), - 'ka' : lambda v: dh_yearAD( v, u'გარდაცვლილი %d' ), - 'kk' : lambda v: dh_yearAD( v, u'%d жылы қайтыс болғандар' ), - 'ko' : lambda v: dh_yearAD( v, u'%d년 죽음' ), - 'krc' : lambda v: dh_yearAD( v, u'%d джылда ёлгенле' ), - 'ky' : lambda v: dh_yearAD( v, u'%d жылы кайтыш болгандар' ), - 'la' : lambda v: dh_yearAD( v, u'Mortui %d' ), - 'lb' : lambda v: dh_yearAD( v, u'Gestuerwen %d' ), - 'lv' : lambda v: dh_yearAD( v, u'%d. gadā mirušie' ), - 'mk' : lambda v: dh_yearAD( v, u'Починати во %d година' ), - 'ml' : lambda v: dh_yearAD( v, u'%d-ൽ മരിച്ചവർ' ), - 'mn' : lambda v: dh_yearAD( v, u'%d онд нас барагсад' ), - 'ms' : lambda v: dh_yearAD( v, u'Kematian %d' ), - 'mt' : lambda v: dh_yearAD( v, u'Mietu fl-%d' ), - 'nah' : lambda v: dh_yearAD( v, u'%d miquiztli' ), - 'nn' : lambda v: dh_yearAD( v, u'Døde i %d' ), - 'no' : lambda v: dh_yearAD( v, u'Dødsfall i %d' ), - 'oc' : lambda v: dh_yearAD( v, u'Decès en %d' ), - 'pdc' : lambda v: dh_yearAD( v, u'Gschtaerewe %d' ), - 'pl' : lambda v: dh_yearAD( v, u'Zmarli w %d' ), - 'pt' : lambda v: dh_yearAD( v, u'Mortos em %d' ), - 'qu' : lambda v: dh_yearAD( v, u'Wañusqa %d' ), - 'ro' : lambda v: dh_yearAD( v, u'Decese în %d' ), - 'ru' : lambda v: dh_yearAD( v, u'Умершие в %d году' ), - 'sah' : lambda v: dh_yearAD( v, u'%d сыллаахха өлбүттэр' ), - 'se' : lambda v: dh_yearAD( v, u'Jápmimat %d' ), - 'sh' : lambda v: dh_yearAD( v, u'Umrli %d.' ), - 'simple' : lambda v: dh_yearAD( v, u'%d deaths' ), - 'sk' : lambda v: dh_yearAD( v, u'Úmrtia v %d' ), - 'sl' : lambda v: dh_yearAD( v, u'Umrli leta %d' ), - 'sq' : lambda v: dh_yearAD( v, u'Vdekje %d' ), - 'sr' : lambda v: dh_yearAD( v, u'Умрли %d.' ), - 'sv' : lambda v: dh_yearAD( v, u'Avlidna %d' ), - 'sw' : lambda v: dh_yearAD( v, u'Waliofariki %d' ), - 'szl' : lambda v: dh_yearAD( v, u'Umarći we %d' ), - 'ta' : lambda v: dh_yearAD( v, u'%d இறப்புகள்' ), - 'te' : lambda v: dh_yearAD( v, u'%d మరణాలు' ), - 'th' : lambda v: dh_yearAD( v, u'บุคคลที่เสียชีวิตในปี พ.ศ. %T' ), - 'tl' : lambda v: dh_yearAD( v, u'Namatay noong %d' ), - 'tr' : lambda v: dh_yearAD( v, u'%d yılında ölenler' ), - 'tt' : lambda v: dh_yearAD( v, u'%d елда вафатлар' ), - 'uk' : lambda v: dh_yearAD( v, u'Померли %d' ), - 'vi' : lambda v: dh_yearAD( v, u'Mất %d' ), - 'war' : lambda v: dh_yearAD( v, u'Mga namatay han %d' ), - 'yo' : lambda v: dh_yearAD( v, u'Àwọn ọjọ́aláìsí ní %d' ), - 'zh' : lambda v: dh_yearAD( v, u'%d年逝世' ), - 'zh-yue' : lambda v: dh_yearAD( v, u'%d年死' ), + 'an': lambda v: dh_yearAD(v, u'%d (muertes)'), + 'ay': lambda v: dh_yearAD(v, u'Jiwäwi %d'), + 'ar': lambda v: dh_yearAD(v, u'وفيات %d'), + 'ba': lambda v: dh_yearAD(v, u'%d йылда үлгәндәр'), + 'bar': lambda v: dh_yearAD(v, u'Gestorben %d'), + 'be': lambda v: dh_yearAD(v, u'Памерлі ў %d годзе'), + 'be-x-old': lambda v: dh_yearAD(v, u'Памерлі ў %d годзе'), + 'bg': lambda v: dh_yearAD(v, u'Починали през %d година'), + 'bn': lambda v: dh_yearAD(v, u'%B-এ মৃত্যু'), + 'br': lambda v: dh_yearAD(v, u'Marvioù %d'), + 'bs': lambda v: dh_yearAD(v, u'%d smrti'), + 'crh': lambda v: dh_yearAD(v, u'%d senesinde ölgenler'), + 'cs': lambda v: dh_yearAD(v, u'Úmrtí %d'), + 'cy': lambda v: dh_yearAD(v, u'Marwolaethau %d'), + 'da': lambda v: dh_yearAD(v, u'Døde i %d'), + 'de': lambda v: dh_yearAD(v, u'Gestorben %d'), + 'dsb': lambda v: dh_yearAD(v, u'Wum. %d'), + 'el': lambda v: dh_yearAD(v, u'Θάνατοι το %d'), + 'en': lambda v: dh_yearAD(v, u'%d deaths'), + 'eo': lambda v: dh_yearAD(v, u'Mortintoj en %d'), + 'es': lambda v: dh_yearAD(v, u'Fallecidos en %d'), + 'et': lambda v: dh_yearAD(v, u'Surnud %d'), + 'eu': lambda v: dh_yearAD(v, u'%deko heriotzak'), + 'fa': lambda v: dh_yearAD(v, u'درگذشتگان %F (میلادی)'), + 'fi': lambda v: dh_yearAD(v, u'Vuonna %d kuolleet'), + 'fr': lambda v: dh_yearAD(v, u'Décès en %d'), + 'ga': lambda v: dh_yearAD(v, u'Básanna i %d'), + 'gan': lambda v: dh_yearAD(v, u'%d年過世'), + 'gv': lambda v: dh_yearAD(v, u'Baaseyn \'sy vlein %d'), + 'hif': lambda v: dh_yearAD(v, u'%d maut'), + 'hsb': lambda v: dh_yearAD(v, u'Zemr. %d'), + 'hy': lambda v: dh_yearAD(v, u'%d մահեր'), + 'id': lambda v: dh_yearAD(v, u'Kematian %d'), + 'is': lambda v: dh_yearAD(v, u'Fólk dáið árið %d'), + 'it': lambda v: dh_yearAD(v, u'Morti nel %d'), + 'ja': lambda v: dh_yearAD(v, u'%d年没'), + 'jv': lambda v: dh_yearAD(v, u'Pati %d'), + 'ka': lambda v: dh_yearAD(v, u'გარდაცვლილი %d'), + 'kk': lambda v: dh_yearAD(v, u'%d жылы қайтыс болғандар'), + 'ko': lambda v: dh_yearAD(v, u'%d년 죽음'), + 'krc': lambda v: dh_yearAD(v, u'%d джылда ёлгенле'), + 'ky': lambda v: dh_yearAD(v, u'%d жылы кайтыш болгандар'), + 'la': lambda v: dh_yearAD(v, u'Mortui %d'), + 'lb': lambda v: dh_yearAD(v, u'Gestuerwen %d'), + 'lv': lambda v: dh_yearAD(v, u'%d. gadā mirušie'), + 'mk': lambda v: dh_yearAD(v, u'Починати во %d година'), + 'ml': lambda v: dh_yearAD(v, u'%d-ൽ മരിച്ചവർ'), + 'mn': lambda v: dh_yearAD(v, u'%d онд нас барагсад'), + 'ms': lambda v: dh_yearAD(v, u'Kematian %d'), + 'mt': lambda v: dh_yearAD(v, u'Mietu fl-%d'), + 'nah': lambda v: dh_yearAD(v, u'%d miquiztli'), + 'nn': lambda v: dh_yearAD(v, u'Døde i %d'), + 'no': lambda v: dh_yearAD(v, u'Dødsfall i %d'), + 'oc': lambda v: dh_yearAD(v, u'Decès en %d'), + 'pdc': lambda v: dh_yearAD(v, u'Gschtaerewe %d'), + 'pl': lambda v: dh_yearAD(v, u'Zmarli w %d'), + 'pt': lambda v: dh_yearAD(v, u'Mortos em %d'), + 'qu': lambda v: dh_yearAD(v, u'Wañusqa %d'), + 'ro': lambda v: dh_yearAD(v, u'Decese în %d'), + 'ru': lambda v: dh_yearAD(v, u'Умершие в %d году'), + 'sah': lambda v: dh_yearAD(v, u'%d сыллаахха өлбүттэр'), + 'se': lambda v: dh_yearAD(v, u'Jápmimat %d'), + 'sh': lambda v: dh_yearAD(v, u'Umrli %d.'), + 'simple': lambda v: dh_yearAD(v, u'%d deaths'), + 'sk': lambda v: dh_yearAD(v, u'Úmrtia v %d'), + 'sl': lambda v: dh_yearAD(v, u'Umrli leta %d'), + 'sq': lambda v: dh_yearAD(v, u'Vdekje %d'), + 'sr': lambda v: dh_yearAD(v, u'Умрли %d.'), + 'sv': lambda v: dh_yearAD(v, u'Avlidna %d'), + 'sw': lambda v: dh_yearAD(v, u'Waliofariki %d'), + 'szl': lambda v: dh_yearAD(v, u'Umarći we %d'), + 'ta': lambda v: dh_yearAD(v, u'%d இறப்புகள்'), + 'te': lambda v: dh_yearAD(v, u'%d మరణాలు'), + 'th': lambda v: dh_yearAD(v, u'บุคคลที่เสียชีวิตในปี พ.ศ. %T'), + 'tl': lambda v: dh_yearAD(v, u'Namatay noong %d'), + 'tr': lambda v: dh_yearAD(v, u'%d yılında ölenler'), + 'tt': lambda v: dh_yearAD(v, u'%d елда вафатлар'), + 'uk': lambda v: dh_yearAD(v, u'Померли %d'), + 'vi': lambda v: dh_yearAD(v, u'Mất %d'), + 'war': lambda v: dh_yearAD(v, u'Mga namatay han %d'), + 'yo': lambda v: dh_yearAD(v, u'Àwọn ọjọ́aláìsí ní %d'), + 'zh': lambda v: dh_yearAD(v, u'%d年逝世'), + 'zh-yue': lambda v: dh_yearAD(v, u'%d年死'), }, 'Cat_BirthsBC': { - 'en' : lambda v: dh_yearBC( v, u'%d BC births' ), - 'no' : lambda v: dh_yearBC( v, u'Fødsler i %d f.Kr.' ), + 'en': lambda v: dh_yearBC(v, u'%d BC births'), + 'no': lambda v: dh_yearBC(v, u'Fødsler i %d f.Kr.'), }, 'Cat_DeathsBC': { - 'en' : lambda v: dh_yearBC( v, u'%d BC deaths' ), - 'fr' : lambda v: dh_yearBC( v, u'Décès en -%d' ), - 'no' : lambda v: dh_yearBC( v, u'Dødsfall i %d f.Kr.' ), + 'en': lambda v: dh_yearBC(v, u'%d BC deaths'), + 'fr': lambda v: dh_yearBC(v, u'Décès en -%d'), + 'no': lambda v: dh_yearBC(v, u'Dødsfall i %d f.Kr.'), }, 'CurrEvents': { - 'an' : lambda v: dh_singVal( v, u'Autualidá' ), - 'ang': lambda v: dh_singVal( v, u'Efenealde belimpas' ), - 'ar' : lambda v: dh_singVal( v, u'الأحداث الجارية' ), - 'be' : lambda v: dh_singVal( v, u'Бягучыя падзеі' ), - 'bg' : lambda v: dh_singVal( v, u'Текущи събития' ), - 'ca' : lambda v: dh_singVal( v, u'Viquipèdia:Actualitat' ), - 'cs' : lambda v: dh_singVal( v, u'Portál:Aktuality' ), - 'da' : lambda v: dh_singVal( v, u'Aktuelle begivenheder' ), - 'de' : lambda v: dh_singVal( v, u'Aktuelle Ereignisse' ), - 'el' : lambda v: dh_singVal( v, u'Τρέχοντα γεγονότα' ), - 'en' : lambda v: dh_singVal( v, u'Current events' ), - 'eo' : lambda v: dh_singVal( v, u'Aktualaĵoj' ), - 'es' : lambda v: dh_singVal( v, u'Actualidad' ), - 'et' : lambda v: dh_singVal( v, u'Current events' ), - 'fa' : lambda v: dh_singVal( v, u'رویدادهای کنونی'), - 'fi' : lambda v: dh_singVal( v, u'Ajankohtaista' ), - 'fr' : lambda v: dh_singVal( v, u'Actualités' ), - 'gl' : lambda v: dh_singVal( v, u'Novas' ), - 'he' : lambda v: dh_singVal( v, u'אקטואליה' ), - 'hu' : lambda v: dh_singVal( v, u'Friss események' ), - 'id' : lambda v: dh_singVal( v, u'Wikipedia:Peristiwa terkini' ), - 'io' : lambda v: dh_singVal( v, u'Current events' ), - 'it' : lambda v: dh_singVal( v, u'Attualità' ), - 'ja' : lambda v: dh_singVal( v, u'最近の出来事' ), - 'ka' : lambda v: dh_singVal( v, u'ახალი ამბები' ), - 'ko' : lambda v: dh_singVal( v, u'요즘 화제' ), - 'ksh': lambda v: dh_singVal( v, u'Et Neuste' ), - 'ku' : lambda v: dh_singVal( v, u'Bûyerên rojane' ), - 'la' : lambda v: dh_singVal( v, u'Novissima' ), - 'lb' : lambda v: dh_singVal( v, u'Aktualitéit' ), - 'la' : lambda v: dh_singVal( v, u"Nuntii" ), - 'li' : lambda v: dh_singVal( v, u"In 't nuujs" ), - 'mn' : lambda v: dh_singVal( v, u'Мэдээ' ), - 'nl' : lambda v: dh_singVal( v, u'In het nieuws' ), - 'no' : lambda v: dh_singVal( v, u'Aktuelt' ), - 'os' : lambda v: dh_singVal( v, u'Xabar' ), - 'pl' : lambda v: dh_singVal( v, u'Bieżące wydarzenia' ), - 'pt' : lambda v: dh_singVal( v, u'Eventos atuais' ), - 'ro' : lambda v: dh_singVal( v, u'Actualităţi' ), - 'ru' : lambda v: dh_singVal( v, u'Текущие события' ), - 'scn': lambda v: dh_singVal( v, u'Nutizzî' ), - 'simple': lambda v: dh_singVal( v, u'World news' ), - 'sk' : lambda v: dh_singVal( v, u'Aktuality' ), - 'sl' : lambda v: dh_singVal( v, u'Trenutni dogodki' ), - 'sr' : lambda v: dh_singVal( v, u'Википедија:Актуелности' ), - 'sv' : lambda v: dh_singVal( v, u'Aktuella händelser' ), - 'su' : lambda v: dh_singVal( v, u'Keur lumangsung' ), - 'ta' : lambda v: dh_singVal( v, u'நடப்பு நிகழ்வுகள்' ), - 'th' : lambda v: dh_singVal( v, u'เหตุการณ์ปัจจุบัน' ), - 'tl' : lambda v: dh_singVal( v, u'Kasalukuyang pangyayari' ), - 'tr' : lambda v: dh_singVal( v, u'Güncel olaylar' ), - 'uk' : lambda v: dh_singVal( v, u'Поточні події' ), - 'ur' : lambda v: dh_singVal( v, u'حالات حاضرہ' ), - 'vi' : lambda v: dh_singVal( v, u'Thời sự' ), - 'wa' : lambda v: dh_singVal( v, u'Wikinoveles' ), - 'yo' : lambda v: dh_singVal( v, u'Current events' ), - 'zh' : lambda v: dh_singVal( v, u'新闻动态' ), - 'zh-min-nan': lambda v: dh_singVal( v, u'Sin-bûn sū-kiāⁿ' ), + 'an': lambda v: dh_singVal(v, u'Autualidá'), + 'ang': lambda v: dh_singVal(v, u'Efenealde belimpas'), + 'ar': lambda v: dh_singVal(v, u'الأحداث الجارية'), + 'be': lambda v: dh_singVal(v, u'Бягучыя падзеі'), + 'bg': lambda v: dh_singVal(v, u'Текущи събития'), + 'ca': lambda v: dh_singVal(v, u'Viquipèdia:Actualitat'), + 'cs': lambda v: dh_singVal(v, u'Portál:Aktuality'), + 'da': lambda v: dh_singVal(v, u'Aktuelle begivenheder'), + 'de': lambda v: dh_singVal(v, u'Aktuelle Ereignisse'), + 'el': lambda v: dh_singVal(v, u'Τρέχοντα γεγονότα'), + 'en': lambda v: dh_singVal(v, u'Current events'), + 'eo': lambda v: dh_singVal(v, u'Aktualaĵoj'), + 'es': lambda v: dh_singVal(v, u'Actualidad'), + 'et': lambda v: dh_singVal(v, u'Current events'), + 'fa': lambda v: dh_singVal(v, u'رویدادهای کنونی'), + 'fi': lambda v: dh_singVal(v, u'Ajankohtaista'), + 'fr': lambda v: dh_singVal(v, u'Actualités'), + 'gl': lambda v: dh_singVal(v, u'Novas'), + 'he': lambda v: dh_singVal(v, u'אקטואליה'), + 'hu': lambda v: dh_singVal(v, u'Friss események'), + 'id': lambda v: dh_singVal(v, u'Wikipedia:Peristiwa terkini'), + 'io': lambda v: dh_singVal(v, u'Current events'), + 'it': lambda v: dh_singVal(v, u'Attualità'), + 'ja': lambda v: dh_singVal(v, u'最近の出来事'), + 'ka': lambda v: dh_singVal(v, u'ახალი ამბები'), + 'ko': lambda v: dh_singVal(v, u'요즘 화제'), + 'ksh': lambda v: dh_singVal(v, u'Et Neuste'), + 'ku': lambda v: dh_singVal(v, u'Bûyerên rojane'), + 'la': lambda v: dh_singVal(v, u'Novissima'), + 'lb': lambda v: dh_singVal(v, u'Aktualitéit'), + 'la': lambda v: dh_singVal(v, u"Nuntii"), + 'li': lambda v: dh_singVal(v, u"In 't nuujs"), + 'mn': lambda v: dh_singVal(v, u'Мэдээ'), + 'nl': lambda v: dh_singVal(v, u'In het nieuws'), + 'no': lambda v: dh_singVal(v, u'Aktuelt'), + 'os': lambda v: dh_singVal(v, u'Xabar'), + 'pl': lambda v: dh_singVal(v, u'Bieżące wydarzenia'), + 'pt': lambda v: dh_singVal(v, u'Eventos atuais'), + 'ro': lambda v: dh_singVal(v, u'Actualităţi'), + 'ru': lambda v: dh_singVal(v, u'Текущие события'), + 'scn': lambda v: dh_singVal(v, u'Nutizzî'), + 'simple': lambda v: dh_singVal(v, u'World news'), + 'sk': lambda v: dh_singVal(v, u'Aktuality'), + 'sl': lambda v: dh_singVal(v, u'Trenutni dogodki'), + 'sr': lambda v: dh_singVal(v, u'Википедија:Актуелности'), + 'sv': lambda v: dh_singVal(v, u'Aktuella händelser'), + 'su': lambda v: dh_singVal(v, u'Keur lumangsung'), + 'ta': lambda v: dh_singVal(v, u'நடப்பு நிகழ்வுகள்'), + 'th': lambda v: dh_singVal(v, u'เหตุการณ์ปัจจุบัน'), + 'tl': lambda v: dh_singVal(v, u'Kasalukuyang pangyayari'), + 'tr': lambda v: dh_singVal(v, u'Güncel olaylar'), + 'uk': lambda v: dh_singVal(v, u'Поточні події'), + 'ur': lambda v: dh_singVal(v, u'حالات حاضرہ'), + 'vi': lambda v: dh_singVal(v, u'Thời sự'), + 'wa': lambda v: dh_singVal(v, u'Wikinoveles'), + 'yo': lambda v: dh_singVal(v, u'Current events'), + 'zh': lambda v: dh_singVal(v, u'新闻动态'), + 'zh-min-nan': lambda v: dh_singVal(v, u'Sin-bûn sū-kiāⁿ'), }, } @@ -1494,258 +1920,379 @@ for monthOfYear in yrMnthFmts: formats[monthOfYear] = {} -def addFmt( lang, isMnthOfYear, patterns ): - """Add 12 month formats for a specific type ('January','Feb..), for a given language. - The function must accept one parameter for the ->int or ->string conversions, just like - everywhere else in the formats map. + +def addFmt(lang, isMnthOfYear, patterns): + """Add 12 month formats for a specific type ('January','Feb..), for a given + language. The function must accept one parameter for the ->int or ->string + conversions, just like everywhere else in the formats map. The patterns parameter is a list of 12 elements to be used for each month. + """ if len(patterns) != 12: - raise AssertionError(u'pattern %s does not have 12 elements' % lang ) + raise AssertionError(u'pattern %s does not have 12 elements' % lang) for i in xrange(12): if patterns[i] is not None: if isMnthOfYear: - formats[yrMnthFmts[i]][lang] = eval(u'lambda v: dh_mnthOfYear( v, u"%s" )' % patterns[i]) + formats[yrMnthFmts[i]][lang] = eval( + u'lambda v: dh_mnthOfYear(v, u"%s")' % patterns[i]) else: - formats[dayMnthFmts[i]][lang] = eval(u'lambda v: dh_dayOfMnth( v, u"%s" )' % patterns[i]) + formats[dayMnthFmts[i]][lang] = eval( + u'lambda v: dh_dayOfMnth(v, u"%s")' % patterns[i]) + + +def addFmt2(lang, isMnthOfYear, pattern, makeUpperCase=None): + addFmt(lang, isMnthOfYear, makeMonthNamedList(lang, pattern, makeUpperCase)) + def makeMonthList(pattern): - return [pattern % m for m in xrange(1,13)] + return [pattern % m for m in xrange(1, 13)] + def makeMonthNamedList(lang, pattern, makeUpperCase=None): """Creates a list of 12 elements based on the name of the month. - The language-dependent month name is used as a formating argument to the pattern. - The pattern must be have one %s that will be replaced by the localized month name. + The language-dependent month name is used as a formating argument to the + pattern. The pattern must be have one %s that will be replaced by the + localized month name. Use %%d for any other parameters that should be preserved. + """ if makeUpperCase is None: f = lambda s: s - elif makeUpperCase == True: + elif makeUpperCase: f = lambda s: s[0].upper() + s[1:] - elif makeUpperCase == False: + else: f = lambda s: s[0].lower() + s[1:] - - return [ pattern % f(monthName(lang, m)) for m in xrange(1,13) ] - -def addFmt2( lang, isMnthOfYear, pattern, makeUpperCase = None ): - addFmt( lang, isMnthOfYear, makeMonthNamedList( lang, pattern, makeUpperCase )) + return [pattern % f(monthName(lang, m)) for m in xrange(1, 13)] # # Add day of the month formats to the formatting table: "en:May 15" # -addFmt2('af', False, u"%%d %s", True ) -addFmt2('als',False, u"%%d. %s", True ) -addFmt ('an', False, [ u"%d de chinero", u"%d de frebero", u"%d de marzo", u"%d d'abril", u"%d de mayo", u"%d de chunio", u"%d de chulio", u"%d d'agosto", u"%d de setiembre", u"%d d'otubre", u"%d de nobiembre", u"%d d'abiento" ]) -#addFmt ('ang',False, [ u"%d Æfterra Gēola", u"%d Solmōnaþ", u"%d Hréþmónaþ", u"%d Éastermónaþ", u"%d Þrimilcemónaþ", u"%d Séremónaþ", u"%d Mǽdmónaþ", u"%d Wéodmónaþ", u"%d Háligmónaþ", u"%d Winterfylleþ", u"%d Blótmónaþ", u"%d Gēolmōnaþ" ]) -addFmt2('ang',False, u"%%d %s", True ) -addFmt ('ar', False, [ u"%d يناير", u"%d فبراير", u"%d مارس", u"%d أبريل", u"%d مايو", u"%d يونيو", u"%d يوليو", u"%d أغسطس", u"%d سبتمبر", u"%d أكتوبر", u"%d نوفمبر", u"%d ديسمبر" ]) -addFmt ('ast',False, [ u"%d de xineru", u"%d de febreru", u"%d de marzu", u"%d d'abril", u"%d de mayu", u"%d de xunu", u"%d de xunetu", u"%d d'agostu", u"%d de setiembre", u"%d d'ochobre", u"%d de payares", u"%d d'avientu" ]) -addFmt ('be', False, [ u"%d студзеня", u"%d лютага", u"%d сакавіка", u"%d красавіка", u"%d траўня", u"%d чэрвеня", u"%d ліпеня", u"%d жніўня", u"%d верасьня", u"%d кастрычніка", u"%d лістапада", u"%d сьнежня" ]) -addFmt2('bg', False, u"%%d %s", False ) -#addFmt2('br', False, u"%%d %s", True ) # See bellow for br initialization -addFmt2('bn', False, u"%s %%B" ) -addFmt2('bs', False, u"%%d. %s", False ) -addFmt ('ca', False, [ u"%d de gener", u"%d de febrer", u"%d de març", u"%d d'abril", u"%d de maig", u"%d de juny", u"%d de juliol", u"%d d'agost", u"%d de setembre", u"%d d'octubre", u"%d de novembre", u"%d de desembre" ]) -addFmt2('ceb',False, u"%s %%d", True ) -addFmt ('co', False, [ u"%d di ghjennaghju", u"%d di frivaghju", u"%d di marzu", u"%d d'aprile", u"%d di maghju", u"%d di ghjugnu", u"%d di lugliu", u"%d d'aostu", u"%d di settembre", u"%d d'uttrovi", u"%d di nuvembri", u"%d di decembre" ]) -addFmt2('cs', False, u"%%d. %s", False ) -addFmt2('csb',False, u"%%d %sa", False ) -addFmt2('cv', False, u"%s, %%d", True ) -addFmt2('cy', False, u"%%d %s", True ) -addFmt2('da', False, u"%%d. %s", False ) -addFmt2('de', False, u"%%d. %s", True ) -addFmt ('el', False, [ u"%d Ιανουαρίου", u"%d Φεβρουαρίου", u"%d Μαρτίου", u"%d Απριλίου", u"%d Μαΐου", u"%d Ιουνίου", u"%d Ιουλίου", u"%d Αυγούστου", u"%d Σεπτεμβρίου", u"%d Οκτωβρίου", u"%d Νοεμβρίου", u"%d Δεκεμβρίου" ]) -addFmt2('en', False, u"%s %%d", True ) -addFmt2('eo', False, u"%%d-a de %s", False ) -addFmt2('es', False, u"%%d de %s", False ) -addFmt2('et', False, u"%%d. %s", False ) -addFmt2('eu', False, u"%saren %%d", True ) -addFmt ('fa', False, [u"%d ژانویه", u"%d فوریه", u"%d مارس", u"%d آوریل", u"%d مه", u"%d ژوئن", u"%d ژوئیه", u"%d اوت", u"%d سپتامبر", u"%d اکتبر", u"%d نوامبر", u"%d دسامبر" ]) -addFmt2('fi', False, u"%%d. %sta", False ) -addFmt2('fo', False, u"%%d. %s", False ) -addFmt ('fr', False, [ u"%d janvier", u"%d février", u"%d mars", u"%d avril", u"%d mai", u"%d juin", u"%d juillet", u"%d août", u"%d septembre", u"%d octobre", u"%d novembre", u"%d décembre" ]) -addFmt2('fur',False, u"%%d di %s", True ) -addFmt2('fy', False, u"%%d %s", False ) -addFmt ('ga', False, [ u"%d Eanáir", u"%d Feabhra", u"%d Márta", u"%d Aibreán", u"%d Bealtaine", u"%d Meitheamh", u"%d Iúil", u"%d Lúnasa", u"%d Meán Fómhair", u"%d Deireadh Fómhair", u"%d Samhain", u"%d Mí na Nollag" ]) -addFmt2('gl', False, u"%%d de %s", False ) -addFmt2('he', False, u"%%d ב%s" ) # [ u"%d בינואר", u"%d בפברואר", u"%d במרץ", u"%d באפריל", u"%d במאי", u"%d ביוני", u"%d ביולי", u"%d באוגוסט", u"%d בספטמבר", u"%d באוקטובר", u"%d בנובמבר", u"%d בדצמבר" ]) -addFmt ('hr', False, [ u"%d. siječnja", u"%d. veljače", u"%d. ožujka", u"%d. travnja", u"%d. svibnja", u"%d. lipnja", u"%d. srpnja", u"%d. kolovoza", u"%d. rujna", u"%d. listopada", u"%d. studenog", u"%d. prosinca" ]) -addFmt2('hu', False, u"%s %%d", True ) -addFmt2('ia', False, u"%%d de %s", False ) -addFmt2('id', False, u"%%d %s", True ) -addFmt2('ie', False, u"%%d %s", False ) -addFmt2('io', False, u"%%d di %s", False ) -addFmt ('is', False, [ u"%d. janúar", u"%d. febrúar", u"%d. mars", u"%d. apríl", u"%d. maí", u"%d. júní", u"%d. júlí", u"%d. ágúst", u"%d. september", u"%d. október", u"%d. nóvember", u"%d. desember" ]) -addFmt2('it', False, u"%%d %s", False ) -addFmt ('ja', False, makeMonthList( u"%d月%%d日" )) -addFmt2('jv', False, u"%%d %s", True ) -addFmt2('ka', False, u"%%d %s" ) -addFmt ('ko', False, makeMonthList( u"%d월 %%d일" )) -addFmt ('ku', False, [ u"%d'ê rêbendanê", u"%d'ê reşemiyê", u"%d'ê adarê", u"%d'ê avrêlê", u"%d'ê gulanê", u"%d'ê pûşperê", u"%d'ê tîrmehê", u"%d'ê gelawêjê", u"%d'ê rezberê", u"%d'ê kewçêrê", u"%d'ê sermawezê", u"%d'ê berfanbarê" ]) -addFmt ('la', False, [ u"%d Ianuarii", u"%d Februarii", u"%d Martii", u"%d Aprilis", u"%d Maii", u"%d Iunii", u"%d Iulii", u"%d Augusti", u"%d Septembris", u"%d Octobris", u"%d Novembris", u"%d Decembris" ]) -addFmt2('lb', False, u"%%d. %s", True ) -addFmt ('li', False, [ u"%d januari", u"%d februari", u"%d miert", u"%d april", u"%d mei", u"%d juni", u"%d juli", u"%d augustus", u"%d september", u"%d oktober", u"%d november", u"%d december" ]) -addFmt ('lt', False, [ u"Sausio %d", u"Vasario %d", u"Kovo %d", u"Balandžio %d", u"Gegužės %d", u"Birželio %d", u"Liepos %d", u"Rugpjūčio %d", u"Rugsėjo %d", u"Spalio %d", u"Lapkričio %d", u"Gruodžio %d" ]) -addFmt2('lv', False, u"%%d. %s", False ) -addFmt2('mhr',False, u"%%d %s", False ) -addFmt ('mk', False, [ u"%d јануари", u"%d февруари", u"%d март", u"%d април", u"%d мај", u"%d јуни", u"%d јули", u"%d август", u"%d септември", u"%d октомври", u"%d ноември", u"%d декември" ]) -addFmt2('ml', False, u"%s %%d" ) -addFmt2('ms', False, u"%%d %s", True ) -addFmt2('nap',False, u"%%d 'e %s", False ) -addFmt2('nds',False, u"%%d. %s", True ) -addFmt ('nl', False, [ u"%%d %s" % v for v in [ u"januari", u"februari", u"maart", u"april", u"mei", u"juni", u"juli", u"augustus", u"september", u"oktober", u"november", u"december" ]]) -addFmt ('nn', False, [ u"%%d. %s" % v for v in [u"januar", u"februar", u"mars", u"april", u"mai", u"juni", u"juli", u"august", u"september", u"oktober", u"november", u"desember"]]) -addFmt2('no', False, u"%%d. %s", False ) -addFmt ('oc', False, [ u"%d de genièr", u"%d de febrièr", u"%d de març", u"%d d'abril", u"%d de mai", u"%d de junh", u"%d de julhet", u"%d d'agost", u"%d de setembre", u"%d d'octobre", u"%d de novembre", u"%d de decembre" ]) -addFmt ('os', False, [ u"%d январы", u"%d февралы", u"%d мартъийы", u"%d апрелы", u"%d майы", None, u"%d июлы", None, u"%d сентябры", None, u"%d ноябры", u"%d декабры" ]) -addFmt ('pl', False, [ u"%d stycznia", u"%d lutego", u"%d marca", u"%d kwietnia", u"%d maja", u"%d czerwca", u"%d lipca", u"%d sierpnia", u"%d września", u"%d października", u"%d listopada", u"%d grudnia" ]) -addFmt2('pt', False, u"%%d de %s", True ) -addFmt2('ro', False, u"%%d %s", False ) -addFmt ('ru', False, [ u"%d января", u"%d февраля", u"%d марта", u"%d апреля", u"%d мая", u"%d июня", u"%d июля", u"%d августа", u"%d сентября", u"%d октября", u"%d ноября", u"%d декабря" ]) -addFmt2('sco',False, u"%%d %s", True ) -addFmt2('scn',False, u"%%d di %s", False ) -addFmt ('se', False, [ u"ođđajagimánu %d.", u"guovvamánu %d.", u"njukčamánu %d.", u"cuoŋománu %d.", u"miessemánu %d.", u"geassemánu %d.", u"suoidnemánu %d.", u"borgemánu %d.", u"čakčamánu %d.", u"golggotmánu %d.", u"skábmamánu %d.", u"juovlamánu %d." ]) -addFmt ('sh', False, makeMonthList( u"%%d.%d." )) -addFmt2('simple', False, u"%s %%d", True ) -addFmt2('sk', False, u"%%d. %s", False ) -addFmt2('sl', False, u"%%d. %s", False ) -addFmt ('sq', False, [ u"%d Janar", u"%d Shkurt", u"%d Mars", u"%d Prill", u"%d Maj", u"%d Qershor", u"%d Korrik", u"%d Gusht", u"%d Shtator", u"%d Tetor", u"%d Nëntor", u"%d Dhjetor" ]) -addFmt2('sr', False, u"%%d. %s", False ) -addFmt2('su', False, u"%%d %s", True ) -addFmt2('sv', False, u"%%d %s", False ) -addFmt2('ta', False, u"%s %%d" ) -addFmt2('te', False, u"%s %%d" ) -addFmt2('th', False, u"%%d %s" ) # %%T -addFmt2('tl', False, u"%s %%d" ) -addFmt2('tr', False, u"%%d %s", True ) -addFmt2('tt', False, u"%%d. %s", True ) -addFmt ('uk', False, [ u"%d січня", u"%d лютого", u"%d березня", u"%d квітня", u"%d травня", u"%d червня", u"%d липня", u"%d серпня", u"%d вересня", u"%d жовтня", u"%d листопада", u"%d грудня" ]) -addFmt ('ur', False, [ u"%d جنوری", u"%d فروری", u"%d مارچ", u"%d اپریل", u"%d مئ", u"%d جون", u"%d جلائ", u"%d اگست", u"%d ستمب", u"%d اکتوبر", u"%d نومب", u"%d دسمب" ]) -addFmt2('vec',False, u"%%d de %s", False ) -addFmt ('vi', False, makeMonthList( u"%%d tháng %d" )) -addFmt2('vo', False, u"%s %%d", False ) -addFmt ('zh', False, makeMonthList( u"%d月%%d日" )) +addFmt2('af', False, u"%%d %s", True) +addFmt2('als', False, u"%%d. %s", True) +addFmt ('an', False, [u"%d de chinero", u"%d de frebero", u"%d de marzo", + u"%d d'abril", u"%d de mayo", u"%d de chunio", + u"%d de chulio", u"%d d'agosto", u"%d de setiembre", + u"%d d'otubre", u"%d de nobiembre", u"%d d'abiento"]) +##addFmt ('ang',False, [u"%d Æfterra Gēola", u"%d Solmōnaþ", u"%d Hréþmónaþ", +## u"%d Éastermónaþ", u"%d Þrimilcemónaþ", u"%d Séremónaþ", +## u"%d Mǽdmónaþ", u"%d Wéodmónaþ", u"%d Háligmónaþ", +## u"%d Winterfylleþ", u"%d Blótmónaþ", u"%d Gēolmōnaþ"]) +addFmt2('ang', False, u"%%d %s", True) +addFmt ('ar', False, [u"%d يناير", u"%d فبراير", u"%d مارس", u"%d أبريل", + u"%d مايو", u"%d يونيو", u"%d يوليو", u"%d أغسطس", + u"%d سبتمبر", u"%d أكتوبر", u"%d نوفمبر", u"%d ديسمبر"]) +addFmt ('ast', False, [u"%d de xineru", u"%d de febreru", u"%d de marzu", + u"%d d'abril", u"%d de mayu", u"%d de xunu", + u"%d de xunetu", u"%d d'agostu", u"%d de setiembre", + u"%d d'ochobre", u"%d de payares", u"%d d'avientu"]) +addFmt ('be', False, [u"%d студзеня", u"%d лютага", u"%d сакавіка", + u"%d красавіка", u"%d траўня", u"%d чэрвеня", + u"%d ліпеня", u"%d жніўня", u"%d верасьня", + u"%d кастрычніка", u"%d лістапада", u"%d сьнежня"]) +addFmt2('bg', False, u"%%d %s", False) +##addFmt2('br', False, u"%%d %s", True) # See bellow for br initialization +addFmt2('bn', False, u"%s %%B") +addFmt2('bs', False, u"%%d. %s", False) +addFmt ('ca', False, [u"%d de gener", u"%d de febrer", u"%d de març", + u"%d d'abril", u"%d de maig", u"%d de juny", + u"%d de juliol", u"%d d'agost", u"%d de setembre", + u"%d d'octubre", u"%d de novembre", u"%d de desembre"]) +addFmt2('ceb', False, u"%s %%d", True) +addFmt ('co', False, [u"%d di ghjennaghju", u"%d di frivaghju", u"%d di marzu", + u"%d d'aprile", u"%d di maghju", u"%d di ghjugnu", + u"%d di lugliu", u"%d d'aostu", u"%d di settembre", + u"%d d'uttrovi", u"%d di nuvembri", u"%d di decembre"]) +addFmt2('cs', False, u"%%d. %s", False) +addFmt2('csb', False, u"%%d %sa", False) +addFmt2('cv', False, u"%s, %%d", True) +addFmt2('cy', False, u"%%d %s", True) +addFmt2('da', False, u"%%d. %s", False) +addFmt2('de', False, u"%%d. %s", True) +addFmt ('el', False, [u"%d Ιανουαρίου", u"%d Φεβρουαρίου", u"%d Μαρτίου", + u"%d Απριλίου", u"%d Μαΐου", u"%d Ιουνίου", + u"%d Ιουλίου", u"%d Αυγούστου", u"%d Σεπτεμβρίου", + u"%d Οκτωβρίου", u"%d Νοεμβρίου", u"%d Δεκεμβρίου"]) +addFmt2('en', False, u"%s %%d", True) +addFmt2('eo', False, u"%%d-a de %s", False) +addFmt2('es', False, u"%%d de %s", False) +addFmt2('et', False, u"%%d. %s", False) +addFmt2('eu', False, u"%saren %%d", True) +addFmt ('fa', False, [u"%d ژانویه", u"%d فوریه", u"%d مارس", u"%d آوریل", + u"%d مه", u"%d ژوئن", u"%d ژوئیه", u"%d اوت", + u"%d سپتامبر", u"%d اکتبر", u"%d نوامبر", u"%d دسامبر"]) +addFmt2('fi', False, u"%%d. %sta", False) +addFmt2('fo', False, u"%%d. %s", False) +addFmt ('fr', False, [u"%d janvier", u"%d février", u"%d mars", u"%d avril", + u"%d mai", u"%d juin", u"%d juillet", u"%d août", + u"%d septembre", u"%d octobre", u"%d novembre", + u"%d décembre"]) +addFmt2('fur', False, u"%%d di %s", True) +addFmt2('fy', False, u"%%d %s", False) +addFmt ('ga', False, [u"%d Eanáir", u"%d Feabhra", u"%d Márta", u"%d Aibreán", + u"%d Bealtaine", u"%d Meitheamh", u"%d Iúil", + u"%d Lúnasa", u"%d Meán Fómhair", u"%d Deireadh Fómhair", + u"%d Samhain", u"%d Mí na Nollag"]) +addFmt2('gl', False, u"%%d de %s", False) +addFmt2('he', False, u"%%d ב%s") # [u"%d בינואר", u"%d בפברואר", u"%d במרץ", u"%d באפריל", u"%d במאי", u"%d ביוני", u"%d ביולי", u"%d באוגוסט", u"%d בספטמבר", u"%d באוקטובר", u"%d בנובמבר", u"%d בדצמבר"]) +addFmt ('hr', False, [u"%d. siječnja", u"%d. veljače", u"%d. ožujka", + u"%d. travnja", u"%d. svibnja", u"%d. lipnja", + u"%d. srpnja", u"%d. kolovoza", u"%d. rujna", + u"%d. listopada", u"%d. studenog", u"%d. prosinca"]) +addFmt2('hu', False, u"%s %%d", True) +addFmt2('ia', False, u"%%d de %s", False) +addFmt2('id', False, u"%%d %s", True) +addFmt2('ie', False, u"%%d %s", False) +addFmt2('io', False, u"%%d di %s", False) +addFmt ('is', False, [u"%d. janúar", u"%d. febrúar", u"%d. mars", u"%d. apríl", + u"%d. maí", u"%d. júní", u"%d. júlí", u"%d. ágúst", + u"%d. september", u"%d. október", u"%d. nóvember", + u"%d. desember"]) +addFmt2('it', False, u"%%d %s", False) +addFmt ('ja', False, makeMonthList(u"%d月%%d日")) +addFmt2('jv', False, u"%%d %s", True) +addFmt2('ka', False, u"%%d %s") +addFmt ('ko', False, makeMonthList(u"%d월 %%d일")) +addFmt ('ku', False, [u"%d'ê rêbendanê", u"%d'ê reşemiyê", u"%d'ê adarê", + u"%d'ê avrêlê", u"%d'ê gulanê", u"%d'ê pûşperê", + u"%d'ê tîrmehê", u"%d'ê gelawêjê", u"%d'ê rezberê", + u"%d'ê kewçêrê", u"%d'ê sermawezê", u"%d'ê berfanbarê"]) +addFmt ('la', False, [u"%d Ianuarii", u"%d Februarii", u"%d Martii", + u"%d Aprilis", u"%d Maii", u"%d Iunii", u"%d Iulii", + u"%d Augusti", u"%d Septembris", u"%d Octobris", + u"%d Novembris", u"%d Decembris"]) +addFmt2('lb', False, u"%%d. %s", True) +addFmt ('li', False, [u"%d januari", u"%d februari", u"%d miert", u"%d april", + u"%d mei", u"%d juni", u"%d juli", u"%d augustus", + u"%d september", u"%d oktober", u"%d november", + u"%d december"]) +addFmt ('lt', False, [u"Sausio %d", u"Vasario %d", u"Kovo %d", u"Balandžio %d", + u"Gegužės %d", u"Birželio %d", u"Liepos %d", + u"Rugpjūčio %d", u"Rugsėjo %d", u"Spalio %d", + u"Lapkričio %d", u"Gruodžio %d"]) +addFmt2('lv', False, u"%%d. %s", False) +addFmt2('mhr', False, u"%%d %s", False) +addFmt ('mk', False, [u"%d јануари", u"%d февруари", u"%d март", u"%d април", + u"%d мај", u"%d јуни", u"%d јули", u"%d август", + u"%d септември", u"%d октомври", u"%d ноември", + u"%d декември"]) +addFmt2('ml', False, u"%s %%d") +addFmt2('ms', False, u"%%d %s", True) +addFmt2('nap', False, u"%%d 'e %s", False) +addFmt2('nds', False, u"%%d. %s", True) +addFmt ('nl', False, [u"%%d %s" % v + for v in [u"januari", u"februari", u"maart", u"april", + u"mei", u"juni", u"juli", u"augustus", + u"september", u"oktober", u"november", + u"december"]]) +addFmt ('nn', False, [u"%%d. %s" % v + for v in [u"januar", u"februar", u"mars", u"april", + u"mai", u"juni", u"juli", u"august", + u"september", u"oktober", u"november", + u"desember"]]) +addFmt2('no', False, u"%%d. %s", False) +addFmt ('oc', False, [u"%d de genièr", u"%d de febrièr", u"%d de març", + u"%d d'abril", u"%d de mai", u"%d de junh", + u"%d de julhet", u"%d d'agost", u"%d de setembre", + u"%d d'octobre", u"%d de novembre", u"%d de decembre"]) +addFmt ('os', False, [u"%d январы", u"%d февралы", u"%d мартъийы", + u"%d апрелы", u"%d майы", None, u"%d июлы", None, + u"%d сентябры", None, u"%d ноябры", u"%d декабры"]) +addFmt ('pl', False, [u"%d stycznia", u"%d lutego", u"%d marca", + u"%d kwietnia", u"%d maja", u"%d czerwca", u"%d lipca", + u"%d sierpnia", u"%d września", u"%d października", + u"%d listopada", u"%d grudnia"]) +addFmt2('pt', False, u"%%d de %s", True) +addFmt2('ro', False, u"%%d %s", False) +addFmt ('ru', False, [u"%d января", u"%d февраля", u"%d марта", + u"%d апреля", u"%d мая", u"%d июня", u"%d июля", + u"%d августа", u"%d сентября", u"%d октября", + u"%d ноября", u"%d декабря"]) +addFmt2('sco', False, u"%%d %s", True) +addFmt2('scn', False, u"%%d di %s", False) +addFmt ('se', False, [u"ođđajagimánu %d.", u"guovvamánu %d.", u"njukčamánu %d.", + u"cuoŋománu %d.", u"miessemánu %d.", u"geassemánu %d.", + u"suoidnemánu %d.", u"borgemánu %d.", u"čakčamánu %d.", + u"golggotmánu %d.", u"skábmamánu %d.", u"juovlamánu %d."]) +addFmt ('sh', False, makeMonthList(u"%%d.%d.")) +addFmt2('simple', False, u"%s %%d", True) +addFmt2('sk', False, u"%%d. %s", False) +addFmt2('sl', False, u"%%d. %s", False) +addFmt ('sq', False, [u"%d Janar", u"%d Shkurt", u"%d Mars", u"%d Prill", + u"%d Maj", u"%d Qershor", u"%d Korrik", u"%d Gusht", + u"%d Shtator", u"%d Tetor", u"%d Nëntor", u"%d Dhjetor"]) +addFmt2('sr', False, u"%%d. %s", False) +addFmt2('su', False, u"%%d %s", True) +addFmt2('sv', False, u"%%d %s", False) +addFmt2('ta', False, u"%s %%d") +addFmt2('te', False, u"%s %%d") +addFmt2('th', False, u"%%d %s") # %%T +addFmt2('tl', False, u"%s %%d") +addFmt2('tr', False, u"%%d %s", True) +addFmt2('tt', False, u"%%d. %s", True) +addFmt ('uk', False, [u"%d січня", u"%d лютого", u"%d березня", u"%d квітня", + u"%d травня", u"%d червня", u"%d липня", u"%d серпня", + u"%d вересня", u"%d жовтня", u"%d листопада", + u"%d грудня"]) +addFmt ('ur', False, [u"%d جنوری", u"%d فروری", u"%d مارچ", u"%d اپریل", + u"%d مئ", u"%d جون", u"%d جلائ", u"%d اگست", u"%d ستمب", + u"%d اکتوبر", u"%d نومب", u"%d دسمب"]) +addFmt2('vec', False, u"%%d de %s", False) +addFmt ('vi', False, makeMonthList(u"%%d tháng %d")) +addFmt2('vo', False, u"%s %%d", False) +addFmt ('zh', False, makeMonthList(u"%d月%%d日")) -# Walloon names depend on the day number, thus we must generate various different patterns -waMonthNames = [ u"djanvî", u"fevrî", u"måss", u"avri", u"may", u"djun", u"djulete", u"awousse", u"setimbe", u"octôbe", u"nôvimbe", u"decimbe" ] +# Walloon names depend on the day number, thus we must generate various +# different patterns +waMonthNames = [u"djanvî", u"fevrî", u"måss", u"avri", u"may", u"djun", + u"djulete", u"awousse", u"setimbe", u"octôbe", u"nôvimbe", + u"decimbe"] # For month names begining with a consonant... -for i in [0,1,2,4,5,6,8,10,11]: +for i in (0, 1, 2, 4, 5, 6, 8, 10, 11): formats[dayMnthFmts[i]]['wa'] = eval( - (u'lambda m: multi( m, [' + - u'(lambda v: dh_dayOfMnth( v, u"%%dî d\' %s" ), lambda p: p == 1),' + - u'(lambda v: dh_dayOfMnth( v, u"%%d d\' %s" ), lambda p: p in [2,3,20,22,23]),' + - u'(lambda v: dh_dayOfMnth( v, u"%%d di %s" ), alwaysTrue)])') % (waMonthNames[i], waMonthNames[i], waMonthNames[i])) -# For month names begining with a vowel... -for i in [3,7,9]: - formats[dayMnthFmts[i]]['wa'] = eval( - (u'lambda m: multi( m, [' + - u'(lambda v: dh_dayOfMnth( v, u"%%dî d\' %s" ), lambda p: p == 1),' + - u'(lambda v: dh_dayOfMnth( v, u"%%d d\' %s" ), alwaysTrue)])') % (waMonthNames[i], waMonthNames[i])) + (u'lambda m: multi(m, [' + + u'(lambda v: dh_dayOfMnth(v, u"%%dî d\' %s"), lambda p: p == 1),' + + u'(lambda v: dh_dayOfMnth(v, u"%%d d\' %s"), lambda p: p in [2,3,20,22,23]),' + + u'(lambda v: dh_dayOfMnth(v, u"%%d di %s"), alwaysTrue)])') + % (waMonthNames[i], waMonthNames[i], waMonthNames[i])) -# Brazil uses "1añ" for the 1st of every month, and number without suffix for all other days -brMonthNames = makeMonthNamedList( 'br', u"%s", True ) -for i in xrange(0,12): +# For month names begining with a vowel... +for i in (3, 7, 9): + formats[dayMnthFmts[i]]['wa'] = eval( + (u'lambda m: multi(m, [' + + u'(lambda v: dh_dayOfMnth(v, u"%%dî d\' %s"), lambda p: p == 1),' + + u'(lambda v: dh_dayOfMnth(v, u"%%d d\' %s"), alwaysTrue)])') + % (waMonthNames[i], waMonthNames[i])) + +# Brazil uses "1añ" for the 1st of every month, and number without suffix for +# all other days +brMonthNames = makeMonthNamedList('br', u"%s", True) +for i in xrange(0, 12): formats[dayMnthFmts[i]]['br'] = eval( - (u'lambda m: multi( m, [' + - u'(lambda v: dh_dayOfMnth( v, u"%%dañ %s" ), lambda p: p == 1),' + - u'(lambda v: dh_dayOfMnth( v, u"%%d %s" ), alwaysTrue)])') % (brMonthNames[i], brMonthNames[i])) + (u'lambda m: multi(m, [' + + u'(lambda v: dh_dayOfMnth(v, u"%%dañ %s"), lambda p: p == 1),' + + u'(lambda v: dh_dayOfMnth(v, u"%%d %s"), alwaysTrue)])') + % (brMonthNames[i], brMonthNames[i])) # # Month of the Year: "en:May 1976" # -addFmt2('af', True, u"%s %%d", True ) -addFmt2('ar', True, u"%s %%d" ) -addFmt2('ang',True, u"%s %%d", True ) -addFmt2('cs', True, u"%s %%d" ) -addFmt2('de', True, u"%s %%d", True ) -addFmt ('el', True, [ u"Ιανουάριος %d", u"Φεβρουάριος %d", u"Μάρτιος %d", u"Απρίλιος %d", u"Μάιος %d", u"Ιούνιος %d", u"Ιούλιος %d", u"Άυγουστος %d", u"Σεπτέμβριος %d", u"Οκτώβριος %d", u"Νοέμβριος %d", u"Δεκέμβριος %d" ]) -addFmt2('en', True, u"%s %%d", True ) -addFmt2('eo', True, u"%s de %%d" ) -addFmt2('es', True, u"%s de %%d", True ) -addFmt2('et', True, u"%s %%d", True ) -addFmt2('fi', True, u"%s %%d", True ) -addFmt ('fr', True, [ u"Janvier %d", u"Février %d", u"Mars %d", u"Avril %d", u"Mai %d", u"Juin %d", u"Juillet %d", u"Août %d", u"Septembre %d", u"Octobre %d", u"Novembre %d", u"Décembre %d" ]) -addFmt2('he', True, u"%s %%d", True ) -addFmt2('it', True, u"Attualità/Anno %%d - %s", True ) -addFmt ('ja', True, [ u"「最近の出来事」%%d年%d月" % mm for mm in xrange(1,13)]) -addFmt2('ka', True, u"%s, %%d" ) -addFmt ('ko', True, [ u"%d년 1월", u"%d년 2월", u"%d년 3월", u"%d년 4월", u"%d년 5월", u"%d년 6월", u"%d년 7월", u"%d년 8월", u"%d년 9월", u"%d년 10월", u"%d년 11월", u"%d년 12월" ]) -addFmt ('li', True, [ u"januari %d", u"februari %d", u"miert %d", u"april %d", u"mei %d", u"juni %d", u"juli %d", u"augustus %d", u"september %d", u"oktober %d", u"november %d", u"december %d" ]) -addFmt ('nl', True, [ u"Januari %d", u"Februari %d", u"Maart %d", u"April %d", u"Mei %d", u"Juni %d", u"Juli %d", u"Augustus %d", u"September %d", u"Oktober %d", u"November %d", u"December %d" ]) -addFmt2('pl', True, u"%s %%d", True ) -addFmt ('scn',True, [ None, None, u"Marzu %d", None, None, None, None, None, None, None, None, None ]) -addFmt2('simple', True, u"%s %%d", True ) -addFmt2('sk', True, u"%s %%d" ) -addFmt2('sv', True, u"%s %%d", True ) -addFmt2('th', True, u"%s พ.ศ. %%T" ) -addFmt2('tl', True, u"%s %%d" ) -addFmt2('tt', True, u"%s, %%d", True ) -addFmt ('ur', True, [ u"%d01مبم", u"%d02مبم", u"%d03مبم", u"%d04مبم", u"%d05مبم", u"%d06مبم", u"%d07مبم", u"%d08مبم", u"%d09مبم", u"%d10مبم", u"%d11مبم", u"%d12مبم" ]) -addFmt2('uk', True, u"%s %%d", True ) -addFmt ('vi', True, makeMonthList( u"Tháng %d năm %%d" )) -addFmt ('zh', True, makeMonthList( u"%%d年%d月" )) -addFmt ('zh-min-nan',True, makeMonthList( u"%%d nî %d goe̍h" )) +addFmt2('af', True, u"%s %%d", True) +addFmt2('ar', True, u"%s %%d") +addFmt2('ang', True, u"%s %%d", True) +addFmt2('cs', True, u"%s %%d") +addFmt2('de', True, u"%s %%d", True) +addFmt ('el', True, [u"Ιανουάριος %d", u"Φεβρουάριος %d", u"Μάρτιος %d", + u"Απρίλιος %d", u"Μάιος %d", u"Ιούνιος %d", u"Ιούλιος %d", + u"Άυγουστος %d", u"Σεπτέμβριος %d", u"Οκτώβριος %d", + u"Νοέμβριος %d", u"Δεκέμβριος %d"]) +addFmt2('en', True, u"%s %%d", True) +addFmt2('eo', True, u"%s de %%d") +addFmt2('es', True, u"%s de %%d", True) +addFmt2('et', True, u"%s %%d", True) +addFmt2('fi', True, u"%s %%d", True) +addFmt ('fr', True, [u"Janvier %d", u"Février %d", u"Mars %d", u"Avril %d", + u"Mai %d", u"Juin %d", u"Juillet %d", u"Août %d", + u"Septembre %d", u"Octobre %d", u"Novembre %d", + u"Décembre %d"]) +addFmt2('he', True, u"%s %%d", True) +addFmt2('it', True, u"Attualità/Anno %%d - %s", True) +addFmt ('ja', True, [u"「最近の出来事」%%d年%d月" % mm for mm in xrange(1, 13)]) +addFmt2('ka', True, u"%s, %%d") +addFmt ('ko', True, [u"%d년 1월", u"%d년 2월", u"%d년 3월", u"%d년 4월", + u"%d년 5월", u"%d년 6월", u"%d년 7월", u"%d년 8월", + u"%d년 9월", u"%d년 10월", u"%d년 11월", u"%d년 12월"]) +addFmt ('li', True, [u"januari %d", u"februari %d", u"miert %d", u"april %d", + u"mei %d", u"juni %d", u"juli %d", u"augustus %d", + u"september %d", u"oktober %d", u"november %d", + u"december %d"]) +addFmt ('nl', True, [u"Januari %d", u"Februari %d", u"Maart %d", u"April %d", + u"Mei %d", u"Juni %d", u"Juli %d", u"Augustus %d", + u"September %d", u"Oktober %d", u"November %d", + u"December %d"]) +addFmt2('pl', True, u"%s %%d", True) +addFmt ('scn', True, [None, None, u"Marzu %d", None, None, None, None, None, + None, None, None, None]) +addFmt2('simple', True, u"%s %%d", True) +addFmt2('sk', True, u"%s %%d") +addFmt2('sv', True, u"%s %%d", True) +addFmt2('th', True, u"%s พ.ศ. %%T") +addFmt2('tl', True, u"%s %%d") +addFmt2('tt', True, u"%s, %%d", True) +addFmt ('ur', True, [u"%d01مبم", u"%d02مبم", u"%d03مبم", u"%d04مبم", + u"%d05مبم", u"%d06مبم", u"%d07مبم", u"%d08مبم", u"%d09مبم", + u"%d10مبم", u"%d11مبم", u"%d12مبم"]) +addFmt2('uk', True, u"%s %%d", True) +addFmt ('vi', True, makeMonthList(u"Tháng %d năm %%d")) +addFmt ('zh', True, makeMonthList(u"%%d年%d月")) +addFmt ('zh-min-nan', True, makeMonthList(u"%%d nî %d goe̍h")) -# -# # This table defines the limits for each type of format data. -# Each item is a tuple with a predicate function (returns True if the value falls within acceptable limits, False otherwise), -# In addition, tuple contains start, end, and step values that will be used to test the formats table for internal consistency. -# +# Each item is a tuple with a predicate function +# (returns True if the value falls within acceptable limits, False otherwise), +# In addition, tuple contains start, end, and step values that will be used to +# test the formats table for internal consistency. formatLimits = { - 'MonthName' : (lambda v: 1 <=v and v < 13, 1, 13), - 'Number' : (lambda v: 0 <=v and v < 1000000, 0, 1001), - - 'YearAD' : (lambda v: 0 <=v and v < 2501, 0, 2501), - 'YearBC' : (lambda v: 0 <=v and v < 4001, 0, 501), # zh: has years as old as 前1700年 - 'DecadeAD' : (lambda v: 0 <=v and v < 2501, 0, 2501), # At some point need to re-add "and v%10==0" to the limitation - 'DecadeBC' : (lambda v: 0 <=v and v < 4001, 0, 501), # zh: has decades as old as 前1700年代 - 'CenturyAD' : (lambda v: 1 <=v and v < 41, 1, 23), # Some centuries use Roman numerals or a given list - do not exceed them in testing - 'CenturyBC' : (lambda v: 1 <=v and v < 91, 1, 23), # Some centuries use Roman numerals or a given list - do not exceed them in testing - 'MillenniumAD' : (lambda v: 1 <=v and v < 6, 1, 4), # For milleniums, only test first 3 AD Milleniums, - 'MillenniumBC' : (lambda v: 1 <=v and v < 20, 1, 2), # And only 1 BC Millenium - 'CenturyAD_Cat' : (lambda v: 1 <=v and v < 41, 1, 23), # Some centuries use Roman numerals or a given list - do not exceed them in testing - 'CenturyBC_Cat' : (lambda v: 1 <=v and v < 41, 1, 23), # Some centuries use Roman numerals or a given list - do not exceed them in testing - 'Cat_Year_MusicAlbums' : (lambda v: 1950 <= v and v < 2021, 1950, 2021), - 'Cat_BirthsAD' : (lambda v: 0 <=v and v < 2501, 0, 2501), - 'Cat_DeathsAD' : (lambda v: 0 <=v and v < 2501, 0, 2501), - 'Cat_BirthsBC' : (lambda v: 0 <=v and v < 4001, 0, 501), - 'Cat_DeathsBC' : (lambda v: 0 <=v and v < 4001, 0, 501), - 'CurrEvents' : (lambda v: 0 <= v and v < 1, 0, 1), + 'MonthName': (lambda v: 1 <= v and v < 13, 1, 13), + 'Number': (lambda v: 0 <= v and v < 1000000, 0, 1001), + 'YearAD': (lambda v: 0 <= v and v < 2501, 0, 2501), + 'YearBC': (lambda v: 0 <= v and v < 4001, 0, 501), # zh: has years as old as 前1700年 + 'DecadeAD': (lambda v: 0 <= v and v < 2501, 0, 2501), # At some point need to re-add "and v%10==0" to the limitation + 'DecadeBC': (lambda v: 0 <= v and v < 4001, 0, 501), # zh: has decades as old as 前1700年代 + 'CenturyAD': (lambda v: 1 <= v and v < 41, 1, 23), # Some centuries use Roman numerals or a given list - do not exceed them in testing + 'CenturyBC': (lambda v: 1 <= v and v < 91, 1, 23), # Some centuries use Roman numerals or a given list - do not exceed them in testing + 'MillenniumAD': (lambda v: 1 <= v and v < 6, 1, 4), # For milleniums, only test first 3 AD Milleniums, + 'MillenniumBC': (lambda v: 1 <= v and v < 20, 1, 2), # And only 1 BC Millenium + 'CenturyAD_Cat': (lambda v: 1 <= v and v < 41, 1, 23), # Some centuries use Roman numerals or a given list - do not exceed them in testing + 'CenturyBC_Cat': (lambda v: 1 <= v and v < 41, 1, 23), # Some centuries use Roman numerals or a given list - do not exceed them in testing + 'Cat_Year_MusicAlbums': (lambda v: 1950 <= v and v < 2021, 1950, 2021), + 'Cat_BirthsAD': (lambda v: 0 <= v and v < 2501, 0, 2501), + 'Cat_DeathsAD': (lambda v: 0 <= v and v < 2501, 0, 2501), + 'Cat_BirthsBC': (lambda v: 0 <= v and v < 4001, 0, 501), + 'Cat_DeathsBC': (lambda v: 0 <= v and v < 4001, 0, 501), + 'CurrEvents': (lambda v: 0 <= v and v < 1, 0, 1), } # All month of year articles are in the same format -_formatLimit_MonthOfYear = (lambda v: 1 <= 1900 and v < 2051, 1900, 2051) +_formatLimit_MonthOfYear = (lambda v: 1 <= 1900 and v < 2051, 1900, 2051) for month in yrMnthFmts: formatLimits[month] = _formatLimit_MonthOfYear -_formatLimit_DayOfMonth31 = (lambda v: 1 <= v and v < 32, 1, 32) -_formatLimit_DayOfMonth30 = (lambda v: 1 <= v and v < 31, 1, 31) -_formatLimit_DayOfMonth29 = (lambda v: 1 <= v and v < 30, 1, 30) +_formatLimit_DayOfMonth31 = (lambda v: 1 <= v and v < 32, 1, 32) +_formatLimit_DayOfMonth30 = (lambda v: 1 <= v and v < 31, 1, 31) +_formatLimit_DayOfMonth29 = (lambda v: 1 <= v and v < 30, 1, 30) for monthId in xrange(12): - if (monthId + 1) in [1, 3, 5, 7, 8, 10, 12]: - formatLimits[dayMnthFmts[monthId]] = _formatLimit_DayOfMonth31 # 31 days a month - elif (monthId+1) == 2: # February - formatLimits[dayMnthFmts[monthId]] = _formatLimit_DayOfMonth29 # 29 days a month + if (monthId + 1) in (1, 3, 5, 7, 8, 10, 12): + # 31 days a month + formatLimits[dayMnthFmts[monthId]] = _formatLimit_DayOfMonth31 + elif (monthId+1) == 2: # February + # 29 days a month + formatLimits[dayMnthFmts[monthId]] = _formatLimit_DayOfMonth29 else: - formatLimits[dayMnthFmts[monthId]] = _formatLimit_DayOfMonth30 # 30 days a month + # 30 days a month + formatLimits[dayMnthFmts[monthId]] = _formatLimit_DayOfMonth30 + def getNumberOfDaysInMonth(month): """Returns the number of days in a given month, 1 being January, etc.""" return formatLimits[dayMnthFmts[month-1]][2]-1 -def getAutoFormat( lang, title, ignoreFirstLetterCase = True ): - """Returns (dictName,value), where value can be a year, date, etc, and dictName is 'YearBC', 'December', etc.""" + +def getAutoFormat(lang, title, ignoreFirstLetterCase=True): + """Returns (dictName,value), where value can be a year, date, etc, and + dictName is 'YearBC', 'December', etc. + + """ for dictName, dict in formats.iteritems(): try: - year = dict[ lang ]( title ) + year = dict[lang](title) return dictName, year except: pass - # sometimes the title may begin with an upper case while its listed as lower case, or the other way around + # sometimes the title may begin with an upper case while its listed as + # lower case, or the other way around # change case of the first character to the opposite, and try again if ignoreFirstLetterCase: try: @@ -1753,18 +2300,19 @@ title = title[0].lower() + title[1:] else: title = title[0].upper() + title[1:] - return getAutoFormat(lang, title, ignoreFirstLetterCase = False) + return getAutoFormat(lang, title, ignoreFirstLetterCase=False) except: pass return None, None class FormatDate(object): + def __init__(self, site): self.site = site def __call__(self, m, d): - return formats['Day_' + enMonthNames[m-1]][self.site.lang](d) + return formats['Day_' + enMonthNames[m-1]][self.site.code](d) def formatYear(lang, year): @@ -1777,46 +2325,59 @@ # Map testing methods # -def printMonthArray( lang, pattern, capitalize ): + +def printMonthArray(lang, pattern, capitalize): """ """ - for s in makeMonthNamedList( lang, pattern, capitalize ): + for s in makeMonthNamedList(lang, pattern, capitalize): pywikibot.output(s) -def testMapEntry( formatName, showAll = True, value = None ): - """This is a test function, to be used interactivelly to test the validity of the above maps. - To test, run this function with the map name, value to be tested, and the final value expected. + +def testMapEntry(formatName, showAll=True, value=None): + """This is a test function, to be used interactivelly to test the validity + of the above maps. To test, run this function with the map name, value to + be tested, and the final value expected. Usage example: run python interpreter >>> import date - >>> date.testMapEntry( 'DecadeAD', 1992, 1990 ) - >>> date.testMapEntry( 'CenturyAD', 20, 20 ) + >>> date.testMapEntry('DecadeAD', 1992, 1990) + >>> date.testMapEntry('CenturyAD', 20, 20) + """ step = 1 - if formatName in decadeFormats: step = 10 - predicate,start,stop = formatLimits[formatName] + if formatName in decadeFormats: + step = 10 + predicate, start, stop = formatLimits[formatName] if value is not None: - start, stop = value, value+1 + start, stop = value, value + 1 if showAll: - pywikibot.output(u"Processing %s with limits from %d to %d and step %d" % (formatName, start, stop - 1, step)) + print(u"Processing %s with limits from %d to %d and step %d" + % (formatName, start, stop - 1, step)) for code, convFunc in formats[formatName].iteritems(): -# import time -# startClock = time.clock() +## import time +## startClock = time.clock() for value in xrange(start, stop, step): try: if not predicate(value): - raise AssertionError(" Not a valid value for this format.") + raise AssertionError( + " Not a valid value for this format.") newValue = convFunc(convFunc(value)) if newValue != value: - raise AssertionError(" %s != %s: assert failed, values didn't match" % (newValue, value)) + raise AssertionError( + " %s != %s: assert failed, values didn't match" + % (newValue, value)) if showAll: - pywikibot.output(u"date.formats['%s']['%s'](%d): '%s' -> %d" % (formatName, code, value, convFunc(value), newValue)) + print(u"date.formats['%s']['%s'](%d): '%s' -> %d" + % (formatName, code, value, convFunc(value), + newValue)) except: - pywikibot.output(u"********** Error in date.formats['%s']['%s'](%d)" % (formatName, code, value)) + print(u"********** Error in date.formats['%s']['%s'](%d)" + % (formatName, code, value)) raise -# pywikibot.output( u"%s\t%s\t%f" % (formatName, code, time.clock() - startClock) ) +## print(u"%s\t%s\t%f" % (formatName, code, time.clock() - startClock)) + def test(quick=False, showAll=False): """This is a test function, to be used interactively to test entire @@ -1828,17 +2389,19 @@ >>> date.test() """ - for formatName in formats.keys(): + for formatName in formats: if quick: - testMapEntry( formatName, showAll, formatLimits[formatName][1] ) # Only test the first value in the test range + # Only test the first value in the test range + testMapEntry(formatName, showAll, formatLimits[formatName][1]) else: - testMapEntry( formatName, showAll ) # Extensive test! # Test decade rounding - pywikibot.output(u"'%s' complete." % formatName) + # Extensive test! Test decade rounding + testMapEntry(formatName, showAll) + print(u"'%s' complete." % formatName) if quick: - #pywikibot.output(u'Date module quick consistency test passed') +## print(u'Date module quick consistency test passed') pass else: - pywikibot.output(u'Date module has been fully tested') + print(u'Date module has been fully tested') if __name__=="__main__": # Test the date file -- To view, visit https://gerrit.wikimedia.org/r/95191 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0f6b66a44acba89182a2dbd8eae34fa32a6b71b2 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ignore pep8 for catimages.py for now which is really hard - change (pywikibot/compat)
by jenkins-bot (Code Review) 13 Nov '13

13 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: ignore pep8 for catimages.py for now which is really hard ...................................................................... ignore pep8 for catimages.py for now which is really hard Change-Id: I3c5d368797a1da864a4f284ba41d7e2c6f7e832e --- M .pep8 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.pep8 b/.pep8 index 8e83dbb..4f1391e 100644 --- a/.pep8 +++ b/.pep8 @@ -1,4 +1,4 @@ [pep8] ignore = E122,E127,E241,E502 -exclude = ./wiktionary.py,./wiktionary/*,./tests/*,./userinterfaces/*,./commonsdelinker/*,./families/*,./maintenance/*,./pywikibot/*,./externals/* +exclude = ./catimages.py,./wiktionary.py,./wiktionary/*,./tests/*,./userinterfaces/*,./commonsdelinker/*,./families/*,./maintenance/*,./pywikibot/*,./externals/* max_line_length = 256 -- To view, visit https://gerrit.wikimedia.org/r/95182 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3c5d368797a1da864a4f284ba41d7e2c6f7e832e Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] [PEP8]ify catimages.py - change (pywikibot/compat)
by Xqt (Code Review) 13 Nov '13

13 Nov '13

Xqt has submitted this change and it was merged. Change subject: [PEP8]ify catimages.py ...................................................................... [PEP8]ify catimages.py (giving up) Change-Id: I9f26f326f9d57bfdadb1a32cf41ebb75a193d3ca --- M catimages.py 1 file changed, 781 insertions(+), 669 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/catimages.py b/catimages.py index acff497..516cf81 100644 --- a/catimages.py +++ b/catimages.py @@ -38,7 +38,7 @@ # # (C) Kyle/Orgullomoore, 2006-2007 (newimage.py) -# (C) Pywikipedia team, 2007-2011 (checkimages.py) +# (C) Pywikibot team, 2007-2012 (checkimages.py) # (C) DrTrigon, 2012 # # Distributed under the terms of the MIT license. @@ -47,8 +47,18 @@ # # python default packages -import re, urllib2, os, locale, sys, datetime, math, shutil, mimetypes, shelve -import StringIO, json +import re +import urllib2 +import os +import locale +import sys +import datetime +import math +import shutil +import mimetypes +import shelve +import StringIO +import json from subprocess import Popen, PIPE try: import Image # classic 'PIL' @@ -65,7 +75,7 @@ sys.exc_clear() try: import numpy as np - from scipy import ndimage, fftpack#, signal + from scipy import ndimage, fftpack # , signal import cv # TS: nonofficial cv2.so backport of the testing-version of # python-opencv because of missing build-host, done by DaB @@ -76,17 +86,18 @@ import warnings with warnings.catch_warnings(): warnings.simplefilter("ignore") - import gtk # ignore warning: "GtkWarning: could not open display" - import rsvg # gnome-python2-rsvg (binding to librsvg) + import gtk # ignore warning: "GtkWarning: could not open display" + import rsvg # gnome-python2-rsvg (binding to librsvg) import cairo - import magic # python-magic (binding to libmagic) + import magic # python-magic (binding to libmagic) except: # either raise the ImportError later or skip it pass # pywikipedia framework python packages import wikipedia as pywikibot -import pagegenerators, catlib +import pagegenerators +import catlib import checkimages import externals # allow import from externals @@ -99,21 +110,25 @@ # TODO: # (pdfminer not used anymore/at the moment...) # python-djvulibre or python-djvu for djvu support -externals.check_setup('colormath') # check for and install needed -externals.check_setup('jseg') # 'externals' modules -externals.check_setup('jseg/jpeg-6b') # -#externals.check_setup('_mlpy') # -externals.check_setup('_music21') # -externals.check_setup('opencv/haarcascades') # -externals.check_setup('pydmtx') # <<< !!! test OS package management here !!! -externals.check_setup('py_w3c') # -externals.check_setup('_zbar') # + +# check for and install needed 'externals' modules +externals.check_setup('colormath') +externals.check_setup('jseg') +externals.check_setup('jseg/jpeg-6b') +##externals.check_setup('_mlpy') +externals.check_setup('_music21') +externals.check_setup('opencv/haarcascades') +externals.check_setup('pydmtx') # <<< !!! test OS package management here !!! +externals.check_setup('py_w3c') +externals.check_setup('_zbar') + import pycolorname -#import _mlpy as mlpy +##import _mlpy as mlpy from colormath.color_objects import RGBColor from py_w3c.validators.html.validator import HTMLValidator, ValidationFault -#from pdfminer import pdfparser, pdfinterp, pdfdevice, converter, cmapdb, layout -#externals.check_setup('_ocropus') +##from pdfminer import pdfparser, pdfinterp, pdfdevice, converter, cmapdb +##from pdfminer import layout +##externals.check_setup('_ocropus') locale.setlocale(locale.LC_ALL, '') @@ -126,7 +141,7 @@ # will automatically replaced with the bot's nickname. # Add your project (in alphabetical order) if you want that the bot start -project_inserted = [u'commons',] +project_inserted = [u'commons'] # Ok, that's all. What is below, is the rest of code, now the code is fixed and it will run correctly in your project. ################################################################################ @@ -138,44 +153,52 @@ | botName = ~~~ |""" -# this list is auto-generated during bot run (may be add notifcation about NEW templates) -#tmpl_available_spec = [ u'Properties', u'ColorRegions', u'Faces', u'ColorAverage' ] +# this list is auto-generated during bot run (may be add notifcation about NEW +# templates) +##tmpl_available_spec = [u'Properties', u'ColorRegions', u'Faces', +## u'ColorAverage'] tmpl_available_spec = [] # auto-generated # global useGuesses = True # Use guesses which are less reliable than true searches +# all detection and recognition methods - bindings to other classes, modules +# and libs -# all detection and recognition methods - bindings to other classes, modules and libs class _UnknownFile(object): + def __init__(self, file_name, file_mime, *args, **kwargs): self.file_name = file_name self.file_mime = file_mime self.image_size = (None, None) # available file properties and metadata - self._properties = { 'Properties': [{'Format': u'-', 'Length': -1}], - 'Metadata': [], } + self._properties = { + 'Properties': [{'Format': u'-', 'Length': -1}], + 'Metadata': [], + } # available feature to extract - self._features = { 'ColorAverage': [], - 'ColorRegions': [], - 'Faces': [], - 'People': [], - 'OpticalCodes': [], - 'Chessboard': [], - 'History': [], - 'Text': [], - 'Streams': [], - #'Audio': [], - 'Legs': [], - 'Hands': [], - 'Torsos': [], - 'Ears': [], - 'Eyes': [], - 'Automobiles': [], - 'Classify': [], } + self._features = { + 'ColorAverage': [], + 'ColorRegions': [], + 'Faces': [], + 'People': [], + 'OpticalCodes': [], + 'Chessboard': [], + 'History': [], + 'Text': [], + 'Streams': [], +## 'Audio': [], + 'Legs': [], + 'Hands': [], + 'Torsos': [], + 'Ears': [], + 'Eyes': [], + 'Automobiles': [], + 'Classify': [], + } def __enter__(self): return self @@ -189,7 +212,8 @@ return self._properties def getFeatures(self): - pywikibot.warning(u"File format '%s/%s' not supported (yet)!" % tuple(self.file_mime[:2])) + pywikibot.warning(u"File format '%s/%s' not supported (yet)!" + % tuple(self.file_mime[:2])) return self._features def _detect_HeaderAndMetadata(self): @@ -204,19 +228,20 @@ misc += [exif['DescProducer']] if 'DescProducer' in exif else [] misc += [exif['DescCreator']] if 'DescCreator' in exif else [] - result = { 'Software': u'%s'%exif['Software'] if 'Software' in exif else u'-', - 'Desc': u'%s'%exif['Desc'] if 'Desc' in exif else u'-', - 'Comment': u'%s'%exif['Comment'] if 'Comment' in exif else u'-', - 'Producer': u'%s'%exif['Producer'] if 'Producer' in exif else u'-', - 'Misc': u'\n'.join(misc) if misc else u'-',} - #'Output_Extension': exif['Output_extension'] if 'Output_extension' in exif else u'-', - #'DescProducer': exif['DescProducer'] if 'DescProducer' in exif else u'-', - #'DescCreator': exif['DescCreator'] if 'DescCreator' in exif else u'-', - #'Comments': exif['Comments'] if 'Comments' in exif else u'-', - #'WorkDesc': exif['WorkDescription'] if 'WorkDescription' in exif else u'-', - ##'Dimensions': tuple(map(int, exif['ImageSize'].split(u'x'))),} - #'Dimensions': tuple(exif['ImageSize'].split(u'x')) if 'ImageSize' in exif else (None, None),} - #'Mode': exif['ColorType'], } + result = { + 'Software': u'%s' % exif['Software'] if 'Software' in exif else u'-', + 'Desc': u'%s' % exif['Desc'] if 'Desc' in exif else u'-', + 'Comment': u'%s' % exif['Comment'] if 'Comment' in exif else u'-', + 'Producer': u'%s' % exif['Producer'] if 'Producer' in exif else u'-', + 'Misc': u'\n'.join(misc) if misc else u'-', + } + #'Output_Extension': exif['Output_extension'] if 'Output_extension' in exif else u'-', + #'DescProducer': exif['DescProducer'] if 'DescProducer' in exif else u'-', + #'DescCreator': exif['DescCreator'] if 'DescCreator' in exif else u'-', + #'Comments': exif['Comments'] if 'Comments' in exif else u'-', + #'WorkDesc': exif['WorkDescription'] if 'WorkDescription' in exif else u'-', + #'Dimensions': tuple(exif['ImageSize'].split(u'x')) if 'ImageSize' in exif else (None, None),} + #'Mode': exif['ColorType'], } ## https://pypi.python.org/pypi/hachoir-metadata (needs 'core' and 'parser') # @@ -275,35 +300,35 @@ def _util_get_DataTags_EXIF(self): # http://tilloy.net/dev/pyexiv2/tutorial.html # (is UNFORTUNATELY NOT ABLE to handle all tags, e.g. 'FacesDetected', ...) - + if hasattr(self, '_buffer_EXIF'): return self._buffer_EXIF res = {} - enable_recovery() # enable recovery from hard crash + enable_recovery() # enable recovery from hard crash try: if hasattr(pyexiv2, 'ImageMetadata'): metadata = pyexiv2.ImageMetadata(self.file_name) metadata.read() - + for key in metadata.exif_keys: res[key] = metadata[key] - + for key in metadata.iptc_keys: res[key] = metadata[key] - + for key in metadata.xmp_keys: res[key] = metadata[key] else: image = pyexiv2.Image(self.file_name) image.readMetadata() - + for key in image.exifKeys(): res[key] = image[key] - + for key in image.iptcKeys(): res[key] = image[key] - + #for key in image.xmpKeys(): # res[key] = image[key] except IOError: @@ -311,27 +336,28 @@ except RuntimeError: pass disable_recovery() # disable since everything worked out fine - - + + # http://www.sno.phy.queensu.ca/~phil/exiftool/ # MIGHT BE BETTER TO USE AS PYTHON MODULE; either by wrapper or perlmodule: # http://search.cpan.org/~gaas/pyperl-1.0/perlmodule.pod # (or use C++ with embbedded perl to write a python module) - data = Popen("exiftool -j %s" % self.file_name, + data = Popen("exiftool -j %s" % self.file_name, shell=True, stdout=PIPE).stdout.read() if not data: raise ImportError("exiftool not found!") - try: # work-a-round for badly encoded exif data (from pywikibot/comms/http.py) - data = unicode(data, 'utf-8', errors = 'strict') + try: # work-a-round for badly encoded exif data (from pywikibot/comms/http.py) + data = unicode(data, 'utf-8', errors='strict') except UnicodeDecodeError: - data = unicode(data, 'utf-8', errors = 'replace') + data = unicode(data, 'utf-8', errors='replace') #res = {} - data = re.sub("(?<!\")$Binary data (?P<size>\d*) bytes$", "\"(Binary data \g<size> bytes)\"", data) # work-a-round some issue + data = re.sub("(?<!\")$Binary data (?P<size>\d*) bytes$", + "\"(Binary data \g<size> bytes)\"", + data) # work-a-round some issue for item in json.loads(data): - res.update( item ) + res.update(item) #print res self._buffer_EXIF = res - return self._buffer_EXIF @@ -357,17 +383,16 @@ self.image_filename = os.path.split(self.file_name)[-1] self.image_path = self.file_name self.image_path_JPEG = self.image_path + '.jpg' - self._convert() def __exit__(self, type, value, traceback): #if os.path.exists(self.image_path): - # os.remove( self.image_path ) + # os.remove(self.image_path) if os.path.exists(self.image_path_JPEG): - os.remove( self.image_path_JPEG ) + os.remove(self.image_path_JPEG) #image_path_new = self.image_path_JPEG.replace(u"cache/", u"cache/0_DETECTED_") #if os.path.exists(image_path_new): - # os.remove( image_path_new ) + # os.remove(image_path_new) def getFeatures(self): # Faces (extract EXIF data) @@ -407,19 +432,18 @@ # general (self-trained) detection WITH classification # BoW: uses feature detection (SIFT, SURF, ...) AND classification (SVM, ...) -# self._detectclassify_ObjectAll() +## self._detectclassify_ObjectAll() # Wavelet: uses wavelet transformation AND classification (machine learning) -# self._detectclassify_ObjectAll_PYWT() +## self._detectclassify_ObjectAll_PYWT() # general file EXIF history information self._detect_History() - return self._features # supports a lot of different file types thanks to PIL def _convert(self): try: - im = Image.open(self.image_path) # might be png, gif etc, for instance + im = Image.open(self.image_path) # might be png, gif etc, for instance #im.thumbnail(size, Image.ANTIALIAS) # size is 640x480 im.convert('RGB').save(self.image_path_JPEG, "JPEG") @@ -433,7 +457,7 @@ else: try: # since opencv might still work, try this as fall-back - img = cv2.imread( self.image_path, cv.CV_LOAD_IMAGE_COLOR ) + img = cv2.imread(self.image_path, cv.CV_LOAD_IMAGE_COLOR) cv2.imwrite(self.image_path_JPEG, img) self.image_size = (img.shape[1], img.shape[0]) @@ -462,13 +486,13 @@ return # http://mail.python.org/pipermail/image-sig/1999-May/000740.html - pc=0 # count number of pages + pc = 0 # count number of pages while True: try: i.seek(pc) except EOFError: break - pc+=1 + pc += 1 i.seek(0) # restore default # http://grokbase.com/t/python/image-sig/082psaxt6k/embedded-icc-profiles @@ -520,8 +544,7 @@ # MAY BE USE 'haarcascade_frontalface_alt_tree.xml' ALSO / INSTEAD...?!! if not os.path.exists(xml): raise IOError(u"No such file: '%s'" % xml) - #cascade = cv.Load( - cascade = cv2.CascadeClassifier(xml) + cascade = cv2.CascadeClassifier(xml) xml = os.path.join(scriptdir, 'externals/opencv/haarcascades/haarcascade_profileface.xml') if not os.path.exists(xml): raise IOError(u"No such file: '%s'" % xml) @@ -557,12 +580,12 @@ # http://opencv.itseez.com/modules/objdetect/doc/cascade_classification.html try: #image = cv.LoadImage(self.image_path) - #img = cv2.imread( self.image_path, cv.CV_LOAD_IMAGE_COLOR ) - img = cv2.imread( self.image_path_JPEG, cv.CV_LOAD_IMAGE_COLOR ) + #img = cv2.imread(self.image_path, cv.CV_LOAD_IMAGE_COLOR) + img = cv2.imread(self.image_path_JPEG, cv.CV_LOAD_IMAGE_COLOR) #image = cv.fromarray(img) if img == None: raise IOError - + # !!! the 'scale' here IS RELEVANT FOR THE DETECTION RATE; # how small and how many features are detected as faces (or eyes) scale = max([1., np.average(np.array(img.shape)[0:2]/500.)]) @@ -573,49 +596,49 @@ pywikibot.warning(u'unknown file type [_detect_Faces]') return - #detectAndDraw( image, cascade, nestedCascade, scale ); + #detectAndDraw(image, cascade, nestedCascade, scale); # http://nullege.com/codes/search/cv.CvtColor - #smallImg = cv.CreateImage( (cv.Round(img.shape[0]/scale), cv.Round(img.shape[1]/scale)), cv.CV_8UC1 ) - #smallImg = cv.fromarray(np.empty( (cv.Round(img.shape[0]/scale), cv.Round(img.shape[1]/scale)), dtype=np.uint8 )) - smallImg = np.empty( (cv.Round(img.shape[1]/scale), cv.Round(img.shape[0]/scale)), dtype=np.uint8 ) + #smallImg = cv.CreateImage((cv.Round(img.shape[0]/scale), cv.Round(img.shape[1]/scale)), cv.CV_8UC1) + #smallImg = cv.fromarray(np.empty((cv.Round(img.shape[0]/scale), cv.Round(img.shape[1]/scale)), dtype=np.uint8)) + smallImg = np.empty((cv.Round(img.shape[1]/scale), cv.Round(img.shape[0]/scale)), dtype=np.uint8) - #cv.CvtColor( image, gray, cv.CV_BGR2GRAY ) - gray = cv2.cvtColor( img, cv.CV_BGR2GRAY ) - #cv.Resize( gray, smallImg, smallImg.size(), 0, 0, INTER_LINEAR ) - smallImg = cv2.resize( gray, smallImg.shape, interpolation=cv2.INTER_LINEAR ) - #cv.EqualizeHist( smallImg, smallImg ) - smallImg = cv2.equalizeHist( smallImg ) + #cv.CvtColor(image, gray, cv.CV_BGR2GRAY) + gray = cv2.cvtColor(img, cv.CV_BGR2GRAY) + #cv.Resize(gray, smallImg, smallImg.size(), 0, 0, INTER_LINEAR) + smallImg = cv2.resize(gray, smallImg.shape, interpolation=cv2.INTER_LINEAR) + #cv.EqualizeHist(smallImg, smallImg) + smallImg = cv2.equalizeHist(smallImg) t = cv.GetTickCount() - faces = list(cascade.detectMultiScale( smallImg, + faces = list(cascade.detectMultiScale(smallImg, 1.1, 2, 0 #|cv.CV_HAAR_FIND_BIGGEST_OBJECT #|cv.CV_HAAR_DO_ROUGH_SEARCH |cv.CV_HAAR_SCALE_IMAGE, - (30, 30) )) + (30, 30))) #faces = cv.HaarDetectObjects(grayscale, cascade, storage, 1.2, 2, # cv.CV_HAAR_DO_CANNY_PRUNING, (50,50)) - facesprofil = list(cascadeprofil.detectMultiScale( smallImg, + facesprofil = list(cascadeprofil.detectMultiScale(smallImg, 1.1, 2, 0 #|cv.CV_HAAR_FIND_BIGGEST_OBJECT #|cv.CV_HAAR_DO_ROUGH_SEARCH |cv.CV_HAAR_SCALE_IMAGE, - (30, 30) )) + (30, 30))) #faces = self._util_merge_Regions(faces + facesprofil)[0] faces = self._util_merge_Regions(faces + facesprofil, overlap=True)[0] faces = np.array(faces) #if faces: # self._drawRect(faces) #call to a python pil t = cv.GetTickCount() - t - #print( "detection time = %g ms\n" % (t/(cv.GetTickFrequency()*1000.)) ) - #colors = [ (0,0,255), + #print("detection time = %g ms\n" % (t/(cv.GetTickFrequency()*1000.))) + #colors = [(0,0,255), # (0,128,255), # (0,255,255), # (0,255,0), # (255,128,0), # (255,255,0), # (255,0,0), - # (255,0,255) ] + # (255,0,255)] result = [] for i, r in enumerate(faces): #color = colors[i%8] @@ -623,7 +646,7 @@ #cx = cv.Round((rx + rwidth*0.5)*scale) #cy = cv.Round((ry + rheight*0.5)*scale) #radius = cv.Round((rwidth + rheight)*0.25*scale) - #cv2.circle( img, (cx, cy), radius, color, 3, 8, 0 ) + #cv2.circle(img, (cx, cy), radius, color, 3, 8, 0) #if nestedCascade.empty(): # continue # Wilson, Fernandez: FACIAL FEATURE DETECTION USING HAAR CLASSIFIERS @@ -635,131 +658,141 @@ #print r, (rx, ry, rwidth, rheight) #smallImgROI = smallImg[ry:(ry+rheight),rx:(rx+rwidth)] smallImgROI = smallImg[ry:(ry+6*dy),rx:(rx+rwidth)] # speed up by setting instead of extracting ROI - nestedObjects = nestedCascade.detectMultiScale( smallImgROI, + nestedObjects = nestedCascade.detectMultiScale(smallImgROI, 1.1, 2, 0 #|CV_HAAR_FIND_BIGGEST_OBJECT #|CV_HAAR_DO_ROUGH_SEARCH #|CV_HAAR_DO_CANNY_PRUNING |cv.CV_HAAR_SCALE_IMAGE, - (30, 30) ) + (30, 30)) nestedObjects = self._util_merge_Regions(list(nestedObjects), overlap=True)[0] if len(nestedObjects) < 2: - nestedLeftEye = cascadelefteye.detectMultiScale( smallImgROI, + nestedLeftEye = cascadelefteye.detectMultiScale(smallImgROI, 1.1, 2, 0 #|CV_HAAR_FIND_BIGGEST_OBJECT #|CV_HAAR_DO_ROUGH_SEARCH #|CV_HAAR_DO_CANNY_PRUNING |cv.CV_HAAR_SCALE_IMAGE, - (30, 30) ) - nestedRightEye = cascaderighteye.detectMultiScale( smallImgROI, + (30, 30)) + nestedRightEye = cascaderighteye.detectMultiScale(smallImgROI, 1.1, 2, 0 #|CV_HAAR_FIND_BIGGEST_OBJECT #|CV_HAAR_DO_ROUGH_SEARCH #|CV_HAAR_DO_CANNY_PRUNING |cv.CV_HAAR_SCALE_IMAGE, - (30, 30) ) + (30, 30)) nestedObjects = self._util_merge_Regions(list(nestedObjects) + - list(nestedLeftEye) + + list(nestedLeftEye) + list(nestedRightEye), overlap=True)[0] #if len(nestedObjects) > 2: # nestedObjects = self._util_merge_Regions(list(nestedObjects), close=True)[0] smallImgROI = smallImg[(ry+4*dy):(ry+rheight),rx:(rx+rwidth)] - nestedMouth = cascademouth.detectMultiScale( smallImgROI, + nestedMouth = cascademouth.detectMultiScale(smallImgROI, 1.1, 2, 0 |cv.CV_HAAR_FIND_BIGGEST_OBJECT |cv.CV_HAAR_DO_ROUGH_SEARCH #|CV_HAAR_DO_CANNY_PRUNING |cv.CV_HAAR_SCALE_IMAGE, - (30, 30) ) + (30, 30)) smallImgROI = smallImg[(ry+(5*dy)/2):(ry+5*dy+(5*dy)/2),(rx+(5*dx)/2):(rx+5*dx+(5*dx)/2)] - nestedNose = cascadenose.detectMultiScale( smallImgROI, + nestedNose = cascadenose.detectMultiScale(smallImgROI, 1.1, 2, 0 |cv.CV_HAAR_FIND_BIGGEST_OBJECT |cv.CV_HAAR_DO_ROUGH_SEARCH #|CV_HAAR_DO_CANNY_PRUNING |cv.CV_HAAR_SCALE_IMAGE, - (30, 30) ) + (30, 30)) smallImgROI = smallImg[(ry+2*dy):(ry+6*dy),rx:(rx+rwidth)] - nestedEars = list(cascadeleftear.detectMultiScale( smallImgROI, + nestedEars = list(cascadeleftear.detectMultiScale(smallImgROI, 1.1, 2, 0 |cv.CV_HAAR_FIND_BIGGEST_OBJECT |cv.CV_HAAR_DO_ROUGH_SEARCH #|CV_HAAR_DO_CANNY_PRUNING |cv.CV_HAAR_SCALE_IMAGE, - (30, 30) )) - nestedEars += list(cascaderightear.detectMultiScale( smallImgROI, + (30, 30))) + nestedEars += list(cascaderightear.detectMultiScale(smallImgROI, 1.1, 2, 0 |cv.CV_HAAR_FIND_BIGGEST_OBJECT |cv.CV_HAAR_DO_ROUGH_SEARCH #|CV_HAAR_DO_CANNY_PRUNING |cv.CV_HAAR_SCALE_IMAGE, - (30, 30) )) - data = { 'ID': (i+1), - 'Position': tuple(np.int_(r*scale)), - 'Type': u'-', - 'Eyes': [], - 'Mouth': (), - 'Nose': (), - 'Ears': [], - 'Pose': (), } - data['Coverage'] = float(data['Position'][2]*data['Position'][3])/(self.image_size[0]*self.image_size[1]) + (30, 30))) + data = {'ID': (i+1), + 'Position': tuple(np.int_(r*scale)), + 'Type': u'-', + 'Eyes': [], + 'Mouth': (), + 'Nose': (), + 'Ears': [], + 'Pose': (), } + data['Coverage'] = float(data['Position'][2] * + data['Position'][3]) / ( + self.image_size[0] * + self.image_size[1]) #if (c >= confidence): # eyes = nestedObjects # if not (type(eyes) == type(tuple())): # eyes = tuple((eyes*scale).tolist()) - # result.append( {'Position': r*scale, 'eyes': eyes, 'confidence': c} ) + # result.append({'Position': r*scale, 'eyes': eyes, 'confidence': c}) #print {'Position': r, 'eyes': nestedObjects, 'confidence': c} for nr in nestedObjects: (nrx, nry, nrwidth, nrheight) = nr - cx = cv.Round((rx + nrx + nrwidth*0.5)*scale) - cy = cv.Round((ry + nry + nrheight*0.5)*scale) - radius = cv.Round((nrwidth + nrheight)*0.25*scale) - #cv2.circle( img, (cx, cy), radius, color, 3, 8, 0 ) - data['Eyes'].append( (cx-radius, cy-radius, 2*radius, 2*radius) ) + cx = cv.Round((rx + nrx + nrwidth * 0.5) * scale) + cy = cv.Round((ry + nry + nrheight * 0.5) * scale) + radius = cv.Round((nrwidth + nrheight) * 0.25 * scale) + #cv2.circle(img, (cx, cy), radius, color, 3, 8, 0) + data['Eyes'].append((cx-radius, cy-radius, + 2 * radius, 2 * radius)) if len(nestedMouth): (nrx, nry, nrwidth, nrheight) = nestedMouth[0] - cx = cv.Round((rx + nrx + nrwidth*0.5)*scale) - cy = cv.Round(((ry+4*dy) + nry + nrheight*0.5)*scale) - radius = cv.Round((nrwidth + nrheight)*0.25*scale) - #cv2.circle( img, (cx, cy), radius, color, 3, 8, 0 ) - data['Mouth'] = (cx-radius, cy-radius, 2*radius, 2*radius) + cx = cv.Round((rx + nrx + nrwidth * 0.5) * scale) + cy = cv.Round(((ry+4*dy) + nry + nrheight * 0.5) * scale) + radius = cv.Round((nrwidth + nrheight) * 0.25 * scale) + #cv2.circle(img, (cx, cy), radius, color, 3, 8, 0) + data['Mouth'] = (cx-radius, cy-radius, 2 * radius, 2 * radius) if len(nestedNose): (nrx, nry, nrwidth, nrheight) = nestedNose[0] - cx = cv.Round(((rx+(5*dx)/2) + nrx + nrwidth*0.5)*scale) - cy = cv.Round(((ry+(5*dy)/2) + nry + nrheight*0.5)*scale) + cx = cv.Round(((rx+(5*dx)/2) + nrx + nrwidth * 0.5) * scale) + cy = cv.Round(((ry+(5*dy)/2) + nry + nrheight * 0.5) * scale) radius = cv.Round((nrwidth + nrheight)*0.25*scale) - #cv2.circle( img, (cx, cy), radius, color, 3, 8, 0 ) - data['Nose'] = (cx-radius, cy-radius, 2*radius, 2*radius) + #cv2.circle(img, (cx, cy), radius, color, 3, 8, 0) + data['Nose'] = (cx-radius, cy-radius, 2 * radius, 2 * radius) for nr in nestedEars: (nrx, nry, nrwidth, nrheight) = nr cx = cv.Round((rx + nrx + nrwidth*0.5)*scale) cy = cv.Round((ry + nry + nrheight*0.5)*scale) radius = cv.Round((nrwidth + nrheight)*0.25*scale) - #cv2.circle( img, (cx, cy), radius, color, 3, 8, 0 ) - data['Ears'].append( (cx-radius, cy-radius, 2*radius, 2*radius) ) - if data['Mouth'] and data['Nose'] and data['Eyes'] and (len(data['Eyes']) == 2): + #cv2.circle(img, (cx, cy), radius, color, 3, 8, 0) + data['Ears'].append((cx-radius, cy-radius, 2*radius, 2*radius)) + + if data['Mouth'] and data['Nose'] and data['Eyes'] and ( + len(data['Eyes']) == 2): # head model "little girl" for use in "MeshLab": # http://www.turbosquid.com/FullPreview/Index.cfm/ID/302581 # http://meshlab.sourceforge.net/ - D3points = [[ 70.0602, 109.898, 20.8234], # left eye - [ 2.37427, 110.322, 21.7776], # right eye - [ 36.8301, 78.3185, 52.0345], # nose - [ 36.6391, 51.1675, 38.5903],] # mouth - #[ 119.268, 91.3111, -69.6397], # left ear + D3points = [[70.0602, 109.898, 20.8234], # left eye + [2.37427, 110.322, 21.7776], # right eye + [36.8301, 78.3185, 52.0345], # nose + [36.6391, 51.1675, 38.5903],] # mouth + #[119.268, 91.3111, -69.6397], # left ear #[-49.1328, 91.3111, -67.2481],] # right ear - D2points = [np.array(data['Eyes'][0]), np.array(data['Eyes'][1]), - np.array(data['Nose']), np.array(data['Mouth']),] - D2points = [ item[:2] + item[2:]/2. for item in D2points ] - neutral = np.array([[np.pi],[0.],[0.]]) + D2points = [np.array(data['Eyes'][0]), + np.array(data['Eyes'][1]), + np.array(data['Nose']), + np.array(data['Mouth'])] + D2points = [item[:2] + item[2:]/2. for item in D2points] + neutral = np.array([[np.pi], [0.], [0.]]) # calculate pose - rvec, tvec, cm, err = self._util_get_Pose_solvePnP(D3points, D2points, self.image_size) + rvec, tvec, cm, err = self._util_get_Pose_solvePnP( + D3points, D2points, self.image_size) #data['Pose'] = tuple(rvec[:,0]) check = not (err[:,0,:].max() > 0.5) if not check: - rvec = neutral # reset to neutral pose - tvec = np.array([[0.],[0.],[100.]]) # reset to neutral position (same order as max of D3points) - pywikibot.warning(u'Could not calculate pose of face, too big errors. ' - u'(looks like neutral pose/position is somehow singular)') + rvec = neutral # reset to neutral pose + tvec = np.array([[0.], [0.], [100.]]) # reset to neutral position (same order as max of D3points) + pywikibot.warning( + u'Could not calculate pose of face, too big errors. ' + u'(looks like neutral pose/position is somehow singular)') ## debug: draw pose ##rvec *= 0 #mat, perp = self._util_getD2coords_calc(np.eye(3), cm, rvec, tvec, hacky=False) @@ -771,8 +804,8 @@ #cv2.imshow("win", img) #cv2.waitKey() # calculate delta to neutral pose - drv = -cv2.composeRT(-rvec, np.zeros((3,1)), - neutral, np.zeros((3,1)))[0] + drv = -cv2.composeRT(-rvec, np.zeros((3, 1)), + neutral, np.zeros((3, 1)))[0] rvec = cv2.Rodrigues(cv2.Rodrigues(rvec)[0])[0] # NOT unique!!! #nrv = cv2.composeRT(neutral, np.zeros((3,1)), # drv, np.zeros((3,1)))[0] @@ -785,18 +818,20 @@ pywikibot.output(str(rvec[:,0])) pywikibot.output(str(tvec[:,0])) pywikibot.output(str(err[:,0,:])) - rvec, tvec, cm, err = self._util_get_Pose_POSIT(D3points, D2points) + rvec, tvec, cm, err = self._util_get_Pose_POSIT(D3points, + D2points) pywikibot.output("POSIT:") pywikibot.output(str(rvec[:,0])) pywikibot.output(str(tvec)) - pywikibot.output(str(np.array(err)[:,0,:]/max(self.image_size))) - result.append( data ) + pywikibot.output(str(np.array(err)[:,0,:] / + max(self.image_size))) + result.append(data) ## see '_drawRect' #if result: # #image_path_new = os.path.join(scriptdir, 'cache/0_DETECTED_' + self.image_filename) # image_path_new = self.image_path_JPEG.replace(u"cache/", u"cache/0_DETECTED_") - # cv2.imwrite( image_path_new, img ) + # cv2.imwrite(image_path_new, img) #return faces.tolist() self._features['Faces'] += result @@ -819,30 +854,37 @@ # set-up camera matrix (no calibration needed!) max_d = max(shape) cameraMatrix = [[max_d, 0, shape[0]/2.0], - [ 0, max_d, shape[1]/2.0], - [ 0, 0, 1.0],] + [ 0, max_d, shape[1]/2.0], + [ 0, 0, 1.0],] # calculate pose - rvec, tvec = cv2.solvePnP(np.array(D3points).astype('float32'), np.array(D2points).astype('float32'), np.array(cameraMatrix).astype('float32'), None) + rvec, tvec = cv2.solvePnP(np.array(D3points).astype('float32'), + np.array(D2points).astype('float32'), + np.array(cameraMatrix).astype('float32'), + None) # compare to 2D points err = [] for i, vec in enumerate(np.array(D3points)): - nvec = np.dot(cameraMatrix, (np.dot(cv2.Rodrigues(rvec)[0], vec) + tvec[:,0])) - err.append(((D2points[i] - nvec[:2]/nvec[2]), D2points[i], nvec[:2]/nvec[2])) + nvec = np.dot(cameraMatrix, (np.dot(cv2.Rodrigues(rvec)[0], + vec) + tvec[:,0])) + err.append(((D2points[i] - nvec[:2]/nvec[2]), D2points[i], + nvec[:2] / nvec[2])) - pywikibot.output(u'result for UN-calibrated camera:\n rot=%s' % rvec.transpose()[0]) + pywikibot.output(u'result for UN-calibrated camera:\n rot=%s' + % rvec.transpose()[0]) return rvec, tvec, np.array(cameraMatrix), (np.array(err)/max_d) #def _util_get_Pose_POSIT(self, D3points, D2points, shape): def _util_get_Pose_POSIT(self, D3points, D2points): """ Calculate pose from head model "little girl" w/o camera or other - calibrations needed. + calibrations needed. - Method similar to '_util_get_Pose_solvePnP', please compare. + Method similar to '_util_get_Pose_solvePnP', please compare. - D2points: left eye, right eye, nose, mouth + D2points: left eye, right eye, nose, mouth + """ # calculate pose import opencv @@ -857,32 +899,36 @@ # CV_32F, principal point in the centre of the image is (0, 0) instead of (self.image_size[0]*0.5) FOCAL_LENGTH = 760.0 # hard-coded in posit_python.cpp, should be changed... cameraMatrix = [[FOCAL_LENGTH, 0.0, 0.0],#shape[0]*0.0], - [ 0.0, FOCAL_LENGTH, 0.0],#shape[1]*0.0], - [ 0.0, 0.0, 1.0],] + [ 0.0, FOCAL_LENGTH, 0.0],#shape[1]*0.0], + [ 0.0, 0.0, 1.0],] # compare to 2D points err = [] for i, vec in enumerate(np.array(mdl)): nvec = np.dot(cameraMatrix, (np.dot(rmat, vec) + tvec)) - err.append(((D2points[i] - nvec[:2]/nvec[2]), D2points[i], nvec[:2]/nvec[2])) + err.append(((D2points[i] - nvec[:2]/nvec[2]), D2points[i], + nvec[:2]/nvec[2])) - #pywikibot.output(u'result for UN-calibrated camera:\n rot=%s' % rvec.transpose()[0]) +## pywikibot.output(u'result for UN-calibrated camera:\n rot=%s' +## % rvec.transpose()[0]) - return rvec, tvec, np.array(cameraMatrix), (np.array(err)/1.0) + return rvec, tvec, np.array(cameraMatrix), (np.array(err) / 1.0) # https://pypi.python.org/pypi/xbob.flandmark # http://cmp.felk.cvut.cz/~uricamic/flandmark/ def _detect_FaceLandmark_xBOB(self): """Prints the locations of any face landmark(s) found, respective - converts them to usual face position data""" + converts them to usual face position data + + """ scale = 1. try: #video = bob.io.VideoReader(self.image_path_JPEG.encode('utf-8')) - video = [cv2.imread( self.image_path_JPEG, cv.CV_LOAD_IMAGE_COLOR )] + video = [cv2.imread(self.image_path_JPEG, cv.CV_LOAD_IMAGE_COLOR)] #if img == None: # raise IOError - + # !!! the 'scale' here IS RELEVANT FOR THE DETECTION RATE; # how small and how many features are detected as faces (or eyes) scale = max([1., np.average(np.array(video[0].shape)[0:2]/750.)]) @@ -893,8 +939,8 @@ pywikibot.warning(u'unknown file type [_detect_FaceLandmark_xBOB]') return - smallImg = np.empty( (cv.Round(video[0].shape[1]/scale), cv.Round(video[0].shape[0]/scale)), dtype=np.uint8 ) - video = [ cv2.resize( img, smallImg.shape, interpolation=cv2.INTER_LINEAR ) for img in video ] + smallImg = np.empty((cv.Round(video[0].shape[1]/scale), cv.Round(video[0].shape[0]/scale)), dtype=np.uint8) + video = [cv2.resize(img, smallImg.shape, interpolation=cv2.INTER_LINEAR) for img in video] sys.path.append(os.path.join(scriptdir, 'dtbext')) import _bob as bob @@ -909,8 +955,8 @@ for i, flm in enumerate(localize(frame)): #for pi, point in enumerate(flm['landmark']): - # cv2.circle(img, tuple(map(int, point)), 3, ( 0, 0, 255)) - # cv2.circle(img, tuple(map(int, point)), 5, ( 0, 255, 0)) + # cv2.circle(img, tuple(map(int, point)), 3, ( 0, 0, 255)) + # cv2.circle(img, tuple(map(int, point)), 5, ( 0, 255, 0)) # cv2.circle(img, tuple(map(int, point)), 7, (255, 0, 0)) # cv2.putText(img, str(pi), tuple(map(int, point)), cv2.FONT_HERSHEY_PLAIN, 1.0, (0,255,0)) #cv2.rectangle(img, tuple(map(int, flm['bbox'][:2])), tuple(map(int, (flm['bbox'][0]+flm['bbox'][2], flm['bbox'][1]+flm['bbox'][3]))), (0, 255, 0)) @@ -926,15 +972,18 @@ mi = np.min(mat, axis=0) reye = tuple(mi.astype(int)) + tuple((np.max(mat, axis=0)-mi).astype(int)) #cv2.rectangle(img, tuple(mi.astype(int)), tuple(np.max(mat, axis=0).astype(int)), (0, 255, 0)) - data = { 'ID': (i+1), - 'Position': flm['bbox'], - 'Type': u'Landmark', - 'Eyes': [leye, reye], - 'Mouth': mouth, - 'Nose': tuple(np.array(flm['landmark'][7]).astype(int)) + (0, 0), - 'Ears': [], - 'Landmark': [tuple(lm) for lm in np.array(flm['landmark']).astype(int)], } - data['Coverage'] = float(data['Position'][2]*data['Position'][3])/(self.image_size[0]*self.image_size[1]) + data = {'ID': (i+1), + 'Position': flm['bbox'], + 'Type': u'Landmark', + 'Eyes': [leye, reye], + 'Mouth': mouth, + 'Nose': tuple(np.array(flm['landmark'][7]).astype(int)) + (0, 0), + 'Ears': [], + 'Landmark': [tuple(lm) for lm in np.array(flm['landmark']).astype(int)], } + data['Coverage'] = float(data['Position'][2] * + data['Position'][3]) / ( + self.image_size[0] * + self.image_size[1]) result.append(data) #img = img.astype('uint8') @@ -974,17 +1023,19 @@ return # similar to face detection - smallImg = np.empty( (cv.Round(img.shape[1]/scale), cv.Round(img.shape[0]/scale)), dtype=np.uint8 ) - #gray = cv2.cvtColor( img, cv.CV_BGR2GRAY ) + smallImg = np.empty((cv.Round(img.shape[1]/scale), + cv.Round(img.shape[0]/scale)), dtype=np.uint8) + #gray = cv2.cvtColor(img, cv.CV_BGR2GRAY) gray = img - smallImg = cv2.resize( gray, smallImg.shape, interpolation=cv2.INTER_LINEAR ) - #smallImg = cv2.equalizeHist( smallImg ) + smallImg = cv2.resize(gray, smallImg.shape, + interpolation=cv2.INTER_LINEAR) + #smallImg = cv2.equalizeHist(smallImg) img = smallImg - + hog = cv2.HOGDescriptor() hog.setSVMDetector(cv2.HOGDescriptor_getDefaultPeopleDetector()) #cv2.namedWindow("people detector", 1) - + found = found_filtered = [] #t = time.time() # run the detector with default parameters. to get a higher hit-rate @@ -1009,12 +1060,12 @@ if not os.path.exists(xml): raise IOError(u"No such file: '%s'" % xml) cascade = cv2.CascadeClassifier(xml) - objects = list(cascade.detectMultiScale( smallImg, + objects = list(cascade.detectMultiScale(smallImg, 1.1, 3, 0 #|cv.CV_HAAR_FIND_BIGGEST_OBJECT #|cv.CV_HAAR_DO_ROUGH_SEARCH |cv.CV_HAAR_SCALE_IMAGE, - (30, 30) )) + (30, 30))) found += objects #t = time.time() - t @@ -1027,23 +1078,26 @@ r = found_filtered[i] # the HOG detector returns slightly larger rectangles than the real objects. # so we slightly shrink the rectangles to get a nicer output. - r.x += cv.Round(r.width*0.1) - r.width = cv.Round(r.width*0.8) - r.y += cv.Round(r.height*0.07) - r.height = cv.Round(r.height*0.8) - data = { 'ID': (i+1), } + r.x += cv.Round(r.width * 0.1) + r.width = cv.Round(r.width * 0.8) + r.y += cv.Round(r.height * 0.07) + r.height = cv.Round(r.height * 0.8) + data = {'ID': (i + 1), + } #'Center': (int(r.x + r.width*0.5), int(r.y + r.height*0.5)), } # crop to image size (because of the slightly bigger boxes) r = bbox.intersect(r) #cv2.rectangle(img, (r.x, r.y), (r.x+r.width, r.y+r.height), cv.Scalar(0,255,0), 3) - data['Position'] = tuple(np.int_(np.array(r)*scale)) - data['Coverage'] = float(data['Position'][2]*data['Position'][3])/(self.image_size[0]*self.image_size[1]) - result.append( data ) + data['Position'] = tuple(np.int_(np.array(r) * scale)) + data['Coverage'] = float(data['Position'][2] * + data['Position'][3]) / ( + self.image_size[0] * + self.image_size[1]) + result.append(data) #cv2.imshow("people detector", img) #c = cv2.waitKey(0) & 255 self._features['People'] = result - return def _detect_Geometry(self): result = self._util_get_Geometry_CVnSCIPY() @@ -1051,7 +1105,6 @@ self._features['Geometry'] = [{'Lines': result['Lines'], 'Circles': result['Circles'], 'Corners': result['Corners'],}] - return # https://code.ros.org/trac/opencv/browser/trunk/opencv/samples/python/houghl… def _util_get_Geometry_CVnSCIPY(self): @@ -1084,13 +1137,13 @@ return self._buffer_Geometry # similar to face or people detection - smallImg = np.empty( (cv.Round(img.shape[1]/scale), cv.Round(img.shape[0]/scale)), dtype=np.uint8 ) - _gray = cv2.cvtColor( img, cv.CV_BGR2GRAY ) + smallImg = np.empty((cv.Round(img.shape[1]/scale), cv.Round(img.shape[0]/scale)), dtype=np.uint8) + _gray = cv2.cvtColor(img, cv.CV_BGR2GRAY) # smooth it, otherwise a lot of false circles may be detected - #gray = cv2.GaussianBlur( _gray, (9, 9), 2 ) - gray = cv2.GaussianBlur( _gray, (5, 5), 2 ) - smallImg = cv2.resize( gray, smallImg.shape, interpolation=cv2.INTER_LINEAR ) - #smallImg = cv2.equalizeHist( smallImg ) + #gray = cv2.GaussianBlur(_gray, (9, 9), 2) + gray = cv2.GaussianBlur(_gray, (5, 5), 2) + smallImg = cv2.resize(gray, smallImg.shape, interpolation=cv2.INTER_LINEAR) + #smallImg = cv2.equalizeHist(smallImg) src = smallImg # https://code.ros.org/trac/opencv/browser/trunk/opencv/samples/python/houghl… @@ -1115,20 +1168,20 @@ #for (rho, theta) in lines[:100]: # a = math.cos(theta) # b = math.sin(theta) - # x0 = a * rho + # x0 = a * rho # y0 = b * rho # pt1 = (cv.Round(x0 + 1000*(-b)), cv.Round(y0 + 1000*(a))) # pt2 = (cv.Round(x0 - 1000*(-b)), cv.Round(y0 - 1000*(a))) # cv2.line(color_dst, pt1, pt2, cv.RGB(255, 0, 0), 3, 8) else: #lines = cv.HoughLines2(dst, storage, cv.CV_HOUGH_PROBABILISTIC, 1, pi / 180, 50, 50, 10) - lines = cv2.HoughLinesP(dst, 1, math.pi / 180, 100) + lines = cv2.HoughLinesP(dst, 1, math.pi / 180, 100) #for line in lines: # cv2.line(color_dst, line[0], line[1], cv.CV_RGB(255, 0, 0), 3, 8) # circles try: - #circles = cv2.HoughCircles(src, cv.CV_HOUGH_GRADIENT, 2, src.shape[0]/4)#, 200, 100 ) + #circles = cv2.HoughCircles(src, cv.CV_HOUGH_GRADIENT, 2, src.shape[0]/4)#, 200, 100) circles = cv2.HoughCircles(src, cv.CV_HOUGH_GRADIENT, 2, src.shape[0]/4, param2=200) except cv2.error: circles = None @@ -1139,29 +1192,29 @@ # center = (cv.Round(c[0]), cv.Round(c[1])) # radius = cv.Round(c[2]) # # draw the circle center - # cv2.circle( color_dst, center, 3, cv.CV_RGB(0,255,0), -1, 8, 0 ) + # cv2.circle(color_dst, center, 3, cv.CV_RGB(0,255,0), -1, 8, 0) # # draw the circle outline - # cv2.circle( color_dst, center, radius, cv.CV_RGB(0,0,255), 3, 8, 0 ) + # cv2.circle(color_dst, center, radius, cv.CV_RGB(0,0,255), 3, 8, 0) # corners - corner_dst = cv2.cornerHarris( edges, 2, 3, 0.04 ) + corner_dst = cv2.cornerHarris(edges, 2, 3, 0.04) # Normalizing - cv2.normalize( corner_dst, corner_dst, 0, 255, cv2.NORM_MINMAX, cv.CV_32FC1 ) - #dst_norm_scaled = cv2.convertScaleAbs( corner_dst ) + cv2.normalize(corner_dst, corner_dst, 0, 255, cv2.NORM_MINMAX, cv.CV_32FC1) + #dst_norm_scaled = cv2.convertScaleAbs(corner_dst) # Drawing a circle around corners corner = [] for j in range(corner_dst.shape[0]): for i in range(corner_dst.shape[1]): if corner_dst[j,i] > 200: - #circle( dst_norm_scaled, Point( i, j ), 5, Scalar(0), 2, 8, 0 ); - corner.append( (j,i) ) + #circle(dst_norm_scaled, Point(i, j), 5, Scalar(0), 2, 8, 0); + corner.append((j,i)) data['Corners'] = len(corner) #cv2.imshow("people detector", color_dst) #c = cv2.waitKey(0) & 255 # fft spectral/frequency/momentum analysis with svd peak detection - gray = cv2.resize( _gray, smallImg.shape, interpolation=cv2.INTER_LINEAR ) + gray = cv2.resize(_gray, smallImg.shape, interpolation=cv2.INTER_LINEAR) ##s = (self.image_size[1], self.image_size[0]) #s = gray.shape fft = fftpack.fftn(gray) @@ -1183,7 +1236,7 @@ #SS = np.zeros(s) #ss = min(s) - #for i in range(0, len(S)-1, max( int(len(S)/100.), 1 )): # (len(S)==ss) -> else; problem! + #for i in range(0, len(S)-1, max(int(len(S)/100.), 1)): # (len(S)==ss) -> else; problem! # #SS = np.zeros(s) # #SS[:(ss-i),:(ss-i)] = np.diag(S[:(ss-i)]) # SS[:(i+1),:(i+1)] = np.diag(S[:(i+1)]) @@ -1197,7 +1250,7 @@ #data['SVD_Min'] = S[:(i+1)].min() data['FFT_Peaks'] = float(count)/len(S) - #pywikibot.output( u'FFT_Peaks: %s' % data['FFT_Peaks'] ) + #pywikibot.output(u'FFT_Peaks: %s' % data['FFT_Peaks']) # use wavelet transformation (FWT) from e.g. pywt, scipy signal or mlpy # (may be other) in addition to FFT and compare the spectra with FFT... # confer; "A Practical Guide to Wavelet Analysis" (http://journals.ametsoc.org/doi/pdf/10.1175/1520-0477%281998%29079%3C0061%3…) @@ -1218,7 +1271,7 @@ # http://authors.library.caltech.edu/7694/ # http://www.vision.caltech.edu/Image_Datasets/Caltech256/ # http://opencv.itseez.com/modules/features2d/doc/object_categorization.html - + # http://www.morethantechnical.com/2011/08/25/a-simple-object-classifier-with… # source: https://github.com/royshil/FoodcamClassifier # http://app-solut.com/blog/2011/07/using-the-normal-bayes-classifier-for-ima… @@ -1226,7 +1279,7 @@ # parts of code here should/have to be placed into e.g. a own # class in 'dtbext/opencv/__init__.py' script/module - + trained = ['aeroplane', 'bicycle', 'bird', 'boat', 'bottle', 'bus', 'car', 'cat', 'chair', 'cow', 'diningtable', 'dog', 'horse', 'motorbike', 'person', 'pottedplant', 'sheep', @@ -1247,13 +1300,14 @@ stdout = sys.stdout sys.stdout = StringIO.StringIO() #result = opencv.BoWclassify.main(0, '', '', '', '', '') - result = opencv.BoWclassify(6, - os.path.join(scriptdir, 'dtbext/opencv/VOC2007'), - os.path.join(scriptdir, 'dtbext/opencv/data'), - 'HARRIS', # not important; given by training - 'SIFT', # not important; given by training - 'BruteForce', # not important; given by training - [str(os.path.abspath(self.image_path).encode('latin-1'))]) + result = opencv.BoWclassify( + 6, + os.path.join(scriptdir, 'dtbext/opencv/VOC2007'), + os.path.join(scriptdir, 'dtbext/opencv/data'), + 'HARRIS', # not important; given by training + 'SIFT', # not important; given by training + 'BruteForce', # not important; given by training + [str(os.path.abspath(self.image_path).encode('latin-1'))]) #out = sys.stdout.getvalue() sys.stdout = stdout #print out @@ -1265,7 +1319,8 @@ # http://www.xrce.xerox.com/layout/set/print/content/download/18763/134049/fi… # http://people.csail.mit.edu/torralba/shortCourseRLOC/index.html - self._features['Classify'] = [dict([ (trained[i], r) for i, r in enumerate(result) ])] + self._features['Classify'] = [dict([(trained[i], r) + for i, r in enumerate(result)])] return def _detectclassify_ObjectAll_PYWT(self): @@ -1316,9 +1371,9 @@ ## crop 25% of the image in order to give the bot a more human eye ## (needed for categorization only and thus should be done there/later) #scale = 0.75 # crop 25% percent (area) bounding box - #(w, h) = ( self.image_size[0]*math.sqrt(scale), self.image_size[1]*math.sqrt(scale) ) - #(l, t) = ( (self.image_size[0]-w)/2, (self.image_size[1]-h)/2 ) - #i = im.crop( (int(l), int(t), int(l+w), int(t+h)) ) + #(w, h) = (self.image_size[0]*math.sqrt(scale), self.image_size[1]*math.sqrt(scale)) + #(l, t) = ((self.image_size[0]-w)/2, (self.image_size[1]-h)/2) + #i = im.crop((int(l), int(t), int(l+w), int(t+h))) (l, t) = (0, 0) i = im except IOError: @@ -1349,10 +1404,10 @@ data['ID'] = (i+1) data['Center'] = (int(center[0]+l), int(center[1]+t)) data['Position'] = (int(bbox[0]+l), int(bbox[1]+t), int(bbox[2]), int(bbox[3])) - data['Delta_R'] = math.sqrt( (self.image_size[0]/2 - center[0])**2 + \ - (self.image_size[1]/2 - center[1])**2 ) + data['Delta_R'] = math.sqrt((self.image_size[0]/2 - center[0])**2 + \ + (self.image_size[1]/2 - center[1])**2) - result.append( data ) + result.append(data) i += 1 self._features['ColorRegions'] = result @@ -1392,17 +1447,17 @@ r = h[0:256] g = h[256:256*2] b = h[256*2: 256*3] - + # perform the weighted average of each channel: # the *index* 'i' is the channel value, and the *value* 'w' is its weight rgb = ( - sum( i*w for i, w in enumerate(r) ) / max(1, sum(r)), - sum( i*w for i, w in enumerate(g) ) / max(1, sum(g)), - sum( i*w for i, w in enumerate(b) ) / max(1, sum(b)) - ) + sum(i * w for i, w in enumerate(r)) / max(1, sum(r)), + sum(i * w for i, w in enumerate(g)) / max(1, sum(g)), + sum(i * w for i, w in enumerate(b)) / max(1, sum(b)) + ) # count number of colors used more than 1% of maximum - ma = 0.01*max(h) + ma = 0.01 * max(h) count = sum([int(c > ma) for c in h]) # # TODO: peak detection (not supported by my local scipy version yet) @@ -1418,7 +1473,7 @@ #colors = pycolorname.RAL.colors #colors = pycolorname.pantone.Formula_Guide_Solid colors = pycolorname.pantone.Fashion_Home_paper - + #print "=== RGB Example: RGB->LAB ===" # Instantiate an Lab color object with the given values. rgb = RGBColor(rgb[0], rgb[1], rgb[2], rgb_type='sRGB') @@ -1428,7 +1483,7 @@ lab = rgb.convert_to('lab', target_illuminant='D65') #print lab #print "=== End Example ===\n" - + # Reference color. #color1 = LabColor(lab_l=0.9, lab_a=16.3, lab_b=-2.22) # Color to be compared to the reference. @@ -1468,44 +1523,44 @@ scale = max([1., np.average(np.array(im.size)[0:2]/200.)]) #print np.array(im.size)/scale, scale try: - smallImg = im.resize( tuple(np.int_(np.array(im.size)/scale)), Image.ANTIALIAS ) + smallImg = im.resize(tuple(np.int_(np.array(im.size)/scale)), + Image.ANTIALIAS) except IOError: pywikibot.warning(u'unknown file type [_util_detect_ColorSegments_JSEG]') return - + #im.thumbnail(size, Image.ANTIALIAS) # size is 640x480 smallImg.convert('RGB').save(tmpjpg, "JPEG", quality=100, optimize=True) - + # Program limitation: The total number of regions in the image must be less # than 256 before the region merging process. This works for most images # smaller than 512x512. - + # Processing time will be about 10 seconds for an 192x128 image and 60 seconds # for a 352x240 image. It will take several minutes for a 512x512 image. # Minimum image size is 64x64. - + # ^^^ THUS RESCALING TO ABOUT 200px ABOVE ^^^ # sys.stdout handeled, but with freopen which could give issues import jseg # e.g. "segdist -i test3.jpg -t 6 -r9 test3.map.gif" enable_recovery() # enable recovery from hard crash - jseg.segdist_cpp.main( [ item.encode('utf-8') for item in - ("segdist -i %s -t 6 -r9 %s"%(tmpjpg, tmpgif)).split(" ") ] ) + jseg.segdist_cpp.main([item.encode('utf-8') for item in + ("segdist -i %s -t 6 -r9 %s"%(tmpjpg, tmpgif)).split(" ")]) disable_recovery() # disable since everything worked out fine #out = open((tmpgif + ".stdout"), "r").read() # reading stdout #print out os.remove(tmpgif + ".stdout") - - os.remove( tmpjpg ) - + + os.remove(tmpjpg) + # http://stackoverflow.com/questions/384759/pil-and-numpy pic = Image.open(tmpgif) #pix = np.array(pic) #Image.fromarray(10*pix).show() - - os.remove( tmpgif ) + os.remove(tmpgif) return (pic, scale) # http://planet.scipy.org/ @@ -1538,7 +1593,7 @@ #Image.fromarray(255*pix/np.max(pix)).show() try: - smallImg = im.resize( tuple(np.int_(np.array(im.size)/scale)), Image.ANTIALIAS ) + smallImg = im.resize(tuple(np.int_(np.array(im.size)/scale)), Image.ANTIALIAS) except IOError: pywikibot.warning(u'unknown file type [_util_get_ColorSegmentsHist_PIL]') return @@ -1549,11 +1604,11 @@ mask = np.uint8(pix == i)*255 (y, x) = np.where(mask != 0) center = (np.average(x)*scale, np.average(y)*scale) - bbox = (np.min(x)*scale, np.min(y)*scale, + bbox = (np.min(x)*scale, np.min(y)*scale, (np.max(x)-np.min(x))*scale, (np.max(y)-np.min(y))*scale) #coverage = np.count_nonzero(mask)/imgsize coverage = (mask != 0).sum()/imgsize # count_nonzero is missing in older numpy - mask = Image.fromarray( mask ) + mask = Image.fromarray(mask) h = smallImg.histogram(mask) #smallImg.show() #dispImg = Image.new('RGBA', smallImg.size) @@ -1565,8 +1620,8 @@ if (len(h) == 256*4): pywikibot.output(u"4-ch. image, try to fix (exclude transparency)...") h = h[0:(256*3)] - hist.append( (h, coverage, (center, bbox)) ) - + hist.append((h, coverage, (center, bbox))) + return hist # http://www.scipy.org/SciPyPackages/Ndimage @@ -1586,30 +1641,30 @@ for j, (h, coverage, (center, bbox)) in enumerate(hist): # split into red, green, blue r = h[0:256] - g = h[256:256*2] - b = h[256*2: 256*3] - + g = h[256:256 * 2] + b = h[256 * 2:256 * 3] + # perform the weighted average of each channel: # the *index* 'i' is the channel value, and the *value* 'w' is its weight rgb = ( - sum( i*w for i, w in enumerate(r) ) / max(1, sum(r)), - sum( i*w for i, w in enumerate(g) ) / max(1, sum(g)), - sum( i*w for i, w in enumerate(b) ) / max(1, sum(b)) - ) + sum(i * w for i, w in enumerate(r)) / max(1, sum(r)), + sum(i * w for i, w in enumerate(g)) / max(1, sum(g)), + sum(i * w for i, w in enumerate(b)) / max(1, sum(b)) + ) # color frequency analysis; do not average regions with high fluctations #rgb2 = ( - # sum( i*i*w for i, w in enumerate(r) ) / max(1, sum(r)), - # sum( i*i*w for i, w in enumerate(g) ) / max(1, sum(g)), - # sum( i*i*w for i, w in enumerate(b) ) / max(1, sum(b)) + # sum(i*i*w for i, w in enumerate(r)) / max(1, sum(r)), + # sum(i*i*w for i, w in enumerate(g)) / max(1, sum(g)), + # sum(i*i*w for i, w in enumerate(b)) / max(1, sum(b)) #) - #if ( 500. < np.average( ( + #if (500. < np.average(( # rgb2[0] - rgb[0]**2, # rgb2[1] - rgb[1]**2, - # rgb2[2] - rgb[2]**2, ) ) ): + # rgb2[2] - rgb[2]**2,))): # continue - mask = np.uint8(pix == j)*255 - mask = Image.fromarray( mask ) + mask = np.uint8(pix == j) * 255 + mask = Image.fromarray(mask) #dispImg = Image.new('RGB', im.size) #dispImg.paste(rgb, mask=mask) #dispImg.show() @@ -1619,7 +1674,7 @@ pix[:,:,0] = ndimage.gaussian_filter(pix[:,:,0], .5) pix[:,:,1] = ndimage.gaussian_filter(pix[:,:,1], .5) pix[:,:,2] = ndimage.gaussian_filter(pix[:,:,2], .5) - im = Image.fromarray( pix, mode='RGB' ) + im = Image.fromarray(pix, mode='RGB') #im = im.filter(ImageFilter.BLUR) # or 'SMOOTH' return im @@ -1646,7 +1701,7 @@ scale = 1. try: - img = cv2.imread( self.image_path_JPEG, cv.CV_LOAD_IMAGE_COLOR ) + img = cv2.imread(self.image_path_JPEG, cv.CV_LOAD_IMAGE_COLOR) if (img == None) or (self.image_size[0] is None): raise IOError @@ -1661,26 +1716,30 @@ return # similar to face detection - smallImg = np.empty( (cv.Round(img.shape[1]/scale), cv.Round(img.shape[0]/scale)), dtype=np.uint8 ) - gray = cv2.cvtColor( img, cv.CV_BGR2GRAY ) - smallImg = cv2.resize( gray, smallImg.shape, interpolation=cv2.INTER_LINEAR ) - smallImg = cv2.equalizeHist( smallImg ) + smallImg = np.empty((cv.Round(img.shape[1]/scale), + cv.Round(img.shape[0]/scale)), dtype=np.uint8) + gray = cv2.cvtColor(img, cv.CV_BGR2GRAY) + smallImg = cv2.resize(gray, smallImg.shape, + interpolation=cv2.INTER_LINEAR) + smallImg = cv2.equalizeHist(smallImg) - objects = list(cascade.detectMultiScale( smallImg, + objects = list(cascade.detectMultiScale(smallImg, 1.1, 5, 0 #|cv.CV_HAAR_FIND_BIGGEST_OBJECT #|cv.CV_HAAR_DO_ROUGH_SEARCH |cv.CV_HAAR_SCALE_IMAGE, - (30, 30) )) + (30, 30))) result = [] for i, r in enumerate(objects): data = { 'Position': tuple(np.int_(np.array(r)*scale)) } - data['Coverage'] = float(data['Position'][2]*data['Position'][3])/(self.image_size[0]*self.image_size[1]) - result.append( data ) + data['Coverage'] = float(data['Position'][2] * + data['Position'][3]) / ( + self.image_size[0] * + self.image_size[1]) + result.append(data) # generic detection ... - self._features[info_desc] = result return @@ -1690,7 +1749,7 @@ # http://blog.globalstomp.com/2011/09/decoding-qr-code-code-128-code-39.html # http://zbar.sourceforge.net/ # http://pypi.python.org/pypi/zbar - + # DataMatrix from pydmtx import DataMatrix # linux distro package (fedora) / TS (debian) @@ -1717,7 +1776,8 @@ pywikibot.warning(u'unknown file type [_recognize_OpticalCodes]') return - smallImg = img.resize( (int(img.size[0]/scale), int(img.size[1]/scale)) ) + smallImg = img.resize((int(img.size[0] / scale), + int(img.size[1] / scale))) img = smallImg enable_recovery() # enable recovery from hard crash @@ -1731,14 +1791,15 @@ data, bbox = dm_read.stats(i+1) bbox = np.array(bbox) x, y = bbox[:,0], bbox[:,1] - pos = (np.min(x), np.min(y), np.max(x)-np.min(x), np.max(y)-np.min(y)) - result.append({ 'ID': (i+1), + pos = (np.min(x), np.min(y), np.max(x)-np.min(x), + np.max(y)-np.min(y)) + result.append({'ID': (i+1), #'Data': dm_read.message(i+1), - 'Data': data, - 'Position': pos, - 'Type': u'DataMatrix', - 'Quality': 10, }) - + 'Data': data, + 'Position': pos, + 'Type': u'DataMatrix', + 'Quality': 10}) + self._features['OpticalCodes'] = result # supports many popular symbologies @@ -1746,18 +1807,18 @@ import zbar # TS (debian) except: import _zbar as zbar # other distros (fedora) - + try: img = Image.open(self.image_path_JPEG).convert('L') width, height = img.size except IOError: pywikibot.warning(u'unknown file type [_recognize_OpticalCodes]') return - + scanner = zbar.ImageScanner() scanner.parse_config('enable') zbar_img = zbar.Image(width, height, 'Y800', img.tostring()) - + # scan the image for barcodes # http://zbar.sourceforge.net/api/zbar_8h.html scanner.scan(zbar_img) @@ -1766,14 +1827,14 @@ i += 1 p = np.array(symbol.location) # list of points within code region/area p = (min(p[:,0]), min(p[:,1]), (max(p[:,0])-min(p[:,0])), (max(p[:,1])-min(p[:,1]))) - result.append({ #'components': symbol.components, - 'ID': (i+1), + result.append({#'components': symbol.components, + 'ID': (i+1), #'Count': symbol.count, # 'ID'? - 'Data': symbol.data or u'-', - 'Position': p, # (left, top, width, height) - 'Quality': symbol.quality, # usable for 'Confidence' - 'Type': symbol.type, }) - + 'Data': symbol.data or u'-', + 'Position': p, # (left, top, width, height) + 'Quality': symbol.quality, # usable for 'Confidence' + 'Type': symbol.type}) + # further detection ? self._features['OpticalCodes'] = result @@ -1788,10 +1849,10 @@ scale = 1. try: #im = cv.LoadImage(self.image_path_JPEG, cv.CV_LOAD_IMAGE_COLOR) - im = cv2.imread( self.image_path_JPEG, cv2.CV_LOAD_IMAGE_GRAYSCALE ) - #im = cv2.imread( 'Mutilated_checkerboard_3_1.jpg', cv2.CV_LOAD_IMAGE_GRAYSCALE ) - #im = cv2.imread( 'Jogo_de_Damas_-_Acatabul.JPG', cv2.CV_LOAD_IMAGE_GRAYSCALE ) - chessboard_dim = ( 7, 7 ) + im = cv2.imread(self.image_path_JPEG, cv2.CV_LOAD_IMAGE_GRAYSCALE) + #im = cv2.imread('Mutilated_checkerboard_3_1.jpg', cv2.CV_LOAD_IMAGE_GRAYSCALE) + #im = cv2.imread('Jogo_de_Damas_-_Acatabul.JPG', cv2.CV_LOAD_IMAGE_GRAYSCALE) + chessboard_dim = (7, 7) if im == None: raise IOError @@ -1805,21 +1866,21 @@ pywikibot.warning(u'unknown file type [_detect_Chessboard]') return - smallImg = np.empty( (cv.Round(im.shape[1]/scale), cv.Round(im.shape[0]/scale)), dtype=np.uint8 ) - #gray = cv2.cvtColor( im, cv.CV_BGR2GRAY ) - smallImg = cv2.resize( im, smallImg.shape, interpolation=cv2.INTER_LINEAR ) - #smallImg = cv2.equalizeHist( smallImg ) + smallImg = np.empty((cv.Round(im.shape[1]/scale), cv.Round(im.shape[0]/scale)), dtype=np.uint8) + #gray = cv2.cvtColor(im, cv.CV_BGR2GRAY) + smallImg = cv2.resize(im, smallImg.shape, interpolation=cv2.INTER_LINEAR) + #smallImg = cv2.equalizeHist(smallImg) im = smallImg found_all = False corners = None try: - #found_all, corners = cv.FindChessboardCorners( im, chessboard_dim ) - found_all, corners = cv2.findChessboardCorners( im, chessboard_dim ) + #found_all, corners = cv.FindChessboardCorners(im, chessboard_dim) + found_all, corners = cv2.findChessboardCorners(im, chessboard_dim) except cv2.error: pywikibot.exception(tb=True) - #cv2.drawChessboardCorners( im, chessboard_dim, corners, found_all ) + #cv2.drawChessboardCorners(im, chessboard_dim, corners, found_all) ##cv2.imshow("win", im) ##cv2.waitKey() @@ -1870,14 +1931,14 @@ # #if theta > 0.3125: continue # a = math.cos(theta) # b = math.sin(theta) -# x0 = a * rho +# x0 = a * rho # y0 = b * rho # pt1 = (cv.Round(x0 + 1000*(-b)), cv.Round(y0 + 1000*(a))) # pt2 = (cv.Round(x0 - 1000*(-b)), cv.Round(y0 - 1000*(a))) # cv2.line(color_dst, pt1, pt2, cv.RGB(255, 0, 0), 3, 8) # else: # #lines = cv.HoughLines2(dst, storage, cv.CV_HOUGH_PROBABILISTIC, 1, pi / 180, 50, 50, 10) -# lines = cv2.HoughLinesP(dst, 1, math.pi / 180, 100) +# lines = cv2.HoughLinesP(dst, 1, math.pi / 180, 100) # # for line in lines[0]: # print line @@ -1889,21 +1950,21 @@ # pose detection # http://docs.opencv.org/modules/calib3d/doc/camera_calibration_and_3d_recons… # http://stackoverflow.com/questions/10022568/opencv-2-3-camera-calibration - d = shelve.open( os.path.join(scriptdir, 'externals/opencv/camera_virtual_default') ) + d = shelve.open(os.path.join(scriptdir, 'externals/opencv/camera_virtual_default')) if ('retval' not in d): # http://commons.wikimedia.org/wiki/File:Mutilated_checkerboard_3.jpg pywikibot.output(u"Doing (virtual) camera calibration onto reference image 'File:Mutilated_checkerboard_3.jpg'") - im3 = cv2.imread( 'Mutilated_checkerboard_3.jpg', cv2.CV_LOAD_IMAGE_GRAYSCALE ) - im3 = cv2.resize( im3, (cv.Round(im3.shape[1]/scale), cv.Round(im3.shape[0]/scale)), interpolation=cv2.INTER_LINEAR ) + im3 = cv2.imread('Mutilated_checkerboard_3.jpg', cv2.CV_LOAD_IMAGE_GRAYSCALE) + im3 = cv2.resize(im3, (cv.Round(im3.shape[1]/scale), cv.Round(im3.shape[0]/scale)), interpolation=cv2.INTER_LINEAR) # Compute the the three dimensional world-coordinates tmp = [] for h in range(chessboard_dim[0]): for w in range(chessboard_dim[1]): - tmp.append( (float(h), float(w), 0.0) ) + tmp.append((float(h), float(w), 0.0)) objectPoints = np.array(tmp) # Compute matrices - _found_all, _corners = cv2.findChessboardCorners( im3, chessboard_dim, flags=cv.CV_CALIB_CB_ADAPTIVE_THRESH | cv.CV_CALIB_CB_FILTER_QUADS ) - #cv2.drawChessboardCorners( im3, chessboard_dim, _corners, _found_all ) + _found_all, _corners = cv2.findChessboardCorners(im3, chessboard_dim, flags=cv.CV_CALIB_CB_ADAPTIVE_THRESH | cv.CV_CALIB_CB_FILTER_QUADS) + #cv2.drawChessboardCorners(im3, chessboard_dim, _corners, _found_all) retval, cameraMatrix, distCoeffs, rvecs, tvecs = cv2.calibrateCamera([objectPoints.astype('float32')], [_corners.astype('float32')], im3.shape, np.eye(3), np.zeros((5, 1))) fovx, fovy, focalLength, principalPoint, aspectRatio = cv2.calibrationMatrixValues(cameraMatrix, im3.shape, 1.0, 1.0) d['objectPoints'] = [objectPoints.astype('float32')] # shape: (49, 3) in a list of 1 item @@ -1943,15 +2004,15 @@ #for k in range(3): # row # for j in range(5): # column # rmat = cv2.Rodrigues(2*3.14/5.*j*np.array(np.eye(3)[:,k]))[0] - # mat, perp = self._util_getD2coords_proj( np.dot(rmat, np.eye(3)), cameraMatrix, None, None, distCoeffs=distCoeffs, sign=-1 ) + # mat, perp = self._util_getD2coords_proj(np.dot(rmat, np.eye(3)), cameraMatrix, None, None, distCoeffs=distCoeffs, sign=-1) # self._util_drawAxes(mat, 50+100*j, k*100+50, im) ## debug: rotated axis-cross - #mat, perp = self._util_getD2coords_proj( np.eye(3), cameraMatrix, rvec, tvec, distCoeffs=distCoeffs ) + #mat, perp = self._util_getD2coords_proj(np.eye(3), cameraMatrix, rvec, tvec, distCoeffs=distCoeffs) #self._util_drawAxes(mat, 50, 350, im) ## debug: self-calculated rotated axis-cross - gives strange/wrong results #mat = np.dot((cameraMatrix), np.dot(cv2.Rodrigues(rvec)[0], np.eye(3))) - ##mat, perp = self._util_getD2coords_proj( mat, np.eye(3), None, None, distCoeffs=distCoeffs, sign=-1 ) - #mat, perp = self._util_getD2coords_proj( mat, np.eye(3), None, None, distCoeffs=np.zeros((5,1)) ) + ##mat, perp = self._util_getD2coords_proj(mat, np.eye(3), None, None, distCoeffs=distCoeffs, sign=-1) + #mat, perp = self._util_getD2coords_proj(mat, np.eye(3), None, None, distCoeffs=np.zeros((5,1))) #self._util_drawAxes(mat, 150, 350, im) # debug: self-calculated rotated axis-cross - results looks good: OK # (and can be calculated in order to give numerical results) @@ -2028,8 +2089,8 @@ origin2D[:,i] /= origin2D[2,i] mat = coords2D - origin2D # simple'n'fast solution, if just 2D results are needed - #mat, jacobian = cv2.projectPoints(np.append(np.zeros((1,3)), - # D3coords, + #mat, jacobian = cv2.projectPoints(np.append(np.zeros((1,3)), + # D3coords, # axis=0), # rvec, tvec, cm, np.zeros((5,1))) #mat = mat[:,0,:] @@ -2046,10 +2107,10 @@ def _detect_Faces_EXIF(self): res = self._util_get_DataTags_EXIF() - + # http://u88.n24.queensu.ca/exiftool/forum/index.php?topic=3156.0 # http://u88.n24.queensu.ca/pub/facetest.pl - # ( all scaling stuff ignored (!) and some strongly simplified (!) ) + # (all scaling stuff ignored (!) and some strongly simplified (!)) # Example: 'File:Annagrah-2 041.JPG' (canon) if 'Make' in res: make = res['Make'].lower() @@ -2069,8 +2130,9 @@ else: (width, height) = self.image_size wasRotated = (height > width) - - if True in [item in make for item in ['sony', 'nikon', 'panasonic', 'casio', 'ricoh']]: + + if True in [item in make for item in + ['sony', 'nikon', 'panasonic', 'casio', 'ricoh']]: # UNTESTED: ['sony', 'nikon', 'casio', 'ricoh'] # TESTED: ['panasonic'] if set(['FacesDetected', 'Face1Position']).issubset(found): @@ -2088,15 +2150,17 @@ if 'FaceDetectFrameSize' in res: (width, height) = map(int, res['FaceDetectFrameSize'].split(' ')) (sx, sy) = (1./width, 1./height) - while (('Face%iPosition'%i) in res) and (i <= int(res['FacesDetected'])): + while (('Face%iPosition' % i) in res) and (i <= int(res['FacesDetected'])): buf = map(int, res['Face%iPosition'%i].split(' ')) - (x1, y1) = ((buf[0]-buf[2]/2)*sx, (buf[1]-buf[3]/2)*sy) # 'panasonic' - (x2, y2) = (x1+buf[2]*sx, y1+buf[3]*sy) # + (x1, y1) = ((buf[0] - buf[2]/2) * sx, + (buf[1] - buf[3]/2) * sy) # 'panasonic' + (x2, y2) = (x1 + buf[2]*sx, y1 + buf[3]*sy) # #(x1, y1) = (buf[1]*sx, buf[0]*sy) #(x2, y2) = (x1+buf[3]*sx, y1+buf[2]*sy) - data.append({ 'Position': (x1, y1, x2, y2) }) + data.append({'Position': (x1, y1, x2, y2)}) if ('RecognizedFace%iName'%i) in res: - pywikibot.output(str((res['RecognizedFace%iName'%i], res['RecognizedFace%iAge'%i]))) + pywikibot.output(str((res['RecognizedFace%iName' % i], + res['RecognizedFace%iAge' % i]))) i += 1 elif 'fujifilm' in make: # UNTESTED: 'fujifilm' @@ -2104,10 +2168,14 @@ buf = map(int, res['FacePositions'].split(' ')) (sx, sy) = (1./width, 1./height) for i in range(int(res['FacesDetected'])): - data.append({ 'Position': [buf[i*4]*sx, buf[i*4+1]*sy, - buf[i*4+2]*sx, buf[i*4+3]*sy] }) + data.append({'Position': [buf[i*4] * sx, + buf[i*4 + 1] * sy, + buf[i*4 + 2] * sx, + buf[i*4 + 3] * sy]}) if ('Face%iName'%i) in res: - pywikibot.output(str((res['Face%iName'%i], res['Face%iCategory'%i], res['Face%iBirthday'%i]))) + pywikibot.output(str((res['Face%iName' % i], + res['Face%iCategory' % i], + res['Face%iBirthday' % i]))) elif 'olympus' in make: # UNTESTED: 'olympus' if set(['FacesDetected', 'FaceDetectArea']).issubset(found): @@ -2115,34 +2183,37 @@ if buf[0] or buf[1]: buf = map(int, res['FaceDetectArea'].split(' ')) for i in range(int(res['MaxFaces'])): - data.append({ 'Position': [buf[i*4], buf[i*4+1], buf[i*4+2], buf[i*4+3]] }) + data.append({'Position': [buf[i * 4], buf[i*4 + 1], + buf[i*4 + 2], buf[i*4 + 3]]}) elif True in [item in make for item in ['pentax', 'sanyo']]: # UNTESTED: ['pentax', 'sanyo'] if set(['FacesDetected']).issubset(found): i = 1 (sx, sy) = (1./width, 1./height) while ('Face%iPosition'%i) in res: - buf = map(int, res['Face%iPosition'%i].split(' ') + \ - res['Face%iSize'%i].split(' ')) - (x1, y1) = ((buf[0] - buf[2]/2.)*sx, (buf[1] - buf[3]/2.)*sy) - (x2, y2) = (x1+buf[2]*sx, y1+buf[3]*sy) - data.append({ 'Position': (x1, y1, x2, y2) }) + buf = map(int, res['Face%iPosition' % i].split(' ') + \ + res['Face%iSize' % i].split(' ')) + (x1, y1) = ((buf[0] - buf[2]/2.) * sx, + (buf[1] - buf[3]/2.) * sy) + (x2, y2) = (x1 + buf[2]*sx, y1 + buf[3]*sy) + data.append({'Position': (x1, y1, x2, y2)}) i += 1 if 'FacePosition' in res: - buf = map(int, res['FacePosition'].split(' ') + ['100', '100']) # how big is the face? - (x1, y1) = (buf[0]*sx, buf[1]*sy) - (x2, y2) = (buf[2]*sx, buf[3]*sy) - data.append({ 'Position': (x1, y1, x2, y2) }) + buf = map(int, + res['FacePosition'].split(' ') + ['100', '100']) # how big is the face? + (x1, y1) = (buf[0] * sx, buf[1] * sy) + (x2, y2) = (buf[2] * sx, buf[3] * sy) + data.append({'Position': (x1, y1, x2, y2)}) elif 'canon' in make: - if set(['FacesDetected', 'FaceDetectFrameSize']).issubset(found) \ + if set(['FacesDetected', 'FaceDetectFrameSize']).issubset(found) \ and (int(res['FacesDetected'])): # TESTED: older models store face detect information (width, height) = map(int, res['FaceDetectFrameSize'].split(' ')) # default: (320,240) - (sx, sy) = (1./width, 1./height) + (sx, sy) = (1. / width, 1. / height) fw = res['FaceWidth'] or 35 i = 1 while ('Face%iPosition'%i) in res: - buf = map(int, res['Face%iPosition'%i].split(' ')) + buf = map(int, res['Face%iPosition' % i].split(' ')) (x1, y1) = ((buf[0] + width/2. - fw)*sx, (buf[1] + height/2. - fw)*sy) (x2, y2) = (x1 + fw*2*sx, y1 + fw*2*sy) data.append({ 'Position': (x1, y1, x2, y2) }) @@ -2164,11 +2235,11 @@ else: pywikibot.output(u'No AF area size') # conversion to positive coordinates - buf_x = [ int(x) + width/2. for x in buf_x ] - buf_y = [ int(y) + height/2. for y in buf_y ] + buf_x = [int(x) + width/2. for x in buf_x] + buf_y = [int(y) + height/2. for y in buf_y] # EOS models have Y flipped if ('Model' in res) and ('EOS' in res['Model']): - buf_y = [ height - y for y in buf_y ] + buf_y = [height - y for y in buf_y] (sx, sy) = (1./width, 1./height) for i in range(int(res['ValidAFPoints'])): (x1, y1) = ((buf_x[i]-buf_w[i]/2)*sx, (buf_y[i]-buf_h[i]/2)*sy) @@ -2181,7 +2252,7 @@ if make and (True in (available+unknown)): pywikibot.warning(u"skipped '%s' since not supported (yet) [_detect_Faces_EXIF]" % make) pywikibot.warning(u"FacesDetected: %s - ValidAFPoints: %s" % tuple(available)) - + # finally, rotate face coordinates if image was rotated if wasRotated: rot = 270 @@ -2200,11 +2271,11 @@ data[i]['Rotation'] += 360 if data[i]['Rotation'] < 0 else 0 # rescale relative sizes to real pixel values - p = (p[0]*self.image_size[0] + 0.5, p[1]*self.image_size[1] + 0.5, + p = (p[0]*self.image_size[0] + 0.5, p[1]*self.image_size[1] + 0.5, p[2]*self.image_size[0] + 0.5, p[3]*self.image_size[1] + 0.5) # change from (x1, y1, x2, y2) to (x, y, w, h) #data[i]['Position'] = (p[0], p[1], p[0]-p[2], p[3]-p[1]) - data[i]['Position'] = (min(p[0],p[2]), min(p[1],p[3]), + data[i]['Position'] = (min(p[0],p[2]), min(p[1],p[3]), abs(p[0]-p[2]), abs(p[3]-p[1])) data[i] = { 'Position': tuple(map(int, data[i]['Position'])), @@ -2226,11 +2297,11 @@ #a = [] #for k in res.keys(): # if 'history' in k.lower(): - # a.append( k ) + # a.append(k) #for item in sorted(a): # print item # http://tilloy.net/dev/pyexiv2/api.html#pyexiv2.xmp.XmpTag - #print [getattr(res['Xmp.xmpMM.History'], item) for item in ['key', 'type', 'name', 'title', 'description', 'raw_value', 'value', ]] + #print [getattr(res['Xmp.xmpMM.History'], item) for item in ['key', 'type', 'name', 'title', 'description', 'raw_value', 'value',]] result = [] i = 1 while (('Xmp.xmpMM.History[%i]' % i) in res): @@ -2246,16 +2317,16 @@ if ('Xmp.xmpMM.History[%i]/stEvt:changed'%i) in res: data['Info'] = res['Xmp.xmpMM.History[%i]/stEvt:changed'%i].value #print res['Xmp.xmpMM.History[%i]/stEvt:instanceID'%i].value - result.append( data ) + result.append(data) elif ('Xmp.xmpMM.History[%i]/stEvt:parameters'%i) in res: data['Action'] = res['Xmp.xmpMM.History[%i]/stEvt:action'%i].value data['Info'] = res['Xmp.xmpMM.History[%i]/stEvt:parameters'%i].value #data['Action'] = data['Info'].split(' ')[0] - result.append( data ) + result.append(data) else: pass i += 1 - + self._features['History'] = result return @@ -2298,22 +2369,22 @@ #print check, np.average(check), np.std(check) if (np.average(check) >= 0.9) and (np.std(check) <= 0.1): #if (np.average(check) >= 0.85) and (np.std(check) <= 0.1): - drop.append( i1 ) + drop.append(i1) # remove all sub-rect/-regions (all regions fully contained in other) if sub: - #drop.append( [i1, i2][check[0:2].index(1.0)] ) + #drop.append([i1, i2][check[0:2].index(1.0)]) if (ar1 >= thsr) and (i2 not in drop): - drop.append( i1 ) + drop.append(i1) elif (ar2 >= thsr) and (i1 not in drop): - drop.append( i2 ) + drop.append(i2) # from '_detect_Faces()' if overlap: if (r2[0] <= c1[0] <= (r2[0] + r2[2])) and \ (r2[1] <= c1[1] <= (r2[1] + r2[3])) and (i2 not in drop): - drop.append( i1 ) + drop.append(i1) if close: if (check[0] >= 0.985) and (i2 not in drop): # at least (!) - drop.append( i1 ) + drop.append(i1) i2 += 1 @@ -2390,9 +2461,9 @@ ctx = cairo.Context(img) svg.render_cairo(ctx) #img.write_to_png("svg.png") - #Image.frombuffer("RGBA",( img.get_width(),img.get_height() ), + #Image.frombuffer("RGBA",(img.get_width(),img.get_height()), # img.get_data(),"raw","RGBA",0,1).save(self.image_path_JPEG, "JPEG") - png = Image.frombuffer("RGBA",( img.get_width(),img.get_height() ), + png = Image.frombuffer("RGBA",(img.get_width(),img.get_height()), img.get_data(),"raw","RGBA",0,1) background = Image.new("RGB", png.size, (255, 255, 255)) background.paste(png, mask=png.split()[3]) # 3 is the alpha channel @@ -2414,7 +2485,7 @@ # similar to PDF page count OR use BeautifulSoup svgcountpages = re.compile("<page>") - pc = len(svgcountpages.findall( file(self.image_path,"r").read() )) + pc = len(svgcountpages.findall(file(self.image_path,"r").read())) #svg = rsvg.Handle(self.image_path) @@ -2477,7 +2548,7 @@ # http://code.activestate.com/recipes/496837-count-pdf-pages/ #rxcountpages = re.compile(r"$\s*/Type\s*/Page[/\s]", re.MULTILINE|re.DOTALL) rxcountpages = re.compile(r"/Type\s*/Page([^s]|$)", re.MULTILINE|re.DOTALL) # PDF v. 1.3,1.4,1.5,1.6 - pc = len(rxcountpages.findall( file(self.image_path,"rb").read() )) + pc = len(rxcountpages.findall(file(self.image_path,"rb").read())) result = { 'Format': u'PDF', 'Mode': u'-', @@ -2514,35 +2585,35 @@ shutil.rmtree(os.path.join(path, "temp")) if os.system("ocropus-nlbin %s -o %s" % (self.image_path_JPEG, os.path.join(path, "temp"))): raise ImportError("ocropus not found!") - + # page level segmentation if os.system("ocropus-gpageseg --minscale 6.0 '%s'" % os.path.join(path, "temp/????.bin.png")): # detection error return - + # raw text line recognition if os.system("ocropus-lattices --writebestpath '%s'" % os.path.join(path, "temp/????/??????.bin.png")): # detection error return - + # language model application # (optional - improve the raw results by applying a pretrained model) os.environ['OCROPUS_DATA'] = os.path.join(path, "models/") if os.system("ocropus-ngraphs '%s'" % os.path.join(path, "temp/????/??????.lattice")): # detection error return - + # create hOCR output if os.system("ocropus-hocr '%s' -o %s" % (os.path.join(path, "temp/????.bin.png"), os.path.join(path, "temp.html"))): # detection error return - + ## 'create HTML for debugging (use "firefox temp/index.html" to view)' ## (optional - generate human readable debug output) #if os.system("ocropus-visualize-results %s" % os.path.join(path, "temp")): # # detection error # return - + # "to see recognition results, type: firefox temp.html" # "to see details on the recognition process, type: firefox temp/index.html" tmpfile = open(os.path.join(path, "temp.html"), 'r') @@ -2556,7 +2627,7 @@ #print data pywikibot.output(data) - + def _detect_EmbeddedText(self): # may be also: http://www.reportlab.com/software/opensource/rl-toolkit/ @@ -2568,34 +2639,34 @@ # https://launchpad.net/poppler-python/ # http://stackoverflow.com/questions/2732178/extracting-text-from-pdf-with-po… # http://stackoverflow.com/questions/25665/python-module-for-converting-pdf-t… - #proc = Popen("pdftotext -layout %s %s" % (self.image_path, self.image_path+'.txt'), - proc = Popen("pdftotext %s %s" % (self.image_path, self.image_path+'.txt'), + #proc = Popen("pdftotext -layout %s %s" % (self.image_path, self.image_path+'.txt'), + proc = Popen("pdftotext %s %s" % (self.image_path, self.image_path+'.txt'), shell=True, stderr=PIPE)#.stderr.readlines() proc.wait() if proc.returncode: raise ImportError("pdftotext not found!") data = open(self.image_path+'.txt', 'r').readlines() - os.remove( self.image_path+'.txt' ) + os.remove(self.image_path+'.txt') # self._content_text = data (s1, l1) = (len(u''.join(data)), len(data)) tmp_path = os.path.join(os.environ.get('TMP', '/tmp'), 'DrTrigonBot/') - os.mkdir( tmp_path ) + os.mkdir(tmp_path) # switch this part off since 'pdfimages' (on toolserver) is too old; TS-1449 -# proc = Popen("pdfimages -p %s %s/" % (self.image_path, tmp_path), - proc = Popen("pdfimages %s %s/" % (self.image_path, tmp_path), +# proc = Popen("pdfimages -p %s %s/" % (self.image_path, tmp_path), + proc = Popen("pdfimages %s %s/" % (self.image_path, tmp_path), shell=True, stderr=PIPE)#.stderr.readlines() proc.wait() if proc.returncode: raise ImportError("pdfimages not found!") - images = os.listdir( tmp_path ) + images = os.listdir(tmp_path) # pages = set() for f in images: -# pages.add( int(f.split('-')[1]) ) - os.remove( os.path.join(tmp_path, f) ) - os.rmdir( tmp_path ) - +# pages.add(int(f.split('-')[1])) + os.remove(os.path.join(tmp_path, f)) + os.rmdir(tmp_path) + ## pdfminer (tools/pdf2txt.py) ## http://denis.papathanasiou.org/?p=343 (for layout and images) #debug = 0 @@ -2720,8 +2791,8 @@ # (similar as in '_util_get_DataTags_EXIF') # switch this part off since 'ffprobe' (on toolserver) is too old; TS-1449 -# data = Popen("ffprobe -v quiet -print_format json -show_format -show_streams %s" % self.image_path, - proc = Popen("ffprobe -v quiet -show_format -show_streams %s" % self.image_path,#.replace('%', '%%'), +# data = Popen("ffprobe -v quiet -print_format json -show_format -show_streams %s" % self.image_path, + proc = Popen("ffprobe -v quiet -show_format -show_streams %s" % self.image_path,#.replace('%', '%%'), shell=True, stdout=PIPE)#.stdout.read() proc.wait() if proc.returncode == 127: @@ -2737,20 +2808,20 @@ if key not in res: res[key] = [] else: - res[key].append( cur ) + res[key].append(cur) else: val = item.split('=') cur[val[0].strip()] = val[1].strip() if res: res = { 'streams': res['STREAM'], 'format': res['FORMAT'][0] } self._buffer_FFMPEG = res - + return self._buffer_FFMPEG def _detect_AudioFeatures(self): # http://yaafe.sourceforge.net/manual/tools.html # http://yaafe.sourceforge.net/manual/quickstart.html - yaafe.py - # ( help: yaafe.py -h / features: yaafe.py -l ) + # (help: yaafe.py -h / features: yaafe.py -l) # # compile yaafe on fedora: # 1.) get and compile 'argtable2' (2-13) @@ -2991,12 +3062,12 @@ #print mm.durationToSeconds(part.duration.quarterLength) #print sum([item.seconds for item in stream]) # sum over all Note(s) #print part.metadata - data.append( {'ID': (i+1), - 'Format': u'(audio/midi)', + data.append({'ID': (i + 1), + 'Format': u'(audio/midi)', # note rate / noteduration ...?? 'Rate': u'%s/-/-' % d["channels"][i], 'Dimension': (None, None), - 'Duration': part.seconds,} ) + 'Duration': part.seconds,}) self._features['Streams'] = data return @@ -3055,30 +3126,30 @@ res = {} - res["channels"] = [ len(t.getChannels()) for t in mf.tracks ] - res["parts"] = [ p for p in s.elements ] - res["duration"] = max([ p.seconds for p in s.elements ]) + res["channels"] = [len(t.getChannels()) for t in mf.tracks] + res["parts"] = [p for p in s.elements] + res["duration"] = max([p.seconds for p in s.elements]) self._buffer_MUSIC21 = res return self._buffer_MUSIC21 # http://commons.wikimedia.org/wiki/File_formats -_FILETYPES = { '*': _UnknownFile, - ( 'image', 'jpeg'): _JpegFile, - ( 'image', 'png'): _PngFile, - ( 'image', 'gif'): _GifFile, - ( 'image', 'tiff'): _TiffFile, - ( 'image', 'x-xcf'): _XcfFile, - ( 'image', 'svg+xml'): _SvgFile, # unify/merge them? +_FILETYPES = {'*': _UnknownFile, + ( 'image', 'jpeg'): _JpegFile, + ( 'image', 'png'): _PngFile, + ( 'image', 'gif'): _GifFile, + ( 'image', 'tiff'): _TiffFile, + ( 'image', 'x-xcf'): _XcfFile, + ( 'image', 'svg+xml'): _SvgFile, # unify/merge them? ('application', 'xml'): _SvgFile, # ('application', 'pdf'): _PdfFile, # djvu: python-djvulibre or python-djvu for djvu support # http://pypi.python.org/pypi/python-djvulibre/0.3.9 -# ( 'image', 'vnd.djvu'): DjvuFile, - ( 'audio', 'midi'): _MidiFile, +# ( 'image', 'vnd.djvu'): DjvuFile, + ( 'audio', 'midi'): _MidiFile, ('application', 'ogg'): _OggFile,} -# ( '?', '?'): _WebMFile,} +# ( '?', '?'): _WebMFile,} def GenericFile(file_name): # 'magic' (libmagic) @@ -3104,7 +3175,7 @@ class CatImages_Default(object): #ignore = [] ignore = ['color'] - + _thrhld_group_size = 4 #_thrshld_guesses = 0.1 _thrshld_default = 0.75 @@ -3164,8 +3235,8 @@ #cb = (0.02 * (50. - data['Delta_E']))**(1./2) # 20.0 -> ~0.75 ##cb = (0.02 * (50. - data['Delta_E']))**(1./3) # 25.0 -> ~0.75 #cc = (1. - (data['Delta_R']/max_dim))**(1.) # 0.25 -> ~0.75 - #c = ( 3*ca + cb ) / 4 - #c = ( cc + 6*ca + 2*cb ) / 9 + #c = (3*ca + cb) / 4 + #c = (cc + 6*ca + 2*cb) / 9 c = ca self._info['ColorRegions'][i]['Confidence'] = c @@ -3207,7 +3278,6 @@ def _cat_people_People(self): #relevance = bool(self._info_filter['People']) relevance = self._cat_people_Groups()[1] - return (u'Unidentified people', relevance) # Category:Unidentified people @@ -3215,13 +3285,11 @@ def _cat_face_People(self): relevance = bool(self._info_filter['Faces']) #relevance = bool(self._info_filter['People']) or relevance - return (u'Unidentified people', relevance) # Category:Groups def _cat_people_Groups(self): result = self._info_filter['People'] - relevance = (len(result) >= self._thrhld_group_size) and \ (not self._cat_coloraverage_Graphics()[1]) @@ -3236,22 +3304,19 @@ #else: # relevance = 1 - 1./(len(result)-1) relevance = (len(result) >= self._thrhld_group_size) - return (u'Groups', relevance) # Category:Faces def _cat_face_Faces(self): result = self._info_filter['Faces'] - - #return (u'Faces', ((len(result) == 1) and (result[0]['Coverage'] >= .50))) - return (u'Faces', ((len(result) == 1) and (result[0]['Coverage'] >= .40))) + return (u'Faces', + ((len(result) == 1) and (result[0]['Coverage'] >= .40))) # Category:Portraits def _cat_face_Portraits(self): result = self._info_filter['Faces'] - - #return (u'Portraits', ((len(result) == 1) and (result[0]['Coverage'] >= .25))) - return (u'Portraits', ((len(result) == 1) and (result[0]['Coverage'] >= .20))) + return (u'Portraits', + ((len(result) == 1) and (result[0]['Coverage'] >= .20))) # Category:Barcode def _cat_code_Barcode(self): @@ -3301,8 +3366,8 @@ def _cat_streams_OggSoundFiles(self): result = self._info_filter['Streams'] - return (u'Ogg sound files', ((len(result) == 1) and - (u'audio/' in result[0]['Format']) and + return (u'Ogg sound files', ((len(result) == 1) and + (u'audio/' in result[0]['Format']) and (u'/midi' not in result[0]['Format']))) # Category:Videos @@ -3384,7 +3449,7 @@ relevance = ((key in result) or ('*' in result)) and \ (magic in result.get(key, result.get('*'))) if relevance: - cats.add( cat ) + cats.add(cat) return (list(cats), bool(len(cats))) @@ -3460,20 +3525,20 @@ # Category:Human legs def _guess_legs_HumanLegs(self): result = self._info_filter['Legs'] - - return (u'Human legs', ((len(result) == 1) and (result[0]['Coverage'] >= .40))) + return (u'Human legs', + ((len(result) == 1) and (result[0]['Coverage'] >= .40))) # Category:Human torsos def _guess_torsos_HumanTorsos(self): result = self._info_filter['Torsos'] - - return (u'Human torsos', ((len(result) == 1) and (result[0]['Coverage'] >= .40))) + return (u'Human torsos', + ((len(result) == 1) and (result[0]['Coverage'] >= .40))) # Category:Automobiles def _guess_automobiles_Automobiles(self): result = self._info_filter['Automobiles'] - - return (u'Automobiles', ((len(result) == 1) and (result[0]['Coverage'] >= .40))) + return (u'Automobiles', + ((len(result) == 1) and (result[0]['Coverage'] >= .40))) ## Category:Hands #def _guess_hands_Hands(self): @@ -3481,15 +3546,15 @@ # # return (u'Hands', ((len(result) == 1) and (result[0]['Coverage'] >= .50))) - # Category:Black ( 0, 0, 0) - # Category:Blue‎ ( 0, 0, 255) + # Category:Black ( 0, 0, 0) + # Category:Blue‎ ( 0, 0, 255) # Category:Brown (165, 42, 42) - # Category:Green ( 0, 255, 0) + # Category:Green ( 0, 255, 0) # Category:Orange (255, 165, 0) # Category:Pink‎ (255, 192, 203) # Category:Purple (160, 32, 240) # Category:Red‎ (255, 0, 0) - # Category:Turquoise ( 64, 224, 208) + # Category:Turquoise (64, 224, 208) # Category:White‎ (255, 255, 255) # Category:Yellow (255, 255, 0) # http://www.farb-tabelle.de/en/table-of-color.htm @@ -3532,7 +3597,7 @@ for key in self._info: for i in range(len(self._info[key])): self._info[key][i]['Confidence'] = 1.0 - + # (all trained categories) # http://scipy-lectures.github.com/advanced/scikit-learn/index.html # http://mlpy.sourceforge.net/docs/3.5/index.html @@ -3545,15 +3610,15 @@ features = [] for key in sorted(self._info): #print key, len(self._info[key]), self._info[key] - features.append( len(self._info[key]) ) + features.append(len(self._info[key])) features = np.array(features) linear_svm = mlpy.LibSvm().load_model('cache/test.csf') - yp = linear_svm.pred(features) - cat = self.trained_cat[int(yp)-1] + yp = linear_svm.pred(features) + cat = self.trained_cat[int(yp) - 1] #print linear_svm.labels() # confidence of match? - + return (cat, True) @@ -3568,18 +3633,20 @@ def load_licenses(self): #pywikibot.output(u'\n\t...Listing the procedures available...\n') pywikibot.output(u'\n\t...Listing the procedures used...\n') - + self._funcs = {'filter': [], 'cat': [], 'addcat': [], 'guess': []} for item in dir(self): s = item.split('_') - if (len(s) < 3) or (s[1] not in self._funcs) or (s[2] in self.ignore): + if (len(s) < 3) or (s[1] not in self._funcs) or (s[2] in + self.ignore): continue - pywikibot.output( item ) - self._funcs[s[1]].append( item ) + pywikibot.output(item) + self._funcs[s[1]].append(item) self.tmpl_available_spec = tmpl_available_spec - gen = pagegenerators.PrefixingPageGenerator(prefix = u'Template:FileContentsByBot/') + gen = pagegenerators.PrefixingPageGenerator( + prefix=u'Template:FileContentsByBot/') buf = [] for item in gen: item = item.title() @@ -3588,11 +3655,13 @@ item = os.path.split(item)[1] if (item[0].lower() == item[0]): # e.g. 'generic' continue - buf.append( item ) + buf.append(item) if buf: self.tmpl_available_spec = buf - pywikibot.output( u'\n\t...Following specialized templates found, check them since they are used now...\n' ) - pywikibot.output( u'tmpl_available_spec = [ %s ]\n' % u", ".join(buf) ) + pywikibot.output(u'\n\t...Following specialized templates found, ' + u'check them since they are used now...\n') + pywikibot.output(u'tmpl_available_spec = [%s]\n' + % u", ".join(buf)) return [] @@ -3600,10 +3669,12 @@ #print self.image_path pywikibot.output(u'Processing media %s ...' % self.image.title(asLink=True)) - image_filename = os.path.split(self.image.fileUrl())[-1] - self.image_path = urllib2.quote(os.path.join(scriptdir, ('cache/' + image_filename[-128:]))) + image_filename = os.path.split(self.image.fileUrl())[-1] + self.image_path = urllib2.quote(os.path.join(scriptdir, + ('cache/' + + image_filename[-128:]))) - self._wikidata = self.image._latestInfo # all info wikimedia got from content (mime, sha1, ...) + self._wikidata = self.image._latestInfo # all info wikimedia got from content (mime, sha1, ...) #print self._wikidata #print self._wikidata['mime'] #print self._wikidata['sha1'] @@ -3613,15 +3684,15 @@ if not os.path.exists(self.image_path): pywikibot.get_throttle() - f_url, data = self.site.getUrl(self.image.fileUrl(), no_hostname=True, - back_response=True) + f_url, data = self.site.getUrl(self.image.fileUrl(), + no_hostname=True, back_response=True) # needed patch for 'getUrl' applied upstream in r10441 # (allows to re-read from back_response) data = f_url.read() del f_url # free some memory (no need to keep a copy...) f = open(self.image_path, 'wb') - f.write( data ) + f.write(data) f.close() # LOOK ALSO AT: checkimages.CatImagesBot.checkStep @@ -3629,14 +3700,15 @@ def checkStep(self): self.thrshld = self._thrshld_default - self._info = {} # used for LOG/DEBUG OUTPUT ONLY - self._info_filter = {} # used for CATEGORIZATION + self._info = {} # used for LOG/DEBUG OUTPUT ONLY + self._info_filter = {} # used for CATEGORIZATION self._result_check = [] - self._result_add = [] + self._result_add = [] self._result_guess = [] # flush internal buffers - for attr in ['_buffer_EXIF', '_buffer_FFMPEG', '_buffer_Geometry']:#, '_content_text']: + for attr in ['_buffer_EXIF', '_buffer_FFMPEG', + '_buffer_Geometry']: # , '_content_text']: if hasattr(self, attr): delattr(self, attr) @@ -3655,17 +3727,17 @@ # the ones that get reported self._info_filter = {} for item in self._funcs['filter']: - self._info_filter.update( getattr(self, item)() ) + self._info_filter.update(getattr(self, item)()) # categorization: use explicit searches for classification (rel = ?) for item in self._funcs['cat']: (cats, rel) = getattr(self, item)() #print cat, result, len(result) if not isinstance(cats, list): # because of 'Histroy' and '_cat_meta_and_history_general' - cats = [cats] # which return multiple results... + cats = [cats] # which return multiple results... if rel: for cat in cats: - self._result_check.append( cat ) + self._result_check.append(cat) self._result_check = list(set(self._result_check)) # categorization: conditional (only if the ones before are present) @@ -3674,7 +3746,7 @@ (cat, rel) = getattr(self, item)() #print cat, result, len(result) if rel: - self._result_add.append( cat ) + self._result_add.append(cat) self._result_add = list(set(self._result_add)) # categorization: use guesses for unreliable classification (rel = 0.1) @@ -3684,7 +3756,7 @@ (cat, rel) = getattr(self, item)() #print cat, result, len(result) if rel: - self._result_guess.append( cat ) + self._result_guess.append(cat) return self._result_check @@ -3705,37 +3777,47 @@ break if pos > 1: # cosmetic changes: format the page well to have '\n\n' after the template - diff = content[:(pos-2)].count(u'{{') - content[:(pos-2)].count(u'}}') - while (content[:pos].count(u'{{') - content[:pos].count(u'}}')) != diff: + diff = (content[:(pos - 2)].count(u'{{') - + content[:(pos - 2)].count(u'}}')) + while (content[:pos].count(u'{{') - + content[:pos].count(u'}}')) != diff: pos = content.find(u'}}', pos) + 2 - if content[pos:(pos+2)] != (u"\n"*2): - content = content[:pos] + (u"\n"*2) + content[pos:].lstrip() + if content[pos:(pos+2)] != (u"\n" * 2): + content = content[:pos] + (u"\n" * 2) + content[pos:].lstrip() else: pywikibot.warning(u'Page layout issue; Information template could ' u'not be found and thus the data not appended!') return False # append template and fill it with data - content = self._append_to_template(content, temp, tmpl_FileContentsByBot) + content = self._append_to_template(content, temp, + tmpl_FileContentsByBot) for i, key in enumerate(self._info_filter): item = self._info_filter[key] info = self._make_infoblock(key, item) if info: - content = self._append_to_template(content, u"FileContentsByBot", info) + content = self._append_to_template(content, + u"FileContentsByBot", info) # append categories tags = set([]) - for i, cat in enumerate(list(set(self._result_check + self._result_add))): - tags.add( u"[[:Category:%s]]" % cat ) - content = pywikibot.replaceCategoryLinks(content, [cat], site=self.site, addOnly=True) + for i, cat in enumerate(list(set(self._result_check + + self._result_add))): + tags.add(u"[[:Category:%s]]" % cat) + content = pywikibot.replaceCategoryLinks(content, [cat], + site=self.site, + addOnly=True) # cleanup double categories, remove obsolete ones and add templates - content = pywikibot.replaceCategoryLinks( content, - list(set(pywikibot.getCategoryLinks(content, site=self.site))), - site=self.site ) + content = pywikibot.replaceCategoryLinks( + content, + list(set(pywikibot.getCategoryLinks(content, site=self.site))), + site=self.site) content = self._remove_category_or_template(content, u"Uncategorized") # template - content = self._add_template(content, u"Check categories|year={{subst:#time:Y}}|month={{subst:#time:F}}|day={{subst:#time:j}}|category=[[Category:Categorized by DrTrigonBot]]", top=True) + content = self._add_template(content, + u"Check categories|year={{subst:#time:Y}}|month={{subst:#time:F}}|day={{subst:#time:j}}|category=[[Category:Categorized by DrTrigonBot]]", + top=True) # add category guesses for i, cat in enumerate(self._result_guess): @@ -3746,14 +3828,14 @@ pywikibot.output(content) pywikibot.output(u"--- " * 20) pywikibot.put_throttle() - self.image.put( content, comment="bot automatic categorization; adding %s" % u", ".join(tags), - botflag=False ) + self.image.put(content, comment="bot automatic categorization; adding %s" % u", ".join(tags), + botflag=False) # TODO: (work-a-round if https://bugzilla.wikimedia.org/show_bug.cgi?id=6421 not solved) # if hasattr(self, '_content_text'): # textpage = pywikibot.Page(self.site, os.path.join(self.image.title(), u'Contents/Text')) -# textpage.put( self._content_text, comment="bot adding content from %s" % textpage.title(asLink=True), -# botflag=False ) +# textpage.put(self._content_text, comment="bot adding content from %s" % textpage.title(asLink=True), +# botflag=False) return True @@ -3762,43 +3844,46 @@ ignore = ['Properties', 'Metadata', 'ColorAverage', 'ColorRegions', 'Geometry'] #if not self._existInformation(self._info): # information available? # information available? AND/OR category available? - if not (self._existInformation(self._info, ignore = ignore) or self._result_check): + if not (self._existInformation(self._info, ignore=ignore) or + self._result_check): return u"" - ret = [] - ret.append( u"" ) - ret.append( u"== [[:%s]] ==" % self.image.title() ) - ret.append( u'{|' ) - ret.append( u'|<div style="position:relative;">' ) - ret.append( u"[[%s|200px]]" % self.image.title() ) - ret.append( self._make_markerblock(self._info[u'Faces'], 200., - structure=['Position', 'Eyes', 'Mouth', 'Nose']) ) - ret.append( self._make_markerblock(self._info[u'People'], 200., - line='dashed') ) - ret.append( u"</div>" ) - ret.append( u'|<div style="position:relative;">' ) - ret.append( u"[[%s|200px]]" % self.image.title() ) - ret.append( self._make_markerblock(self._info[u'ColorRegions'], 200.) ) - ret.append( self._make_markerblock(self._info[u'OpticalCodes'], 200., - line='dashed') ) - ret.append( u"</div>" ) - ret.append( u'|<div style="position:relative;">' ) - ret.append( u"[[%s|200px]]" % self.image.title() ) - ret.append( self._make_markerblock(self._info[u'Ears'], 200.) ) - ret.append( self._make_markerblock(self._info[u'Eyes'], 200.) ) - ret.append( self._make_markerblock(self._info[u'Legs'], 200., - line='dashed') ) - ret.append( self._make_markerblock(self._info[u'Torsos'], 200., - line='dashed') ) - ret.append( self._make_markerblock(self._info[u'Automobiles'], 200., - line='dashed') ) - #ret.append( self._make_markerblock(self._info[u'Hands'], 200., - # line='dashed') ) - ret.append( u"</div>" ) - ret.append( u'|}' ) + ret = [] + ret.append(u"") + ret.append(u"== [[:%s]] ==" % self.image.title()) + ret.append(u'{|') + ret.append(u'|<div style="position:relative;">') + ret.append(u"[[%s|200px]]" % self.image.title()) + ret.append(self._make_markerblock(self._info[u'Faces'], 200., + structure=['Position', 'Eyes', 'Mouth', 'Nose'])) + ret.append(self._make_markerblock(self._info[u'People'], 200., + line='dashed')) + ret.append(u"</div>") + ret.append(u'|<div style="position:relative;">') + ret.append(u"[[%s|200px]]" % self.image.title()) + ret.append(self._make_markerblock(self._info[u'ColorRegions'], 200.)) + ret.append(self._make_markerblock(self._info[u'OpticalCodes'], 200., + line='dashed')) + ret.append(u"</div>") + ret.append(u'|<div style="position:relative;">') + ret.append(u"[[%s|200px]]" % self.image.title()) + ret.append(self._make_markerblock(self._info[u'Ears'], 200.)) + ret.append(self._make_markerblock(self._info[u'Eyes'], 200.)) + ret.append(self._make_markerblock(self._info[u'Legs'], 200., + line='dashed')) + ret.append(self._make_markerblock(self._info[u'Torsos'], 200., + line='dashed')) + ret.append(self._make_markerblock(self._info[u'Automobiles'], 200., + line='dashed')) + #ret.append(self._make_markerblock(self._info[u'Hands'], 200., + # line='dashed')) + ret.append(u"</div>") + ret.append(u'|}') - color = {True: "rgb(0,255,0)", False: "rgb(255,0,0)"}[bool(self._result_check + self._result_guess)] - ret.append( u"<div style='background:%s'>'''automatic categorization''': %s</div>" % (color, u", ".join(list(set(self._result_check + self._result_add)))) ) + color = {True: "rgb(0,255,0)", + False: "rgb(255,0,0)"}[bool(self._result_check + + self._result_guess)] + ret.append(u"<div style='background:%s'>'''automatic categorization''': %s</div>" % (color, u", ".join(list(set(self._result_check + self._result_add))))) buf = [] for i, key in enumerate(self._info): @@ -3806,19 +3891,19 @@ info = self._make_infoblock(key, item, []) if info: - buf.append( info ) - ret.append( tmpl_FileContentsByBot[3:] + u"\n" + u"\n".join( buf ) + u"\n}}" ) + buf.append(info) + ret.append(tmpl_FileContentsByBot[3:] + u"\n" + u"\n".join(buf) + u"\n}}") - return u"\n".join( ret ) + return u"\n".join(ret) def clean_cache(self): if os.path.exists(self.image_path): - os.remove( self.image_path ) + os.remove(self.image_path) #if os.path.exists(self.image_path_JPEG): - # os.remove( self.image_path_JPEG ) + # os.remove(self.image_path_JPEG) ##image_path_new = self.image_path_JPEG.replace(u"cache/", u"cache/0_DETECTED_") ##if os.path.exists(image_path_new): - ## os.remove( image_path_new ) + ## os.remove(image_path_new) # LOOK ALSO AT: checkimages.CatImagesBot.report def report(self): @@ -3842,7 +3927,7 @@ if not res: return u'' - if (tmpl_available == None): + if tmpl_available is None: tmpl_available = self.tmpl_available_spec generic = (cat not in tmpl_available) @@ -3851,26 +3936,27 @@ return u'' result = [] - #result.append( u'{{(!}}style="background:%s;"' % {True: 'green', False: 'red'}[report] ) + #result.append(u'{{(!}}style="background:%s;"' % {True: 'green', False: 'red'}[report]) if generic: - result.append( u"{{FileContentsByBot/generic|name=%s|" % cat ) - buf = dict([ (key, []) for key in titles ]) + result.append(u"{{FileContentsByBot/generic|name=%s|" % cat) + buf = dict([(key, []) for key in titles]) for item in res: for key in titles: - buf[key].append( self._output_format(item[key]) ) + buf[key].append(self._output_format(item[key])) for key in titles: - result.append( u" {{FileContentsByBot/generic|name=%s|value=%s}}" % (key, u"; ".join(buf[key])) ) + result.append(u" {{FileContentsByBot/generic|name=%s|value=%s}}" % (key, u"; ".join(buf[key]))) else: - result.append( u"{{FileContentsByBot/%s|" % cat ) + result.append(u"{{FileContentsByBot/%s|" % cat) for item in res: - result.append( u" {{FileContentsByBot/%s" % cat ) + result.append(u" {{FileContentsByBot/%s" % cat) for key in titles: if item[key]: # hide/omit (work-a-round for empty 'Eyes') - result.append( self._output_format_flatten(key, item[key]) ) - result.append( u" }}" ) - result.append( u"}}" ) + result.append(self._output_format_flatten(key, + item[key])) + result.append(u" }}") + result.append(u"}}") - return u"\n".join( result ) + return u"\n".join(result) def _output_format(self, value): if (type(value) == type(float())): @@ -3885,47 +3971,52 @@ if (type(value) == type(tuple())) or (type(value) == type(list())): buf = [] for i, t in enumerate(value): - buf.append( self._output_format_flatten(key + (u"-%02i" % i), t) ) - return u"\n".join( buf ) + buf.append(self._output_format_flatten(key + (u"-%02i" % i), t)) + return u"\n".join(buf) else: # end of recursion return u" | %s = %s" % (key, self._output_format(value)) - def _make_markerblock(self, res, size, structure=['Position'], line='solid'): + def _make_markerblock(self, res, size, structure=['Position'], + line='solid'): # same as in '_detect_Faces' - colors = [ (0,0,255), - (0,128,255), - (0,255,255), - (0,255,0), - (255,128,0), - (255,255,0), - (255,0,0), - (255,0,255) ] + colors = [ + (0, 0, 255), + (0, 128, 255), + (0, 255, 255), + (0, 255, 0), + (255, 128, 0), + (255, 255, 0), + (255, 0, 0), + (255, 0, 255) + ] result = [] for i, r in enumerate(res): if ('RGB' in r): - color = list(np.array((255,255,255))-np.array(r['RGBref'])) + color = list(np.array((255, 255, 255)) - np.array(r['RGBref'])) else: - color = list(colors[i%8]) + color = list(colors[i % 8]) color.reverse() color = u"%02x%02x%02x" % tuple(color) - - #scale = r['size'][0]/size - scale = self.image_size[0]/size - f = list(np.array(r[structure[0]])/scale) - - result.append( u'<div class="%s-marker" style="position:absolute; left:%ipx; top:%ipx; width:%ipx; height:%ipx; border:2px %s #%s;"></div>' % tuple([structure[0].lower()] + f + [line, color]) ) - for ei in range(len(structure)-1): - data = r[structure[ei+1]] - if data and (not hasattr(data[0], '__iter__')): # Mouth and Nose are not lists - data = [ r[structure[ei+1]] ] + scale = self.image_size[0] / size + f = list(np.array(r[structure[0]]) / scale) + + result.append(u'<div class="%s-marker" style="position:absolute; left:%ipx; top:%ipx; width:%ipx; height:%ipx; border:2px %s #%s;"></div>' + % tuple([structure[0].lower()] + f + [line, color])) + + for ei in range(len(structure) - 1): + data = r[structure[ei + 1]] + if data and (not hasattr(data[0], '__iter__')): # Mouth and Nose are not lists + data = [r[structure[ei + 1]]] for e in data: - e = list(np.array(e)/scale) - - result.append( u'<div class="%s-marker" style="position:absolute; left:%ipx; top:%ipx; width:%ipx; height:%ipx; border:2px solid #%s;"></div>' % tuple([structure[ei+1].lower()] + e + [color]) ) + e = list(np.array(e) / scale) - return u"\n".join( result ) + result.append(u'<div class="%s-marker" style="position:absolute; left:%ipx; top:%ipx; width:%ipx; height:%ipx; border:2px solid #%s;"></div>' + % tuple([ + structure[ei + 1].lower()] + e + [color])) + + return u"\n".join(result) # place into 'textlib' (or else e.g. 'catlib'/'templib'...) def _remove_category_or_template(self, text, name): @@ -3941,16 +4032,16 @@ buf = [text, name] else: buf = [text, (u"{{%s}}" % name)] - return u"\n".join( buf ) + return u"\n".join(buf) # place into 'textlib' (or else e.g. 'catlib'/'templib'...) def _append_to_template(self, text, name, append): # mask/search template to append to - pattern = re.compile(u"(\{\{%s.*?\n)(\s*\}\}\n{2})" % name, flags=re.S) + pattern = re.compile(u"(\{\{%s.*?\n)(\s*\}\}\n{2})" % name, flags=re.S) template = pattern.search(text).groups() # append to template - template = u"".join( [template[0], append, u"\n", template[1]] ) + template = u"".join([template[0], append, u"\n", template[1]]) # apply changes text = pattern.sub(template, text) @@ -3966,13 +4057,14 @@ self._info.update(result) self.image_size = gf.image_size - def _existInformation(self, info, ignore = ['Properties', 'Metadata', 'ColorAverage']): + def _existInformation(self, info, ignore=['Properties', 'Metadata', + 'ColorAverage']): result = [] for item in info: if item in ignore: continue if info[item]: - result.append( item ) + result.append(item) return result def _filter_Properties(self): @@ -3995,7 +4087,7 @@ for item in self._info['Faces']: # >>> drop if below thrshld <<< if (item['Confidence'] >= self.thrshld): - buf.append( item ) + buf.append(item) result = buf return {'Faces': result} @@ -4006,7 +4098,7 @@ for item in self._info['People']: # >>> drop if below thrshld <<< if (item['Confidence'] >= self.thrshld): - buf.append( item ) + buf.append(item) result = buf return {'People': result} @@ -4019,7 +4111,7 @@ # result[item['Color']] = item # >>> drop if below thrshld <<< if (item['Confidence'] >= self.thrshld): - result.append( item ) + result.append(item) #return {'ColorRegions': [result[item] for item in result]} return {'ColorRegions': result} @@ -4035,7 +4127,7 @@ for item in self._info['OpticalCodes']: # >>> drop if below thrshld <<< if (item['Confidence'] >= self.thrshld): - result.append( item ) + result.append(item) return {'OpticalCodes': result} def _filter_Chessboard(self): @@ -4053,7 +4145,7 @@ for item in self._info['Legs']: # >>> drop if below thrshld <<< if (item['Confidence'] >= self.thrshld): - result.append( item ) + result.append(item) return {'Legs': result} def _filter_Torsos(self): @@ -4061,7 +4153,7 @@ for item in self._info['Torsos']: # >>> drop if below thrshld <<< if (item['Confidence'] >= self.thrshld): - result.append( item ) + result.append(item) return {'Torsos': result} def _filter_Ears(self): @@ -4069,7 +4161,7 @@ for item in self._info['Ears']: # >>> drop if below thrshld <<< if (item['Confidence'] >= self.thrshld): - result.append( item ) + result.append(item) return {'Ears': result} def _filter_Eyes(self): @@ -4077,7 +4169,7 @@ for item in self._info['Eyes']: # >>> drop if below thrshld <<< if (item['Confidence'] >= self.thrshld): - result.append( item ) + result.append(item) return {'Eyes': result} def _filter_Automobiles(self): @@ -4085,7 +4177,7 @@ for item in self._info['Automobiles']: # >>> drop if below thrshld <<< if (item['Confidence'] >= self.thrshld): - result.append( item ) + result.append(item) return {'Automobiles': result} def _filter_Streams(self): @@ -4108,7 +4200,7 @@ # for item in self._info['Geometry']: # # >>> drop if below thrshld <<< # if (item['Confidence'] >= self.thrshld): - # result.append( item ) + # result.append(item) # return {'Geometry': result} #def _filter_Hands(self): @@ -4116,15 +4208,15 @@ # for item in self._info['Hands']: # # >>> drop if below thrshld <<< # if (item['Confidence'] >= self.thrshld): - # result.append( item ) + # result.append(item) # return {'Hands': result} # def _filter_Classify(self): # from operator import itemgetter # result = sorted(self._info['Classify'][0].items(), key=itemgetter(1)) # result.reverse() -# pywikibot.output(u' Best: %s' % result[:3] ) -# pywikibot.output(u'Worst: %s' % result[-3:] ) +# pywikibot.output(u' Best: %s' % result[:3]) +# pywikibot.output(u'Worst: %s' % result[-3:]) # # # >>> dummy: drop all (not reliable yet since untrained) <<< # return {'Classify': []} @@ -4134,9 +4226,9 @@ """ Main function """ global useGuesses # Command line configurable parameters - limit = 150 # How many images to check? + limit = 150 # How many images to check? # untagged = False # Use the untagged generator - sendemailActive = False # Use the send-email + sendemailActive = False # Use the send-email train = False generator = None @@ -4150,8 +4242,9 @@ #sys.argv += ['-noguesses'] # try to resume last run and continue - if os.path.exists( os.path.join(scriptdir, 'cache/catimages_start') ): - shutil.copy2(os.path.join(scriptdir, 'cache/catimages_start'), os.path.join(scriptdir, 'cache/catimages_start.bak')) + if os.path.exists(os.path.join(scriptdir, 'cache/catimages_start')): + shutil.copy2(os.path.join(scriptdir, 'cache/catimages_start'), + os.path.join(scriptdir, 'cache/catimages_start.bak')) posfile = open(os.path.join(scriptdir, 'cache/catimages_start'), "r") firstPageTitle = posfile.read().decode('utf-8') posfile.close() @@ -4162,7 +4255,8 @@ for arg in pywikibot.handleArgs(): if arg.startswith('-limit'): if len(arg) == 7: - limit = int(pywikibot.input(u'How many files do you want to check?')) + limit = int(pywikibot.input( + u'How many files do you want to check?')) else: limit = int(arg[7:]) # elif arg == '-sendemail': @@ -4179,8 +4273,10 @@ catName = u'Media_needing_categories' elif len(arg) > 4: catName = str(arg[5:]) - catSelected = catlib.Category(pywikibot.getSite(), 'Category:%s' % catName) - generator = pagegenerators.CategorizedPageGenerator(catSelected, recurse = True) + catSelected = catlib.Category(pywikibot.getSite(), + 'Category:%s' % catName) + generator = pagegenerators.CategorizedPageGenerator(catSelected, + recurse=True) # elif arg.startswith('-untagged'): # untagged = True # if len(arg) == 9: @@ -4194,7 +4290,7 @@ pageName = unicode(arg[8:]) if 'File:' not in pageName: pageName = 'File:%s' % pageName - generator = [ pywikibot.Page(pywikibot.getSite(), pageName) ] + generator = [pywikibot.Page(pywikibot.getSite(), pageName)] firstPageTitle = None elif arg.startswith('-train'): train = True @@ -4204,7 +4300,7 @@ if not generator: pywikibot.output(u'no generator defined... EXIT.') sys.exit() - + # Define the site. site = pywikibot.getSite() @@ -4214,12 +4310,13 @@ # A little block-statement to ensure that the bot will not start with en-parameters if site.lang not in project_inserted: - pywikibot.output(u"Your project is not supported by this script. You have to edit the script and add it!") + pywikibot.output(u"Your project is not supported by this script. You " + u"have to edit the script and add it!") return # Defing the Main Class. - Bot = CatImagesBot(site, sendemailActive = sendemailActive, - duplicatesReport = False, logFullError = False) + Bot = CatImagesBot(site, sendemailActive=sendemailActive, + duplicatesReport=False, logFullError=False) # # Untagged is True? Let's take that generator # if untagged == True: # generator = Bot.untaggedGenerator(projectUntagged, limit) @@ -4237,35 +4334,39 @@ for image in generator: if firstPageTitle: if (image.title() == firstPageTitle): - pywikibot.output( u"found last page '%s' ..." % image.title() ) + pywikibot.output(u"found last page '%s' ..." % image.title()) firstPageTitle = None continue else: - #pywikibot.output( u"skipping page '%s' ..." % image.title() ) + #pywikibot.output(u"skipping page '%s' ..." % image.title()) continue # recover from hard crash in the run before, thus skip one more page - if os.path.exists( os.path.join(scriptdir, 'cache/catimages_recovery') ): - pywikibot.output( u"trying to recover from hard crash, skipping page '%s' ..." % image.title() ) + if os.path.exists(os.path.join(scriptdir, 'cache/catimages_recovery')): + pywikibot.output( + u"trying to recover from hard crash, skipping page '%s' ..." + % image.title()) disable_recovery() # in case the next one has a hard-crash too... - posfile = open(os.path.join(scriptdir, 'cache/catimages_start'), "w") - posfile.write( image.title().encode('utf-8') ) + posfile = open(os.path.join(scriptdir, 'cache/catimages_start'), + "w") + posfile.write(image.title().encode('utf-8')) posfile.close() continue #comment = None # useless, also this, let it here for further developments try: - imageName = image.title().split(image_namespace)[1] # Deleting the namespace (useless here) - except IndexError:# Namespace image not found, that's not an image! Let's skip... + imageName = image.title().split(image_namespace)[1] # Deleting the namespace (useless here) + except IndexError: # Namespace image not found, that's not an image! Let's skip... try: imageName = image.title().split(image_old_namespace)[1] except IndexError: - pywikibot.output(u"%s is not a file, skipping..." % image.title()) + pywikibot.output(u"%s is not a file, skipping..." + % image.title()) continue - Bot.setParameters(imageName) # Setting the image for the main class + Bot.setParameters(imageName) # Setting the image for the main class try: Bot.downloadImage() except IOError, err: @@ -4275,23 +4376,24 @@ except: # skip on any unexpected error, but report it pywikibot.exception(tb=True) - pywikibot.error(u"was not able to process page %s !!!\n" %\ - image.title(asLink=True)) + pywikibot.error(u"was not able to process page %s !!!\n" + % image.title(asLink=True)) continue resultCheck = Bot.checkStep() tagged = False try: (tagged, ret) = Bot.report() if ret: - outresult.append( ret ) + outresult.append(ret) except AttributeError: pywikibot.exception(tb=True) pywikibot.error(u"was not able to process page %s !!!\n" %\ image.title(asLink=True)) limit += -1 if not tagged: - posfile = open(os.path.join(scriptdir, 'cache/catimages_start'), "w") - posfile.write( image.title().encode('utf-8') ) + posfile = open(os.path.join(scriptdir, 'cache/catimages_start'), + "w") + posfile.write(image.title().encode('utf-8')) posfile.close() if limit <= 0: break @@ -4299,8 +4401,8 @@ continue if outresult: - outpage = pywikibot.Page(site, u"User:DrTrigon/User:DrTrigonBot/logging") - #outresult = [ outpage.get() ] + outresult # append to page + outpage = pywikibot.Page(site, + u"User:DrTrigon/User:DrTrigonBot/logging") outresult = u"\n".join(outresult) pywikibot.output(u"Size of log page data: %s byte(s)" % len(outresult)) # work-a-round: write pages mutliple times if content is too large in order to circumvent @@ -4308,20 +4410,21 @@ # (why is that...?!?? FIX THIS in the framework core e.g. 'postForm'!) tmp = outresult while tmp: - i = np.array([m.start() for m in re.finditer(u"\n\n==", tmp)] - + [len(tmp)]) - #pos = i[ np.where((i - 2048*1024) <= 0)[0][-1] ] # $wgMaxArticleSize - pos = i[ np.where((i - 500*1024) <= 0)[0][-1] ] - pywikibot.output(u"Size of bunch to write: %s byte(s)" % len(tmp[:pos])) - outpage.put( tmp[:pos], comment="bot writing log for last run" ) + i = np.array([m.start() for m in re.finditer(u"\n\n==", tmp)] + + [len(tmp)]) + pos = i[np.where((i - 500 * 1024) <= 0)[0][-1]] + pywikibot.output(u"Size of bunch to write: %s byte(s)" + % len(tmp[:pos])) + outpage.put(tmp[:pos], comment="bot writing log for last run") tmp = tmp[pos:] if pywikibot.simulate: #print u"--- " * 20 #print u"--- " * 20 #print outresult posfile = open(os.path.join(scriptdir, 'cache/catimages.log'), "a") - posfile.write( outresult ) + posfile.write(outresult) posfile.close() + # http://scipy-lectures.github.com/advanced/scikit-learn/index.html # http://mlpy.sourceforge.net/docs/3.5/index.html @@ -4334,19 +4437,21 @@ # gather training dataset from wiki commons categories trainset = [] for i, catName in enumerate(Bot.trained_cat): - catSelected = catlib.Category(pywikibot.getSite(), 'Category:%s' % catName) + catSelected = catlib.Category(pywikibot.getSite(), + 'Category:%s' % catName) generator = pagegenerators.CategorizedPageGenerator(catSelected) for image in generator: try: - imageName = image.title().split(image_namespace)[1] # Deleting the namespace (useless here) - except IndexError:# Namespace image not found, that's not an image! Let's skip... + imageName = image.title().split(image_namespace)[1] # Deleting the namespace (useless here) + except IndexError: # Namespace image not found, that's not an image! Let's skip... try: imageName = image.title().split(image_old_namespace)[1] except IndexError: - pywikibot.output(u"%s is not a file, skipping..." % image.title()) + pywikibot.output(u"%s is not a file, skipping..." + % image.title()) continue - Bot.setParameters(imageName) # Setting the image for the main class + Bot.setParameters(imageName) # Setting the image for the main class try: Bot.downloadImage() except IOError, err: @@ -4356,46 +4461,46 @@ except Exception, err: # skip on any unexpected error, but report it pywikibot.error(u"%s" % err) - pywikibot.error(u"was not able to process page %s !!!\n" %\ - image.title(asLink=True)) + pywikibot.error(u"was not able to process page %s !!!\n" + % image.title(asLink=True)) continue # gather all features (information) related to current image Bot._info = {} Bot.gatherFeatures() - + # create classifier feature set # !!!currently number of detected features is used only -> lots of room for improvements!!! # choose a good and meaningful featureset from extracted (better than actual one) features = [] for key in sorted(Bot._info): #print key, len(self._info[key]), self._info[key] - features.append( len(Bot._info[key]) ) - features.append( i+1 ) # category id (returned by predictor later) + features.append(len(Bot._info[key])) + features.append(i + 1) # category id (returned by predictor later) #print features - trainset.append( features ) + trainset.append(features) trainset = np.array(trainset) cols = trainset.shape[1] # http://mlpy.sourceforge.net/docs/3.5/tutorial.html - import matplotlib.pyplot as plt # required for plotting + import matplotlib.pyplot as plt # required for plotting ##iris = np.loadtxt('iris.csv', delimiter=',') ##x, y = iris[:, :4], iris[:, 4].astype(np.int) # x: (observations x attributes) matrix, y: classes (1: setosa, 2: versicolor, 3: virginica) #trainset = np.loadtxt('cache/test.csv', delimiter=' ') #cols = trainset.shape[1] #print trainset - x, y = trainset[:, :(cols-1)], trainset[:, (cols-1)].astype(np.int) # x: (observations x attributes) matrix, y: classes (1: setosa, 2: versicolor, 3: virginica) + x, y = trainset[:, :(cols - 1)], trainset[:, (cols - 1)].astype(np.int) # x: (observations x attributes) matrix, y: classes (1: setosa, 2: versicolor, 3: virginica) pywikibot.output(x.shape) pywikibot.output(y.shape) - + # Dimensionality reduction by Principal Component Analysis (PCA) - pca = mlpy.PCA() # new PCA instance - pca.learn(x) # learn from data - z = pca.transform(x, k=2) # embed x into the k=2 dimensional subspace + pca = mlpy.PCA() # new PCA instance + pca.learn(x) # learn from data + z = pca.transform(x, k=2) # embed x into the k=2 dimensional subspace pywikibot.output(z.shape) - + plt.set_cmap(plt.cm.Paired) fig1 = plt.figure(1) title = plt.title("PCA on dataset") @@ -4403,20 +4508,22 @@ labx = plt.xlabel("First component") laby = plt.ylabel("Second component") plt.show() - + # Learning by Kernel Support Vector Machines (SVMs) on principal components - linear_svm = mlpy.LibSvm(kernel_type='linear') # new linear SVM instance - linear_svm.learn(z, y) # learn from principal components - - # !!! train also BoW (bag-of-words) in '_detectclassify_ObjectAll' resp. 'opencv.BoWclassify.main' !!! - - xmin, xmax = z[:,0].min()-0.1, z[:,0].max()+0.1 - ymin, ymax = z[:,1].min()-0.1, z[:,1].max()+0.1 - xx, yy = np.meshgrid(np.arange(xmin, xmax, 0.01), np.arange(ymin, ymax, 0.01)) + linear_svm = mlpy.LibSvm(kernel_type='linear') # new linear SVM instance + linear_svm.learn(z, y) # learn from principal components + + # !!! train also BoW (bag-of-words) in '_detectclassify_ObjectAll' resp. + # 'opencv.BoWclassify.main' !!! + + xmin, xmax = z[:, 0].min() - 0.1, z[:, 0].max() + 0.1 + ymin, ymax = z[:, 1].min() - 0.1, z[:, 1].max() + 0.1 + xx, yy = np.meshgrid(np.arange(xmin, xmax, 0.01), + np.arange(ymin, ymax, 0.01)) zgrid = np.c_[xx.ravel(), yy.ravel()] yp = linear_svm.pred(zgrid) - + plt.set_cmap(plt.cm.Paired) fig2 = plt.figure(2) title = plt.title("SVM (linear kernel) on principal components") @@ -4427,7 +4534,7 @@ limx = plt.xlim(xmin, xmax) limy = plt.ylim(ymin, ymax) plt.show() - + linear_svm.save_model('cache/test.csf') pywikibot.output(u'Linear SVM model stored to %s.' % 'cache/test.csf') @@ -4439,20 +4546,25 @@ recoveryfile.write('') recoveryfile.close() + def disable_recovery(): - if os.path.exists( os.path.join(scriptdir, 'cache/catimages_recovery') ): - os.remove( os.path.join(scriptdir, 'cache/catimages_recovery') ) + if os.path.exists(os.path.join(scriptdir, 'cache/catimages_recovery')): + os.remove(os.path.join(scriptdir, 'cache/catimages_recovery')) # Main loop will take all the (name of the) images and then i'll check them. if __name__ == "__main__": - old = datetime.datetime.strptime(str(datetime.datetime.utcnow()).split('.')[0], "%Y-%m-%d %H:%M:%S") #timezones are UTC + old = datetime.datetime.strptime( + str(datetime.datetime.utcnow()).split('.')[0], + "%Y-%m-%d %H:%M:%S") # timezones are UTC if sys.exc_info()[0]: # re-raise ImportError raise # try: main() finally: - final = datetime.datetime.strptime(str(datetime.datetime.utcnow()).split('.')[0], "%Y-%m-%d %H:%M:%S") #timezones are UTC + final = datetime.datetime.strptime( + str(datetime.datetime.utcnow()).split('.')[0], + "%Y-%m-%d %H:%M:%S") # timezones are UTC delta = final - old secs_of_diff = delta.seconds pywikibot.output("Execution time: %s" % secs_of_diff) -- To view, visit https://gerrit.wikimedia.org/r/95180 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9f26f326f9d57bfdadb1a32cf41ebb75a193d3ca Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] [PEP8] pep8 changes - change (pywikibot/compat)
by jenkins-bot (Code Review) 13 Nov '13

13 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: [PEP8] pep8 changes ...................................................................... [PEP8] pep8 changes Change-Id: I892ebfcbcabcfcd9ac1e6c899cd75029fc4d2993 --- M casechecker.py 1 file changed, 184 insertions(+), 138 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/casechecker.py b/casechecker.py index 094f5ab..80fede6 100644 --- a/casechecker.py +++ b/casechecker.py @@ -4,17 +4,27 @@ with mixed latin and cyrilic alphabets. """ # -# (C) Pywikipedia bot team, 2006-2012 +# (C) Pywikibot team, 2006-2013 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' +import os +import sys +import query +import re +import codecs +import wikipedia as pywikibot + + # -# Permutations code was taken from http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/190465 +# Permutations code was taken from +# http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/190465 # def xuniqueCombinations(items, n): - if n==0: yield [] + if n == 0: + yield [] else: for i in xrange(len(items)): for cc in xuniqueCombinations(items[i+1:], n-1): @@ -29,16 +39,16 @@ # # Adapted from http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/496901 # -STD_OUTPUT_HANDLE= -11 +STD_OUTPUT_HANDLE = -11 -FOREGROUND_BLUE = 0x01 # text color contains blue. -FOREGROUND_GREEN= 0x02 # text color contains green. -FOREGROUND_RED = 0x04 # text color contains red. -FOREGROUND_INTENSITY = 0x08 # text color is intensified. -BACKGROUND_BLUE = 0x10 # background color contains blue. -BACKGROUND_GREEN= 0x20 # background color contains green. -BACKGROUND_RED = 0x40 # background color contains red. -BACKGROUND_INTENSITY = 0x80 # background color is intensified. +FOREGROUND_BLUE = 0x01 # text color contains blue. +FOREGROUND_GREEN = 0x02 # text color contains green. +FOREGROUND_RED = 0x04 # text color contains red. +FOREGROUND_INTENSITY = 0x08 # text color is intensified. +BACKGROUND_BLUE = 0x10 # background color contains blue. +BACKGROUND_GREEN = 0x20 # background color contains green. +BACKGROUND_RED = 0x40 # background color contains red. +BACKGROUND_INTENSITY = 0x80 # background color is intensified. FOREGROUND_WHITE = FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED @@ -57,18 +67,17 @@ except: pass - if color == FOREGROUND_BLUE: print '(b:', - if color == FOREGROUND_GREEN: print '(g:', - if color == FOREGROUND_RED: print '(r:', + if color == FOREGROUND_BLUE: + print '(b:', + if color == FOREGROUND_GREEN: + print '(g:', + if color == FOREGROUND_RED: + print '(r:', # end of console code -import os -import sys, query, re, codecs -import wikipedia as pywikibot - -class CaseChecker( object ): +class CaseChecker(object): msgRename = { 'ar': u'تغيير اسم لحالة مخلوطة', 'en': u'mixed case rename', @@ -90,8 +99,8 @@ # These words are always in one language, even though they could be typed # in both - alwaysInLocal = [ u'СССР', u'Как', u'как' ] - alwaysInLatin = [ u'II', u'III' ] + alwaysInLocal = [u'СССР', u'Как', u'как'] + alwaysInLatin = [u'II', u'III'] localUpperLtr = u'ЁІЇЎАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯҐ' localLowerLtr = u'ёіїўабвгдежзийклмнопрстуфхцчшщъыьэюяґ' @@ -113,7 +122,7 @@ whitelists = { 'ru': u'ВП:КЛ/Проверенные', - } + } latLtr = u'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' @@ -167,7 +176,7 @@ elif arg == '-autonomous' or arg == '-a': self.autonomous = True elif arg.startswith('-ns:'): - self.namespaces.append( int(arg[4:]) ) + self.namespaces.append(int(arg[4:])) elif arg.startswith('-wikilog:'): self.wikilogfile = arg[9:] elif arg.startswith('-failedlog:'): @@ -191,13 +200,14 @@ self.aplimit = 200 if self.links else 'max' if not self.doFailed: - self.queryParams = { 'action' : 'query', - 'generator' : 'allpages', - 'gaplimit' : self.aplimit, - 'gapfilterredir': self.filterredir} + self.queryParams = {'action': 'query', + 'generator': 'allpages', + 'gaplimit': self.aplimit, + 'gapfilterredir': self.filterredir} else: - self.queryParams = { 'action' : 'query' } - if self.apfrom != u'': pywikibot.output(u'Argument "-from" is ignored with "-failed"') + self.queryParams = {'action': 'query'} + if self.apfrom != u'': + pywikibot.output(u'Argument "-from" is ignored with "-failed"') propParam = 'info' if self.links: @@ -262,12 +272,12 @@ wlpage = self.whitelists[self.site.lang] pywikibot.output(u'Loading whitelist from %s' % wlpage) wlparams = { - 'action' : 'query', - 'prop' : 'links', - 'titles' : wlpage, - 'redirects' : '', - 'indexpageids' : '', - 'pllimit' : 'max', + 'action': 'query', + 'prop': 'links', + 'titles': wlpage, + 'redirects': '', + 'indexpageids': '', + 'pllimit': 'max', } data = query.GetData(wlparams) @@ -275,21 +285,25 @@ pageid = data['query']['pageids'][0] links = data['query']['pages'][pageid]['links'] - allWords = [nn for n in links for nn in self.FindBadWords(n['title'])] + allWords = [nn for n in links + for nn in self.FindBadWords(n['title'])] self.knownWords = set(allWords) -# kw = set() -# for w in allWords: -# if len(self.ProcessTitle(w)[1]) > 0: -# kw.add(w) -# self.knownWords = kw +## kw = set() +## for w in allWords: +## if len(self.ProcessTitle(w)[1]) > 0: +## kw.add(w) +## self.knownWords = kw else: raise ValueError(u'The number of pageids is not 1') - pywikibot.output(u'Loaded whitelist with %i items' % len(self.knownWords)) + pywikibot.output(u'Loaded whitelist with %i items' + % len(self.knownWords)) if pywikibot.verbose and len(self.knownWords) > 0: - pywikibot.output(u'Whitelist: %s' % u', '.join([self.MakeLink(i, False) for i in self.knownWords])) + pywikibot.output(u'Whitelist: %s' + % u', '.join([self.MakeLink(i, False) + for i in self.knownWords])) else: pywikibot.output(u'Whitelist is not known for language %s' % self.site.lang) @@ -303,18 +317,23 @@ yield data # Clear any continuations first - if 'clcontinue' in params: del params['clcontinue'] - if 'plcontinue' in params: del params['plcontinue'] + if 'clcontinue' in params: + del params['clcontinue'] + if 'plcontinue' in params: + del params['plcontinue'] if 'query-continue' not in data: - if 'gapcontinue' in params: del params['gapcontinue'] + if 'gapcontinue' in params: + del params['gapcontinue'] break qc = data['query-continue'] # First continue properties only, once done, continue with allpages if 'categories' in qc or 'links' in qc: - if 'categories' in qc: params.update(qc['categories']) - if 'links' in qc: params.update(qc['links']) + if 'categories' in qc: + params.update(qc['categories']) + if 'links' in qc: + params.update(qc['links']) elif 'allpages' in qc: params.update(qc['allpages']) else: @@ -336,14 +355,14 @@ self.currentTitle = None batchSize = 10 for batchStart in xrange(0, len(self.titleList), batchSize): - self.queryParams['titles'] = self.titleList[batchStart:batchStart+batchSize] + self.queryParams['titles'] = self.titleList[ + batchStart:batchStart + batchSize] for data in self.RunQuery(self.queryParams): self.ProcessDataBlock(data) - print "*" * 29, "Done" - except: - pywikibot.output(u'Exception at Title = %s, Next = %s' % (self.currentTitle, self.apfrom)) + pywikibot.output(u'Exception at Title = %s, Next = %s' + % (self.currentTitle, self.apfrom)) try: import traceback pywikibot.output(traceback.format_exc()) @@ -357,20 +376,16 @@ firstItem = True for pageID, page in data['query']['pages'].iteritems(): - printed = False title = page['title'] self.currentTitle = title - if 'missing' in page: continue - if firstItem: if self.lastLetter != title[0]: pywikibot.ui.output('Processing %s\n' % title) self.lastLetter = title[0] firstItem = False - if self.titles: err = self.ProcessTitle(title) if err: @@ -378,31 +393,46 @@ if self.replace: if len(err[1]) == 1: newTitle = err[1][0] - # choice = pywikibot.inputChoice(u'Move %s to %s?' % (title, newTitle), ['Yes', 'No'], ['y', 'n']) - editSummary = pywikibot.translate(self.site, self.msgRename) +## choice = pywikibot.inputChoice(u'Move %s to %s?' +## % (title, newTitle), +## ['Yes', 'No'], +## ['y', 'n']) + editSummary = pywikibot.translate(self.site, + self.msgRename) dst = self.Page(newTitle) if 'redirect' in page: src = self.Page(title) redir = src.getRedirectTarget() - redirTitle = redir.title(asLink = True, textlink = True) + redirTitle = redir.title(asLink=True, + textlink=True) if not dst.exists(): - src.move(newTitle, editSummary, movesubpages=True) + src.move(newTitle, editSummary, + movesubpages=True) changed = True replErrors = False - for p in src.getReferences(follow_redirects = False): + for p in src.getReferences( + follow_redirects=False): if p.namespace() == 2: continue - oldText = p.get(get_redirect = True) - newText = self.ReplaceLink(oldText, title, newTitle) - if not self.PutNewPage(p, newText, [self.MakeMoveSummary(title, newTitle)]): + oldText = p.get(get_redirect=True) + newText = self.ReplaceLink(oldText, title, + newTitle) + if not self.PutNewPage( + p, newText, [ + self.MakeMoveSummary(title, + newTitle)]): replErrors = True if not replErrors: - editSummary = pywikibot.translate(self.site, self.msgDeleteRedirect) - newText = pywikibot.translate(self.site, self.textDeleteRedirect) % redirTitle - src.put(newText, editSummary, minorEdit=False) + editSummary = pywikibot.translate( + self.site, self.msgDeleteRedirect) + newText = pywikibot.translate( + self.site, + self.textDeleteRedirect) % redirTitle + src.put(newText, editSummary, + minorEdit=False) changed = True elif not dst.exists(): @@ -414,11 +444,13 @@ src.title(withNamespace=False), dst.title(withNamespace=False), self.autonomous, - editSummary + u' ' + self.MakeMoveSummary(title, newTitle), + editSummary + u' ' + + self.MakeMoveSummary(title, newTitle), True) bot.run() else: - src.move(newTitle, editSummary, movesubpages=True) + src.move(newTitle, editSummary, + movesubpages=True) changed = True if not changed: @@ -463,18 +495,19 @@ pageObj = self.Page(title) pageTxt = pageObj.get() - msg.append(self.MakeMoveSummary(ltxt, newTitle)) + msg.append(self.MakeMoveSummary(ltxt, + newTitle)) - pageTxt = self.ReplaceLink(pageTxt, ltxt, newTitle) - + pageTxt = self.ReplaceLink(pageTxt, ltxt, + newTitle) if not newTitle: if not printed: - self.WikiLog(u"* %s: link to %s" % (self.MakeLink(title, False), err[0])) + self.WikiLog(u"* %s: link to %s" + % (self.MakeLink(title, False), + err[0])) printed = True else: self.WikiLog(u"** link to %s" % err[0]) - - if pageObj is not None: if self.PutNewPage(pageObj, pageTxt, msg): # done, no need to log anything @@ -482,8 +515,6 @@ if foundSuggestions: self.AppendLineToLog(self.failedTitles, title) - - if self.stopAfter > 0: self.stopAfter -= 1 if self.stopAfter == 0: @@ -496,19 +527,18 @@ def FindBadWords(self, title): for m in self.badWordPtrn.finditer(title): - yield title[m.span()[0] : m.span()[1]] + yield title[m.span()[0]:m.span()[1]] def ProcessTitle(self, title): - badWords = list(self.FindBadWords(title)) - if len(badWords) > 0: # Allow known words, allow any roman numerals with local suffixes - badWords = set([i for i in badWords if i not in self.knownWords and self.romanNumSfxPtrn.match(i) is not None]) + badWords = set([i for i in badWords + if i not in self.knownWords and + self.romanNumSfxPtrn.match(i) is not None]) if len(badWords) == 0 or self.Page(title).isImage(): - return None - + return count = 0 ambigBadWords = set() ambigBadWordsCount = 0 @@ -516,7 +546,6 @@ mapLat = {} for badWord in badWords: - # See if it would make sense to treat the whole word as either # cyrilic or latin mightBeLat = mightBeLcl = True @@ -527,7 +556,8 @@ else: if mightBeLcl and l not in self.latinSuspects: mightBeLcl = False - if l not in self.latLtr: raise ValueError(u'Assert failed') + if l not in self.latLtr: + raise ValueError(u'Assert failed') # Some words are well known and frequently mixed-typed if mightBeLcl and mightBeLat: @@ -559,9 +589,11 @@ c2 = self.lclToLatDict[co] else: c2 = None - kw = [w for w in kw if p < len(w) and (w[p] == c or (c2 is not None and w[p] == c2))] + kw = [w for w in kw if p < len(w) and + (w[p] == c or (c2 is not None and w[p] == c2))] if len(kw) > 1: - pywikibot.output(u"Word '%s' could be treated as more than one known words" % badWord) + pywikibot.output(u"Word '%s' could be treated as more than " + u"one known words" % badWord) elif len(kw) == 1: mapLcl[badWord] = kw[0] count += 1 @@ -580,10 +612,9 @@ else: # Replace all unambiguous bad words - for k,v in mapLat.items() + mapLcl.items(): + for k, v in mapLat.items() + mapLcl.items(): if k not in ambigBadWords: - title = title.replace(k,v) - + title = title.replace(k, v) if len(ambigBadWords) == 0: # There are no ambiguity, we can safelly convert possibleAlternatives.append(title) @@ -593,7 +624,7 @@ # combinations from the bad words list, and convert just the # picked words to cyrilic, whereas making all other words as # latin character. - for itemCntToPick in xrange(0, len(ambigBadWords)+1): + for itemCntToPick in xrange(0, len(ambigBadWords) + 1): title2 = title for uc in xuniqueCombinations(list(ambigBadWords), itemCntToPick): @@ -610,14 +641,11 @@ [self.MakeLink(t) for t in possibleAlternatives]) else: infoText += u", no suggestions" - return (infoText, possibleAlternatives) def PickTarget(self, title, original, candidates): - if len(candidates) == 0: - return None - + return if len(candidates) == 1: return candidates[0] @@ -633,16 +661,15 @@ pagesRedir[newTitle] = dst.getRedirectTarget().title() else: pagesExist.append(newTitle) - if len(pagesExist) == 1: return pagesExist[0] elif len(pagesExist) == 0 and len(pagesRedir) > 0: if len(pagesRedir) == 1: return pagesRedir.keys()[0] t = None - for k,v in pagesRedir.iteritems(): + for k, v in pagesRedir.iteritems(): if not t: - t = v # first item + t = v # first item elif t != v: break else: @@ -651,54 +678,66 @@ return pagesRedir.keys()[0] if not self.autonomous: - pywikibot.output(u'Could not auto-decide for page %s. Which link should be chosen?' % self.MakeLink(title, False)) + pywikibot.output(u'Could not auto-decide for page %s. Which link ' + u'should be chosen?' % self.MakeLink(title, False)) pywikibot.output(u'Original title: ', newline=False) self.ColorCodeWord(original + "\n", True) count = 1 for t in candidates: - if t in pagesDontExist: msg = u'missing' - elif t in pagesRedir: msg = u'Redirect to ' + pagesRedir[t] - else: msg = u'page exists' - self.ColorCodeWord(u' %d: %s (%s)\n' - % (count, t, msg), True) + if t in pagesDontExist: + msg = u'missing' + elif t in pagesRedir: + msg = u'Redirect to ' + pagesRedir[t] + else: + msg = u'page exists' + self.ColorCodeWord(u' %d: %s (%s)\n' % (count, t, msg), True) count += 1 - answers = [str(i) for i in xrange(0, count)] choice = int(pywikibot.inputChoice( u'Which link to choose? (0 to skip)', answers, [a[0] for a in answers])) if choice > 0: - return candidates[choice-1] + return candidates[choice - 1] - return None - - def ColorCodeWord(self, word, toScreen = False): - - if not toScreen: res = u"<b>" + def ColorCodeWord(self, word, toScreen=False): + if not toScreen: + res = u"<b>" lastIsCyr = word[0] in self.localLtr if lastIsCyr: - if toScreen: SetColor(FOREGROUND_GREEN) - else: res += self.lclClrFnt + if toScreen: + SetColor(FOREGROUND_GREEN) + else: + res += self.lclClrFnt else: - if toScreen: SetColor(FOREGROUND_RED) - else: res += self.latClrFnt + if toScreen: + SetColor(FOREGROUND_RED) + else: + res += self.latClrFnt for l in word: if l in self.localLtr: if not lastIsCyr: - if toScreen: SetColor(FOREGROUND_GREEN) - else: res += self.suffixClr + self.lclClrFnt + if toScreen: + SetColor(FOREGROUND_GREEN) + else: + res += self.suffixClr + self.lclClrFnt lastIsCyr = True elif l in self.latLtr: if lastIsCyr: - if toScreen: SetColor(FOREGROUND_RED) - else: res += self.suffixClr + self.latClrFnt + if toScreen: + SetColor(FOREGROUND_RED) + else: + res += self.suffixClr + self.latClrFnt lastIsCyr = False - if toScreen: pywikibot.output(l, newline=False) - else: res += l + if toScreen: + pywikibot.output(l, newline=False) + else: + res += l - if toScreen: SetColor(FOREGROUND_WHITE) - else: return res + self.suffixClr + u"</b>" + if toScreen: + SetColor(FOREGROUND_WHITE) + else: + return res + self.suffixClr + u"</b>" def AddNoSuggestionTitle(self, title): if title in self.seenUnresolvedLinks: @@ -706,10 +745,10 @@ self.seenUnresolvedLinks.add(title) params = { - 'action' : 'query', - 'list' : 'backlinks', - 'bltitle' : title, - 'bllimit' : '50', + 'action': 'query', + 'list': 'backlinks', + 'bltitle': title, + 'bllimit': '50', } data = query.GetData(params) @@ -725,15 +764,17 @@ else: count = str(cl if cl > 0 else 'no backlinks') - self.AppendLineToLog(self.nosuggestions, u'* %s (%s%s)' % - (self.MakeLink(title), count, u', %d redirects' % redirs if redirs > 0 else u'')) + self.AppendLineToLog(self.nosuggestions, u'* %s (%s%s)' + % (self.MakeLink(title), count, u', %d redirects' + % redirs if redirs > 0 else u'')) return False def PutNewPage(self, pageObj, pageTxt, msg): - title = pageObj.title(asLink = True, textlink = True) + title = pageObj.title(asLink=True, textlink=True) coloredMsg = u', '.join([self.ColorCodeWord(m) for m in msg]) - if pageObj.get(get_redirect = True) == pageTxt: - self.WikiLog(u"* Error: Text replacement failed in %s (%s)" % (self.MakeLink(title, False), coloredMsg)) + if pageObj.get(get_redirect=True) == pageTxt: + self.WikiLog(u"* Error: Text replacement failed in %s (%s)" + % (self.MakeLink(title, False), coloredMsg)) else: pywikibot.output(u'Case Replacements: %s' % u', '.join(msg)) try: @@ -748,7 +789,8 @@ except KeyboardInterrupt: raise except: - self.WikiLog(u"* Error: Could not save updated page %s (%s)" % (self.MakeLink(title, False), coloredMsg)) + self.WikiLog(u"* Error: Could not save updated page %s (%s)" + % (self.MakeLink(title, False), coloredMsg)) return False def MakeMoveSummary(self, fromTitle, toTitle): @@ -774,8 +816,10 @@ def ReplaceLink(self, text, oldtxt, newtxt): - frmParts = [str.strip(self.stripChars) for str in self.wordBreaker.split(oldtxt)] - toParts = [str.strip(self.stripChars) for str in self.wordBreaker.split(newtxt)] + frmParts = [s.strip(self.stripChars) + for d in self.wordBreaker.split(oldtxt)] + toParts = [s.strip(self.stripChars) + for s in self.wordBreaker.split(newtxt)] if len(frmParts) != len(toParts): raise ValueError(u'Splitting parts do not match counts') @@ -783,8 +827,10 @@ if len(frmParts[i]) != len(toParts[i]): raise ValueError(u'Splitting parts do not match word length') if len(frmParts[i]) > 0: - text = text.replace(frmParts[i][0].lower() + frmParts[i][1:], toParts[i][0].lower() + toParts[i][1:]) - text = text.replace(frmParts[i][0].upper() + frmParts[i][1:], toParts[i][0].upper() + toParts[i][1:]) + text = text.replace(frmParts[i][0].lower() + frmParts[i][1:], + toParts[i][0].lower() + toParts[i][1:]) + text = text.replace(frmParts[i][0].upper() + frmParts[i][1:], + toParts[i][0].upper() + toParts[i][1:]) return text -- To view, visit https://gerrit.wikimedia.org/r/95164 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I892ebfcbcabcfcd9ac1e6c899cd75029fc4d2993 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] [PEP8]ify catall.py - change (pywikibot/compat)
by jenkins-bot (Code Review) 13 Nov '13

13 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: [PEP8]ify catall.py ...................................................................... [PEP8]ify catall.py Change-Id: Ib7184e626d6b973dd577fc1152003d1f07c919dc --- M catall.py 1 file changed, 43 insertions(+), 40 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/catall.py b/catall.py index 41141bf..d2dd254 100644 --- a/catall.py +++ b/catall.py @@ -9,7 +9,7 @@ """ # # (C) Rob W.W. Hooft, Andre Engels, 2004 -# (C) Pywikipedia bot team, 2004-2011 +# (C) Pywikibot team, 2004-2013 # # Distributed under the terms of the MIT license. # @@ -20,77 +20,80 @@ import wikipedia as pywikibot from pywikibot import i18n + def choosecats(pagetext): - chosen=[] - flag=False - length=1000 - print ("Give the new categories, one per line.") - print ("Empty line: if the first, don't change. Otherwise: Ready.") - print ("-: I made a mistake, let me start over.") - print ("?: Give the text of the page with GUI.") - print ("??: Give the text of the page in console.") - print ("xx: if the first, remove all categories and add no new.") - print ("q: quit.") - while flag == False: - choice=pywikibot.input(u"?") - if choice=="": - flag=True - elif choice=="-": - chosen=choosecats(pagetext) - flag=True - elif choice=="?": + chosen = [] + done = False + length = 1000 + print("""Give the new categories, one per line. +Empty line: if the first, don't change. Otherwise: Ready. +-: I made a mistake, let me start over. +?: Give the text of the page with GUI. +??: Give the text of the page in console. +xx: if the first, remove all categories and add no new. +q: quit.""") + while not done: + choice = pywikibot.input(u"?") + if choice == "": + done = True + elif choice == "-": + chosen = choosecats(pagetext) + done = True + elif choice == "?": import editarticle editor = editarticle.TextEditor() newtext = editor.edit(pagetext) - elif choice =="??": + elif choice == "??": pywikibot.output(pagetext[0:length]) - length = length+500 - elif choice=="xx" and chosen==[]: + length = length + 500 + elif choice == "xx" and chosen == []: chosen = None - flag=True - elif choice=="q": + done = True + elif choice == "q": print "quit..." sys.exit() else: chosen.append(choice) return chosen -def make_categories(page, list, site = None): + +def make_categories(page, list, site=None): if site is None: site = pywikibot.getSite() - pllist=[] + pllist = [] for p in list: - cattitle="%s:%s" % (site.category_namespace(), p) - pllist.append(pywikibot.Page(site,cattitle)) + cattitle = "%s:%s" % (site.category_namespace(), p) + pllist.append(pywikibot.Page(site, cattitle)) page.put_async(pywikibot.replaceCategoryLinks(page.get(), pllist), comment=i18n.twtranslate(site.lang, 'catall-changing')) + def main(): - docorrections=True - start=[] + docorrections = True + start = [] for arg in pywikibot.handleArgs(): if arg == '-onlynew': - docorrections=False + docorrections = False else: start.append(arg) - if start == []: - start='A' + if not start: + start = 'A' else: - start=' '.join(start) + start = ' '.join(start) mysite = pywikibot.getSite() - for p in mysite.allpages(start = start): + for p in mysite.allpages(start=start): try: - text=p.get() - cats=p.categories() - if cats == []: + text = p.get() + cats = p.categories() + if not cats: pywikibot.output(u"========== %s ==========" % p.title()) print "No categories" print "-" * 40 - newcats=choosecats(text) + newcats = choosecats(text) if newcats != [] and newcats is not None: make_categories(p, newcats, mysite) elif docorrections: @@ -98,7 +101,7 @@ for c in cats: pywikibot.output(c.title()) print "-" * 40 - newcats=choosecats(text) + newcats = choosecats(text) if newcats is None: make_categories(p, [], mysite) elif newcats != []: -- To view, visit https://gerrit.wikimedia.org/r/95166 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib7184e626d6b973dd577fc1152003d1f07c919dc Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] [PEP8] pep8 changes - change (pywikibot/compat)
by Xqt (Code Review) 13 Nov '13

13 Nov '13

Xqt has submitted this change and it was merged. Change subject: [PEP8] pep8 changes ...................................................................... [PEP8] pep8 changes Change-Id: I934b58ed4af87584d6414dd58341f83216b58a93 --- M capitalize_redirects.py 1 file changed, 15 insertions(+), 9 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/capitalize_redirects.py b/capitalize_redirects.py index 06b2563..6246097 100644 --- a/capitalize_redirects.py +++ b/capitalize_redirects.py @@ -19,14 +19,16 @@ ''' # # (C) Yrithinnd -# (C) Pywikipedia bot team, 2007-2010 +# (C) Pywikipedia bot team, 2007-2013 # # Class licensed under terms of the MIT license # __version__ = '$Id$' # -import time, sys, re +import time +import sys +import re import wikipedia as pywikibot from pywikibot import i18n import pagegenerators @@ -34,6 +36,7 @@ docuReplacements = { '&params;': pagegenerators.parameterHelp } + class CapitalizeBot: def __init__(self, generator, acceptall, titlecase): @@ -45,7 +48,8 @@ def run(self): for page in self.generator: - if self.done: break + if self.done: + break if page.exists(): self.treat(page) @@ -68,24 +72,26 @@ pywikibot.output(u'[[%s]] doesn\'t exist' % page_cap.title()) if not self.acceptall: choice = pywikibot.inputChoice( - u'Do you want to create a redirect?', - ['Yes', 'No', 'All', 'Quit'], ['y', 'N', 'a', 'q'], 'N') + u'Do you want to create a redirect?', + ['Yes', 'No', 'All', 'Quit'], ['y', 'N', 'a', 'q'], 'N') if choice == 'a': self.acceptall = True elif choice == 'q': self.done = True if self.acceptall or choice == 'y': - comment = i18n.twtranslate(self.site, - 'capitalize_redirects-create-redirect', - {'to': page_t}) + comment = i18n.twtranslate( + self.site, + 'capitalize_redirects-create-redirect', + {'to': page_t}) try: page_cap.put(u"#%s %s" % (self.site.redirect(), page.title(asLink=True, textlink=True)), - comment) + comment) except: pywikibot.output(u"An error occurred, skipping...") + def main(): genFactory = pagegenerators.GeneratorFactory() acceptall = False -- To view, visit https://gerrit.wikimedia.org/r/95161 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I934b58ed4af87584d6414dd58341f83216b58a93 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] [PEP8] pep8 changes - change (pywikibot/compat)
by jenkins-bot (Code Review) 13 Nov '13

13 Nov '13

1 0

[Gerrit] [PEP8] pep8 changes - change (pywikibot/compat)
by jenkins-bot (Code Review) 13 Nov '13

13 Nov '13

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits