From 5bb5cbb6f446f9445c0431d6b905c9d59e1e1d54 Mon Sep 17 00:00:00 2001
From: "NeatElves@gmail.com"
 <NeatElves@gmail.com@e451fad0-63ce-11de-bed1-e3a98b22654c>
Date: Sun, 17 Apr 2011 12:01:47 +0000
Subject: [PATCH] =?utf8?q?=D0=9A=D0=BE=D0=BD=D0=B4=D0=B8=D1=86=D0=B8=D0=B8?=
 =?utf8?q?=20-=20=D1=8D=D0=B2=D0=B5=D0=BD=D1=82=D1=8B=20=D0=B8=20=D0=BF?=
 =?utf8?q?=D1=80=D0=B0=D0=B7=D0=B4=D0=BD=D0=B8=D0=BA=D0=B8.)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: http://cswowd-fork.googlecode.com/svn/trunk@102 e451fad0-63ce-11de-bed1-e3a98b22654c
---
 include/functions.php        | 7 +++++++
 include/report_generator.php | 8 ++++----
 lang/lang.en.php             | 8 ++++----
 lang/lang.ru.php             | 8 ++++----
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/include/functions.php b/include/functions.php
index 506e3b2..a3211a9 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1001,6 +1001,13 @@ function getGameEventName($event_id)
   SELECT `description` FROM `game_event` WHERE `entry` = ?d", $event_id);
 }
 
+function getGameHolidayName($holiday_id)
+{
+  global $dDB;
+  return $dDB->selectCell("-- CACHE: 1h
+  SELECT `description` FROM `game_event` WHERE `holiday` = ?d", $holiday_id);
+}
+
 function getTeamContributionPoints($level_id)
 {
   global $wDB;
diff --git a/include/report_generator.php b/include/report_generator.php
index e1b0db8..943f682 100644
--- a/include/report_generator.php
+++ b/include/report_generator.php
@@ -410,7 +410,7 @@ function r_lootRequire($data)
      echo $lang['condition11']; show_spell($spell['id'], $spell['SpellIconID'], 'quest');
      break;
    case 12: // CONDITION_ACTIVE_GAME_EVENT  event_id
-     echo $lang['condition12'].$data['condition_value1'];
+     echo $lang['condition12'].getGameEventName($data['condition_value1']);
      break;
    case 13: // CONDITION_AREA_FLAG  area_flag    area_flag_not
      if ($data['condition_value1'] > 0) echo $lang['condition13_1'].$data['condition_value1'];
@@ -454,13 +454,13 @@ function r_lootRequire($data)
      if ($data['condition_value1'] > 1) echo 'x'.$data['condition_value2'];
      break;
    case 25: // CONDITION_NOT_ACTIVE_GAME_EVENT  event_id
-     echo $lang['condition25'].$data['condition_value1'];
+     echo $lang['condition25'].getGameEventName($data['condition_value1']);
      break;
    case 26: // CONDITION_ACTIVE_HOLIDAY  holiday_id
-     echo $lang['condition26'].$data['condition_value1'];
+     echo $lang['condition26'].getGameHolidayName($data['condition_value1']);
      break;
    case 27: // CONDITION_NOT_ACTIVE_HOLIDAY  holiday_id
-     echo $lang['condition27'].$data['condition_value1'];
+     echo $lang['condition27'].getGameHolidayName($data['condition_value1']);
      break;
   }
 }
diff --git a/lang/lang.en.php b/lang/lang.en.php
index 45ee914..e27773a 100644
--- a/lang/lang.en.php
+++ b/lang/lang.en.php
@@ -53,7 +53,7 @@ $lang = array(
 'condition9' => 'Take ',
 'condition10' => 'AD aura',
 'condition11' => 'No aura ',
-'condition12' => 'Active event ',
+'condition12' => 'In ',
 'condition13_1' => 'In (sub)area flags ',
 'condition13_2' => 'Not in (sub)area flags ',
 'condition15_1' => ' level equal to',
@@ -67,9 +67,9 @@ $lang = array(
 'condition22' => 'No take and no rewarded for ',
 'condition23' => 'Have(bank yes) ',
 'condition24' => 'Not have(bank yes) ',
-'condition25' => 'No active event ',
-'condition26' => 'Holiday ',
-'condition27' => 'No active holiday ',
+'condition25' => 'No in ',
+'condition26' => 'In ',
+'condition27' => 'No in ',
 
 # Item report
 'item_name' => 'Item name',
diff --git a/lang/lang.ru.php b/lang/lang.ru.php
index b46aee2..74f2b74 100644
--- a/lang/lang.ru.php
+++ b/lang/lang.ru.php
@@ -53,7 +53,7 @@ $lang = array(
 'condition9' => 'Взято ',
 'condition10' => 'AD аура',
 'condition11' => 'Нет ауры ',
-'condition12' => 'В событие ',
+'condition12' => 'В ',
 'condition13_1' => 'Флаг у местности ',
 'condition13_2' => 'Нет флага у местности ',
 'condition15_1' => ' уровень',
@@ -67,9 +67,9 @@ $lang = array(
 'condition22' => 'Не бралось и не выполнялось ',
 'condition23' => 'Есть в сумках(есть в банке) ',
 'condition24' => 'Нет в сумках(есть в банке) ',
-'condition25' => 'Не в событие ',
-'condition26' => 'В праздник ',
-'condition27' => 'Не в праздник ',
+'condition25' => 'Не в ',
+'condition26' => 'В ',
+'condition27' => 'Не в ',
 
 # Item report
 'item_name' => 'Название предмета',
-- 
2.11.4.GIT