Merge branch 'bbmaster' of ssh://git.cy55.de/home/git/cybertools into bbmaster

.gitignore

@@ -4,3 +4,4 @@ ajax/dojo/*
 *.pydevproject
 *.sublime-project
 *.sublime-workspace
+.settings

composer/schema/field.py

@@ -368,7 +368,7 @@ class EmailFieldInstance(FieldInstance):
 class BooleanFieldInstance(FieldInstance):
 
     def marshall(self, value):
-        return value
+        return bool(value)
 
     def display(self, value):
         #return value and _(u'Yes') or _(u'No')

util/date.py

@@ -71,7 +71,6 @@ def year(d=None):
         d = datetime.today()
     return d.year
 
-
 def toLocalTime(d):
     if pytz is None or not d:
         return d
@@ -82,3 +81,13 @@ def toLocalTime(d):
         return d.astimezone(cet)
     except ValueError:
         return d
+
+def month(d=None):
+    if d is None:
+        d = datetime.today()
+    return d.month
+
+def day(d=None):
+    if d is None:
+        d = datetime.today()
+    return d.day

util/format.py

@@ -50,9 +50,12 @@ def formatDate(dt=None, type='date', variant='medium', lang='de'):
     return fmt.format(dt or datetime.now())
 
 
-def formatNumber(num, type='decimal', lang='de', pattern=u'#,##0.00;-#,##0.00'):
+def formatNumber(num, type='decimal', lang='de', 
+                 pattern=u'#,##0.00;-#,##0.00', precision=2):
     loc = locales.getLocale(lang)
     fmt = loc.numbers.getFormatter(type)
+    if precision:
+        num = round(num, precision)     # avoid zope.i18n formatting bug
     return fmt.format(num, pattern=pattern)
 
 

util/format.txt

@@ -15,3 +15,5 @@ Basic Formatting Functions
 
   >>> format.formatNumber(17.2)
   u'17,20'
+  >>> format.formatNumber(13399.99999997)
+  u'13.400,00'