From afd81c359105a94d67606bc2c234b9c5d7840be4 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 26 May 2022 09:33:18 +0800
Subject: [PATCH] 1

---
 server/rankserver/guildmgr.cc | 36 +++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/server/rankserver/guildmgr.cc b/server/rankserver/guildmgr.cc
index 91ed9ef..8308762 100644
--- a/server/rankserver/guildmgr.cc
+++ b/server/rankserver/guildmgr.cc
@@ -160,7 +160,7 @@ void GuildMgr::__GuildCreate(f8::JsonHttpRequest* request)
     long long guild_id = request->request.At("guild_id")->AsXValue();
     if (GetGuildById(guild_id)) {
         request->resp_xobj->SetVal("errcode", 1);
-        request->resp_xobj->SetVal("errmsg", TEXT("guildid_already_exists", "guild_id已经存在"));
+        request->resp_xobj->SetVal("errmsg", TEXT("guildid_already_exists", "guild id already exists"));
         return;
     }
 
@@ -169,7 +169,7 @@ void GuildMgr::__GuildCreate(f8::JsonHttpRequest* request)
     TypeConvert::Convert(request, guild);
     if (guild->guild_name().empty()) {
         request->resp_xobj->SetVal("errcode", 2);
-        request->resp_xobj->SetVal("errmsg", TEXT("guild_name_cannt_emtpy", "战队名字不能为空"));
+        request->resp_xobj->SetVal("errmsg", TEXT("guild_name_cannt_emtpy", "guild name is emtpy"));
         delete guild;
         return;
     }
@@ -183,31 +183,31 @@ void GuildMgr::__GuildCreate(f8::JsonHttpRequest* request)
                        guild->guild_name()
                        )) {
         request->resp_xobj->SetVal("errcode", 3);
-        request->resp_xobj->SetVal("errmsg", TEXT("guild_name_already_exists", "战队名已经存在"));
+        request->resp_xobj->SetVal("errmsg", TEXT("guild_name_already_exists", "guild name already exists"));
         delete guild;
         return;
     }
     if (a8::GetUtf8Length(guild->guild_name().c_str()) > MAX_GUILD_NAME_LEN) {
         request->resp_xobj->SetVal("errcode", 3);
-        request->resp_xobj->SetVal("errmsg", TEXT("guild_name_too_long", "战队名字长度超过限制"));
+        request->resp_xobj->SetVal("errmsg", TEXT("guild_name_too_long", "guild name too long"));
         delete guild;
         return;
     }
     if (a8::GetUtf8Length(guild->guild_declaration().c_str()) > MAX_GUILD_DECLARATION_LEN) {
         request->resp_xobj->SetVal("errcode", 3);
-        request->resp_xobj->SetVal("errmsg", TEXT("guild_declaration_too_long", "战队宣言长度超过限制"));
+        request->resp_xobj->SetVal("errmsg", TEXT("guild_declaration_too_long", "guild declaration too long"));
         delete guild;
         return;
     }
     if (MetaMgr::Instance()->HasDirtyWord(guild->guild_name())) {
         request->resp_xobj->SetVal("errcode", 4);
-        request->resp_xobj->SetVal("errmsg", TEXT("guild_name_has_forbid_word", "战队名含有违禁字符"));
+        request->resp_xobj->SetVal("errmsg", TEXT("guild_name_has_forbid_word", "guild name has forbid word"));
         delete guild;
         return;
     }
     if (MetaMgr::Instance()->HasDirtyWord(guild->guild_declaration())) {
         request->resp_xobj->SetVal("errcode", 5);
-        request->resp_xobj->SetVal("errmsg", TEXT("guild_declaration_has_forbid_word", "战队宣言含有违禁字符"));
+        request->resp_xobj->SetVal("errmsg", TEXT("guild_declaration_has_forbid_word", "guild declaration has forbid word"));
         delete guild;
         return;
     }
@@ -296,7 +296,7 @@ void GuildMgr::__GuildCreate(f8::JsonHttpRequest* request)
              {
                  std::string response;
                  request->resp_xobj->SetVal("errcode", 2);
-                 request->resp_xobj->SetVal("errmsg", TEXT("server_internal_error", "服务器内部错误"));
+                 request->resp_xobj->SetVal("errmsg", TEXT("server_internal_error", "server internal error"));
                  request->resp_xobj->ToJsonStr(response);
                  IMListener::Instance()->SendText(request->socket_handle, a8::HttpResponse(response));
              }
