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 956067cb1f49d9f8fe1c21456545a7a22dea2d03 Author: ddekany <[email protected]> AuthorDate: Wed Jan 4 23:22:01 2023 +0100 (Minor typos) --- src/main/java/freemarker/core/ExtendedDecimalFormatParser.java | 4 ++-- src/main/java/freemarker/ext/jsp/JspTagModelBase.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/freemarker/core/ExtendedDecimalFormatParser.java b/src/main/java/freemarker/core/ExtendedDecimalFormatParser.java index 02e0fbaa..db47c9aa 100644 --- a/src/main/java/freemarker/core/ExtendedDecimalFormatParser.java +++ b/src/main/java/freemarker/core/ExtendedDecimalFormatParser.java @@ -264,7 +264,7 @@ class ExtendedDecimalFormatParser { } String currencySymbol = null; // Exceptional, as must be applied after "currency code" - fetchParamters: do { + fetchParameters: do { int namePos = pos; String name = fetchName(); if (name == null) { @@ -308,7 +308,7 @@ class ExtendedDecimalFormatParser { skipWS(); } else { if (pos == ln) { - break fetchParamters; + break fetchParameters; } if (pos == paramEndPos) { throw newExpectedSgParseException("parameter separator whitespace or comma"); diff --git a/src/main/java/freemarker/ext/jsp/JspTagModelBase.java b/src/main/java/freemarker/ext/jsp/JspTagModelBase.java index 2c4d57b2..0fc96a49 100644 --- a/src/main/java/freemarker/ext/jsp/JspTagModelBase.java +++ b/src/main/java/freemarker/ext/jsp/JspTagModelBase.java @@ -119,7 +119,7 @@ class JspTagModelBase { "). See cause exception for the more specific cause..."); if (e instanceof IllegalArgumentException && !(setterType.isAssignableFrom(String.class)) && argArray[0] != null && argArray[0] instanceof String) { - desc.tip("This problem is often caused by unnecessary parameter quotation. Paramters " + desc.tip("This problem is often caused by unnecessary parameter quotation. Parameters " + "aren't quoted in FTL, similarly as they aren't quoted in most languages. " + "For example, these parameter assignments are wrong: ", "<@my.tag p1=\"true\" p2=\"10\" p3=\"${someVariable}\" p4=\"${x+1}\" />",
