Merge pull request #16 from TerminalHash/Translations

Translations System

Author: TerminalHash

BindingStuff/BindingsCommon.as

@@ -1,28 +1,15 @@
+#include "TranslationsSystem.as"
+
 string BINDINGSDIR = "../Cache/";
 string BINDINGSFILE = "GRUHSHA_playerbindings";
 
 string[] page_texts =
 {
-	"Emotes",
-	"Tags"
+	Names::modbindsmenu
 };
 
-
 string[][] button_texts =
 {
-	{
-		"Emote 1 (NOT USABLE)",
-		"Emote 2 (NOT USABLE)",
-		"Emote 3 (NOT USABLE)",
-		"Emote 4 (NOT USABLE)",
-		"Emote 5 (NOT USABLE)",
-		"Emote 6 (NOT USABLE)",
-		"Emote 7 (NOT USABLE)",
-		"Emote 8 (NOT USABLE)",
-		"Emote 9 (NOT USABLE)",
-		"Emote Wheel",
-		"Emote Wheel 2"
-	},
 	{
 		"GO HERE",
 		"DIG HERE",
@@ -32,25 +19,13 @@ string[][] button_texts =
 		"HELP",
 		"KEG",
 		"WiT SENCE",
-		"Tag wheel"
+		Names::tagwheel,
+		Names::emotewheelsecond
 	},
 };
 
 string[][] button_file_names =
 {
-	{
-		"emote1",
-		"emote2",
-		"emote3",
-		"emote4",
-		"emote5",
-		"emote6",
-		"emote7",
-		"emote8",
-		"emote9",
-		"emote_wheel",
-		"emote_wheel_two"
-	},
 	{
 		"tag1",
 		"tag2",
@@ -60,7 +35,8 @@ string[][] button_file_names =
 		"tag6",
 		"tag7",
 		"tag8",
-		"tag_wheel"
+		"tag_wheel",
+		"emote_wheel_two"
 	},
 };
 
@@ -271,7 +247,7 @@ class ClickableButton
 		this.m_clickable = true;
 		this.m_selected = false;
 		this.deselect_instantly = false;
-		this.bindings.push_back("placeholder");
+		this.bindings.push_back(Descriptions::modbindplaceholder);
 		//printf("Init button");
 	}
 
@@ -768,7 +744,7 @@ class ClickableButtonGUI
 				}
 			}
 
