fix: merge conflict
This commit is contained in:
commit
76e40bd412
1 changed files with 2 additions and 2 deletions
|
@ -52,10 +52,10 @@ def formatDate(dt=None, type='date', variant='medium', lang='de'):
|
|||
return fmt.format(dt or datetime.now())
|
||||
|
||||
|
||||
def formatNumber(num, type='decimal', lang='de'):
|
||||
def formatNumber(num, type='decimal', lang='de', pattern=u'#,##0.00;-#,##0.00'):
|
||||
loc = locales.getLocale(lang)
|
||||
fmt = loc.numbers.getFormatter(type)
|
||||
return fmt.format(num)
|
||||
return fmt.format(num, pattern=pattern)
|
||||
|
||||
|
||||
def toStr(value, encoding='UTF-8'):
|
||||
|
|
Loading…
Add table
Reference in a new issue