From 4f371ccb6c4e63429feae0fc7873afb151ca69be Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Thu, 19 Aug 2004 22:21:11 +0000 Subject: [PATCH] fixed missing menu text --- plugins/admincmd.sma | 2 +- plugins/mapsmenu.sma | 4 ++-- plugins/menufront.sma | 6 +++--- plugins/multilingual.sma | 16 +++++++++------- plugins/pausecfg.sma | 4 ++-- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/plugins/admincmd.sma b/plugins/admincmd.sma index 82dfbf64..4bc7b8d1 100755 --- a/plugins/admincmd.sma +++ b/plugins/admincmd.sma @@ -544,7 +544,7 @@ public cmdPause(id,level,cid) { if (activity==1) len += copy(msg[len],127-len,":") else - len += format(msg[len],127-len," %s:",name) + len += format(msg[len],127-len," %s: ",name) format(msg[len],127-len,"%L",players[i],g_Paused ? "UNPAUSE" : "PAUSE" ) client_print(players[i],print_chat,"%s server",msg) } diff --git a/plugins/mapsmenu.sma b/plugins/mapsmenu.sma index ffd2d39f..e5092812 100755 --- a/plugins/mapsmenu.sma +++ b/plugins/mapsmenu.sma @@ -403,10 +403,10 @@ displayMapsMenu(id,pos) { } if (end != g_mapNums) { - format(menuBody[len],511-len,"^n9. %L...^n0. %s", id, "MORE", id, pos ? "BACK" : "EXIT") + format(menuBody[len],511-len,"^n9. %L...^n0. %L", id, "MORE", id, pos ? "BACK" : "EXIT") keys |= MENU_KEY_9 } - else format(menuBody[len],511-len,"^n0. %s", id, pos ? "BACK" : "EXIT") + else format(menuBody[len],511-len,"^n0. %L", id, pos ? "BACK" : "EXIT") new menuName[64] format(menuName,63,"%L","en","CHANGLE_MENU") diff --git a/plugins/menufront.sma b/plugins/menufront.sma index 83abfa8d..1cb2d5e7 100755 --- a/plugins/menufront.sma +++ b/plugins/menufront.sma @@ -83,7 +83,7 @@ new g_menuCmd[MENUS_NUMBER][] = { "amx_cmdmenu", "amx_cvarmenu", "amx_cfgmenu", - "amx_setlangmenu", + "amx_langmenu", "amx_statscfgmenu", "amx_pausecfgmenu", @@ -186,10 +186,10 @@ displayMenu(id,pos) { } if (end != MENUS_NUMBER ) { - format(menuBody[len],511-len,"^n9. %L...^n0. %s", id, "MORE", id, pos ? "BACK" : "EXIT") + format(menuBody[len],511-len,"^n9. %L...^n0. %L", id, "MORE", id, pos ? "BACK" : "EXIT") keys |= MENU_KEY_9 } - else format(menuBody[len],511-len,"^n0. %s", id, pos ? "BACK" : "EXIT") + else format(menuBody[len],511-len,"^n0. %L", id, pos ? "BACK" : "EXIT") show_menu(id,keys,menuBody) } diff --git a/plugins/multilingual.sma b/plugins/multilingual.sma index f32a8d1c..0208e9c0 100755 --- a/plugins/multilingual.sma +++ b/plugins/multilingual.sma @@ -76,12 +76,14 @@ public client_infochanged(id) { new lang[3] get_user_info(id,"lang",lang,2) - if ( lang_exists(lang) ) - copy(g_userLang[id],2,lang) - else if ( g_userLang[id][0] ) - set_user_info(id,"lang",g_userLang[id]) - else - set_user_info(id,"lang","en") + if ( strlen(lang)>0 ) { + if ( lang_exists(lang) ) + copy(g_userLang[id],2,lang) + else if ( g_userLang[id][0] ) + set_user_info(id,"lang",g_userLang[id]) + else + set_user_info(id,"lang","en") + } } #if defined DISPLAY_MSG @@ -129,7 +131,7 @@ showMenu(id) { if ( access(id,ADMIN_CFG) ) { new server_lang[64],sLang[3] - format(perso_lang,63,"%L",id,"SERVER_LANG") + format(server_lang,63,"%L",id,"SERVER_LANG") get_lang(g_menuLang[id][1],sLang) len += format( menuBody[len],511-len,(g_coloredMenus ? "2. %s\R\r%s\w^n^n" : "2. %s %s^n^n"),server_lang,sLang ) len += format( menuBody[len],511-len,"3. %L",id,"SAVE_LANG" ) diff --git a/plugins/pausecfg.sma b/plugins/pausecfg.sma index ccc9f2d5..62ee65ad 100755 --- a/plugins/pausecfg.sma +++ b/plugins/pausecfg.sma @@ -198,10 +198,10 @@ displayMenu(id, pos) { len += format(menu_body[len],511-len,g_coloredMenus ? "8. %L \y\R%s^n\w" : "8. %L %s^n", id, "SAVE_STOPPED", g_Modified ? "*" : "") if (end != datanum){ - format(menu_body[len],511-len,"^n9. %L...^n0. %s", id, "MORE", id, pos ? "BACK" : "EXIT") + format(menu_body[len],511-len,"^n9. %L...^n0. %L", id, "MORE", id, pos ? "BACK" : "EXIT") keys |= MENU_KEY_9 } - else format(menu_body[len],511-len,"^n0. %s", id, pos ? "BACK" : "EXIT") + else format(menu_body[len],511-len,"^n0. %L", id, pos ? "BACK" : "EXIT") show_menu(id,keys,menu_body,-1,"Pause/Unpause Plugins") }