From 85a6a18b9ad5fa60e3f299a507d43a2713bfde25 Mon Sep 17 00:00:00 2001 From: kylesv Date: Thu, 12 Apr 2012 18:12:35 +0400 Subject: [PATCH] continue translate dorf1 and dorf2 fields --- GameEngine/Lang/en.php | 7 +++- GameEngine/Lang/ru.php | 79 +++++++++++++++++++++------------------- Templates/Admin/menu.tpl | 2 +- Templates/dorf2.tpl | 34 ++++++++--------- Templates/field.tpl | 2 +- 5 files changed, 65 insertions(+), 59 deletions(-) diff --git a/GameEngine/Lang/en.php b/GameEngine/Lang/en.php index b5e00d6e..26a109dc 100644 --- a/GameEngine/Lang/en.php +++ b/GameEngine/Lang/en.php @@ -416,9 +416,12 @@ define("MASS_SENT","Mass IGM was sent"); 43 => "Error"); $lang['fields'] = array ( - 0 => ' Level ', + 0 => ' Level', 1 => 'Woodcutter Level', 2 => 'Clay Pit Level', 3 => 'Iron Mine Level', - 4 => 'Cropland Level'); + 4 => 'Cropland Level', + 5 => 'Outer building site', + 6 => 'Building site', + 7 => 'Rally Point building site'); ?> diff --git a/GameEngine/Lang/ru.php b/GameEngine/Lang/ru.php index 9e0fc26a..ab97f319 100644 --- a/GameEngine/Lang/ru.php +++ b/GameEngine/Lang/ru.php @@ -378,48 +378,51 @@ define("MASS_SENT","Mass IGM was sent"); 5 => "Лесопильный завод", 6 => "Кирпичный завод", 7 => "Сталелитейный завод", - 8 => "Grain Mill", - 9 => "Bakery", - 10 => "Warehouse", - 11 => "Granary", - 12 => "Blacksmith", - 13 => "Armoury", - 14 => "Tournament Square", - 15 => "Main Building", - 16 => "Rally Point", - 17 => "Marketplace", - 18 => "Embassy", - 19 => "Barracks", - 20 => "Stable", - 21 => "Workshop", - 22 => "Academy", - 23 => "Cranny", - 24 => "Town Hall", - 25 => "Residence", - 26 => "Palace", - 27 => "Treasury", - 28 => "Trade Office", - 29 => "Great Barracks", - 30 => "Great Stable", - 31 => "City Wall", - 32 => "Earth Wall", - 33 => "Palisade", - 34 => "Stonemason's Lodge", - 35 => "Brewery", - 36 => "Trapper", - 37 => "Hero's Mansion", - 38 => "Great Warehouse", - 39 => "Great Granary", - 40 => "Wonder of the World", - 41 => "Horse Drinking Trough", - 42 => "Great Workshop", - 43 => "Error"); + 8 => "Мукомольная мельница", + 9 => "Пекарня", + 10 => "Склад", + 11 => "Амбар", + 12 => "Кузня", + 13 => "Оружейня", + 14 => "Арена", + 15 => "Главное здание", + 16 => "Пункт сбора", + 17 => "Рынок", + 18 => "Посольство", + 19 => "Казарма", + 20 => "Канюшня", + 21 => "Мастерская", + 22 => "Академия", + 23 => "Тайник", + 24 => "Ратуша", + 25 => "Резиденция", + 26 => "Дворец", + 27 => "Сокровищница", + 28 => "Торговая палата", + 29 => "Большая казарма", + 30 => "Большая конюшня", + 31 => "Городская стена", + 32 => "Земляной вал", + 33 => "Изгородь", + 34 => "Каменотес", + 35 => "Пивоваренный завод", + 36 => "Капканщик", + 37 => "Таверна", + 38 => "Большой склад", + 39 => "Большой амбар", + 40 => "Чудо Света", + 41 => "Водопой", + 42 => "Большая мастерская", + 43 => "Ошибка"); $lang['fields'] = array ( - 0 => ' Уровень ', + 0 => ' уровень', 1 => 'Лесопилка уровень', 2 => 'Глиняный карьер уровень ', 3 => 'Железный рудник уровень', - 4 => 'Ферма уровень'); + 4 => 'Ферма уровень', + 5 => 'Наружняя строительная площадка', + 6 => 'Строительная площадка', + 7 => 'Строительная площадка пункта сбора'); ?> diff --git a/Templates/Admin/menu.tpl b/Templates/Admin/menu.tpl index 92f7c9f0..99703379 100644 --- a/Templates/Admin/menu.tpl +++ b/Templates/Admin/menu.tpl @@ -42,7 +42,7 @@ include_once ("GameEngine/Ranking.php"); Mass message System message Update top 10 - Add World Wonder Villages + Add WW Villages

