From 398bb3fd40f74aa72d8b22d92b580016325c16ba Mon Sep 17 00:00:00 2001 From: Sarjuuk Date: Sun, 31 May 2015 21:05:56 +0200 Subject: [PATCH] properly localize "not found"-pages --- localization/lang.class.php | 1 + localization/locale_dede.php | 21 +++++++++++++++++++-- localization/locale_enus.php | 19 ++++++++++++++++++- localization/locale_eses.php | 19 ++++++++++++++++++- localization/locale_frfr.php | 19 ++++++++++++++++++- localization/locale_ruru.php | 19 ++++++++++++++++++- pages/achievement.php | 6 +++--- pages/class.php | 2 +- pages/currency.php | 2 +- pages/event.php | 2 +- pages/faction.php | 2 +- pages/genericPage.class.php | 2 ++ pages/item.php | 6 +++--- pages/itemset.php | 2 +- pages/npc.php | 8 ++++---- pages/object.php | 6 +++--- pages/pet.php | 2 +- pages/profile.php | 10 +++++----- pages/quest.php | 6 +++--- pages/race.php | 2 +- pages/search.php | 3 +++ pages/skill.php | 2 +- pages/spell.php | 6 +++--- pages/title.php | 2 +- pages/zone.php | 2 +- 25 files changed, 131 insertions(+), 40 deletions(-) diff --git a/localization/lang.class.php b/localization/lang.class.php index e4621919..f87ffca8 100644 --- a/localization/lang.class.php +++ b/localization/lang.class.php @@ -10,6 +10,7 @@ class Lang private static $game; private static $achievement; + private static $chrClass; private static $currency; private static $event; private static $faction; diff --git a/localization/locale_dede.php b/localization/locale_dede.php index dca6f5fe..68df160f 100644 --- a/localization/locale_dede.php +++ b/localization/locale_dede.php @@ -28,7 +28,7 @@ $lang = array( 'timeSQL' => "Zeit für MySQL-Queries", 'noJScript' => 'Diese Seite macht ausgiebigen Gebrauch von JavaScript.
Bitte aktiviert JavaScript in Eurem Browser.', 'userProfiles' => "Deine Charaktere", - 'pageNotFound' => "Diese|Dieser|Dieses %s existiert nicht.", // todo: dämliche Fälle... + 'pageNotFound' => "Dies %s existiert nicht.", 'gender' => "Geschlecht", 'sex' => [null, "Mann", "Frau"], 'players' => "Spieler", @@ -384,6 +384,7 @@ $lang = array( 'resetPass' => ["Kennwortreset", "Folgt diesem Link um euer Kennwort zurückzusetzen.\r\n\r\n".HOST_URL."?account=forgotpassword&token=%s\r\n\r\nFalls Ihr diese Mail nicht angefordert habt kann sie einfach ignoriert werden."] ), 'gameObject' => array( + 'notFound' => "Dieses Objekt existiert nicht .", 'cat' => [0 => "Anderes", 9 => "Bücher", 3 => "Behälter", -5 => "Truhen", 25 => "Fischschwärme", -3 => "Kräuter", -4 => "Erzadern", -2 => "Quest", -6 => "Werkzeuge"], 'type' => [ 9 => "Buch", 3 => "Behälter", -5 => "Truhe", 25 => "", -3 => "Kraut", -4 => "Erzvorkommen", -2 => "Quest", -6 => ""], 'unkPosition' => "Der Standort dieses Objekts ist nicht bekannt.", @@ -397,6 +398,7 @@ $lang = array( 'restock' => "Wird alle %s wieder aufgefüllt." ), 'npc' => array( + 'notFound' => "Dieser NPC existiert nicht.", 'classification'=> "Einstufung", 'petFamily' => "Tierart", 'react' => "Reaktion", @@ -433,6 +435,7 @@ $lang = array( ) ), 'event' => array( + 'notFound' => "Dieses Weltereignis existiert nicht.", 'start' => "Anfang", 'end' => "Ende", 'interval' => "Intervall", @@ -440,6 +443,7 @@ $lang = array( 'category' => ["Nicht kategorisiert", "Feiertage", "Wiederkehrend", "Spieler vs. Spieler"] ), 'achievement' => array( + 'notFound' => "Dieser Erfolg existiert nicht.", 'criteria' => "Kriterien", 'points' => "Punkte", 'series' => "Reihe", @@ -452,7 +456,11 @@ $lang = array( 'rfAvailable' => "Verfügbar auf Realm:", '_transfer' => 'Dieser Erfolg wird mit %s vertauscht, wenn Ihr zur %s wechselt.', ), + 'chrClass' => array( + 'notFound' => "Diese Klasse existiert nicht." + ), 'race' => array( + 'notFound' => "Dieses Volk existiert nicht.", 'racialLeader' => "Volksanführer", 'startZone' => "Startgebiet", ), @@ -474,6 +482,7 @@ $lang = array( 'CosmicMap' => "Kosmische Karte", ), 'zone' => array( + 'notFound' => "Dieses Gebiet existiert nicht.", 'attunement' => ["Einstimmung", "Heroische Einstimmung"], 'key' => ["Schlüssel", "Heroischer Schlüssel"], 'location' => "Ort", @@ -496,8 +505,8 @@ $lang = array( ) ), 'quest' => array( + 'notFound' => "Diese Quest existiert nicht.", '_transfer' => 'Dieses Quest wird mit %s vertauscht, wenn Ihr zur %s wechselt.', - 'questLevel' => "Stufe %s", 'requirements' => "Anforderungen", 'reqMoney' => "Benötigtes Geld", @@ -627,28 +636,33 @@ $lang = array( ) ), 'title' => array( + 'notFound' => "Dieser Titel existiert nicht.", '_transfer' => 'Dieser Titel wird mit %s vertauscht, wenn Ihr zur %s wechselt.', 'cat' => array( "Allgemein", "Spieler gegen Spieler", "Ruf", "Dungeon & Schlachtzug", "Quests", "Berufe", "Weltereignisse" ) ), 'skill' => array( + 'notFound' => "Diese Fertigkeit existiert nicht.", 'cat' => array( -6 => "Haustiere", -5 => "Reittiere", -4 => "Völkerfertigkeiten", 5 => "Attribute", 6 => "Waffenfertigkeiten", 7 => "Klassenfertigkeiten", 8 => "Rüstungssachverstand", 9 => "Nebenberufe", 10 => "Sprachen", 11 => "Berufe" ) ), 'currency' => array( + 'notFound' => "Diese Währung existiert nicht.", 'cap' => "Obergrenze", 'cat' => array( 1 => "Verschiedenes", 2 => "Spieler gegen Spieler", 4 => "Classic", 21 => "Wrath of the Lich King", 22 => "Dungeon und Schlachtzug", 23 => "Burning Crusade", 41 => "Test", 3 => "Unbenutzt" ) ), 'pet' => array( + 'notFound' => "Diese Tierart existiert nicht.", 'exotic' => "Exotisch", 'cat' => ["Wildheit", "Hartnäckigkeit", "Gerissenheit"] ), 'faction' => array( + 'notFound' => "Diese Fraktion existiert nicht.", 'spillover' => "Reputationsüberlauf", 'spilloverDesc' => "Für diese Fraktion erhaltener Ruf wird zusätzlich mit den unten aufgeführten Fraktionen anteilig verrechnet.", 'maxStanding' => "Max. Ruf", @@ -663,6 +677,7 @@ $lang = array( ) ), 'itemset' => array( + 'notFound' => "Dieses Ausrüstungsset existiert nicht.", '_desc' => "%s ist das %s. Es enthält %s Teile.", '_descTagless' => "%s ist ein Ausrüstungsset, das %s Teile enthält.", '_setBonuses' => "Setboni", @@ -687,6 +702,7 @@ $lang = array( ) ), 'spell' => array( + 'notFound' => "Dieser Zauber existiert nicht.", '_spellDetails' => "Zauberdetails", '_cost' => "Kosten", '_range' => "Reichweite", @@ -828,6 +844,7 @@ $lang = array( 'invisibilityType' => ["Allgemein", 3 => "Falle", 6 => "Trunkenheit"] ), 'item' => array( + 'notFound' => "Dieser Gegenstand existiert nicht .", 'armor' => "%s Rüstung", 'block' => "%s Blocken", 'charges' => "Aufladungen", diff --git a/localization/locale_enus.php b/localization/locale_enus.php index 773a15b6..9eb1ff48 100644 --- a/localization/locale_enus.php +++ b/localization/locale_enus.php @@ -379,6 +379,7 @@ $lang = array( 'resetPass' => ["Password Reset", "Follow this link to reset your password.\r\n\r\n".HOST_URL."?account=forgotpassword&token=%s\r\n\r\nIf you did not request this mail simply ignore it."] ), 'gameObject' => array( + 'notFound' => "This object doesn't exist.", 'cat' => [0 => "Other", 9 => "Books", 3 => "Containers", -5 => "Chests", 25 => "Fishing Pools", -3 => "Herbs", -4 => "Mineral Veins", -2 => "Quest", -6 => "Tools"], 'type' => [ 9 => "Book", 3 => "Container", -5 => "Chest", 25 => "", -3 => "Herb", -4 => "Mineral Vein", -2 => "Quest", -6 => ""], 'unkPosition' => "The location of this object is unknown.", @@ -392,6 +393,7 @@ $lang = array( 'restock' => "Restocks every %s." ), 'npc' => array( + 'notFound' => "This NPC doesn't exist.", 'classification'=> "Classification", 'petFamily' => "Pet familiy", 'react' => "React", @@ -428,6 +430,7 @@ $lang = array( ), ), 'event' => array( + 'notFound' => "This world event doesn't exist.", 'start' => "Start", 'end' => "End", 'interval' => "Interval", @@ -435,6 +438,7 @@ $lang = array( 'category' => ["Uncategorized", "Holidays", "Recurring", "Player vs. Player"] ), 'achievement' => array( + 'notFound' => "This achievement doesn't exist.", 'criteria' => "Criteria", 'points' => "Points", 'series' => "Series", @@ -447,7 +451,11 @@ $lang = array( 'rfAvailable' => "Available on realm:", '_transfer' => 'This achievement will be converted to %s if you transfer to %s.', ), + 'chrClass' => array( + 'notFound' => "This class doesn't exist." + ), 'race' => array( + 'notFound' => "This race doesn't exist.", 'racialLeader' => "Racial leader", 'startZone' => "Starting zone", ), @@ -469,6 +477,7 @@ $lang = array( 'CosmicMap' => "Cosmic Map", ), 'zone' => array( + 'notFound' => "This zone doesn't exist.", 'attunement' => ["Attunement", "Heroic attunement"], 'key' => ["Key", "Heroic key"], 'location' => "Location", @@ -491,8 +500,8 @@ $lang = array( ) ), 'quest' => array( + 'notFound' => "This quest doesn't exist.", '_transfer' => 'This quest will be converted to %s if you transfer to %s.', - 'questLevel' => "Level %s", 'requirements' => "Requirements", 'reqMoney' => "Required money", @@ -622,28 +631,33 @@ $lang = array( ) ), 'title' => array( + 'notFound' => "This title doesn't exist.", '_transfer' => 'This title will be converted to %s if you transfer to %s.', 'cat' => array( "General", "Player vs. Player", "Reputation", "Dungeons & Raids", "Quests", "Professions", "World Events" ) ), 'skill' => array( + 'notFound' => "This skill doesn't exist.", 'cat' => array( -6 => "Companions", -5 => "Mounts", -4 => "Racial Traits", 5 => "Attributes", 6 => "Weapon Skills", 7 => "Class Skills", 8 => "Armor Proficiencies", 9 => "Secondary Skills", 10 => "Languages", 11 => "Professions" ) ), 'currency' => array( + 'notFound' => "This currency doesn't exist.", 'cap' => "Total cap", 'cat' => array( 1 => "Miscellaneous", 2 => "Player vs. Player", 4 => "Classic", 21 => "Wrath of the Lich King", 22 => "Dungeon and Raid", 23 => "Burning Crusade", 41 => "Test", 3 => "Unused" ) ), 'pet' => array( + 'notFound' => "This pet family doesn't exist.", 'exotic' => "Exotic", 'cat' => ["Ferocity", "Tenacity", "Cunning"] ), 'faction' => array( + 'notFound' => "This faction doesn't exist.", 'spillover' => "Reputation Spillover", 'spilloverDesc' => "Gaining reputation with this faction also yields a proportional gain with the factions listed below.", 'maxStanding' => "Max. Standing", @@ -658,6 +672,7 @@ $lang = array( ) ), 'itemset' => array( + 'notFound' => "This item set doesn't exist.", '_desc' => "%s is the %s. It contains %s pieces.", '_descTagless' => "%s is an item set that contains %s pieces.", '_setBonuses' => "Set Bonuses", @@ -682,6 +697,7 @@ $lang = array( ) ), 'spell' => array( + 'notFound' => "This spell doesn't exist.", '_spellDetails' => "Spell Details", '_cost' => "Cost", '_range' => "Range", @@ -823,6 +839,7 @@ $lang = array( 'invisibilityType' => ["General", 3 => "Trap", 6 => "Drunk"] ), 'item' => array( + 'notFound' => "This item doesn't exist.", 'armor' => "%s Armor", 'block' => "%s Block", 'charges' => "Charges", diff --git a/localization/locale_eses.php b/localization/locale_eses.php index 24de2b6f..256518e8 100644 --- a/localization/locale_eses.php +++ b/localization/locale_eses.php @@ -385,6 +385,7 @@ $lang = array( 'resetPass' => ["Password Reset", "Follow this link to reset your password.\r\n\r\n".HOST_URL."?account=forgotpassword&token=%s\r\n\r\nIf you did not request this mail simply ignore it."] ), 'gameObject' => array( + 'notFound' => "Este entidad no existe.", 'cat' => [0 => "Otros", 9 => "Libros", 3 => "Contenedores", -5 => "Cofres", 25 => "Bancos de peces", -3 => "Hierbas", -4 => "Venas de minerales", -2 => "Misiones", -6 => "Herramientas"], 'type' => [ 9 => "Libro", 3 => "Contenedore", -5 => "Cofre", 25 => "", -3 => "Hierba", -4 => "Filóne de mineral", -2 => "Misión", -6 => ""], 'unkPosition' => "No se conoce la ubicación de esta entidad.", @@ -397,6 +398,7 @@ $lang = array( 'restock' => "[Restocks every %s.]" ), 'npc' => array( + 'notFound' => "Este PNJ no existe.", 'classification'=> "Clasificación", 'petFamily' => "Familia de mascota", 'react' => "Reacción", @@ -432,6 +434,7 @@ $lang = array( ) ), 'event' => array( + 'notFound' => "Este evento del mundo no existe.", 'start' => "Empieza", 'end' => "Termina", 'interval' => "Intervalo", @@ -439,6 +442,7 @@ $lang = array( 'category' => ["Sin categoría", "Vacacionales", "Periódicos", "Jugador contra Jugador"] ), 'achievement' => array( + 'notFound' => "Este logro no existe.", 'criteria' => "Requisitos", 'points' => "Puntos", 'series' => "Serie", @@ -451,7 +455,11 @@ $lang = array( 'rfAvailable' => "Disponible en reino:", '_transfer' => 'Este logro será convertido a %s si lo transfieres a la %s.', ), + 'chrClass' => array( + 'notFound' => "Esta clase no existe." + ), 'race' => array( + 'notFound' => "Esta raza no existe.", 'racialLeader' => "Lider racial", 'startZone' => "Zona de inicio", ), @@ -473,6 +481,7 @@ $lang = array( 'CosmicMap' => "Mapa cósmico", ), 'zone' => array( + 'notFound' => "Esta zona no existe.", 'attunement' => ["Requisito", "Requisito heroica"], 'key' => ["Llave", "Llave heroica"], 'location' => "Ubicación", @@ -495,8 +504,8 @@ $lang = array( ) ), 'quest' => array( + 'notFound' => "Esta misión no existe.", '_transfer' => 'Esta misión será convertido a %s si lo transfieres a la %s.', - 'questLevel' => 'Nivel %s', 'requirements' => 'Requisitos', 'reqMoney' => 'Dinero necesario', @@ -626,28 +635,33 @@ $lang = array( ) ), 'title' => array( + 'notFound' => "Este título no existe.", '_transfer' => 'Este título será convertido a %s si lo transfieres a la %s.', 'cat' => array( "General", "Jugador contra Jugador", "Reputación", "Mazmorras y bandas", "Misiones", "Profesiones", "Eventos del mundo" ) ), 'skill' => array( + 'notFound' => "Esta habilidad no existe.", 'cat' => array( -6 => "Compañeros", -5 => "Monturas", -4 => "Habilidades de raza", 5 => "Atributos", 6 => "Habilidades con armas", 7 => "Habilidades de clase", 8 => "Armaduras disponibles", 9 => "Habilidades secundarias", 10 => "Idiomas", 11 => "Profesiones" ) ), 'currency' => array( + 'notFound' => "Esta moneda no existe.", 'cap' => "Límite total", 'cat' => array( 1 => "Miscelánea", 2 => "Jugador contra Jugador", 4 => "Clásico", 21 => "Wrath of the Lich King", 22 => "Mazmorra y banda", 23 => "Burning Crusade", 41 => "Prueba", 3 => "No las uso" ) ), 'pet' => array( + 'notFound' => "Esta familia de mascotas no existe.", 'exotic' => "Exótica", 'cat' => ["Ferocidad", "Tenacidad", "Astucia"] ), 'faction' => array( + 'notFound' => "Esta facción no existe.", 'spillover' => "[Reputation Spillover]", 'spilloverDesc' => "[Gaining reputation with this faction also yields a proportional gain with the factions listed below.]", 'maxStanding' => "Posición máxima", @@ -662,6 +676,7 @@ $lang = array( ) ), 'itemset' => array( + 'notFound' => "Este conjunto de objetos no existe.", '_desc' => "%s es el %s. Contiene %s piezas.", '_descTagless' => "%s es un conjunto de objetos que tiene %s piezas.", '_setBonuses' => "Bonificación de conjunto", @@ -686,6 +701,7 @@ $lang = array( ) ), 'spell' => array( + 'notFound' => "Este hechizo no existe.", '_spellDetails' => "Detalles de hechizos", '_cost' => "Costo", '_range' => "Rango", @@ -827,6 +843,7 @@ $lang = array( 'invisibilityType' => ["GENERAL", 3 => "TRAP", 6 => "DRUNK"] ), 'item' => array( + 'notFound' => "Este objeto no existe.", 'armor' => "%s armadura", 'block' => "%s bloqueo", 'charges' => "cargas", diff --git a/localization/locale_frfr.php b/localization/locale_frfr.php index c0d85a19..11411611 100644 --- a/localization/locale_frfr.php +++ b/localization/locale_frfr.php @@ -384,6 +384,7 @@ $lang = array( 'resetPass' => ["Password Reset", "Follow this link to reset your password.\r\n\r\n".HOST_URL."?account=forgotpassword&token=%s\r\n\r\nIf you did not request this mail simply ignore it."] ), 'gameObject' => array( + 'notFound' => "Cette entité n'existe pas.", 'cat' => [0 => "Autre", 9 => "Livres", 3 => "Conteneurs", -5 => "Coffres", 25 => "Bancs de poissons", -3 => "Herbes", -4 => "Filons de minerai", -2 => "Quêtes", -6 => "Outils"], 'type' => [ 9 => "Livre", 3 => "Conteneur", -5 => "Coffre", 25 => "", -3 => "Herbe", -4 => "Filon de minerai", -2 => "Quête", -6 => ""], 'unkPosition' => "L'emplacement de cette entité est inconnu.", @@ -396,6 +397,7 @@ $lang = array( 'restock' => "[Restocks every %s.]" ), 'npc' => array( + 'notFound' => "Ce PNJ n'existe pas.", 'classification'=> "Classification", 'petFamily' => "Familier", 'react' => "Réaction", @@ -431,6 +433,7 @@ $lang = array( ) ), 'event' => array( + 'notFound' => "Cet évènement mondial n'existe pas.", 'start' => "Début", 'end' => "Fin", 'interval' => "Intervalle", @@ -438,6 +441,7 @@ $lang = array( 'category' => ["Non classés", "Vacances", "Récurrent", "Joueur ctr. Joueur"] ), 'achievement' => array( + 'notFound' => "Ce haut fait n'existe pas.", 'criteria' => "Critères", 'points' => "Points", 'series' => "Série", @@ -450,7 +454,11 @@ $lang = array( 'rfAvailable' => "Disponibles sur les royaumes : ", '_transfer' => 'Cet haut fait sera converti en %s si vous transférez en %s.', ), + 'chrClass' => array( + 'notFound' => "Cette classe n'existe pas." + ), 'race' => array( + 'notFound' => "Cette race n'existe pas.", 'racialLeader' => "Leader racial", 'startZone' => "Zone initiales", ), @@ -472,6 +480,7 @@ $lang = array( 'CosmicMap' => "Carte cosmique", ), 'zone' => array( + 'notFound' => "Cette zone n'existe pas.", 'attunement' => ["Accès", "Accès Héroïque"], 'key' => ["Clef", "Clef Héroïque"], 'location' => "Localisation", @@ -494,8 +503,8 @@ $lang = array( ) ), 'quest' => array( + 'notFound' => "Cette quête n'existe pas.", '_transfer' => 'Cette quête sera converti en %s si vous transférez en %s.', - 'questLevel' => "Niveau %s", 'requirements' => "Conditions", 'reqMoney' => "Argent requis", @@ -624,28 +633,33 @@ $lang = array( ) ), 'title' => array( + 'notFound' => "Ce titre n'existe pas.", '_transfer' => 'Ce titre sera converti en %s si vous transférez en %s.', 'cat' => array( "Général", "Joueur ctr. Joueur", "Réputation", "Donjons & raids", "Quêtes", "Métiers", "Évènements mondiaux" ) ), 'skill' => array( + 'notFound' => "Cette compétence n'existe pas.", 'cat' => array( -6 => "Compagnons", -5 => "Montures", -4 => "Traits raciaux", 5 => "Caractéristiques", 6 => "Compétences d'armes", 7 => "Compétences de classe", 8 => "Armures utilisables", 9 => "Compétences secondaires", 10 => "Langues", 11 => "Métiers" ) ), 'currency' => array( + 'notFound' => "Cette monnaie n'existe pas.", 'cap' => "Maximum total", 'cat' => array( 1 => "Divers", 2 => "JcJ", 4 => "Classique", 21 => "Wrath of the Lich King", 22 => "Raid", 23 => "Burning Crusade", 41 => "Test", 3 => "Inutilisées" ) ), 'pet' => array( + 'notFound' => "Cette famille de familiers n'existe pas.", 'exotic' => "Exotique", 'cat' => ["Férocité", "Tenacité", "Ruse"] ), 'faction' => array( + 'notFound' => "Cette faction n'existe pas.", 'spillover' => "[Reputation Spillover]", 'spilloverDesc' => "[Gaining reputation with this faction also yields a proportional gain with the factions listed below.]", 'maxStanding' => "Niveau maximum", @@ -660,6 +674,7 @@ $lang = array( ) ), 'itemset' => array( + 'notFound' => "Cet ensemble d'objets n'existe pas.", '_desc' => "%s est le %s. Il contient %s pièces.", '_descTagless' => "%s est un ensemble d'objet qui contient %s pièces.", '_setBonuses' => "Bonus de l'ensemble", @@ -684,6 +699,7 @@ $lang = array( ) ), 'spell' => array( + 'notFound' => "Ce sort n'existe pas.", '_spellDetails' => "Détails sur le sort", '_cost' => "Coût", '_range' => "Portée", @@ -825,6 +841,7 @@ $lang = array( 'invisibilityType' => ["GENERAL", 3 => "TRAP", 6 => "DRUNK"] ), 'item' => array( + 'notFound' => "Cet objet n'existe pas.", 'armor' => "Armure : %s", 'block' => "Bloquer : %s", 'charges' => "Charges", diff --git a/localization/locale_ruru.php b/localization/locale_ruru.php index 0c0efc2d..58c119ff 100644 --- a/localization/locale_ruru.php +++ b/localization/locale_ruru.php @@ -384,6 +384,7 @@ $lang = array( 'resetPass' => ["Password Reset", "Follow this link to reset your password.\r\n\r\n".HOST_URL."?account=forgotpassword&token=%s\r\n\r\nIf you did not request this mail simply ignore it."] ), 'gameObject' => array( + 'notFound' => "Такой объект не существует.", 'cat' => [0 => "Другое", 9 => "Книги", 3 => "Контейнеры", -5 => "Сундуки", 25 => "Рыболовные лунки",-3 => "Травы", -4 => "Полезные ископаемые", -2 => "Задания", -6 => "Инструменты"], 'type' => [ 9 => "Книга", 3 => "Контейнер", -5 => "Сундук", 25 => "", -3 => "Растение", -4 => "Полезное ископаемое", -2 => "Задание", -6 => ""], 'unkPosition' => "Местонахождение этого объекта неизвестно.", @@ -396,6 +397,7 @@ $lang = array( 'restock' => "[Restocks every %s.]" ), 'npc' => array( + 'notFound' => "Такой НИП не существует.", 'classification'=> "Классификация", 'petFamily' => "Семейство питомца", 'react' => "Реакция", @@ -431,6 +433,7 @@ $lang = array( ) ), 'event' => array( + 'notFound' => "Это игровое событие не существует.", 'start' => "Начало", 'end' => "Конец", 'interval' => "[Interval]", @@ -438,6 +441,7 @@ $lang = array( 'category' => array("Разное", "Праздники", "Периодические", "PvP") ), 'achievement' => array( + 'notFound' => "Такое достижение не существует.", 'criteria' => "Критерий", 'points' => "Очки", 'series' => "Серии", @@ -450,7 +454,11 @@ $lang = array( 'rfAvailable' => "[Available on realm]:", '_transfer' => 'Этот предмет превратится в %s, если вы перейдете за %s.', ), + 'chrClass' => array( + 'notFound' => "Такой класс не существует." + ), 'race' => array( + 'notFound' => "Такая раса не существует.", 'racialLeader' => "Лидер расы", 'startZone' => "Начальная локация", ), @@ -472,6 +480,7 @@ $lang = array( 'CosmicMap' => "Звёздная карта", ), 'zone' => array( + 'notFound' => "Такая местность не существует.", 'attunement' => ["[Attunement]", "[Heroic attunement]"], 'key' => ["[Key]", "[Heroic key]"], 'location' => "Местоположение", @@ -494,8 +503,8 @@ $lang = array( ) ), 'quest' => array( + 'notFound' => "Такое задание не существует.", '_transfer' => 'Этот предмет превратится в %s, если вы перейдете за %s.', - 'questLevel' => "%s-го уровня", 'requirements' => "Требования", 'reqMoney' => "Требуется денег", @@ -625,28 +634,33 @@ $lang = array( ) ), 'title' => array( + 'notFound' => "Такое звание не существует.", '_transfer' => 'Этот предмет превратится в %s, если вы перейдете за %s.', 'cat' => array( 'Общее", "PvP", "Репутация", "Подземелья и рейды", "Задания", "Профессии", "Игровые события' ) ), 'skill' => array( + 'notFound' => "Этот навык не существует.", 'cat' => array( -6 => "Спутники", -5 => "Транспорт", -4 => "Классовые навыки", 5 => "Характеристики", 6 => "Оружейные навыки", 7 => "Классовые навыки", 8 => "Доспехи", 9 => "Вторичные навыки", 10 => "Языки", 11 => "Профессии" ) ), 'currency' => array( + 'notFound' => "Такая валюта не существует.", 'cap' => "Максимум всего", 'cat' => array( 1 => "Разное", 2 => "PvP", 4 => "World of Warcraft", 21 => "Wrath of the Lich King", 22 => "Подземелья и рейды", 23 => "Burning Crusade", 41 => "Test", 3 => "Неактивно" ) ), 'pet' => array( + 'notFound' => "Такой породы питомцев не существует.", 'exotic' => "Экзотический", 'cat' => ["Свирепость", "Упорство", "Хитрость"] ), 'faction' => array( + 'notFound' => "Такая фракция не существует.", 'spillover' => "[Reputation Spillover]", 'spilloverDesc' => "[Gaining reputation with this faction also yields a proportional gain with the factions listed below.]", 'maxStanding' => "Макс Уровень", @@ -661,6 +675,7 @@ $lang = array( ) ), 'itemset' => array( + 'notFound' => "Такой комплект не существует.", '_desc' => "%s — %s. Он состоит из %s предметов.", '_descTagless' => "%s — набор из %s предметов.", '_setBonuses' => "Бонус за комплект", @@ -685,6 +700,7 @@ $lang = array( ) ), 'spell' => array( + 'notFound' => "Такое заклинание не существует.", '_spellDetails' => "Описание заклинания", '_cost' => "Цена", '_range' => "Радиус действия", @@ -827,6 +843,7 @@ $lang = array( 'invisibilityType' => ["GENERAL", 3 => "TRAP", 6 => "DRUNK"] ), 'item' => array( + 'notFound' => "Такой предмет не существует.", 'armor' => "Броня: %s", 'block' => "Блок: %s", 'charges' => "зарядов", diff --git a/pages/achievement.php b/pages/achievement.php index 95170e01..0fc90127 100644 --- a/pages/achievement.php +++ b/pages/achievement.php @@ -44,7 +44,7 @@ class AchievementPage extends GenericPage $this->subject = new AchievementList(array(['id', $this->typeId])); if ($this->subject->error) - $this->notFound(Lang::game('achievement')); + $this->notFound(); $this->extendGlobalData($this->subject->getJSGlobals(GLOBALINFO_REWARDS)); @@ -464,10 +464,10 @@ class AchievementPage extends GenericPage die($tt); } - public function notFound($typeStr) + public function notFound() { if ($this->mode != CACHE_TYPE_TOOLTIP) - return parent::notFound($typeStr); + return parent::notFound(Lang::game('achievement'), Lang::achievement('notFound')); header('Content-type: application/x-javascript; charset=utf-8'); echo $this->generateTooltip(true); diff --git a/pages/class.php b/pages/class.php index 28fa49f4..df8139e5 100644 --- a/pages/class.php +++ b/pages/class.php @@ -26,7 +26,7 @@ class ClassPage extends GenericPage $this->subject = new CharClassList(array(['id', $this->typeId])); if ($this->subject->error) - $this->notFound(Lang::game('class')); + $this->notFound(Lang::game('class'), Lang::chrClass('notFound')); $this->name = $this->subject->getField('name', true); } diff --git a/pages/currency.php b/pages/currency.php index 97ff3166..270c5d4b 100644 --- a/pages/currency.php +++ b/pages/currency.php @@ -25,7 +25,7 @@ class CurrencyPage extends GenericPage $this->subject = new CurrencyList(array(['id', $this->typeId])); if ($this->subject->error) - $this->notFound(Lang::game('currency')); + $this->notFound(Lang::game('currency'), Lang::currency('notFound')); $this->name = $this->subject->getField('name', true); } diff --git a/pages/event.php b/pages/event.php index 11aff02a..0a3621c8 100644 --- a/pages/event.php +++ b/pages/event.php @@ -30,7 +30,7 @@ class EventPage extends GenericPage $this->subject = new WorldEventList($conditions); if ($this->subject->error) - $this->notFound(Lang::game('event')); + $this->notFound(Lang::game('event'), Lang::event('notFound')); $this->hId = $this->subject->getField('holidayId'); $this->eId = $this->subject->getField('eventBak'); diff --git a/pages/faction.php b/pages/faction.php index 9012dfb3..49e7e4a4 100644 --- a/pages/faction.php +++ b/pages/faction.php @@ -25,7 +25,7 @@ class FactionPage extends GenericPage $this->subject = new FactionList(array(['id', $this->typeId])); if ($this->subject->error) - $this->notFound(Lang::game('faction')); + $this->notFound(Lang::game('faction'), Lang::faction('notFound')); $this->name = $this->subject->getField('name', true); } diff --git a/pages/genericPage.class.php b/pages/genericPage.class.php index 75772b09..2cc8ad3f 100644 --- a/pages/genericPage.class.php +++ b/pages/genericPage.class.php @@ -363,6 +363,8 @@ class GenericPage public function notFound($title, $msg = '') // unknown entry { + array_unshift($this->title, Lang::main('nfPageTitle')); + $this->notFound = array( 'title' => $this->typeId ? Util::ucFirst($title).' #'.$this->typeId : $title, 'msg' => !$msg && $this->typeId ? sprintf(Lang::main('pageNotFound'), $title) : $msg diff --git a/pages/item.php b/pages/item.php index e63ecbea..4a27af60 100644 --- a/pages/item.php +++ b/pages/item.php @@ -59,7 +59,7 @@ class ItemPage extends genericPage $this->subject = new ItemList($conditions); if ($this->subject->error) - $this->notFound(Lang::game('item')); + $this->notFound(); if (!is_numeric($param)) $this->typeId = $this->subject->id; @@ -1136,7 +1136,7 @@ class ItemPage extends genericPage return parent::display($override); } - public function notFound($typeStr) + public function notFound() { if ($this->mode == CACHE_TYPE_TOOLTIP) { @@ -1151,7 +1151,7 @@ class ItemPage extends genericPage exit(); } else - return parent::notFound($typeStr); + return parent::notFound(Lang::game('item'), Lang::item('notFound')); } } diff --git a/pages/itemset.php b/pages/itemset.php index df6868db..3d5ae9b7 100644 --- a/pages/itemset.php +++ b/pages/itemset.php @@ -29,7 +29,7 @@ class ItemsetPage extends GenericPage $this->subject = new ItemsetList(array(['id', $this->typeId])); if ($this->subject->error) - $this->notFound(Lang::game('itemset')); + $this->notFound(Lang::game('itemset'), Lang::itemset('notFound')); $this->name = $this->subject->getField('name', true); $this->extendGlobalData($this->subject->getJSGlobals()); diff --git a/pages/npc.php b/pages/npc.php index 9caad420..1dc8ee8b 100644 --- a/pages/npc.php +++ b/pages/npc.php @@ -30,7 +30,7 @@ class NpcPage extends GenericPage $this->subject = new CreatureList(array(['id', $this->typeId])); if ($this->subject->error) - $this->notFound(Lang::game('npc')); + $this->notFound(); $this->name = $this->subject->getField('name', true); $this->subname = $this->subject->getField('subname', true); @@ -807,10 +807,10 @@ class NpcPage extends GenericPage die($tt); } - public function notFound($typeStr) + public function notFound() { if ($this->mode != CACHE_TYPE_TOOLTIP) - return parent::notFound($typeStr); + return parent::notFound(Lang::game('npc'), Lang::npc('notFound')); header('Content-type: application/x-javascript; charset=utf-8'); echo $this->generateTooltip(true); @@ -959,7 +959,7 @@ class NpcPage extends GenericPage $line = array( 'range' => $t['range'], - 'type' => 2, // [type: 0, 12] say: yellow-ish + 'type' => 2, // [type: 0, 12] say: yellow-ish 'lang' => !empty($t['language']) ? Lang::game('languages', $t['language']) : null, 'text' => sprintf(Util::parseHtmlText(htmlentities($msg)), $this->name), ); diff --git a/pages/object.php b/pages/object.php index 3d3957e4..3b73f000 100644 --- a/pages/object.php +++ b/pages/object.php @@ -37,7 +37,7 @@ class ObjectPage extends GenericPage $this->subject = new GameObjectList(array(['id', $this->typeId])); if ($this->subject->error) - $this->notFound(Lang::game('gameObject')); + $this->notFound(); $this->name = $this->subject->getField('name', true); } @@ -486,10 +486,10 @@ class ObjectPage extends GenericPage die($tt); } - public function notFound($typeStr) + public function notFound() { if ($this->mode != CACHE_TYPE_TOOLTIP) - return parent::notFound($typeStr); + return parent::notFound(Lang::game('gameObject'), Lang:gameObject('notFound')); header('Content-type: application/x-javascript; charset=utf-8'); echo $this->generateTooltip(true); diff --git a/pages/pet.php b/pages/pet.php index dadda193..574d9dce 100644 --- a/pages/pet.php +++ b/pages/pet.php @@ -26,7 +26,7 @@ class PetPage extends GenericPage $this->subject = new PetList(array(['id', $this->typeId])); if ($this->subject->error) - $this->notFound(Lang::game('pet')); + $this->notFound(Lang::game('pet'), Lang::pet('notFound')); $this->name = $this->subject->getField('name', true); } diff --git a/pages/profile.php b/pages/profile.php index 2181fec2..853d2a2b 100644 --- a/pages/profile.php +++ b/pages/profile.php @@ -41,7 +41,7 @@ class ProfilePage extends GenericPage if ($foo = DB::Aowow()->selectCell('SELECT 2161862')) $this->profileId = $foo; else - $this->notFound(Util::ucFirst(Lang::game('profile'))); + $this->notFound(); $this->isCustom = true; $this->profile = intVal($_[0]); @@ -52,12 +52,12 @@ class ProfilePage extends GenericPage if ($foo = DB::Aowow()->selectCell('SELECT 2161862')) $this->profileId = $foo; else - $this->notFound(Util::ucFirst(Lang::game('profile'))); + $this->notFound(); $this->profile = $_; } else if ($_ || !isset($_GET['new'])) - $this->notFound(Util::ucFirst(Lang::game('profile'))); + $this->notFound(); $this->subject = new ProfileList(/*stuff*/); } @@ -122,10 +122,10 @@ class ProfilePage extends GenericPage die($this->generateTooltip()); } - public function notFound($typeStr) + public function notFound() { if ($this->mode != CACHE_TYPE_TOOLTIP) - return parent::notFound($typeStr); + return parent::notFound(Util::ucFirst(Lang::game('profile')), '[NNF]profile or char doesn\'t exist'); header('Content-type: application/x-javascript; charset=utf-8'); echo $this->generateTooltip(true); diff --git a/pages/quest.php b/pages/quest.php index 89945189..644edb29 100644 --- a/pages/quest.php +++ b/pages/quest.php @@ -30,7 +30,7 @@ class QuestPage extends GenericPage $this->subject = new QuestList(array(['id', $this->typeId])); if ($this->subject->error) - $this->notFound(Lang::game('quest')); + $this->notFound(); $this->name = $this->subject->getField('name', true); } @@ -679,10 +679,10 @@ class QuestPage extends GenericPage die($tt); } - public function notFound($typeStr) + public function notFound() { if ($this->mode != CACHE_TYPE_TOOLTIP) - return parent::notFound($typeStr); + return parent::notFound(Lang::game('quest'), Lang::quest('notFound')); header('Content-type: application/x-javascript; charset=utf-8'); echo $this->generateTooltip(true); diff --git a/pages/race.php b/pages/race.php index ca938153..6d20fae5 100644 --- a/pages/race.php +++ b/pages/race.php @@ -26,7 +26,7 @@ class RacePage extends GenericPage $this->subject = new CharRaceList(array(['id', $this->typeId])); if ($this->subject->error) - $this->notFound(Lang::game('race')); + $this->notFound(Lang::game('race'), Lang::race('notFound')); $this->name = $this->subject->getField('name', true); } diff --git a/pages/search.php b/pages/search.php index da97fa80..832296e1 100644 --- a/pages/search.php +++ b/pages/search.php @@ -201,7 +201,10 @@ class SearchPage extends GenericPage { // empty queries go home if (!$this->query) + { header('Location: .', true, 302); + die(); + } parent::display(); // errors are handled in the search-template itself } diff --git a/pages/skill.php b/pages/skill.php index ad576c01..53f37e14 100644 --- a/pages/skill.php +++ b/pages/skill.php @@ -27,7 +27,7 @@ class SkillPage extends GenericPage $this->subject = new SkillList(array(['id', $this->typeId])); if ($this->subject->error) - $this->notFound(Lang::game('skill')); + $this->notFound(Lang::game('skill'), Lang::skill('notFound')); $this->name = $this->subject->getField('name', true); $this->cat = $this->subject->getField('typeCat'); diff --git a/pages/spell.php b/pages/spell.php index a4365980..172608d8 100644 --- a/pages/spell.php +++ b/pages/spell.php @@ -33,7 +33,7 @@ class SpellPage extends GenericPage $this->subject = new SpellList(array(['id', $this->typeId])); if ($this->subject->error) - $this->notFound(Lang::game('spell')); + $this->notFound(); $jsg = $this->subject->getJSGlobals(GLOBALINFO_ANY, $extra); $this->extendGlobalData($jsg, $extra); @@ -1192,10 +1192,10 @@ class SpellPage extends GenericPage die($tt); } - public function notFound($typeStr) + public function notFound() { if ($this->mode != CACHE_TYPE_TOOLTIP) - return parent::notFound($typeStr); + return parent::notFound(Lang::game('spell'), Lang::spell('notFound')); header('Content-type: application/x-javascript; charset=utf-8'); echo $this->generateTooltip(true); diff --git a/pages/title.php b/pages/title.php index e5de6125..20029899 100644 --- a/pages/title.php +++ b/pages/title.php @@ -27,7 +27,7 @@ class TitlePage extends GenericPage $this->subject = new TitleList(array(['id', $this->typeId])); if ($this->subject->error) - $this->notFound(Lang::game('title')); + $this->notFound(Lang::game('title'), Lang::title('notFound')); $this->name = $this->subject->getHtmlizedName(); $this->nameFixed = Util::ucFirst(trim(strtr($this->subject->getField('male', true), ['%s' => '', ',' => '']))); diff --git a/pages/zone.php b/pages/zone.php index 2787276c..e34ac0dc 100644 --- a/pages/zone.php +++ b/pages/zone.php @@ -24,7 +24,7 @@ class ZonePage extends GenericPage $this->subject = new ZoneList(array(['id', $this->typeId])); if ($this->subject->error) - $this->notFound(Lang::game('zone')); + $this->notFound(Lang::game('zone'), Lang::zone('notFound')); $this->name = $this->subject->getField('name', true); }