R-2.18.2

CHANGELOG

@@ -1,4 +1,4 @@
-## 2.18.1
+## 2.18.1-2.18.2
 - pydal 19.02
 - made template its own module (Yet Another Template Language)
 - improved python 3.4-3.7 support

VERSION

@@ -1 +1 @@
-Version 2.18.1-stable+timestamp.2019.02.23.21.45.30
+Version 2.18.2-stable+timestamp.2019.02.25.21.46.30

applications/welcome/languages/it.py

@@ -102,6 +102,7 @@
 'enter a number between %(min)g and %(max)g': 'enter a number between %(min)g and %(max)g',
 'Enter an integer between %(min)g and %(max)g': 'Enter an integer between %(min)g and %(max)g',
 'enter an integer between %(min)g and %(max)g': 'inserisci un intero tra %(min)g e %(max)g',
+'Enter an integer greater than or equal to %(min)g': 'Enter an integer greater than or equal to %(min)g',
 'Errors': 'Errori',
 'Errors in form, please check it out.': 'Errori nel form, ricontrollalo',
 'export as csv file': 'esporta come file CSV',

gluon/highlight.py

@@ -114,7 +114,7 @@ def html_tokenizer(
         Callback for HTML specific highlighting.
         """
 
-        value = xmlespace(match.group(), quote=False)
+        value = xmlescape(match.group(), quote=False)
         self.change_style(token, style)
         self.output.append(value)
         if token == 'GOTOPYTHON':
@@ -286,13 +286,13 @@ def highlight(
                                          'WEB2PY']:
         code = Highlighter(language, link, styles).highlight(code)
     else:
-        code = xmlespace(code, quote=False)
+        code = xmlescape(code, quote=False)
     lines = code.split('\n')
 
     if counter is None:
         linenumbers = [''] * len(lines)
     elif isinstance(counter, str):
-        linenumbers = [xmlespace(counter, quote=False)] * len(lines)
+        linenumbers = [xmlescape(counter, quote=False)] * len(lines)
     else:
         linenumbers = [str(i + counter) + '.' for i in
                        xrange(len(lines))]