This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch 3 in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit 26220fe0427d287c61818d63e6ec77ba8c461c6e Author: ddekany <[email protected]> AuthorDate: Sun Feb 7 16:05:42 2021 +0100 Forward ported from 2.3-gae: (Some built-in variable expression code cleanup) --- .../org/apache/freemarker/core/ASTExpBuiltInVariable.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTExpBuiltInVariable.java b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTExpBuiltInVariable.java index 42fe3f1..d3760a0 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/ASTExpBuiltInVariable.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/ASTExpBuiltInVariable.java @@ -46,18 +46,18 @@ final class ASTExpBuiltInVariable extends ASTExpression { static final String LOCALS = "locals"; static final String DATA_MODEL = "dataModel"; static final String LANG = "lang"; - static final String LOCALE = "locale"; - static final String LOCALE_OBJECT = "localeObject"; + static final String LOCALE = MutableProcessingConfiguration.LOCALE_KEY; + static final String LOCALE_OBJECT = MutableProcessingConfiguration.LOCALE_KEY + "Object"; static final String NODE = "node"; static final String PASS = "pass"; static final String VARS = "vars"; static final String VERSION = "version"; - static final String INCOMPATIBLE_IMPROVEMENTS = "incompatibleImprovements"; + static final String INCOMPATIBLE_IMPROVEMENTS = Configuration.Builder.INCOMPATIBLE_IMPROVEMENTS_KEY; static final String ERROR = "error"; - static final String OUTPUT_ENCODING = "outputEncoding"; - static final String OUTPUT_FORMAT = "outputFormat"; + static final String OUTPUT_ENCODING = MutableProcessingConfiguration.OUTPUT_ENCODING_KEY; + static final String OUTPUT_FORMAT = MutableParsingAndProcessingConfiguration.OUTPUT_FORMAT_KEY; static final String AUTO_ESC = "autoEsc"; - static final String URL_ESCAPING_CHARSET = "urlEscapingCharset"; + static final String URL_ESCAPING_CHARSET = MutableProcessingConfiguration.URL_ESCAPING_CHARSET_KEY; static final String NOW = "now"; static final String GET_OPTIONAL_TEMPLATE = "getOptionalTemplate"; static final String CALLER_TEMPLATE_NAME = "callerTemplateName";
