xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-06-29 00:54:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

tr -- rm dublicates

Browse Source
This commit is contained in:
221V
2024-12-11 15:44:50 +02:00
parent f1b3ff3ed6
commit ff22a74095
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Lang/en.php
-2
View File
@@ -680,7 +680,6 @@ define("ARRIVING_REINF_TROOPS_SHORT","Reinf.");
define("OWN_ATTACKING_TROOPS","Own attacking troops");
define("ATTACK","Attack");
define("OWN_REINFORCING_TROOPS","Own reinforcing troops");
define("TROOPS_DORF","Troops:");
define("NEWVILLAGE","New village.");
define("FOUNDNEWVILLAGE","Founding New village");
define("UNDERATTACK","The village is under attack");
@@ -695,7 +694,6 @@ define("PRISONERS","Prisoners");
define("PRISONERSIN","Prisoners in");
define("PRISONERSFROM","Prisoners from");
define("TROOPS","Troops");
define("TROOPSFROM","Troops");
define("BOUNTY","Bounty");
define("ARRIVAL","Arrival");
define("CATAPULT_TARGET","Catapult target(s)");
GameEngine/Lang/zh_tw.php
-2
View File
@@ -680,7 +680,6 @@ define("ARRIVING_REINF_TROOPS_SHORT","增援");
define("OWN_ATTACKING_TROOPS","己方进攻部队");
define("ATTACK","进攻");
define("OWN_REINFORCING_TROOPS","己方增援部队");
define("TROOPS_DORF","部队:");
define("NEWVILLAGE","新村庄");
define("FOUNDNEWVILLAGE","建立新村庄");
define("UNDERATTACK","村庄遭受攻击");
@@ -695,7 +694,6 @@ define("PRISONERS","俘虏");
define("PRISONERSIN","俘虏在");
define("PRISONERSFROM","俘虏从");
define("TROOPS","部队");
define("TROOPSFROM","部队");
define("BOUNTY","赏金");
define("ARRIVAL","抵达");
define("CATAPULT_TARGET","攻城器目标");
Templates/Build/16.tpl
+4 -4
View File
@@ -62,9 +62,9 @@ if($village->resarray['f39'] > 0){
<a href=\"karte.php?d=".$enforce['from']."&c=".$generator->getMapCheck($enforce['from'])."\">".$database->getVillageField($enforce['from'], "name")."</a></td>
<td colspan=\"$colspan\">";
if(LANG == "es"){
echo "<a href=\"spieler.php?uid=".$database->getVillageField($enforce['from'], "owner")."\">".TROOPSFROM." ".$database->getUserField($database->getVillageField($enforce['from'], "owner"), "username", 0)." </a>";
echo "<a href=\"spieler.php?uid=".$database->getVillageField($enforce['from'], "owner")."\">".TROOPS." ".$database->getUserField($database->getVillageField($enforce['from'], "owner"), "username", 0)." </a>";
}else{
echo "<a href=\"spieler.php?uid=".$database->getVillageField($enforce['from'], "owner")."\">".$database->getUserField($database->getVillageField($enforce['from'], "owner"), "username", 0)." ".TROOPSFROM."</a>";
echo "<a href=\"spieler.php?uid=".$database->getVillageField($enforce['from'], "owner")."\">".$database->getUserField($database->getVillageField($enforce['from'], "owner"), "username", 0)." ".TROOPS."</a>";
}
echo "</td></tr></thead><tbody class=\"units\">";
$tribe = $database->getUserField($database->getVillageField($enforce['from'], "owner"), "tribe", 0);
@@ -190,9 +190,9 @@ if($village->resarray['f39'] > 0){
<a href=\"karte.php?d=".$enforce['vref']."&c=".$generator->getMapCheck($enforce['vref'])."\">".$database->getVillageField($enforce['conqured'], "name")."</a></td>
<td colspan=\"$colspan\">";
if(LANG == "es"){
echo "<a href=\"spieler.php?uid=".$database->getVillageField($enforce['from'], "owner")."\">".TROOPSFROM." ".$database->getUserField($database->getVillageField($enforce['from'], "owner"), "username", 0)." </a> ".FROM." <a href=\"karte.php?d=".$enforce['from']."&c=".$generator->getMapCheck($enforce['from'])."\">".$database->getVillageField($enforce['from'], "name")."</a>";
echo "<a href=\"spieler.php?uid=".$database->getVillageField($enforce['from'], "owner")."\">".TROOPS." ".$database->getUserField($database->getVillageField($enforce['from'], "owner"), "username", 0)." </a> ".FROM." <a href=\"karte.php?d=".$enforce['from']."&c=".$generator->getMapCheck($enforce['from'])."\">".$database->getVillageField($enforce['from'], "name")."</a>";
}else{
echo "<a href=\"spieler.php?uid=".$database->getVillageField($enforce['from'], "owner")."\">".$database->getUserField($database->getVillageField($enforce['from'], "owner"), "username", 0)." ".TROOPSFROM."</a> ".FROM." <a href=\"karte.php?d=".$enforce['from']."&c=".$generator->getMapCheck($enforce['from'])."\">".$database->getVillageField($enforce['from'], "name")."</a>";
echo "<a href=\"spieler.php?uid=".$database->getVillageField($enforce['from'], "owner")."\">".$database->getUserField($database->getVillageField($enforce['from'], "owner"), "username", 0)." ".TROOPS."</a> ".FROM." <a href=\"karte.php?d=".$enforce['from']."&c=".$generator->getMapCheck($enforce['from'])."\">".$database->getVillageField($enforce['from'], "name")."</a>";
}
echo "</td></tr></thead><tbody class=\"units\">";
$tribe = $database->getUserField($database->getVillageField($enforce['from'], "owner"), "tribe", 0);
Templates/troops.tpl
+1 -1
View File
@@ -11,7 +11,7 @@
?>
<table id="troops" cellpadding="1" cellspacing="1">
<thead><tr>
<th colspan="3"><?php echo TROOPS_DORF; ?></th>
<th colspan="3"><?php echo TROOPS; ?></th>
</tr></thead><tbody>
<?php
$troops = $technology->getAllUnits($village->wid,True,1);