Repository: incubator-freemarker Updated Branches: refs/heads/3 04898a206 -> 1efaf3364
(Missing setting name hints for renamed settings "cacheStorage" and "localizedLookup") Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/1efaf336 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/1efaf336 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/1efaf336 Branch: refs/heads/3 Commit: 1efaf33642b4b7a431ffab496f8af49fd61ebad9 Parents: 04898a2 Author: ddekany <[email protected]> Authored: Mon Jun 12 18:51:22 2017 +0200 Committer: ddekany <[email protected]> Committed: Mon Jun 12 18:51:22 2017 +0200 ---------------------------------------------------------------------- .../org/apache/freemarker/core/Configuration.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1efaf336/freemarker-core/src/main/java/org/apache/freemarker/core/Configuration.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/Configuration.java b/freemarker-core/src/main/java/org/apache/freemarker/core/Configuration.java index 9f5a50e..a0bc182 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/Configuration.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/Configuration.java @@ -1954,8 +1954,8 @@ public final class Configuration implements TopLevelConfiguration, CustomStateSc @Override protected String getCorrectedNameForUnknownSetting(String name) { - if ("encoding".equals(name) || "default_encoding".equals(name) || "charset".equals(name) || "default_charset" - .equals(name)) { + if ("encoding".equals(name) || "default_encoding".equals(name) || "charset".equals(name) + || "default_charset".equals(name)) { // [2.4] Default might changes to camel-case return SOURCE_ENCODING_KEY; } @@ -1968,6 +1968,18 @@ public final class Configuration implements TopLevelConfiguration, CustomStateSc if (name.equals("incompatibleEnhancements")) { return INCOMPATIBLE_IMPROVEMENTS_KEY_CAMEL_CASE; } + if (name.equals("cacheStorage")) { + return TEMPLATE_CACHE_STORAGE_KEY_CAMEL_CASE; + } + if (name.equals("cache_storage")) { + return TEMPLATE_CACHE_STORAGE_KEY_SNAKE_CASE; + } + if (name.equals("localizedLookup")) { + return LOCALIZED_TEMPLATE_LOOKUP_KEY_CAMEL_CASE; + } + if (name.equals("localized_lookup")) { + return LOCALIZED_TEMPLATE_LOOKUP_KEY_SNAKE_CASE; + } return super.getCorrectedNameForUnknownSetting(name); }
