From d471663913390c5243ab946ecd6ee8849af484e1 Mon Sep 17 00:00:00 2001 From: oy Date: Mon, 9 Aug 2010 00:35:37 +0200 Subject: added localisation fixes by fujnky --- src/game/client/components/menus_browser.cpp | 2 ++ src/game/client/components/menus_demo.cpp | 2 +- src/game/client/components/menus_settings.cpp | 7 ++++++- 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'src/game/client') diff --git a/src/game/client/components/menus_browser.cpp b/src/game/client/components/menus_browser.cpp index 7d9c9d7e..c1ad18f2 100644 --- a/src/game/client/components/menus_browser.cpp +++ b/src/game/client/components/menus_browser.cpp @@ -63,6 +63,8 @@ void CMenus::RenderServerbrowserServerList(CUIRect View) {-1, -1, " ", 1, 10.0f, 0, {0}, {0}}, {COL_PING, IServerBrowser::SORT_PING, "Ping", 1, 40.0f, FIXED, {0}, {0}}, }; + // This is just for scripts/update_localization.py to work correctly (all other strings are already Localize()'d somewhere else). Don't remove! + // Localize("Type"); int NumCols = sizeof(s_aCols)/sizeof(CColumn); diff --git a/src/game/client/components/menus_demo.cpp b/src/game/client/components/menus_demo.cpp index f8cf8e4f..231cd83a 100644 --- a/src/game/client/components/menus_demo.cpp +++ b/src/game/client/components/menus_demo.cpp @@ -490,7 +490,7 @@ void CMenus::RenderDemoList(CUIRect MainView) { const char *pError = Client()->DemoPlayer_Play(m_lDemos[s_SelectedItem].m_aFilename); if(pError) - PopupMessage(Localize("Error"), Localize(pError), Localize("Ok")); + PopupMessage(Localize("Error"), str_comp(pError, "error loading demo") ? pError : Localize("error loading demo"), Localize("Ok")); } } } diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp index ace86266..364d0b82 100644 --- a/src/game/client/components/menus_settings.cpp +++ b/src/game/client/components/menus_settings.cpp @@ -288,7 +288,6 @@ typedef struct static CKeyInfo gs_aKeys[] = { - // we need to do localize so the scripts can pickup the string { "Move left", "+left", 0}, // Localize - these strings are localized within CLocConstString { "Move right", "+right", 0 }, { "Jump", "+jump", 0 }, @@ -312,6 +311,12 @@ static CKeyInfo gs_aKeys[] = { "Screenshot", "screenshot", 0 }, { "Scoreboard", "+scoreboard", 0 }, }; +/* This is for scripts/update_localization.py to work, don't remove! + Localize("Move left");Localize("Move right");Localize("Jump");Localize("Fire");Localize("Hook");Localize("Hammer"); + Localize("Pistol");Localize("Shotgun");Localize("Grenade");Localize("Rifle");Localize("Next weapon");Localize("Prev. weapon"); + Localize("Vote yes");Localize("Vote no");Localize("Chat");Localize("Team chat");Localize("Show chat");Localize("Emoticon"); + Localize("Console");Localize("Remote console");Localize("Screenshot");Localize("Scoreboard"); +*/ const int g_KeyCount = sizeof(gs_aKeys) / sizeof(CKeyInfo); -- cgit 1.4.1