Convert Text.h to utf-8-sig and move ChineseSpecString* there

This time without mangling the characters
majcosta · Jan 2, 2025 · 846abf5 · 846abf5
1 parent ed73bd0
commit 846abf5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 27 deletions.
diff --git a/i18n/_ChineseText.cpp b/i18n/_ChineseText.cpp
@@ -12159,18 +12159,4 @@ STR16 szRobotText[] =
 	L"机器人附加%s技能效果。",   //L"The robot gains the benefit of the %s skill trait.",
 };
 
-// WANNE: Some Chinese specific strings that needs to be in unicode!
-STR16 ChineseSpecString1 = L"%％";			//defined in _ChineseText.cpp as this file is already unicode
-STR16 ChineseSpecString2 = L"*%3d%％%%";	//defined in _ChineseText.cpp as this file is already unicode
-STR16 ChineseSpecString3 = L"%d%％";		//defined in _ChineseText.cpp as this file is already unicode
-STR16 ChineseSpecString4 = L"%s (%s) [%d%％]\n%s %d\n%s %d\n%s %d (%d)\n%s (%d) %s\n%s %1.1f %s";
-STR16 ChineseSpecString5 = L"%s [%d%％]\n%s %d\n%s %d\n%s %1.1f %s";
-STR16 ChineseSpecString6 = L"%s [%d%％]\n%s %d%％ (%d/%d)\n%s %d%％\n%s %1.1f %s";
-STR16 ChineseSpecString7 = L"%s [%d%％]\n%s %1.1f %s";
-STR16 ChineseSpecString8 = L"%s (%s) [%d%％(%d%％)]\n%s %d\n%s %d\n%s %d (%d)\n%s (%d) %s\n%s %1.1f %s\n%s %.2f%%";	// added by Flugente
-STR16 ChineseSpecString9 = L"%s [%d%％(%d%％)]\n%s %d\n%s %d\n%s %1.1f %s";								// added by Flugente
-STR16 ChineseSpecString10 = L"%s [%d%％(%d%％)]\n%s %d%％ (%d/%d)\n%s %d%％\n%s %1.1f %s";						// added by Flugente
-STR16 ChineseSpecString11 = L"%s (%s) [%d%％(%d%％)]\n%s %d\n%s %d\n%s %d (%d)\n%s (%d) %s\n%s %1.1f %s";	// added by Flugente
-STR16 ChineseSpecString12 = L"%s (%s) [%d%％]\n%s %d\n%s %d\n%s %d (%d)\n%s (%d) %s\n%s %1.1f %s\n%s %.2f%%";	// added by Flugente
-
 #endif //CHINESE
diff --git a/i18n/include/Text.h b/i18n/include/Text.h
@@ -1,4 +1,4 @@
-#ifndef __TEXT_H
+#ifndef __TEXT_H
 #define __TEXT_H
 
 #include "items.h"
@@ -2584,18 +2584,18 @@ extern STR16 MPServerMessage[];
 extern STR16 MPClientMessage[];
 
 // WANNE: Some Chinese specific strings that needs to be in unicode!
-extern STR16 ChineseSpecString1;
-extern STR16 ChineseSpecString2;
-extern STR16 ChineseSpecString3;
-extern STR16 ChineseSpecString4;
-extern STR16 ChineseSpecString5;
-extern STR16 ChineseSpecString6;
-extern STR16 ChineseSpecString7;
-extern STR16 ChineseSpecString8;
-extern STR16 ChineseSpecString9;
-extern STR16 ChineseSpecString10;
-extern STR16 ChineseSpecString11;
-extern STR16 ChineseSpecString12;
+inline constexpr STR16 ChineseSpecString1 = L"%％";			//defined in _ChineseText.cpp as this file is already unicode
+inline constexpr STR16 ChineseSpecString2 = L"*%3d%％%%";	//defined in _ChineseText.cpp as this file is already unicode
+inline constexpr STR16 ChineseSpecString3 = L"%d%％";		//defined in _ChineseText.cpp as this file is already unicode
+inline constexpr STR16 ChineseSpecString4 = L"%s (%s) [%d%％]\n%s %d\n%s %d\n%s %d (%d)\n%s (%d) %s\n%s %1.1f %s";
+inline constexpr STR16 ChineseSpecString5 = L"%s [%d%％]\n%s %d\n%s %d\n%s %1.1f %s";
+inline constexpr STR16 ChineseSpecString6 = L"%s [%d%％]\n%s %d%％ (%d/%d)\n%s %d%％\n%s %1.1f %s";
+inline constexpr STR16 ChineseSpecString7 = L"%s [%d%％]\n%s %1.1f %s";
+inline constexpr STR16 ChineseSpecString8 = L"%s (%s) [%d%％(%d%％)]\n%s %d\n%s %d\n%s %d (%d)\n%s (%d) %s\n%s %1.1f %s\n%s %.2f%%";	// added by Flugente
+inline constexpr STR16 ChineseSpecString9 = L"%s [%d%％(%d%％)]\n%s %d\n%s %d\n%s %1.1f %s";								// added by Flugente
+inline constexpr STR16 ChineseSpecString10 = L"%s [%d%％(%d%％)]\n%s %d%％ (%d/%d)\n%s %d%％\n%s %1.1f %s";						// added by Flugente
+inline constexpr STR16 ChineseSpecString11 = L"%s (%s) [%d%％(%d%％)]\n%s %d\n%s %d\n%s %d (%d)\n%s (%d) %s\n%s %1.1f %s";	// added by Flugente
+inline constexpr STR16 ChineseSpecString12 = L"%s (%s) [%d%％]\n%s %d\n%s %d\n%s %d (%d)\n%s (%d) %s\n%s %1.1f %s\n%s %.2f%%";	// added by Flugente
 
 enum
 {