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

Merge #2942 #2943

Browse source 
2942: Update swedish translations (by cur.ie) r=heinrich5991 a=def-



2943: Need to send info when updating skin in text field r=heinrich5991 a=def-

As reported by abcqwerty on Discord

Co-authored-by: def <dennis@felsin9.de>
This commit is contained in:
bors[bot] 2020-10-02 16:23:49 +00:00 committed by GitHub
parent 2a76cddb4e 94d0c1b95b 10355851ca
commit 4383b8a7e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
data/languages/swedish.txt
View file

@ -5,6 +5,7 @@
# Martin Pola 2011-04-02 11:17:09 # Martin Pola 2011-04-02 11:17:09
# Kottizen 2011-07-02 00:34:54 # Kottizen 2011-07-02 00:34:54
# 3edcxzaq1 2020-06-25 00:00:00 # 3edcxzaq1 2020-06-25 00:00:00
# cur.ie 2020-09-28 00:00:00
##### /authors ##### ##### /authors #####
##### translated strings ##### ##### translated strings #####
@ -1177,71 +1178,71 @@ Show others (own team only)
== Visa andra (eget lag endast) == Visa andra (eget lag endast)
The width or height of texture %s is not divisible by 16, which might cause visual bugs. The width or height of texture %s is not divisible by 16, which might cause visual bugs.
== == Bredden eller höjden av texturen %s är ej delbar med 16, och kan därav skapa visuella buggar.
Warning Warning
== == Varning
Use k key to kill (restart), q to pause and watch other players. See settings for other key binds. Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
== == Använd knappen k för att dö (starta om), q för att pausa och se andra spelare. Se inställnignar för andra knappbindningar.
Country / Region Country / Region
== == Land / Region
Speed Speed
== == Hastighet
Search: Search:
== == Sök:
Exclude: Exclude:
== == Exkludera:
Search servers: Search servers:
== == Sök servrar:
%d of %d servers %d of %d servers
== == %d av %d servrar.
%d of %d server %d of %d server
== == %d av %d server
%d players %d players
== == %d spelare
%d player %d player
== == %d spelare
Skip the main menu Skip the main menu
== == Skippa till huvudmenyn
Download skins Download skins
== == Ladda ner skins
Client message Client message
== == Klientmeddelande
https://wiki.ddnet.tw/ https://wiki.ddnet.tw/
== == https://wiki.ddnet.tw/
Website Website
== == Hemsida
Settings Settings
== == Inställningar
Stop server Stop server
== == Stoppa servern
Run server Run server
== == Kör servern
Server executable not found, can't run server Server executable not found, can't run server
== == Server exekveringsfil hittades ej, kan ej starta servern
Editor Editor
== == Editor
[Start menu] [Start menu]
Play Play
== == Spela

1
src/game/client/components/menus.h
View file

@ -388,6 +388,7 @@ protected:
void RenderSettings(CUIRect MainView); void RenderSettings(CUIRect MainView);
void RenderSettingsCustom(CUIRect MainView); void RenderSettingsCustom(CUIRect MainView);
void SetNeedSendInfo();
void SetActive(bool Active); void SetActive(bool Active);
IGraphics::CTextureHandle m_TextureBlob; IGraphics::CTextureHandle m_TextureBlob;

43
src/game/client/components/menus_settings.cpp
View file

