diff --git a/includes/types/item.class.php b/includes/types/item.class.php index 76194265..0369498c 100644 --- a/includes/types/item.class.php +++ b/includes/types/item.class.php @@ -543,7 +543,13 @@ class ItemList extends BaseType // max duration if ($dur = $this->curTpl['duration']) - $x .= "
".Lang::game('duration').Lang::main('colon').Util::formatTime(abs($dur) * 1000).($this->curTpl['flagsCustom'] & 0x1 ? ' ('.Lang::item('realTime').')' : null); + { + $rt = ''; + if ($this->curTpl['flagsCustom'] & 0x1) + $rt = $interactive ? ' ('.sprintf(Util::$dfnString, 'LANG.tooltip_realduration', Lang::item('realTime')).')' : ' ('.Lang::item('realTime').')'; + + $x .= "
".Lang::game('duration').Lang::main('colon').Util::formatTime(abs($dur) * 1000).$rt; + } // required holiday if ($eId = $this->curTpl['eventId']) diff --git a/localization/locale_dede.php b/localization/locale_dede.php index 4b53a588..99f10ee4 100644 --- a/localization/locale_dede.php +++ b/localization/locale_dede.php @@ -59,7 +59,7 @@ $lang = array( 'extSearch' => "Erweiterte Suche", 'addFilter' => "Weiteren Filter hinzufügen", 'match' => "Verwendete Filter", - 'allFilter' => "Alle Filters", + 'allFilter' => "Alle Filter", 'oneFilter' => "Mindestens einer", 'applyFilter' => "Filter anwenden", 'resetForm' => "Formular zurücksetzen", diff --git a/pages/quest.php b/pages/quest.php index 1a6b65e0..d0ee1a49 100644 --- a/pages/quest.php +++ b/pages/quest.php @@ -115,7 +115,7 @@ class QuestPage extends GenericPage // type (maybe expand uppon?) $_ = []; if ($_flags & QUEST_FLAG_DAILY) - $_[] = Lang::quest('daily'); + $_[] = '[tooltip=tooltip_dailyquest]'.Lang::quest('daily').'[/tooltip]'; else if ($_flags & QUEST_FLAG_WEEKLY) $_[] = Lang::quest('weekly'); else if ($_specialFlags & QUEST_FLAG_SPECIAL_MONTHLY) diff --git a/static/js/global.js b/static/js/global.js index 986c4933..10dead23 100644 --- a/static/js/global.js +++ b/static/js/global.js @@ -21969,7 +21969,7 @@ function g_urlize(str, allowLocales, profile) { "Ñ": "N", "Ò": "O", "Ó": "O", "Ö": "O", "Ô": "O", "Ú": "U", "Ü": "U", "Û": "U", "Ù": "U", - "œ": "Oe" + "Œ": "Oe" }; for (var character in accents) { str = str.replace(new RegExp(character, "g"), accents[character]); @@ -22667,7 +22667,7 @@ var ConditionList = new function() { break; } else // create mask from id and resolve in case 32 - entry[1] == (1 << entry[1]); + entry[1] = (1 << entry[1]); case 32: param[0] = _listing(entry[1], g_world_object_types, '$1'); break; case 36: break; case 27: