Merge branch 'LDEV-2315' of https://github.com/MitrahSoft/Lucee into …

…LDEV-2315 # Conflicts: # core/src/main/java/lucee/runtime/functions/displayFormatting/GetLocaleInfo.java # core/src/main/java/lucee/runtime/tag/QueryParam.java
MitrahSoft · Feb 14, 2024 · 39b53ff · 39b53ff
2 parents 2b70511 + ae80c86
commit 39b53ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/core/src/main/java/lucee/runtime/functions/displayFormatting/GetLocaleInfo.java b/core/src/main/java/lucee/runtime/functions/displayFormatting/GetLocaleInfo.java
@@ -23,6 +23,8 @@
 import java.text.SimpleDateFormat;
 import java.util.Currency;
 import java.util.Locale;
+import java.util.*;
+import java.text.DateFormat;
 
 import lucee.runtime.PageContext;
 import lucee.runtime.ext.function.Function;

diff --git a/core/src/main/java/lucee/runtime/type/util/KeyConstants.java b/core/src/main/java/lucee/runtime/type/util/KeyConstants.java
@@ -937,6 +937,9 @@ public class KeyConstants {
 	public static final Key _STATIC = KeyImpl._const("STATIC");
 	public static final Key _country = KeyImpl._const("country");
 	public static final Key _display = KeyImpl._const("display");
+	public static final Key _currency = KeyImpl._const("currency");
+	public static final Key _currency_code = KeyImpl._const("code");
+	public static final Key _currency_symbol = KeyImpl._const("symbol");
 	public static final Key _generator = KeyImpl._const("generator");
 	public static final Key _http = KeyImpl._const("http");
 	public static final Key _webservice = KeyImpl._const("webservice");