From 8dcb4326c6c5b00decbb176320637f7817d9c33d Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 25 Feb 2019 21:47:06 -0800 Subject: [PATCH] R-2.18.2 --- CHANGELOG | 2 +- VERSION | 2 +- applications/welcome/languages/it.py | 1 + gluon/highlight.py | 6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 7402d1a1d..1500e53aa 100644 --- a/CHANGELOG +++ b/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 diff --git a/VERSION b/VERSION index cc717d5d5..d20e228b8 100644 --- a/VERSION +++ b/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 diff --git a/applications/welcome/languages/it.py b/applications/welcome/languages/it.py index 2b123998c..acaf1a399 100755 --- a/applications/welcome/languages/it.py +++ b/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', diff --git a/gluon/highlight.py b/gluon/highlight.py index d40b2ac95..add65b8f6 100644 --- a/gluon/highlight.py +++ b/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))]