From 3b8f0509acffc99a9e0e2ac6cdd199b732e65399 Mon Sep 17 00:00:00 2001
From: qawery-just-sad <53490397+qawery-just-sad@users.noreply.github.com>
Date: Sun, 6 Sep 2020 12:18:02 +0200
Subject: [PATCH] 1.8 baybe sum ting wong?

---
 addons/sourcemod/scripting/mapchooser.sp             | 3 +--
 addons/sourcemod/scripting/nominations.sp            | 3 ++-
 addons/sourcemod/scripting/rockthevote.sp            | 2 +-
 addons/sourcemod/scripting/voteextend.sp             | 6 +++---
 addons/sourcemod/translations/voteextend.phrases.txt | 6 ++++++
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/addons/sourcemod/scripting/mapchooser.sp b/addons/sourcemod/scripting/mapchooser.sp
index 2b0e357..dd5ec6d 100644
--- a/addons/sourcemod/scripting/mapchooser.sp
+++ b/addons/sourcemod/scripting/mapchooser.sp
@@ -46,7 +46,7 @@ public Plugin myinfo =
 	name = "SurfTimer MapChooser",
 	author = "AlliedModders LLC & SurfTimer Contributors",
 	description = "Automated Map Voting",
-	version = "1.6",
+	version = "1.8",
 	url = "https://github.com/qawery-just-sad/surftimer-mapchooser"
 };
 
@@ -1265,7 +1265,6 @@ public void db_setupDatabase()
 		SetFailState("[Mapchooser] Invalid database type");
 		return;
 	}
-	return;
 }
 
 public void SelectMapList()
diff --git a/addons/sourcemod/scripting/nominations.sp b/addons/sourcemod/scripting/nominations.sp
index d2c6323..155c303 100644
--- a/addons/sourcemod/scripting/nominations.sp
+++ b/addons/sourcemod/scripting/nominations.sp
@@ -43,7 +43,7 @@ public Plugin myinfo =
 	name = "SurfTimer Nominations",
 	author = "AlliedModders LLC & SurfTimer Contributors",
 	description = "Provides Map Nominations",
-	version = "1.6",
+	version = "1.8",
 	url = "https://github.com/qawery-just-sad/surftimer-mapchooser"
 };
 
@@ -539,6 +539,7 @@ public void db_setupDatabase()
 	if (!StrEqual(szIdent, "mysql", false))
 	{
 		SetFailState("[Nominations] Invalid database type");
+		return;
 	}
 }
 
diff --git a/addons/sourcemod/scripting/rockthevote.sp b/addons/sourcemod/scripting/rockthevote.sp
index 0eb4dff..00f7033 100644
--- a/addons/sourcemod/scripting/rockthevote.sp
+++ b/addons/sourcemod/scripting/rockthevote.sp
@@ -45,7 +45,7 @@ public Plugin myinfo =
 	name = "SurfTimer Rock The Vote",
 	author = "AlliedModders LLC & SurfTimer Contributors",
 	description = "Provides RTV Map Voting",
-	version = "1.6",
+	version = "1.8",
 	url = "https://github.com/qawery-just-sad/surftimer-mapchooser"
 };
 
diff --git a/addons/sourcemod/scripting/voteextend.sp b/addons/sourcemod/scripting/voteextend.sp
index b64f33e..addba9a 100644
--- a/addons/sourcemod/scripting/voteextend.sp
+++ b/addons/sourcemod/scripting/voteextend.sp
@@ -34,7 +34,7 @@ public Plugin myinfo =
 	name = "SurfTimer Vote Extend",
 	author = "SurfTimer Contributors",
 	description = "Allows players to vote extend the map",
-	version = "1.6",
+	version = "1.8",
 	url = "https://github.com/qawery-just-sad/surftimer-mapchooser"
 };
 
@@ -146,7 +146,7 @@ public void StartVoteExtend(int client)
 {
 	char szPlayerName[MAX_NAME_LENGTH];	
 	GetClientName(client, szPlayerName, MAX_NAME_LENGTH);
-	CPrintToChatAll("Vote to Extend started by %s", g_szChatPrefix, szPlayerName);
+	CPrintToChatAll("%t", "Vote Start", g_szChatPrefix, szPlayerName);
 
 	g_szUsedVoteExtend[g_VoteExtends] = g_szSteamID[client];	// Add the user's steam ID to the list
 	g_VoteExtends++;	// Increment the total number of vote extends so far
@@ -158,7 +158,7 @@ public void StartVoteExtend(int client)
 	char buffer[8];
 	IntToString(RoundToFloor(GetConVarFloat(g_hVoteExtendTime)), buffer, sizeof(buffer));
 
-	Format(szMenuTitle, sizeof(szMenuTitle), "Extend map for %s minutes?", buffer);
+	Format(szMenuTitle, sizeof(szMenuTitle), "%t", "Vote Menu", buffer);
 	SetMenuTitle(voteExtend, szMenuTitle);
 	
 	AddMenuItem(voteExtend, "", "Yes");
diff --git a/addons/sourcemod/translations/voteextend.phrases.txt b/addons/sourcemod/translations/voteextend.phrases.txt
index e61fdc3..f3286b7 100644
--- a/addons/sourcemod/translations/voteextend.phrases.txt
+++ b/addons/sourcemod/translations/voteextend.phrases.txt
@@ -35,6 +35,12 @@
         "#format"       "{1:s},{2:s}"
         "en"            "{1} Vote to Extend started by {2}"
     }
+    
+    "Vote Menu"
+    {
+        "#format"       "{1:s}"
+        "en"            "Extend map for {1} minutes?"
+    }
 
     "Vote Success"
     {