You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2015/10/26 23:35:41 UTC
[2/2] incubator-freemarker git commit: Merge remote-tracking branch
'github/FREEMARKER-2-option-request-locale' into 2.3-gae
Merge remote-tracking branch 'github/FREEMARKER-2-option-request-locale' into 2.3-gae
FREEMARKER-2: Option to set request locale from the given servlet request
GitHub pull request #7
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/6819382e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/6819382e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/6819382e
Branch: refs/heads/2.3-gae
Commit: 6819382e6e32d03e80ef63b862b13300d1467dbd
Parents: ef943b2 1e4c64f
Author: ddekany <dd...@apache.org>
Authored: Mon Oct 26 23:31:56 2015 +0100
Committer: ddekany <dd...@apache.org>
Committed: Mon Oct 26 23:33:27 2015 +0100
----------------------------------------------------------------------
.../ext/servlet/FreemarkerServlet.java | 69 ++++++++++----
.../ext/servlet/FreemarkerServletTest.java | 95 ++++++++++++++++++--
2 files changed, 144 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6819382e/src/main/java/freemarker/ext/servlet/FreemarkerServlet.java
----------------------------------------------------------------------
diff --cc src/main/java/freemarker/ext/servlet/FreemarkerServlet.java
index f7731ee,560c459..7b785d2
--- a/src/main/java/freemarker/ext/servlet/FreemarkerServlet.java
+++ b/src/main/java/freemarker/ext/servlet/FreemarkerServlet.java
@@@ -458,10 -475,10 +474,11 @@@ public class FreemarkerServlet extends
@SuppressFBWarnings(value="SE_BAD_FIELD", justification="Not investing into making this Servlet serializable")
private ObjectWrapper wrapper;
private String contentType;
- private OverrideResponseContentType overrideResponseContentType = OverrideResponseContentType.ALWAYS;
+ private OverrideResponseContentType overrideResponseContentType = initParamValueToEnum(
+ getDefaultOverrideResponseContentType(), OverrideResponseContentType.values());
private ResponseCharacterEncoding responseCharacterEncoding = ResponseCharacterEncoding.LEGACY;
private boolean contentTypeContainsCharset;
+ private OverrideResponseLocale overrideResponseLocale = OverrideResponseLocale.ALWAYS;
private List/*<MetaInfTldSource>*/ metaInfTldSources;
private List/*<String>*/ classpathTlds;