forgot to translate few strings 84c1476 #115

yavl · Mar 3, 2019 · 693f71c · 693f71c
1 parent 84c1476
commit 693f71c
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 9 deletions.
diff --git a/bin/data/languages/ru.json b/bin/data/languages/ru.json
@@ -747,4 +747,32 @@
 		"key": "Witch {str:PlayerName} has arrived!",
 		"value": "\u0412\u0435\u0434\u044c\u043c\u0430{str:PlayerName} \u043f\u0440\u0438\u0431\u044b\u043b\u0430!"
 	},
+	{
+		"key": "How to use taxi mode",
+		"value": "\u0420\u0435\u0436\u0438\u043c \u0442\u0430\u043a\u0441\u0438"
+	},
+	{
+		"key": "Two or more humans can form a taxi.",
+		"value": "\u0414\u0432\u0430 \u0438\u043b\u0438 \u0431\u043e\u043b\u0435\u0435 \u0447\u0435\u043b\u043e\u0432\u0435\u043a\u0430 \u043c\u043e\u0433\u0443\u0442 \u043e\u0431\u044a\u0435\u0434\u0438\u043d\u0438\u0442\u044c\u0441\u044f \u0432 \u0442\u0430\u043a\u0441\u0438."
+	},
+	{
+		"key": "In order to use it, both humans have to disable hook protection (usually, with F3). The human being hooked becomes the driver.",
+		"value": "\u0427\u0442\u043e\u0431\u044b \u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u0442\u044c \u0442\u0430\u043a\u0441\u0438, \u043e\u0431\u0430 \u0447\u0435\u043b\u043e\u0432\u0435\u043a\u0430 \u0434\u043e\u043b\u0436\u043d\u044b \u043e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0437\u0430\u0449\u0438\u0442\u0443 \u043f\u0440\u043e\u0442\u0438\u0432 \u0437\u0430\u0446\u0435\u043f\u043a\u0438 (\u043e\u0431\u044b\u0447\u043d\u043e, \u043d\u0430\u0436\u0430\u0432 F3)."
+	},
+	{
+		"key": "To get off the taxi, jump. To drop off your passengers, enable hook protection (usually, with F3).",
+		"value": "\u041c\u043e\u0436\u043d\u043e \u0432\u044b\u0439\u0442\u0438 \u0438\u0437 \u0442\u0430\u043a\u0441\u0438, \u043f\u0440\u043e\u0441\u0442\u043e \u0441\u043f\u0440\u044b\u0433\u043d\u0443\u0432. \u0427\u0442\u043e\u0431\u044b \u0441\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u043f\u0430\u0441\u0441\u0430\u0436\u0438\u0440\u043e\u0432, \u0432\u043d\u043e\u0432\u044c \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u0435 \u0437\u0430\u0449\u0438\u0442\u0443 \u043e\u0442 \u0437\u0430\u0446\u0435\u043f\u043a\u0438."
+	},
+	{
+		"key": "You need at least {int:HealthArmor} hp",
+		"value": "\u041d\u0443\u0436\u043d\u043e \u043a\u0430\u043a \u043c\u0438\u043d\u0438\u043c\u0443\u043c {int:HealthArmor} \u0437\u0434\u043e\u0440\u043e\u0432\u044c\u044f"
+	},
+	{
+		"key": "Too few zombies (less than {int:MinZombies})",
+		"value": "\u0421\u043b\u0438\u0448\u043a\u043e\u043c \u043c\u0430\u043b\u043e \u0437\u043e\u043c\u0431\u0438 (\u043c\u0435\u043d\u044c\u0448\u0435 {int:MinZombies})"
+	},
+	{
+		"key": "Medic {str:MedicName} revived {str:PlayerName}",
+		"value": "\u0412\u0440\u0430\u0447 {str:MedicName} \u0440\u0435\u0430\u043d\u0438\u043c\u0438\u0440\u043e\u0432\u0430\u043b {str:PlayerName}"
+	},
 ]}
diff --git a/src/game/server/entities/laser.cpp b/src/game/server/entities/laser.cpp
@@ -39,25 +39,25 @@ bool CLaser::HitCharacter(vec2 From, vec2 To)
 		auto& medic = pOwnerChar;
 		auto& zombie = pHit;
 
-		char aBuf[256];
 		if (medic->GetPlayer()->GetCharacter() && medic->GetPlayer()->GetCharacter()->GetHealthArmorSum() <= DAMAGE_ON_REVIVE) {
-			str_format(aBuf, sizeof(aBuf), "You need at least %d hp", DAMAGE_ON_REVIVE + 1);
-			GameServer()->SendBroadcast(m_Owner, aBuf, BROADCAST_PRIORITY_GAMEANNOUNCE, BROADCAST_DURATION_GAMEANNOUNCE);
+			int HealthArmor = DAMAGE_ON_REVIVE + 1;
+			GameServer()->SendBroadcast_Localization(m_Owner, BROADCAST_PRIORITY_GAMEANNOUNCE, BROADCAST_DURATION_GAMEANNOUNCE, _("You need at least {int:HealthArmor} hp"),
+					"HealthArmor", &HealthArmor);
 		}
 		else if (GameServer()->GetZombieCount() <= MIN_ZOMBIES) {
-			str_format(aBuf, sizeof(aBuf), "Too few zombies (less than %d)", MIN_ZOMBIES+1);
-			GameServer()->SendBroadcast(m_Owner, aBuf, BROADCAST_PRIORITY_GAMEANNOUNCE, BROADCAST_DURATION_GAMEANNOUNCE);
+			int MinZombies = MIN_ZOMBIES + 1;
+			GameServer()->SendBroadcast_Localization(m_Owner, BROADCAST_PRIORITY_GAMEANNOUNCE, BROADCAST_DURATION_GAMEANNOUNCE, _("Too few zombies (less than {int:MinZombies})"),
+					"MinZombies", &MinZombies);
 		}
 		else {
 			zombie->GetPlayer()->SetClass(old_class);
 			if (zombie->GetPlayer()->GetCharacter()) {
 				zombie->GetPlayer()->GetCharacter()->SetHealthArmor(1, 0);
 				zombie->Unfreeze();
 				medic->TakeDamage(vec2(0.f, 0.f), DAMAGE_ON_REVIVE * 2, m_Owner, WEAPON_RIFLE, TAKEDAMAGEMODE_SELFHARM);
-				str_format(aBuf, sizeof(aBuf), "Medic %s revived %s",
-						Server()->ClientName(medic->GetPlayer()->GetCID()),
-						Server()->ClientName(zombie->GetPlayer()->GetCID()));
-				GameServer()->SendChatTarget(-1, aBuf);
+				GameServer()->SendChatTarget_Localization(-1, CHATCATEGORY_DEFAULT, _("Medic {str:MedicName} revived {str:PlayerName}"),
+						"MedicName", Server()->ClientName(medic->GetPlayer()->GetCID()),
+						"PlayerName", Server()->ClientName(zombie->GetPlayer()->GetCID()));
 				int ClientID = medic->GetPlayer()->GetCID();
 				Server()->RoundStatistics()->OnScoreEvent(ClientID, SCOREEVENT_MEDIC_REVIVE, medic->GetClass(), Server()->ClientName(ClientID), GameServer()->Console());
 			}