This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch 2.3 in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit c96660e69e7d6301d99e8519179066213e3d0250 Merge: 17696bc3 9f120dfe Author: ddekany <[email protected]> AuthorDate: Thu Jan 5 01:08:22 2023 +0100 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 .../freemarker/core/AbstractJSONLikeFormat.java | 9 +- .../freemarker/core/AbstractLegacyCFormat.java | 105 - .../java/freemarker/core/ArithmeticEngine.java | 2 +- src/main/java/freemarker/core/CFormat.java | 18 +- .../freemarker/core/CTemplateNumberFormat.java | 6 +- src/main/java/freemarker/core/Configurable.java | 121 +- .../java/freemarker/core/Default230CFormat.java | 73 - .../java/freemarker/core/Default2321CFormat.java | 72 - src/main/java/freemarker/core/Environment.java | 58 +- .../core/ExtendedDecimalFormatParser.java | 4 +- src/main/java/freemarker/core/JSONCFormat.java | 18 +- src/main/java/freemarker/core/JavaCFormat.java | 10 +- .../java/freemarker/core/JavaScriptCFormat.java | 13 +- ...ONCFormat.java => JavaScriptOrJSONCFormat.java} | 28 +- src/main/java/freemarker/core/LegacyCFormat.java | 173 + .../java/freemarker/core/MarkupOutputFormat.java | 2 +- ...andardCLanguages.java => StandardCFormats.java} | 20 +- src/main/java/freemarker/core/XSCFormat.java | 18 +- .../java/freemarker/ext/beans/BeansWrapper.java | 6 +- .../ext/beans/BeansWrapperConfiguration.java | 2 +- .../java/freemarker/ext/jsp/JspTagModelBase.java | 2 +- .../java/freemarker/template/Configuration.java | 48 +- .../java/freemarker/template/_TemplateAPI.java | 2 +- .../template/utility/CollectionUtils.java | 2 + .../freemarker/template/utility/StringUtil.java | 144 +- src/manual/en_US/book.xml | 232 +- src/manual/zh_CN/book.xml | 31353 ------------------- src/manual/zh_CN/docgen-help/README | 2 - src/manual/zh_CN/docgen-misc/googleAnalytics.html | 14 - src/manual/zh_CN/docgen-originals/figures/README | 2 - src/manual/zh_CN/docgen.cjson | 132 - src/manual/zh_CN/favicon.png | Bin 1291 -> 0 bytes src/manual/zh_CN/figures/model2sketch.png | Bin 21425 -> 0 bytes src/manual/zh_CN/figures/overview.png | Bin 11837 -> 0 bytes src/manual/zh_CN/figures/tree.png | Bin 4699 -> 0 bytes src/manual/zh_CN/logo.png | Bin 10134 -> 0 bytes .../core/BooleanFormatEnvironmentCachingTest.java | 5 +- .../java/freemarker/core/CAndCnBuiltInTest.java | 18 +- .../java/freemarker/core/CFormatTemplateTest.java | 6 + .../freemarker/core/CTemplateNumberFormatTest.java | 2 +- src/test/java/freemarker/core/CustomCFormat.java | 8 +- src/test/java/freemarker/core/NumberBiTest.java | 4 - .../freemarker/template/ConfigurationTest.java | 46 +- .../template/utility/StringUtilTest.java | 77 +- 44 files changed, 778 insertions(+), 32079 deletions(-)