-			GUI::DrawTextCentered("Press [DELETE] to remove bind", m_clickable_origin + Vec2f(m_clickable_size.x * 0.5, m_clickable_size.y - 40), SColor(255, 255, 255, 255));
+			GUI::DrawTextCentered(Names::pressdelete, m_clickable_origin + Vec2f(m_clickable_size.x * 0.5, m_clickable_size.y - 40), SColor(255, 255, 255, 255));
 		}
 		else
 		{

CaptainsStuff/PickingCommands.as

@@ -3,12 +3,13 @@
 #include "PickingCommon.as"
 #include "ApprovedTeams.as"
 #include "BindingsCommon.as"
+#include "TranslationsSystem.as"
 
 class SpecAllCommand : ChatCommand
 {
 	SpecAllCommand()
 	{
-		super("specall", "Puts everyone in Spectators");
+		super("specall", Descriptions::specallcomtext);
 	}
 
 	bool canPlayerExecute(CPlayer@ player)
@@ -33,7 +34,7 @@ class AppointCommand : ChatCommand
 {
 	AppointCommand()
 	{
-		super("appoint", "Appoints two Team Leaders (they pick players in their teams)");
+		super("appoint", Descriptions::appointcomtext);
 		AddAlias("caps");
 		SetUsage("<blue leader username> <red leader username>");
 	}
@@ -94,7 +95,7 @@ class DemoteCommand : ChatCommand
 {
 	DemoteCommand()
 	{
-		super("demote", "Demotes the Team Leaders");
+		super("demote", Descriptions::demotecomtext);
 	}
 
 	bool canPlayerExecute(CPlayer@ player)
@@ -115,7 +116,7 @@ class PickPlayerCommand : ChatCommand
 {
 	PickPlayerCommand()
 	{
-		super("pick", "Picks one player FROM SPECTATORS to your team and passes an opportunity to pick to next Team Leader");
+		super("pick", Descriptions::pickcomtext);
 		SetUsage("<username>");
 	}
 
@@ -164,7 +165,7 @@ class ApproveTeamsCommand : ChatCommand
 {
 	ApproveTeamsCommand()
 	{
-		super("lock", "Ends picking process by approving team personnel");
+		super("lock", Descriptions::lockcomtext);
 	}
 
 	bool canPlayerExecute(CPlayer@ player)
@@ -187,24 +188,10 @@ class ApproveTeamsCommand : ChatCommand
 		approved_teams.ClearLists();
 		if (!was_locked) {
 			approved_teams.FormLists();
-			if (g_locale == "ru")
-			{
-				server_AddToChat("Команды сформированы", SColor(0xff474ac6));
-			}
-			else
-			{
-				server_AddToChat("Teams locked", SColor(0xff474ac6));
-			}
+			server_AddToChat(Descriptions::lockcomchatloc, SColor(0xff474ac6));
 		}
 		else
-			if (g_locale == "ru")
-			{
-				server_AddToChat("Команды расформированы", SColor(0xff474ac6));
-			}
-			else
-			{
-				server_AddToChat("Teams unlocked", SColor(0xff474ac6));
-			}
+			server_AddToChat(Descriptions::lockcomchatunl, SColor(0xff474ac6));
 
 		approved_teams.PrintMembers();
 		rules.set("approved_teams", @approved_teams);
@@ -215,7 +202,7 @@ class SetBuilderLimitCommand : ChatCommand
 {
 	SetBuilderLimitCommand()
 	{
-		super("blim", "Limits count of builders for every team");
+		super("blim", Descriptions::builderlimtext);
 		SetUsage("<builder limit>");
 	}
 
@@ -240,15 +227,15 @@ class SetBuilderLimitCommand : ChatCommand
 
 		rules.set_u8("builders_limit", parseInt(args[0]));
 
-		if (isServer()) server_AddToChat("Максимум строителей теперь "+args[0], SColor(0xff474ac6));
+		if (isServer()) server_AddToChat(Descriptions::builderlimchat +args[0], SColor(0xff474ac6));
 	}
 }
 
 class SetArcherLimitCommand : ChatCommand
 {
 	SetArcherLimitCommand()
 	{
-		super("alim", "Limits count of archers for every team");
+		super("alim", Descriptions::archerlimtext);
 		SetUsage("<archer limit>");
 	}
 
@@ -273,15 +260,15 @@ class SetArcherLimitCommand : ChatCommand
 
 		rules.set_u8("archers_limit", parseInt(args[0]));
 
-		if (isServer()) server_AddToChat("Максимум лучников теперь "+args[0], SColor(0xff474ac6));
+		if (isServer()) server_AddToChat(Descriptions::archerlimchat +args[0], SColor(0xff474ac6));
 	}
 }
 
 class ToggleClassChangingOnShops : ChatCommand
 {
 	ToggleClassChangingOnShops()
 	{
-		super("togglechclass", "Disallowing class changing on shops");
+		super("togglechclass", Descriptions::togglechcomtext);
 	}
 
 	bool canPlayerExecute(CPlayer@ player)
@@ -298,19 +285,19 @@ class ToggleClassChangingOnShops : ChatCommand
 		bool isEnable = rules.get_bool("no_class_change_on_shop");
 		rules.set_bool("no_class_change_on_shop", !isEnable);
 		//printf("Boolean no_class_change_on_shop is " + rules.get_bool("no_class_change_on_shop"));
-		string isEnableStr = "включена";
+		string isEnableStr = Descriptions::togglechcom2;
 		if(!isEnable) {
-			isEnableStr = "выключена";
+			isEnableStr = Descriptions::togglechcom3;
 		}
-		if (isServer()) server_AddToChat("Смена классов теперь "+isEnableStr, SColor(0xff474ac6));
+		if (isServer()) server_AddToChat(Descriptions::togglechcomchat +isEnableStr, SColor(0xff474ac6));
 	}
 }
 
 class BindingsMenu : ChatCommand
 {
 	BindingsMenu()
 	{
-		super("bindings", "Show mod bindings menu");
+		super("bindings", Descriptions::bindingscom);
 	}
 
 	bool canPlayerExecute(CPlayer@ player)
@@ -335,4 +322,4 @@ class BindingsMenu : ChatCommand
 
 		//printf("Boolean no_class_change_on_shop is " + rules.get_bool("no_class_change_on_shop"));
 	}
-}
+}

ChangedScripts/Includes/Descriptions.as

@@ -6,6 +6,8 @@
 //	cannot be changed after-the-fact.
 //	It's good for performance to just translate once though.
 
+#include "TranslationsSystem.as"
+
 namespace Descriptions
 {
 	const string
@@ -88,7 +90,7 @@ namespace Descriptions
 	meal                       = getTranslatedString("A hearty meal to get you back on your feet."),
 	egg                        = getTranslatedString("A suspiciously undercooked egg, maybe it will hatch."),
 	burger                     = getTranslatedString("A burger to go."),
-	pear                       = "A juicy and sweet pear.",
+	pear                       = Descriptions::peartext,
 
 	//Magic Scrolls
 	scroll_carnage             = getTranslatedString("This magic scroll when cast will turn all nearby enemies into a pile of bloody gibs."),

ChangedScripts/ScoreboardRender.as

@@ -4,6 +4,7 @@
 #include "ApprovedTeams.as";
 #include "RunnerHead.as";
 #include "pathway.as";
+#include "TranslationsSystem.as";
 //#include "RulesCore"
 
 CPlayer@ hoveredPlayer;
@@ -958,7 +959,7 @@ void onRenderScoreboard(CRules@ this)
 	ScoreboardField(
 		Vec2f(screenWidth - tl.x - 200, 115 - scrollOffset),
 		Vec2f(screenWidth - tl.x,       115 - scrollOffset + 40),
-		"Current version: " + mod_version
+		Descriptions::currentversiontext + mod_version
 	);
 	LinkButton(
 		Vec2f(screenWidth - tl.x - 275, 115 - scrollOffset),

Characters/Accolades.as

@@ -1,4 +1,5 @@
 #include "pathway.as"
+#include "TranslationsSystem.as"
 ///////////////////////////////////////////////////////////////////////////////
 //
 //  Accolades system
@@ -257,5 +258,5 @@ string[] accolade_description = {
 	"Map Contributor - for contributing to the official map cycle",
 	"Moderation Contributor - for contributing to moderating the game, forums, or discord",
 	"Gold Member - for enjoying the game with us since before the F2P launch",
-	"Контрибьютор Груши - за разработку мода Grusha CTF"
+	Descriptions::goldgrushatext
 };

Entities/Common/Respawning/ClassSelectMenu.as

@@ -1,6 +1,7 @@
 //stuff for building respawn menus
 
 #include "RespawnCommandCommon.as"
+#include "TranslationsSystem.as"
 
 //class for getting everything needed for swapping to a class at a building
 
@@ -82,14 +83,8 @@ void addClassesToMenu(CBlob@ this, CGridMenu@ menu, u16 callerID)
 				}
 				else if (P_Archers >= archers_limit)
 				{
-					if (g_locale == "ru")
-					{
-						button.SetHoverText( "    " + "Всего " + P_Archers + " / " + archers_limit + "\n");
-					}
-					else
-					{
-						button.SetHoverText( "    " + "Total " + P_Archers + " / " + archers_limit + "\n");
-					}
+					button.SetHoverText( "    " + Descriptions::totaltext + P_Archers + " / " + archers_limit + "\n");
+
 					button.SetEnabled(false);
 				}
 			}
@@ -101,14 +96,8 @@ void addClassesToMenu(CBlob@ this, CGridMenu@ menu, u16 callerID)
 				}
 				else if (P_Builders >= builders_limit && !rules.isWarmup())
 				{
-					if (g_locale == "ru")
-					{
-						button.SetHoverText( "    " + "Всего " + P_Builders + " / " + builders_limit + "\n");
-					}
-					else
-					{
-						button.SetHoverText( "    " + "Total " + P_Builders + " / " + builders_limit + "\n");
-					}
+					button.SetHoverText( "    " + Descriptions::totaltext + P_Builders + " / " + builders_limit + "\n");
+
 					button.SetEnabled(false);
 				}
 			}

