This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch 2.3-gae in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit 74070abe4f41c237c2f46781d78818275d2d1a88 Author: ddekany <[email protected]> AuthorDate: Sun Feb 7 16:05:03 2021 +0100 (Some built-in variable expression code cleanup) --- src/main/java/freemarker/core/BuiltinVariable.java | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/freemarker/core/BuiltinVariable.java b/src/main/java/freemarker/core/BuiltinVariable.java index 5002a03..b5ec4b7 100644 --- a/src/main/java/freemarker/core/BuiltinVariable.java +++ b/src/main/java/freemarker/core/BuiltinVariable.java @@ -53,26 +53,26 @@ final class BuiltinVariable extends Expression { static final String DATA_MODEL_CC = "dataModel"; static final String DATA_MODEL = "data_model"; static final String LANG = "lang"; - static final String LOCALE = "locale"; - static final String LOCALE_OBJECT_CC = "localeObject"; - static final String LOCALE_OBJECT = "locale_object"; + static final String LOCALE = Configurable.LOCALE_KEY; + static final String LOCALE_OBJECT_CC = Configurable.LOCALE_KEY_CAMEL_CASE + "Object"; + static final String LOCALE_OBJECT = Configurable.LOCALE_KEY + "_object"; static final String CURRENT_NODE_CC = "currentNode"; static final String CURRENT_NODE = "current_node"; 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_CC = "incompatibleImprovements"; - static final String INCOMPATIBLE_IMPROVEMENTS = "incompatible_improvements"; + static final String INCOMPATIBLE_IMPROVEMENTS_CC = Configuration.INCOMPATIBLE_IMPROVEMENTS_KEY_CAMEL_CASE; + static final String INCOMPATIBLE_IMPROVEMENTS = Configuration.INCOMPATIBLE_IMPROVEMENTS_KEY; static final String ERROR = "error"; - static final String OUTPUT_ENCODING_CC = "outputEncoding"; - static final String OUTPUT_ENCODING = "output_encoding"; - static final String OUTPUT_FORMAT_CC = "outputFormat"; - static final String OUTPUT_FORMAT = "output_format"; + static final String OUTPUT_ENCODING_CC = Configurable.OUTPUT_ENCODING_KEY_CAMEL_CASE; + static final String OUTPUT_ENCODING = Configurable.OUTPUT_ENCODING_KEY; + static final String OUTPUT_FORMAT_CC = Configuration.OUTPUT_FORMAT_KEY_CAMEL_CASE; + static final String OUTPUT_FORMAT = Configuration.OUTPUT_FORMAT_KEY; static final String AUTO_ESC_CC = "autoEsc"; static final String AUTO_ESC = "auto_esc"; - static final String URL_ESCAPING_CHARSET_CC = "urlEscapingCharset"; - static final String URL_ESCAPING_CHARSET = "url_escaping_charset"; + static final String URL_ESCAPING_CHARSET_CC = Configurable.URL_ESCAPING_CHARSET_KEY_CAMEL_CASE; + static final String URL_ESCAPING_CHARSET = Configurable.URL_ESCAPING_CHARSET_KEY; static final String NOW = "now"; static final String GET_OPTIONAL_TEMPLATE = "get_optional_template"; static final String GET_OPTIONAL_TEMPLATE_CC = "getOptionalTemplate";
