From 64af4fd7d6a043c00a781d86b14019fc8e208914 Mon Sep 17 00:00:00 2001
From: Haru SaKura <60030937+harusakura924@users.noreply.github.com>
Date: Mon, 23 Sep 2024 01:34:52 +0000
Subject: [PATCH 1/2] Translate Yii2 Unique Validation Error Message to zh-TW

---
 framework/messages/zh-TW/yii.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/messages/zh-TW/yii.php b/framework/messages/zh-TW/yii.php
index ff206fe66e9..a4bce99f28e 100644
--- a/framework/messages/zh-TW/yii.php
+++ b/framework/messages/zh-TW/yii.php
@@ -24,7 +24,7 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    ' and ' => '',
+    ' and ' => ' 和 ',
     '"{attribute}" does not support operator "{operator}".' => '',
     '(not set)' => '(未設定)',
     'Action not found.' => '',
@@ -51,7 +51,7 @@
     'Please fix the following errors:' => '請修正以下錯誤：',
     'Please upload a file.' => '請上傳一個檔案。',
     'Showing <b>{begin, number}-{end, number}</b> of <b>{totalCount, number}</b> {totalCount, plural, one{item} other{items}}.' => '第 <b>{begin, number}-{end, number}</b> 項，共 <b>{totalCount, number}</b> 項資料.',
-    'The combination {values} of {attributes} has already been taken.' => '',
+    'The combination {values} of {attributes} has already been taken.' => '{attribute} 的值 "{value}" 已經被佔用了。',
     'The file "{file}" is not an image.' => '檔案 "{file}" 不是一個圖片檔案。',
     'The file "{file}" is too big. Its size cannot exceed {formattedLimit}.' => '檔案"{file}"太大了。它的大小不可以超過{formattedLimit}。',
     'The file "{file}" is too small. Its size cannot be smaller than {formattedLimit}.' => '文件"{file}"太小了。它的大小不可以小於{formattedLimit}。',

From dff9c269a2ab241b6073c1db3c2c95adab009bfa Mon Sep 17 00:00:00 2001
From: Haru SaKura <60030937+harusakura924@users.noreply.github.com>
Date: Mon, 23 Sep 2024 02:01:05 +0000
Subject: [PATCH 2/2] =?UTF-8?q?Changing=20it=20to=20"=E8=88=87"=20is=20mor?=
 =?UTF-8?q?e=20formal.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/messages/zh-TW/yii.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/messages/zh-TW/yii.php b/framework/messages/zh-TW/yii.php
index a4bce99f28e..598b2b9de71 100644
--- a/framework/messages/zh-TW/yii.php
+++ b/framework/messages/zh-TW/yii.php
@@ -24,7 +24,7 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    ' and ' => ' 和 ',
+    ' and ' => ' 與 ',
     '"{attribute}" does not support operator "{operator}".' => '',
     '(not set)' => '(未設定)',
     'Action not found.' => '',