metin2/server
metin2
/
server
2
2
Fork 9
Code Issues 15 Pull Requests 2 Packages Projects Releases Wiki Activity

encoding #20

Merged
Exynox merged 22 commits from Tr0n/server:encoding into nightly 2024-04-07 08:59:38 +03:00
Conversation 2 Commits 22 Files Changed 224 +6073 -6069
Tr0n commented 2024-04-06 19:18:27 +03:00
Contributor
Copy Link

Transformed all source and header files to UTF-8.

All LC_TEXT calls now using the corresponding strings from the English locale_string.txt where available.
Where unavailable a best-effort translation was done (using DeepL and common sense).
Missing strings have not yet been added to the locale_strings.

English locale_string.txt has been modified to use the same strings for in- and output.

Transformed all source and header files to UTF-8. All `LC_TEXT` calls now using the corresponding strings from the English `locale_string.txt` where available. Where unavailable a best-effort translation was done (using DeepL and common sense). Missing strings have not yet been added to the `locale_string`s. English `locale_string.txt` has been modified to use the same strings for in- and output.
Tr0n added 22 commits 2024-04-06 19:18:28 +03:00
Tr0n commented 2024-04-07 00:32:36 +03:00
Author
Contributor
Copy Link

@exynox Is there anything obvious I missed or do you think this can be merged already?

The conversion of the remaining locale files is still on my TODO, should they be part of this PR or would a separate one at a later time be ok?

@exynox Is there anything obvious I missed or do you think this can be merged already? The conversion of the remaining locale files is still on my TODO, should they be part of this PR or would a separate one at a later time be ok?
Exynox reviewed 2024-04-07 08:09:03 +03:00
src/db/src/ClientManagerGuild.cpp
@ -127,3 +127,3 @@
{
case 0 :
return "ÆпÕ";
return "\xEF\xBF\xBD\xD0\xBF\xEF\xBF\xBD"; // 패왕
Exynox commented 2024-04-07 08:09:03 +03:00
Owner
Copy Link

This works for now, but we should check what this function does and if we can replace these strings as well with their English counterparts.

This works for now, but we should check what this function does and if we can replace these strings as well with their English counterparts.
Tr0n commented 2024-04-07 10:41:36 +03:00
Author
Contributor
Copy Link

AFAIK it was only used in logging calls. The snippets were too short for any meaningful translation so I kept them the way they were.

AFAIK it was only used in logging calls. The snippets were too short for any meaningful translation so I kept them the way they were.
Exynox reviewed 2024-04-07 08:11:43 +03:00
src/db/src/QID.h
@ -33,2 +31,2 @@
QID_ITEMPRICE_LOAD_FOR_UPDATE, ///< 22, 가격정보 업데이트를 위한 아이템 가격정보 로드 쿼리
QID_ITEMPRICE_LOAD, ///< 22, 아이템 가격정보 로드 쿼리
QID_ITEMPRICE_SAVE, ///< 20, 아이템 가격정보 저장 쿼리
QID_ITEMPRICE_DESTROY, ///< 21, 아이템 가격정보 저장 쿼리
Exynox commented 2024-04-07 08:11:43 +03:00
Owner
Copy Link

Not that it matters much, but "삭제" was replaced with "저장", changing the meaning from "delete" to "save"

Not that it matters much, but "삭제" was replaced with "저장", changing the meaning from "delete" to "save"
Tr0n commented 2024-04-07 10:43:50 +03:00
Author
Contributor
Copy Link

Oh that was probably something that happened when I merged the nightly branch, I think I recall resolving a conflict in that section. Sorry about that.

Oh that was probably something that happened when I merged the nightly branch, I think I recall resolving a conflict in that section. Sorry about that.
Exynox reviewed 2024-04-07 08:18:33 +03:00
src/game/src/char.h
@ -267,3 +267,3 @@
// END_PC_BANG_ITEM_ADD
POINT_RAMADAN_CANDY_BONUS_EXP, // 라마단 사탕 경험치 증가용
POINT_RAMADAN_CANDY_BONUS_EXP, // 라마단 사탕 경험치 증가용
Exynox commented 2024-04-07 08:18:33 +03:00
Owner
Copy Link

This looks weird in the online diff tool, to be checked manually later.

This looks weird in the online diff tool, to be checked manually later.
Exynox reviewed 2024-04-07 08:27:15 +03:00
src/game/src/char_skill.cpp
@ -2561,3 +2561,3 @@
if (test_server)
ChatPacket(CHAT_TYPE_INFO, LC_TEXT("%s SP소모: %d"), pkSk->szName, iNeededSP);
ChatPacket(CHAT_TYPE_INFO, LC_TEXT("%s FP-Consumption: %d"), pkSk->szName, iNeededSP);
Exynox commented 2024-04-07 08:27:15 +03:00
Owner
Copy Link

I think this is a mistranslation in the locale file, it should be "SP consumption", but it's a thing for another time.

I think this is a mistranslation in the locale file, it should be "SP consumption", but it's a thing for another time.
Exynox reviewed 2024-04-07 08:28:55 +03:00
src/game/src/cmd.cpp
@ -393,3 +393,2 @@
{ "로그를보여줘", do_detaillog, 0, POS_DEAD, GM_LOW_WIZARD },
{ "몬스터보여줘", do_monsterlog, 0, POS_DEAD, GM_LOW_WIZARD },
// TODO: these can probably be removed
Exynox commented 2024-04-07 08:28:55 +03:00
Owner
Copy Link

Agreed

Agreed
Exynox reviewed 2024-04-07 08:35:38 +03:00
src/game/src/cmd_gm.cpp
@ -3438,3 +3438,3 @@
str_to_number(pids.pid2, arg2);
ch->ChatPacket(CHAT_TYPE_INFO, LC_TEXT("플레이어 %d 와 플레이어 %d를 파혼시킵니다.."), pids.pid1, pids.pid2);
ch->ChatPacket(CHAT_TYPE_INFO, LC_TEXT("Broken contract between player %d and player %d."), pids.pid1, pids.pid2);
Exynox commented 2024-04-07 08:35:38 +03:00
Owner
Copy Link

Certainly some texts should be changed xD

Certainly some texts should be changed xD
Exynox reviewed 2024-04-07 08:37:02 +03:00
src/game/src/constants.cpp
@ -1081,3 +1080,1 @@
"신수국",
"천조국",
"진노국"
"All kingdoms",
Exynox commented 2024-04-07 08:37:02 +03:00
Owner
Copy Link

Good catch!

Good catch!
Exynox reviewed 2024-04-07 08:39:13 +03:00
src/game/src/empire_text_convert.cpp
@ -57,3 +57,3 @@
if (g_iUseLocale)
{
static char s_cChinaTable[][3] = {"¡ò","££","£¤","¡ù","¡ð" };
static char s_cChinaTable[][3] = {"\xA1\xF2","\xA3\xA3","\xA3\xA4","\xA1\xF9","\xA1\xF0" };
Exynox commented 2024-04-07 08:39:13 +03:00
Owner
Copy Link

This whole file looks like a prime candidate for deletion

This whole file looks like a prime candidate for deletion
Exynox commented 2024-04-07 08:59:04 +03:00
Owner
Copy Link

I think we can merge this, I'll take care myself of the small things I pointed out.

I think we can merge this, I'll take care myself of the small things I pointed out.
Exynox changed title from WIP: encoding to encoding 2024-04-07 08:59:07 +03:00
Exynox merged commit 042414a499 into nightly 2024-04-07 08:59:37 +03:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No Label
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: metin2/server#20
No description provided.
Delete Branch "Tr0n/server:encoding"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?