From 079fe080b10b84640cd28c64e9e6daf6fee8f719 Mon Sep 17 00:00:00 2001 From: Jordy Ruiz Date: Sun, 6 Jan 2019 12:12:05 +0100 Subject: [PATCH] Remove scoreboard one-letter locales and add context to server difficulty locales --- src/game/client/components/menus_browser.cpp | 2 +- src/game/client/components/menus_ingame.cpp | 4 ++-- src/game/client/components/scoreboard.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/game/client/components/menus_browser.cpp b/src/game/client/components/menus_browser.cpp index 703dbd6da..8f6e728fe 100644 --- a/src/game/client/components/menus_browser.cpp +++ b/src/game/client/components/menus_browser.cpp @@ -1841,7 +1841,7 @@ void CMenus::RenderDetailInfo(CUIRect View, const CServerInfo *pInfo) if(pInfo) { CUIRect Row; - // Localize("Map"); Localize("Game type"); Localize("Version"); Localize("Casual"); Localize("Normal"); Localize("Difficulty"); Localize("Competitive"); + // Localize("Map"); Localize("Game type"); Localize("Version"); Localize("Casual", "Server difficulty"); Localize("Normal", "Server difficulty"); Localize("Competitive", "Server difficulty"); Localize("Difficulty"); static CLocConstString s_aLabels[] = { "Map", "Game type", diff --git a/src/game/client/components/menus_ingame.cpp b/src/game/client/components/menus_ingame.cpp index ef5400f4e..f1a803c97 100644 --- a/src/game/client/components/menus_ingame.cpp +++ b/src/game/client/components/menus_ingame.cpp @@ -442,8 +442,8 @@ void CMenus::RenderServerInfo(CUIRect MainView) GameInfo.HSplitTop(ButtonHeight, &Label, &GameInfo); Label.y += 2.0f; - str_format(aBuf, sizeof(aBuf), "%s: %s", Localize("Difficulty"), (CurrentServerInfo.m_ServerLevel == 0) ? Localize("Casual") : - (CurrentServerInfo.m_ServerLevel == 1 ? Localize("Normal") : Localize("Competitive"))); + str_format(aBuf, sizeof(aBuf), "%s: %s", Localize("Difficulty"), (CurrentServerInfo.m_ServerLevel == 0) ? Localize("Casual", "Server difficulty") : + (CurrentServerInfo.m_ServerLevel == 1 ? Localize("Normal", "Server difficulty") : Localize("Competitive", "Server difficulty"))); UI()->DoLabel(&Label, aBuf, ButtonHeight*ms_FontmodHeight*0.8f, CUI::ALIGN_LEFT); GameInfo.HSplitTop(ButtonHeight, &Label, &GameInfo); diff --git a/src/game/client/components/scoreboard.cpp b/src/game/client/components/scoreboard.cpp index 7246d81b9..167695a7a 100644 --- a/src/game/client/components/scoreboard.cpp +++ b/src/game/client/components/scoreboard.cpp @@ -321,10 +321,10 @@ float CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const c TextRender()->TextColor(1.0f, 1.0f, 1.0f, 0.5f); tw = TextRender()->TextWidth(0, HeadlineFontsize, "K", -1); - TextRender()->Text(0, KillOffset+KillLength/2-tw/2, y+Spacing, HeadlineFontsize, Localize("K"), -1); + TextRender()->Text(0, KillOffset+KillLength/2-tw/2, y+Spacing, HeadlineFontsize, "K", -1); tw = TextRender()->TextWidth(0, HeadlineFontsize, "D", -1); - TextRender()->Text(0, DeathOffset+DeathLength/2-tw/2, y+Spacing, HeadlineFontsize, Localize("D"), -1); + TextRender()->Text(0, DeathOffset+DeathLength/2-tw/2, y+Spacing, HeadlineFontsize, "D", -1); TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f); tw = TextRender()->TextWidth(0, HeadlineFontsize, Localize("Score"), -1);