edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 22:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1953 from Dune-jr/fix-localize-kd

Browse source 
Remove scoreboard one-letter locales and add context to server difficulty locales
This commit is contained in:
oy 2019-01-06 15:23:56 +01:00 committed by GitHub
parent 2f22a272f9 079fe080b1
commit a6d91aafeb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/client/components/menus_browser.cpp
View file

@ -1841,7 +1841,7 @@ void CMenus::RenderDetailInfo(CUIRect View, const CServerInfo *pInfo)
if(pInfo) if(pInfo)
{ {
CUIRect Row; 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[] = { static CLocConstString s_aLabels[] = {
"Map", "Map",
"Game type", "Game type",

4
src/game/client/components/menus_ingame.cpp
View file

@ -442,8 +442,8 @@ void CMenus::RenderServerInfo(CUIRect MainView)
GameInfo.HSplitTop(ButtonHeight, &Label, &GameInfo); GameInfo.HSplitTop(ButtonHeight, &Label, &GameInfo);
Label.y += 2.0f; Label.y += 2.0f;
str_format(aBuf, sizeof(aBuf), "%s: %s", Localize("Difficulty"), (CurrentServerInfo.m_ServerLevel == 0) ? Localize("Casual") : str_format(aBuf, sizeof(aBuf), "%s: %s", Localize("Difficulty"), (CurrentServerInfo.m_ServerLevel == 0) ? Localize("Casual", "Server difficulty") :
(CurrentServerInfo.m_ServerLevel == 1 ? Localize("Normal") : Localize("Competitive"))); (CurrentServerInfo.m_ServerLevel == 1 ? Localize("Normal", "Server difficulty") : Localize("Competitive", "Server difficulty")));
UI()->DoLabel(&Label, aBuf, ButtonHeight*ms_FontmodHeight*0.8f, CUI::ALIGN_LEFT); UI()->DoLabel(&Label, aBuf, ButtonHeight*ms_FontmodHeight*0.8f, CUI::ALIGN_LEFT);
GameInfo.HSplitTop(ButtonHeight, &Label, &GameInfo); GameInfo.HSplitTop(ButtonHeight, &Label, &GameInfo);

4
src/game/client/components/scoreboard.cpp
View file

@ -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); TextRender()->TextColor(1.0f, 1.0f, 1.0f, 0.5f);
tw = TextRender()->TextWidth(0, HeadlineFontsize, "K", -1); 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); 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); TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
tw = TextRender()->TextWidth(0, HeadlineFontsize, Localize("Score"), -1); tw = TextRender()->TextWidth(0, HeadlineFontsize, Localize("Score"), -1);