From 4aa4ef04801da28c60217079a580497d76630218 Mon Sep 17 00:00:00 2001
From: 221V <221v92@gmail.com>
Date: Wed, 11 Dec 2024 19:21:33 +0200
Subject: [PATCH] tr - rm doubling
---
Admin/Templates/addUsers.tpl | 12 ++++++------
GameEngine/Lang/en.php | 3 ---
GameEngine/Lang/zh_tw.php | 3 ---
Templates/Alliance/Forum/forum_6.tpl | 2 +-
anmelden.php | 6 +++---
5 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/Admin/Templates/addUsers.tpl b/Admin/Templates/addUsers.tpl
index c67e6a34..c051c32d 100644
--- a/Admin/Templates/addUsers.tpl
+++ b/Admin/Templates/addUsers.tpl
@@ -81,13 +81,13 @@ Submitting this form will create new Users
(and their home Villages) on your
$tribe = RANDOM;
break;
case '1':
- $tribe = ROMANS;
+ $tribe = TRIBE1; // Romans
break;
case '2':
- $tribe = TEUTONS;
+ $tribe = TRIBE2; // Teutons
break;
case '3':
- $tribe = GAULS;
+ $tribe = TRIBE3; // Gauls
break;
default:
// Should never reach here
@@ -157,9 +157,9 @@ Beginners Protection
Tribe:
-
-
-
+
+
+
diff --git a/GameEngine/Lang/en.php b/GameEngine/Lang/en.php
index dbd75f33..55cba7f5 100755
--- a/GameEngine/Lang/en.php
+++ b/GameEngine/Lang/en.php
@@ -662,9 +662,6 @@ define("STARTED"," The server started ". round((time()-COMMENCE)/86400) ." days
define("NICKNAME","Nickname");
define("EMAIL","Email");
define("PASSWORD","Password");
-define("ROMANS","Romans");
-define("TEUTONS","Teutons");
-define("GAULS","Gauls");
define("NW","North West");
define("NE","North East");
define("SW","South West");
diff --git a/GameEngine/Lang/zh_tw.php b/GameEngine/Lang/zh_tw.php
index 315a0af9..0f169cd4 100644
--- a/GameEngine/Lang/zh_tw.php
+++ b/GameEngine/Lang/zh_tw.php
@@ -662,9 +662,6 @@ define("STARTED"," 服务器启动于 ". round((time()-COMMENCE)/86400) ." 天
define("NICKNAME","昵称");
define("EMAIL","邮箱");
define("PASSWORD","密码");
-define("ROMANS","罗马");
-define("TEUTONS","条顿");
-define("GAULS","高卢");
define("NW","西北");
define("NE","东北");
define("SW","西南");
diff --git a/Templates/Alliance/Forum/forum_6.tpl b/Templates/Alliance/Forum/forum_6.tpl
index 48f75915..5f14d0aa 100644
--- a/Templates/Alliance/Forum/forum_6.tpl
+++ b/Templates/Alliance/Forum/forum_6.tpl
@@ -27,7 +27,7 @@ $totalpop = 0;
foreach($varray as $vil) $totalpop += $vil['pop'];
$countAu = $database->CountTopic($arr['owner']);
-$tribeArray = [ROMANS, TEUTONS, GAULS];
+$tribeArray = [TRIBE1, TRIBE2, TRIBE3];
$displayarray = $database->getUserArray($arr['owner'], 1);
$trip = $tribeArray[$displayarray['tribe'] - 1];
diff --git a/anmelden.php b/anmelden.php
index df0cb374..ccfaf157 100644
--- a/anmelden.php
+++ b/anmelden.php
@@ -93,17 +93,17 @@ if(REG_OPEN == true){ ?>
