From 8ab334cd82f3c07b078a5c617598ddabc5b64e2a Mon Sep 17 00:00:00 2001
From: Jerry <92690997+TomStilson@users.noreply.github.com>
Date: Tue, 23 May 2023 21:23:51 +0800
Subject: [PATCH 1/2] chore(locales): Update zh-cn.json and zh-tw.json

---
 locales/zh-cn.json | 12 ++++++------
 locales/zh-tw.json | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/locales/zh-cn.json b/locales/zh-cn.json
index 27acbd826..2415b2013 100644
--- a/locales/zh-cn.json
+++ b/locales/zh-cn.json
@@ -4,11 +4,11 @@
     "cancel": "取消",
     "close": "关闭",
     "confirm": "确认",
-    "more": "More..."
+    "more": "更多..."
   },
-  "txadmin_announcement": "Server announcement by %s",
-  "txadmin_dm": "Direct Message from %s",
-  "txadmin_warn": "You have been warned by %s",
-  "txadmin_warn_content": "%s  \nAction ID: %s",
-  "txadmin_scheduledrestart": "Scheduled Restart"
+  "txadmin_announcement": "来自 %s 的服务器通告",
+  "txadmin_dm": "来自 %s 的信息",
+  "txadmin_warn": "您被 %s 警告了",
+  "txadmin_warn_content": "%s  \n操作 ID: %s",
+  "txadmin_scheduledrestart": "计划内重启"
 }
diff --git a/locales/zh-tw.json b/locales/zh-tw.json
index 2eb767f88..65b74ea75 100644
--- a/locales/zh-tw.json
+++ b/locales/zh-tw.json
@@ -4,11 +4,11 @@
     "cancel": "取消",
     "close": "關閉",
     "confirm": "確認",
-    "more": "More..."
+    "more": "更多..."
   },
-  "txadmin_announcement": "Server announcement by %s",
-  "txadmin_dm": "Direct Message from %s",
-  "txadmin_warn": "You have been warned by %s",
-  "txadmin_warn_content": "%s  \nAction ID: %s",
-  "txadmin_scheduledrestart": "Scheduled Restart"
+  "txadmin_announcement": "來自 %s 的伺服器通告",
+  "txadmin_dm": "來自 %s 的訊息",
+  "txadmin_warn": "您被 %s 警告了",
+  "txadmin_warn_content": "%s  \n操作 ID: %s",
+  "txadmin_scheduledrestart": "計劃內重啟"
 }

From c95029fd2d4188856263eadc6ec1b08a31eee422 Mon Sep 17 00:00:00 2001
From: Jerry <92690997+TomStilson@users.noreply.github.com>
Date: Tue, 18 Jul 2023 15:20:10 +0800
Subject: [PATCH 2/2] fix(client/vehicleProperties): Only use livery ID when
 livery exists

---
 resource/vehicleProperties/client.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resource/vehicleProperties/client.lua b/resource/vehicleProperties/client.lua
index ade5a8d93..e05a55391 100644
--- a/resource/vehicleProperties/client.lua
+++ b/resource/vehicleProperties/client.lua
@@ -119,9 +119,10 @@ function lib.getVehicleProperties(vehicle)
             end
         end
 
+        local modLiveryCount = GetVehicleLiveryCount(vehicle)
         local modLivery = GetVehicleLivery(vehicle)
 
-        if modLivery == -1 then
+        if modLiveryCount == -1 or modLivery == -1 then
             modLivery = GetVehicleMod(vehicle, 48)
         end