@@ -395,7 +395,7 @@ void GuildMgr::__GuildRename(f8::JsonHttpRequest* request)
 {
     if (!load_done_) {
         request->resp_xobj->SetVal("errcode", 2);
-        request->resp_xobj->SetVal("errmsg", TEXT("server_internal_error", "服务器内部错误"));
+        request->resp_xobj->SetVal("errmsg", TEXT("server_internal_error", "server internal error"));
         return;
     }
     request->resp_xobj->SetVal("errcode", 0);
@@ -407,13 +407,13 @@ void GuildMgr::__GuildRename(f8::JsonHttpRequest* request)
     cs::MFGuildBasic* guild = GetGuildById(guild_id);
     if (!guild) {
         request->resp_xobj->SetVal("errcode", 1);
-        request->resp_xobj->SetVal("errmsg", TEXT("server_internal_error", "服务器内部错误"));
+        request->resp_xobj->SetVal("errmsg", TEXT("server_internal_error", "server internal error"));
         return;
     }
     if (guild->guild_declaration() != guild_declaration) {
         if (MetaMgr::Instance()->HasDirtyWord(guild_declaration)) {
             request->resp_xobj->SetVal("errcode", 1);
-            request->resp_xobj->SetVal("errmsg", TEXT("guild_declaration_has_forbid_word", "战队宣言含有违禁字符"));
+            request->resp_xobj->SetVal("errmsg", TEXT("guild_declaration_has_forbid_word", "guild declaration has forbid word"));
             return;
         }
     }
@@ -424,7 +424,7 @@ void GuildMgr::__GuildRename(f8::JsonHttpRequest* request)
     }
     if (guild_name.empty()) {
         request->resp_xobj->SetVal("errcode", 1);
-        request->resp_xobj->SetVal("errmsg", TEXT("guild_name_cannt_emtpy", "战队名不能为空"));
+        request->resp_xobj->SetVal("errmsg", TEXT("guild_name_cannt_emtpy", "guild name is emtpy"));
         return;
     }
     if (GetGuildByName(guild->_gameid(),
@@ -433,22 +433,22 @@ void GuildMgr::__GuildRename(f8::JsonHttpRequest* request)
                        guild->_name_ext2(),
                        guild_name)) {
         request->resp_xobj->SetVal("errcode", 1);
-        request->resp_xobj->SetVal("errmsg", TEXT("guild_name_already_exists", "战队名已经存在"));
+        request->resp_xobj->SetVal("errmsg", TEXT("guild_name_already_exists", "guild name already exists"));
         return;
     }
     if (a8::GetUtf8Length(guild_name.c_str()) > MAX_GUILD_NAME_LEN) {
         request->resp_xobj->SetVal("errcode", 3);
-        request->resp_xobj->SetVal("errmsg", TEXT("guild_name_too_long", "战队名字长度超过限制"));
+        request->resp_xobj->SetVal("errmsg", TEXT("guild_name_too_long", "guild name too long"));
         return;
     }
     if (a8::GetUtf8Length(guild_declaration.c_str()) > MAX_GUILD_DECLARATION_LEN) {
         request->resp_xobj->SetVal("errcode", 3);
-        request->resp_xobj->SetVal("errmsg", TEXT("guild_declaration_too_long", "战队宣言长度超过限制"));
+        request->resp_xobj->SetVal("errmsg", TEXT("guild_declaration_too_long", "guild declaration too long"));
         return;
     }
     if (MetaMgr::Instance()->HasDirtyWord(guild_name)) {
         request->resp_xobj->SetVal("errcode", 1);
-        request->resp_xobj->SetVal("errmsg", TEXT("guild_name_has_forbid_word", "战队名含有违禁字符"));
+        request->resp_xobj->SetVal("errmsg", TEXT("guild_name_has_forbid_word", "guild name has forbidword"));
         return;
     }
 
@@ -497,7 +497,7 @@ void GuildMgr::__GuildRename(f8::JsonHttpRequest* request)
              {
                  std::string response;
                  request->resp_xobj->SetVal("errcode", 2);
-                 request->resp_xobj->SetVal("errmsg", TEXT("server_internal_error", "服务器内部错误"));
+                 request->resp_xobj->SetVal("errmsg", TEXT("server_internal_error", "server internal error"));
                  request->resp_xobj->ToJsonStr(response);
                  IMListener::Instance()->SendText(request->socket_handle, a8::HttpResponse(response));
              }
@@ -550,7 +550,7 @@ void GuildMgr::__GuildDirtyWordCheck(f8::JsonHttpRequest* request)
     std::string text = request->request.At("text")->AsXValue();
     if (MetaMgr::Instance()->HasDirtyWord(text)) {
         request->resp_xobj->SetVal("errcode", 1);
-        request->resp_xobj->SetVal("errmsg", "含有屏蔽字符");
+        request->resp_xobj->SetVal("errmsg", "has forbid word");
     }
 }