From 871feb5e3ae4ac4f18357b3f520594a51059b616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <mimmi20@live.de>
Date: Thu, 4 Jan 2024 19:06:28 +0100
Subject: [PATCH 1/2] add support for exotic locales
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Müller <mimmi20@live.de>
---
 src/View/Helper/FormDateTimeSelect.php      | 17 ++++++++++++++++-
 test/View/Helper/FormDateTimeSelectTest.php | 14 ++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/View/Helper/FormDateTimeSelect.php b/src/View/Helper/FormDateTimeSelect.php
index 777de2d3..74e70e87 100644
--- a/src/View/Helper/FormDateTimeSelect.php
+++ b/src/View/Helper/FormDateTimeSelect.php
@@ -12,6 +12,7 @@
 
 use function array_key_exists;
 use function is_numeric;
+use function preg_match_all;
 use function preg_split;
 use function rtrim;
 use function sprintf;
@@ -203,7 +204,21 @@ public function getPattern(): string
      */
     protected function parsePattern(bool $renderDelimiters = true): array
     {
-        $pattern    = $this->getPattern();
+        $pattern = $this->getPattern();
+
+        // are there any non-latin characters in the pattern?
+        $count = preg_match_all('/[^\p{Latin}\s\-,.:\/\\\'\[\]\(\)]+/u', $pattern, $matches);
+
+        if ($count) {
+            // put single quotes around these characters
+            foreach ($matches[0] as $match) {
+                $pattern = str_replace($match, "'$match'", $pattern);
+            }
+
+            // remove double quotes, if there were already quotes around them
+            $pattern = str_replace("''", "'", $pattern);
+        }
+
         $pregResult = preg_split(
             "/([ \-,.:\/]*'.*?'[ \-,.:\/]*)|([ \-,.:\/]+)/",
             $pattern,
diff --git a/test/View/Helper/FormDateTimeSelectTest.php b/test/View/Helper/FormDateTimeSelectTest.php
index c10875cd..3516ee3c 100644
--- a/test/View/Helper/FormDateTimeSelectTest.php
+++ b/test/View/Helper/FormDateTimeSelectTest.php
@@ -453,4 +453,18 @@ public function testShortTimeFormatDoesNotProvideSecondPart(): void
         self::assertStringContainsString('<select name="minute">', $markup);
         self::assertStringNotContainsString('<select name="second">', $markup);
     }
+
+    public function testRendersDatesWithZhHansHKLocaleDatePattern(): void
+    {
+        $this->helper->setLocale('zh_Hans_HK');
+        $this->helper->setDateType(IntlDateFormatter::LONG);
+
+        $element = new DateTimeSelect('foo');
+        $element->setMinYear(2022);
+        $element->setMaxYear(2027);
+
+        $markup = $this->helper->render($element);
+
+        self::assertStringContainsString('<select name="year">', $markup);
+    }
 }

From 9633b46ab76842d7abb04ea89faeb34da0bd54bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <mimmi20@live.de>
Date: Tue, 9 Jan 2024 09:27:19 +0100
Subject: [PATCH 2/2] add check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Filippo Tessarotto <zoeslam@gmail.com>
Signed-off-by: Thomas Müller <mimmi20@live.de>
---
 test/View/Helper/FormDateTimeSelectTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/View/Helper/FormDateTimeSelectTest.php b/test/View/Helper/FormDateTimeSelectTest.php
index 3516ee3c..24984e29 100644
--- a/test/View/Helper/FormDateTimeSelectTest.php
+++ b/test/View/Helper/FormDateTimeSelectTest.php
@@ -458,6 +458,7 @@ public function testRendersDatesWithZhHansHKLocaleDatePattern(): void
     {
         $this->helper->setLocale('zh_Hans_HK');
         $this->helper->setDateType(IntlDateFormatter::LONG);
+        self::assertSame('y年M月d日 z ah:mm:ss', $this->helper->getPattern());
 
         $element = new DateTimeSelect('foo');
         $element->setMinYear(2022);