Industry/CTFShops/Quarters/Quarters.as

@@ -7,6 +7,7 @@
 #include "CheckSpam.as"
 #include "StandardControlsCommon.as"
 #include "GenericButtonCommon.as"
+#include "TranslationsSystem.as"
 
 const f32 beer_amount = 1.0f;
 const f32 heal_amount = 0.25f;
@@ -93,13 +94,13 @@ void onInit(CBlob@ this)
 	this.set_u8("shop icon", 25);
 
 	{
-		ShopItem@ s = addShopItem(this, "Beer - 1 Heart", "$quarters_beer$", "beer", Descriptions::beer, false);
+		ShopItem@ s = addShopItem(this, Names::beeritem, "$quarters_beer$", "beer", Descriptions::beer, false);
 		s.spawnNothing = true;
 		AddRequirement(s.requirements, "coin", "", "Coins", CTFCosts::beer);
 		AddHurtRequirement(s.requirements);
 	}
 	{
-		ShopItem@ s = addShopItem(this, "Meal - Full Health", "$quarters_meal$", "meal", Descriptions::meal, false);
+		ShopItem@ s = addShopItem(this, Names::mealitem, "$quarters_meal$", "meal", Descriptions::meal, false);
 		s.spawnNothing = true;
 		s.customButton = true;
 		s.buttonwidth = 2;
@@ -108,15 +109,15 @@ void onInit(CBlob@ this)
 		AddHurtRequirement(s.requirements);
 	}
 	{
-		ShopItem@ s = addShopItem(this, "Egg - Full Health", "$quarters_egg$", "egg", Descriptions::egg, false);
+		ShopItem@ s = addShopItem(this, Names::eggitem, "$quarters_egg$", "egg", Descriptions::egg, false);
 		AddRequirement(s.requirements, "coin", "", "Coins", CTFCosts::egg);
 	}
 	{
-		ShopItem@ s = addShopItem(this, "Burger - Full Health", "$quarters_burger$", "food", Descriptions::burger, true);
+		ShopItem@ s = addShopItem(this, Names::burgeritem, "$quarters_burger$", "food", Descriptions::burger, true);
 		AddRequirement(s.requirements, "coin", "", "Coins", CTFCosts::burger);
 	}
 	{
-		ShopItem@ s = addShopItem(this, "Pear - Semi-full Health", "$quarters_pear$", "pear", Descriptions::pear, true);
+		ShopItem@ s = addShopItem(this, Names::pearitem, "$quarters_pear$", "pear", Descriptions::pear, true);
 		AddRequirement(s.requirements, "coin", "", "Coins", CTFCosts::pear);
 	}
 }

Scripts/Emotes/EmoteMenu.as

@@ -59,12 +59,11 @@ void onTick(CRules@ rules)
 
 	WheelMenu@ menu = get_wheel_menu("emotes");
 
-
-	if (b_KeyJustPressed("emote_wheel"))
+	if (blob.isKeyJustPressed(key_bubbles))
 	{
 		set_active_wheel_menu(@menu);
 	}
-	else if (b_KeyJustReleased("emote_wheel") && get_active_wheel_menu() is menu)
+	else if (blob.isKeyJustReleased(key_bubbles) && get_active_wheel_menu() is menu)
 	{
 		WheelMenuEntry@ selected = menu.get_selected();
 		set_emote(blob, (selected !is null ? selected.name : ""));