Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 526FB200C92 for ; Mon, 12 Jun 2017 18:51:35 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 510FD160BD9; Mon, 12 Jun 2017 16:51:35 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 96F02160BCF for ; Mon, 12 Jun 2017 18:51:34 +0200 (CEST) Received: (qmail 1444 invoked by uid 500); 12 Jun 2017 16:51:33 -0000 Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.incubator.apache.org Delivered-To: mailing list notifications@freemarker.incubator.apache.org Received: (qmail 1435 invoked by uid 99); 12 Jun 2017 16:51:33 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Jun 2017 16:51:33 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 5529DC02CA for ; Mon, 12 Jun 2017 16:51:33 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.222 X-Spam-Level: X-Spam-Status: No, score=-4.222 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id BOpBZWT3As7c for ; Mon, 12 Jun 2017 16:51:32 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 1F3AD5FC3A for ; Mon, 12 Jun 2017 16:51:30 +0000 (UTC) Received: (qmail 1377 invoked by uid 99); 12 Jun 2017 16:51:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Jun 2017 16:51:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8C4A5DFF2D; Mon, 12 Jun 2017 16:51:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.incubator.apache.org Message-Id: <69525fbd3e6a4318945712f57bd551d5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-freemarker git commit: (Missing setting name hints for renamed settings "cacheStorage" and "localizedLookup") Date: Mon, 12 Jun 2017 16:51:28 +0000 (UTC) archived-at: Mon, 12 Jun 2017 16:51:35 -0000 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 Authored: Mon Jun 12 18:51:22 2017 +0200 Committer: ddekany 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); }