@ -318,6 +318,14 @@ void CMenus::RenderSettingsGeneral(CUIRect MainView)
} }
} }
void CMenus::SetNeedSendInfo()
{
if(m_Dummy)
m_NeedSendDummyinfo = true;
else
m_NeedSendinfo = true;
}
void CMenus::RenderSettingsPlayer(CUIRect MainView) void CMenus::RenderSettingsPlayer(CUIRect MainView)
{ {
CUIRect Button, Label, Dummy; CUIRect Button, Label, Dummy;
@ -346,10 +354,7 @@ void CMenus::RenderSettingsPlayer(CUIRect MainView)
static float s_OffsetName = 0.0f; static float s_OffsetName = 0.0f;
if(DoEditBox(pName, &Button, pName, sizeof(g_Config.m_PlayerName), 14.0f, &s_OffsetName, false, CUI::CORNER_ALL, pNameFallback)) if(DoEditBox(pName, &Button, pName, sizeof(g_Config.m_PlayerName), 14.0f, &s_OffsetName, false, CUI::CORNER_ALL, pNameFallback))
{ {
if(m_Dummy) SetNeedSendInfo();
m_NeedSendDummyinfo = true;
else
m_NeedSendinfo = true;
} }
// player clan // player clan
@ -363,10 +368,7 @@ void CMenus::RenderSettingsPlayer(CUIRect MainView)
static float s_OffsetClan = 0.0f; static float s_OffsetClan = 0.0f;
if(DoEditBox(pClan, &Button, pClan, sizeof(g_Config.m_PlayerClan), 14.0f, &s_OffsetClan)) if(DoEditBox(pClan, &Button, pClan, sizeof(g_Config.m_PlayerClan), 14.0f, &s_OffsetClan))
{ {
if(m_Dummy) SetNeedSendInfo();
m_NeedSendDummyinfo = true;
else
m_NeedSendinfo = true;
} }
if(DoButton_CheckBox(&m_Dummy, Localize("Dummy settings"), m_Dummy, &Dummy)) if(DoButton_CheckBox(&m_Dummy, Localize("Dummy settings"), m_Dummy, &Dummy))
@ -414,10 +416,7 @@ void CMenus::RenderSettingsPlayer(CUIRect MainView)
if(OldSelected != NewSelected) if(OldSelected != NewSelected)
{ {
*pCountry = m_pClient->m_pCountryFlags->GetByIndex(NewSelected)->m_CountryCode; *pCountry = m_pClient->m_pCountryFlags->GetByIndex(NewSelected)->m_CountryCode;
if(m_Dummy) SetNeedSendInfo();
m_NeedSendDummyinfo = true;
else
m_NeedSendinfo = true;
} }
} }
@ -533,7 +532,10 @@ void CMenus::RenderSettingsTee(CUIRect MainView)
//UI()->DoLabelScaled(&Label, Skin, 14.0f, -1, 150.0f); //UI()->DoLabelScaled(&Label, Skin, 14.0f, -1, 150.0f);
static float s_OffsetSkin = 0.0f; static float s_OffsetSkin = 0.0f;
static int s_ClearButton = 0; static int s_ClearButton = 0;
DoClearableEditBox(Skin, &s_ClearButton, &Label, Skin, sizeof(g_Config.m_ClPlayerSkin), 14.0f, &s_OffsetSkin, false, CUI::CORNER_ALL, "default"); if(DoClearableEditBox(Skin, &s_ClearButton, &Label, Skin, sizeof(g_Config.m_ClPlayerSkin), 14.0f, &s_OffsetSkin, false, CUI::CORNER_ALL, "default"))
{
SetNeedSendInfo();
}
// custom color selector // custom color selector
MainView.HSplitTop(20.0f, 0, &MainView); MainView.HSplitTop(20.0f, 0, &MainView);
@ -542,10 +544,7 @@ void CMenus::RenderSettingsTee(CUIRect MainView)
if(DoButton_CheckBox(&ColorBody, Localize("Custom colors"), *UseCustomColor, &Button)) if(DoButton_CheckBox(&ColorBody, Localize("Custom colors"), *UseCustomColor, &Button))
{ {
*UseCustomColor = *UseCustomColor ? 0 : 1; *UseCustomColor = *UseCustomColor ? 0 : 1;
if(m_Dummy) SetNeedSendInfo();
m_NeedSendDummyinfo = true;
else
m_NeedSendinfo = true;
} }
MainView.HSplitTop(5.0f, 0, &MainView); MainView.HSplitTop(5.0f, 0, &MainView);
@ -572,10 +571,7 @@ void CMenus::RenderSettingsTee(CUIRect MainView)
if(PrevColor != *paColors[i]) if(PrevColor != *paColors[i])
{ {
if(m_Dummy) SetNeedSendInfo();
m_NeedSendDummyinfo = true;
else
m_NeedSendinfo = true;
} }
} }
} }
@ -652,10 +648,7 @@ void CMenus::RenderSettingsTee(CUIRect MainView)
if(OldSelected != NewSelected) if(OldSelected != NewSelected)
{ {
mem_copy(Skin, s_paSkinList[NewSelected]->m_aName, sizeof(g_Config.m_ClPlayerSkin)); mem_copy(Skin, s_paSkinList[NewSelected]->m_aName, sizeof(g_Config.m_ClPlayerSkin));
if(m_Dummy) SetNeedSendInfo();
m_NeedSendDummyinfo = true;
else
m_NeedSendinfo = true;
} }
// render quick search // render quick search