Admin Log diff --git a/Templates/dorf2.tpl b/Templates/dorf2.tpl index 47749711..ab83baec 100644 --- a/Templates/dorf2.tpl +++ b/Templates/dorf2.tpl @@ -12,10 +12,10 @@ walling()) { - $wtitle = $building->procResType($building->walling())." Level ".$village->resarray['f40']; + $wtitle = $building->procResType($building->walling())." ".$village->resarray['f40'].$lang['fields'][0]; } else { - $wtitle = ($village->resarray['f40'] == 0)? "Outer building site" : $building->procResType($village->resarray['f40t'],0)." Level ".$village->resarray['f40']; + $wtitle = ($village->resarray['f40'] == 0)? $lang['fields'][5] : $building->procResType($village->resarray['f40t'],0)." ".$village->resarray['f40'].$lang['fields'][0]; } ?> @@ -27,15 +27,15 @@ else { $coords = array(19=>"53,91,91,71,127,91,91,112","136,66,174,46,210,66,174,87","196,56,234,36,270,56,234,77","270,69,308,49,344,69,308,90","327,117,365,97,401,117,365,138","14,129,52,109,88,129,52,150","97,137,135,117,171,137,135,158","182,119,182,65,257,65,257,119,220,140","337,156,375,136,411,156,375,177","2,199,40,179,76,199,40,220","129,164,167,144,203,164,167,185","92,189,130,169,166,189,130,210","342,216,380,196,416,216,380,237","22,238,60,218,96,238,60,259","167,232,205,212,241,232,205,253","290,251,328,231,364,251,328,272","95,273,133,253,169,273,133,294","222,284,260,264,296,284,260,305","80,306,118,286,154,306,118,327","199,316,237,296,273,316,237,337","270,158,303,135,316,155,318,178,304,211,288,227,263,238,250,215"); for($t=19;$t<=39;$t++) { if(($village->resarray['f99t'] == 40 AND ($t)=='25') or ($village->resarray['f99t'] == 40 AND ($t)=='26') or ($village->resarray['f99t'] == 40 AND ($t)=='29') or ($village->resarray['f99t'] == 40 AND ($t)=='30') or ($village->resarray['f99t'] == 40 AND ($t)=='33')) { - echo "resarray['f99']."\" coords=\"$coords[$t]\" shape=\"poly\"/>"; + echo "resarray['f99'].$lang['fields'][0]."\" coords=\"$coords[$t]\" shape=\"poly\"/>"; } else { if($village->resarray['f'.$t.'t'] != 0) { $title = $building->procResType($village->resarray['f'.$t.'t']). " Level ".$village->resarray['f'.$t]; } else { - $title = "Building site"; + $title = $lang['fields'][6]; if(($t == 39) && ($village->resarray['f'.$t] == 0)) { - $title = "Rally Point building site"; + $title = $lang['fields'][7]; } } echo ""; @@ -64,16 +64,16 @@ $vmapc = ($village->resarray['f40'] == 0)? "d2_0" : "d2_1".$session->tribe; for ($i=1;$i<=20;$i++) { if(($village->resarray['f99t'] == 40 AND ($i+18)=='25') or ($village->resarray['f99t'] == 40 AND ($i+18)=='26') or ($village->resarray['f99t'] == 40 AND ($i+18)=='29') or ($village->resarray['f99t'] == 40 AND ($i+18)=='30') or ($village->resarray['f99t'] == 40 AND ($i+18)=='33')) { } else { - $text = "Building site"; + $text = $lang['fields'][6]; $img = "iso"; if($village->resarray['f'.($i+18).'t'] != 0) { - $text = $building->procResType($village->resarray['f'.($i+18).'t'])." Level ".$village->resarray['f'.($i+18)]; + $text = $building->procResType($village->resarray['f'.($i+18).'t'])." ".$village->resarray['f'.($i+18)].$lang['fields'][0]; $img = "g".$village->resarray['f'.($i+18).'t']; } foreach($building->buildArray as $job) { if($job['field'] == ($i+18)) { $img = 'g'.$job['type'].'b'; - $text = $building->procResType($job['type'])." Level ".$village->resarray['f'.$job['field']]; + $text = $building->procResType($job['type'])." ".$village->resarray['f'.$job['field']].$lang['fields'][0]; } } echo "\"$text\""; @@ -81,30 +81,30 @@ for ($i=1;$i<=20;$i++) { } if($village->resarray['f39'] == 0) { if($building->rallying()) { - echo "\"Rallyresarray['f39']."\" />"; + echo "\"".$lang['buildings'][16]." ".$village-resarray['f39'].$lang['fields'][0]."\" />"; } else { - echo "\"Rally"; + echo "\"".$lang['fields'][7]."\""; } } else { - echo "\"Rallyresarray['f39']."\" />"; + echo "\"".$lang['buildings'][16]." ".$village-resarray['f39'].$lang['fields'][0]."\" />"; } ?> resarray['f99t'] == 40) { if($village->resarray['f99'] >= 0 && $village->resarray['f99'] <= 19) { -echo 'Worldwonder'; } +echo ''.$lang['buildings'][40].''; } if($village->resarray['f99'] >= 20 && $village->resarray['f99'] <= 39) { -echo 'Worldwonder'; } +echo ''.$lang['buildings'][40].''; } if($village->resarray['f99'] >= 40 && $village->resarray['f99'] <= 59) { -echo 'Worldwonder'; } +echo ''.$lang['buildings'][40].''; } if($village->resarray['f99'] >= 60 && $village->resarray['f99'] <= 79) { -echo 'Worldwonder'; } +echo ''.$lang['buildings'][40].''; } if($village->resarray['f99'] >= 80 && $village->resarray['f99'] <= 99) { -echo 'Worldwonder'; } +echo ''.$lang['buildings'][40].''; } if($village->resarray['f99'] == 100) { -echo 'Worldwonder'; } +echo ''.$lang['buildings'][40].''; } } ?>

> diff --git a/Templates/field.tpl b/Templates/field.tpl index ef74af3d..6e37111e 100644 --- a/Templates/field.tpl +++ b/Templates/field.tpl @@ -16,7 +16,7 @@ $arrayVillage = $village->resarray; ?> procResType($arrayVillage['f'.$i.'t']).$lang['fields'][0].$arrayVillage['f'.$i]."\"/>\r\n"; +for($i=1;$i<=18;$i++) {echo " procResType($arrayVillage['f'.$i.'t'])." ".$arrayVillage['f'.$i].$lang['fields'][0]."\"/>\r\n"; } ?>