yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Misc/Fixup

Browse Source 
* move guide localization, so Lang::typeName can pick it up
 * rename forgotten TYPE_* definitions
This commit is contained in:
Sarjuuk
2022-03-22 21:59:49 +01:00
parent 7caabc0fa8
commit 1dc8d50289
10 changed files with 318 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/types/item.class.php
View File

@@ -889,7 +889,7 @@ class ItemList extends BaseType
{
foreach ($jsg as $js)
if (empty($this->jsGlobals[Type::CHR_RACE][$js]))
$this->jsGlobals[Type::CHR_ACE][$js] = $js;
$this->jsGlobals[Type::CHR_RACE][$js] = $js;
$x .= Lang::game('races').Lang::main('colon').$races.'<br />';
}

100
localization/locale_dede.php
View File

@@ -159,8 +159,6 @@ $lang = array(
)
),
'guide' => array(
'guide' => "Leitfaden",
'guides' => "Leitfäden",
'myGuides' => "Meine Leitfäden",
'editTitle' => "Eigenen Leitfaden bearbeiten",
'newTitle' => "Leitfaden erstellen",
@@ -275,70 +273,74 @@ $lang = array(
)
),
'game' => array(
'achievement' => "Erfolg",
// type strings
'npc' => "NPC", // 1
'npcs' => "NPCs",
'object' => "Objekt", // 2
'objects' => "Objekte",
'item' => "Gegenstand", // 3
'items' => "Gegenstände",
'itemset' => "Ausrüstungsset", // 4
'itemsets' => "Ausrüstungssets",
'quest' => "Quest", // 5
'quests' => "Quests",
'spell' => "Zauber", // 6
'spells' => "Zauber",
'zone' => "Zone", // 7
'zones' => "Gebiete",
'faction' => "Fraktion", // 8
'factions' => "Fraktionen",
'pet' => "Begleiter", // 9
'pets' => "Begleiter",
'achievement' => "Erfolg", // 10
'achievements' => "Erfolge",
'areatrigger' => "Areatrigger",
'areatriggers' => "Areatrigger",
'class' => "Klasse",
'title' => "Titel", // 11
'titles' => "Titel",
'event' => "Weltereigniss", // 12
'events' => "Weltereignisse",
'class' => "Klasse", // 13
'classes' => "Klassen",
'currency' => "Währung",
'race' => "Volk", // 14
'races' => "Völker",
'skill' => "Fertigkeit", // 15
'skills' => "Fertigkeiten",
'currency' => "Währung", // 17
'currencies' => "Währungen",
'sound' => "Klang", // 19
'sounds' => "Klänge",
'icon' => "Icon", // 29
'icons' => "Icons",
'profile' => "Profil", // 100
'profiles' => "Profile",
'guide' => "Leitfaden", // 300
'guides' => "Leitfäden",
'emote' => "Emote", // 501
'emotes' => "Emotes",
'enchantment' => "Verzauberung", // 502
'enchantments' => "Verzauberungen",
'areatrigger' => "Areatrigger", // 503
'areatriggers' => "Areatrigger",
'mail' => "Brief", // 504
'mails' => "Briefe",
'cooldown' => "%s Abklingzeit",
'difficulty' => "Modus",
'dispelType' => "Bannart",
'duration' => "Dauer",
'emote' => "Emote",
'emotes' => "Emotes",
'enchantment' => "Verzauberung",
'enchantments' => "Verzauberungen",
'flags' => "Flags",
'object' => "Objekt",
'objects' => "Objekte",
'glyphType' => "Glyphenart",
'race' => "Volk",
'races' => "Völker",
'title' => "Titel",
'titles' => "Titel",
'eventShort' => "Ereignis",
'event' => "Weltereigniss",
'events' => "Weltereignisse",
'faction' => "Fraktion",
'factions' => "Fraktionen",
'cooldown' => "%s Abklingzeit",
'icon' => "Icon",
'icons' => "Icons",
'item' => "Gegenstand",
'items' => "Gegenstände",
'itemset' => "Ausrüstungsset",
'itemsets' => "Ausrüstungssets",
'mail' => "Brief",
'mails' => "Briefe",
'flags' => "Flags",
'glyphType' => "Glyphenart",
'level' => "Stufe",
'mechanic' => "Auswirkung",
'mechAbbr' => "Ausw.",
'meetingStone' => "Versammlungsstein",
'npc' => "NPC",
'npcs' => "NPCs",
'pet' => "Begleiter",
'pets' => "Begleiter",
'profile' => "Profil",
'profiles' => "Profile",
'quest' => "Quest",
'quests' => "Quests",
'requires' => "Benötigt %s",
'requires2' => "Benötigt",
'reqLevel' => "Benötigt Stufe %s",
'reqSkillLevel' => "Benötigte Fertigkeitsstufe",
'level' => "Stufe",
'school' => "Magieart",
'skill' => "Fertigkeit",
'skills' => "Fertigkeiten",
'sound' => "Klang",
'sounds' => "Klänge",
'spell' => "Zauber",
'spells' => "Zauber",
'type' => "Art",
'valueDelim' => " - ", // " bis "
'zone' => "Zone",
'zones' => "Gebiete",
'pvp' => "PvP",
'honorPoints' => "Ehrenpunkte",

98
localization/locale_enus.php
View File

@@ -159,8 +159,6 @@ $lang = array(
)
),
'guide' => array(
'guide' => "Guide",
'guides' => "Guides",
'myGuides' => "My Guides",
'editTitle' => "Edit your Guide",
'newTitle' => "Create New Guide",
@@ -275,70 +273,74 @@ $lang = array(
)
),
'game' => array(
'achievement' => "achievement",
'achievements' => "Achievements",
'areatrigger' => "areatrigger",
'areatriggers' => "Areatrigger",
'class' => "class",
'classes' => "Classes",
'currency' => "currency",
'currencies' => "Currencies",
'difficulty' => "Difficulty",
'dispelType' => "Dispel type",
'duration' => "Duration",
'emote' => "emote",
'emotes' => "Emotes",
'enchantment' => "enchantment",
'enchantments' => "Enchantments",
'flags' => "Flags",
// type strings
'npc' => "NPC",
'npcs' => "NPCs",
'object' => "object",
'objects' => "Objects",
'glyphType' => "Glyph type",
'race' => "race",
'races' => "Races",
'title' => "title",
'titles' => "Titles",
'eventShort' => "Event",
'event' => "World Event",
'events' => "World Events",
'faction' => "faction",
'factions' => "Factions",
'cooldown' => "%s cooldown",
'icon' => "icon",
'icons' => "icons",
'item' => "item",
'items' => "Items",
'itemset' => "item Set",
'itemsets' => "Item Sets",
'quest' => "quest",
'quests' => "Quests",
'spell' => "spell",
'spells' => "Spells",
'zone' => "zone",
'zones' => "Zones",
'faction' => "faction",
'factions' => "Factions",
'pet' => "Pet",
'pets' => "Hunter Pets",
'achievement' => "achievement",
'achievements' => "Achievements",
'title' => "title",
'titles' => "Titles",
'event' => "World Event",
'events' => "World Events",
'class' => "class",
'classes' => "Classes",
'race' => "race",
'races' => "Races",
'skill' => "skill",
'skills' => "Skills",
'currency' => "currency",
'currencies' => "Currencies",
'sound' => "sound",
'sounds' => "Sounds",
'icon' => "icon",
'icons' => "icons",
'profile' => "profile",
'profiles' => "Profiles",
'guide' => "Guide",
'guides' => "Guides",
'emote' => "emote",
'emotes' => "Emotes",
'enchantment' => "enchantment",
'enchantments' => "Enchantments",
'areatrigger' => "areatrigger",
'areatriggers' => "Areatrigger",
'mail' => "mail",
'mails' => "Mails",
'cooldown' => "%s cooldown",
'difficulty' => "Difficulty",
'dispelType' => "Dispel type",
'duration' => "Duration",
'eventShort' => "Event",
'flags' => "Flags",
'glyphType' => "Glyph type",
'level' => "Level",
'mechanic' => "Mechanic",
'mechAbbr' => "Mech.",
'meetingStone' => "Meeting Stone",
'npc' => "NPC",
'npcs' => "NPCs",
'pet' => "Pet",
'pets' => "Hunter Pets",
'profile' => "profile",
'profiles' => "Profiles",
'quest' => "quest",
'quests' => "Quests",
'requires' => "Requires %s",
'requires2' => "Requires",
'reqLevel' => "Requires Level %s",
'reqSkillLevel' => "Required skill level",
'level' => "Level",
'school' => "School",
'skill' => "skill",
'skills' => "Skills",
'sound' => "sound",
'sounds' => "Sounds",
'spell' => "spell",
'spells' => "Spells",
'type' => "Type",
'valueDelim' => " to ",
'zone' => "zone",
'zones' => "Zones",
'pvp' => "PvP", // PVP
'honorPoints' => "Honor Points", // HONOR_POINTS

98
localization/locale_eses.php
View File

@@ -159,8 +159,6 @@ $lang = array(
)
),
'guide' => array(
'guide' => "Guía",
'guides' => "Guías",
'myGuides' => "Mis Guías",
'editTitle' => "Editar tu Guía",
'newTitle' => "Crear Nueva Guía",
@@ -275,70 +273,74 @@ $lang = array(
)
),
'game' => array(
'achievement' => "logro",
'achievements' => "Logros",
'areatrigger' => "areatrigger",
'areatriggers' => "Areatrigger",
'class' => "clase",
'classes' => "Clases",
'currency' => "monedas",
'currencies' => "Monedas",
'difficulty' => "Dificultad",
'dispelType' => "Tipo de disipación",
'duration' => "Duración",
'emote' => "emoción",
'emotes' => "Emociones",
'enchantment' => "encantamiento",
'enchantments' => "Encantamientos",
'flags' => "Banderas",
// type strings
'npc' => "PNJ",
'npcs' => "PNJs",
'object' => "entidad",
'objects' => "Entidades",
'glyphType' => "Tipo de glifo",
'race' => "raza",
'races' => "Razas",
'title' => "título",
'titles' => "Títulos",
'eventShort' => "Evento",
'event' => "Suceso mundial ",
'events' => "Eventos del mundo",
'faction' => "facción",
'factions' => "Facciones",
'cooldown' => "%s de reutilización",
'icon' => "icono",
'icons' => "Iconos",
'item' => "objeto",
'items' => "Objetos",
'itemset' => "conjunto de objetos",
'itemsets' => "Conjuntos de objetos",
'quest' => "misión",
'quests' => "Misiones",
'spell' => "hechizo",
'spells' => "Hechizos",
'zone' => "zona",
'zones' => "Zonas",
'faction' => "facción",
'factions' => "Facciones",
'pet' => "Mascota",
'pets' => "Mascotas de cazador",
'achievement' => "logro",
'achievements' => "Logros",
'title' => "título",
'titles' => "Títulos",
'event' => "Suceso mundial ",
'events' => "Eventos del mundo",
'class' => "clase",
'classes' => "Clases",
'race' => "raza",
'races' => "Razas",
'skill' => "habilidad",
'skills' => "Habilidades",
'currency' => "monedas",
'currencies' => "Monedas",
'sound' => "sonido",
'sounds' => "Sonidos",
'icon' => "icono",
'icons' => "Iconos",
'profile' => "Perfile",
'profiles' => "Perfiles",
'guide' => "Guía",
'guides' => "Guías",
'emote' => "emoción",
'emotes' => "Emociones",
'enchantment' => "encantamiento",
'enchantments' => "Encantamientos",
'areatrigger' => "areatrigger",
'areatriggers' => "Areatrigger",
'mail' => "mail",
'mails' => "Mails",
'cooldown' => "%s de reutilización",
'difficulty' => "Dificultad",
'dispelType' => "Tipo de disipación",
'duration' => "Duración",
'eventShort' => "Evento",
'flags' => "Banderas",
'glyphType' => "Tipo de glifo",
'level' => "Nivel",
'mechanic' => "Mecanica",
'mechAbbr' => "Mec.",
'meetingStone' => "Roca de encuentro",
'npc' => "PNJ",
'npcs' => "PNJs",
'pet' => "Mascota",
'pets' => "Mascotas de cazador",
'profile' => "",
'profiles' => "Perfiles",
'quest' => "misión",
'quests' => "Misiones",
'requires' => "Requiere %s",
'requires2' => "Requiere",
'reqLevel' => "Necesitas ser de nivel %s",
'reqSkillLevel' => "Requiere nivel de habilidad",
'level' => "Nivel",
'school' => "Escuela",
'skill' => "habilidad",
'skills' => "Habilidades",
'sound' => "sonido",
'sounds' => "Sonidos",
'spell' => "hechizo",
'spells' => "Hechizos",
'type' => "Tipo",
'valueDelim' => " - ",
'zone' => "zona",
'zones' => "Zonas",
'pvp' => "JcJ",
'honorPoints' => "Puntos de Honor",

98
localization/locale_frfr.php
View File

@@ -159,8 +159,6 @@ $lang = array(
)
),
'guide' => array(
'guide' => "Guide",
'guides' => "Guides",
'myGuides' => "Mes guides",
'editTitle' => "Editez votre Guide",
'newTitle' => "Créer un nouveau Guide",
@@ -275,70 +273,74 @@ $lang = array(
)
),
'game' => array(
'achievement' => "haut fait",
'achievements' => "Hauts faits",
'areatrigger' => "areatrigger",
'areatriggers' => "Areatrigger",
'class' => "classe",
'classes' => "Classes",
'currency' => "monnaies",
'currencies' => "Monnaies",
'difficulty' => "Difficulté",
'dispelType' => "Type de dissipation",
'duration' => "Durée",
'emote' => "emote",
'emotes' => "Emotes",
'enchantment' => "enchantement",
'enchantments' => "Enchantements",
'flags' => "Marqueurs",
// type strings
'npc' => "PNJ",
'npcs' => "PNJs",
'object' => "entité",
'objects' => "Entités",
'glyphType' => "Type de glyphe",
'race' => "race",
'races' => "Races",
'title' => "titre",
'titles' => "Titres",
'eventShort' => "Évènement",
'event' => "Évènement mondial",
'events' => "Évènements mondiaux",
'faction' => "faction",
'factions' => "Factions",
'cooldown' => "%s de recharge",
'icon' => "icône",
'icons' => "Icônes",
'item' => "objet",
'items' => "Objets",
'itemset' => "ensemble d'objets",
'itemsets' => "Ensembles d'objets",
'quest' => "quête",
'quests' => "Quêtes",
'spell' => "sort",
'spells' => "Sorts",
'zone' => "zone",
'zones' => "Zones",
'faction' => "faction",
'factions' => "Factions",
'pet' => "Familier",
'pets' => "Familiers de chasseur",
'achievement' => "haut fait",
'achievements' => "Hauts faits",
'title' => "titre",
'titles' => "Titres",
'event' => "Évènement mondial",
'events' => "Évènements mondiaux",
'class' => "classe",
'classes' => "Classes",
'race' => "race",
'races' => "Races",
'skill' => "compétence",
'skills' => "Compétences",
'currency' => "monnaies",
'currencies' => "Monnaies",
'sound' => "son",
'sounds' => "Sons",
'icon' => "icône",
'icons' => "Icônes",
'profile' => "Profil",
'profiles' => "Profils",
'guide' => "Guide",
'guides' => "Guides",
'emote' => "emote",
'emotes' => "Emotes",
'enchantment' => "enchantement",
'enchantments' => "Enchantements",
'areatrigger' => "areatrigger",
'areatriggers' => "Areatrigger",
'mail' => "mail",
'mails' => "Mails",
'cooldown' => "%s de recharge",
'difficulty' => "Difficulté",
'dispelType' => "Type de dissipation",
'duration' => "Durée",
'eventShort' => "Évènement",
'flags' => "Marqueurs",
'glyphType' => "Type de glyphe",
'level' => "Niveau",
'mechanic' => "Mécanique",
'mechAbbr' => "Mécan.",
'meetingStone' => "Pierre de rencontre",
'npc' => "PNJ",
'npcs' => "PNJs",
'pet' => "Familier",
'pets' => "Familiers de chasseur",
'profile' => "",
'profiles' => "Profils",
'quest' => "quête",
'quests' => "Quêtes",
'requires' => "%s requis",
'requires2' => "Requiert",
'reqLevel' => "Niveau %s requis",
'reqSkillLevel' => "Niveau de compétence requis",
'level' => "Niveau",
'school' => "École",
'skill' => "compétence",
'skills' => "Compétences",
'sound' => "son",
'sounds' => "Sons",
'spell' => "sort",
'spells' => "Sorts",
'type' => "Type",
'valueDelim' => " - ",
'zone' => "zone",
'zones' => "Zones",
'pvp' => "JcJ",
'honorPoints' => "Points d'honneur",

98
localization/locale_ruru.php
View File

@@ -159,8 +159,6 @@ $lang = array(
)
),
'guide' => array(
'guide' => "Руководство",
'guides' => "Руководство",
'myGuides' => "Мои руководства",
'editTitle' => "Редактировать руководство",
'newTitle' => "Написать новое руководство",
@@ -275,70 +273,74 @@ $lang = array(
)
),
'game' => array(
'achievement' => "достижение",
'achievements' => "Достижения",
'areatrigger' => "areatrigger",
'areatriggers' => "Areatrigger",
'class' => "класс",
'classes' => "Классы",
'currency' => "валюта",
'currencies' => "Валюта",
'difficulty' => "Сложность",
'dispelType' => "Тип рассеивания",
'duration' => "Длительность",
'emote' => "Эмоция",
'emotes' => "Эмоции",
'enchantment' => "улучшение",
'enchantments' => "Улучшения",
'flags' => "Метки",
// type strings
'npc' => "НИП",
'npcs' => "НИП",
'object' => "объект",
'objects' => "Объекты",
'glyphType' => "Тип символа",
'race' => "раса",
'races' => "Расы",
'title' => "звание",
'titles' => "Звания",
'eventShort' => "Игровое событие",
'event' => "Событие",
'events' => "Игровые события",
'faction' => "фракция",
'factions' => "Фракции",
'cooldown' => "Восстановление: %s",
'icon' => "иконка",
'icons' => "Иконки",
'item' => "предмет",
'items' => "Предметы",
'itemset' => "комплект",
'itemsets' => "Комплекты",
'quest' => "задание",
'quests' => "Задания",
'spell' => "заклинание",
'spells' => "Заклинания",
'zone' => "игровая зона",
'zones' => "Местности",
'faction' => "фракция",
'factions' => "Фракции",
'pet' => "Питомец",
'pets' => "Питомцы охотников",
'achievement' => "достижение",
'achievements' => "Достижения",
'title' => "звание",
'titles' => "Звания",
'event' => "Событие",
'events' => "Игровые события",
'class' => "класс",
'classes' => "Классы",
'race' => "раса",
'races' => "Расы",
'skill' => "Уровень навыка",
'skills' => "Умения",
'currency' => "валюта",
'currencies' => "Валюта",
'sound' => "Звук",
'sounds' => "Звуки",
'icon' => "иконка",
'icons' => "Иконки",
'profile' => "Профиль",
'profiles' => "Профили",
'guide' => "Руководство",
'guides' => "Руководство",
'emote' => "Эмоция",
'emotes' => "Эмоции",
'enchantment' => "улучшение",
'enchantments' => "Улучшения",
'areatrigger' => "areatrigger",
'areatriggers' => "Areatrigger",
'mail' => "mail",
'mails' => "Mails",
'cooldown' => "Восстановление: %s",
'difficulty' => "Сложность",
'dispelType' => "Тип рассеивания",
'duration' => "Длительность",
'eventShort' => "Игровое событие",
'flags' => "Метки",
'glyphType' => "Тип символа",
'level' => "Уровень",
'mechanic' => "Механика",
'mechAbbr' => "Механика",
'meetingStone' => "Камень встреч",
'npc' => "НИП",
'npcs' => "НИП",
'pet' => "Питомец",
'pets' => "Питомцы охотников",
'profile' => "",
'profiles' => "Профили",
'quest' => "задание",
'quests' => "Задания",
'requires' => "Требует %s",
'requires2' => "Требуется:",
'reqLevel' => "Требуется уровень: %s",
'reqSkillLevel' => "Требуется уровень навыка",
'level' => "Уровень",
'school' => "Школа",
'skill' => "Уровень навыка",
'skills' => "Умения",
'sound' => "Звук",
'sounds' => "Звуки",
'spell' => "заклинание",
'spells' => "Заклинания",
'type' => "Тип",
'valueDelim' => " - ",
'zone' => "игровая зона",
'zones' => "Местности",
'pvp' => "PvP",
'honorPoints' => "Очки Чести",

97
localization/locale_zhcn.php
View File

@@ -159,8 +159,6 @@ $lang = array(
)
),
'guide' => array(
'guide' => "指南",
'guides' => "指南",
'myGuides' => "我的指南",
'editTitle' => "编辑你的指南",
'newTitle' => "创建新指南",
@@ -275,70 +273,73 @@ $lang = array(
)
),
'game' => array(
'achievement' => "成就",
'achievements' => "成就",
'areatrigger' => "areatrigger",
'areatriggers' => "Areatrigger",
'class' => "职业",
'classes' => "职业",
'currency' => "货币",
'currencies' => "货币",
'difficulty' => "难度",
'dispelType' => "驱散类型",
'duration' => "持续时间",
'emote' => "表情",
'emotes' => "表情",
'enchantment' => "附魔",
'enchantments' => "附魔",
'flags' => "标记",
'npc' => "NPC",
'npcs' => "NPC",
'object' => "对象",
'objects' => "对象",
'glyphType' => "雕文类型",
'race' => "种族",
'races' => "种族",
'title' => "头衔",
'titles' => "头衔",
'eventShort' => "事件",
'event' => "世界事件",
'events' => "世界事件",
'faction' => "阵营",
'factions' => "阵营",
'cooldown' => "%s冷却时间",
'icon' => "图标",
'icons' => "图标",
'item' => "物品",
'items' => "物品",
'itemset' => "套装",
'itemsets' => "套装",
'quest' => "任务",
'quests' => "任务",
'spell' => "法术",
'spells' => "法术",
'zone' => "区域",
'zones' => "区域",
'faction' => "阵营",
'factions' => "阵营",
'pet' => "猎人宠物",
'pets' => "猎人宠物",
'achievement' => "成就",
'achievements' => "成就",
'title' => "头衔",
'titles' => "头衔",
'event' => "世界事件",
'events' => "世界事件",
'class' => "职业",
'classes' => "职业",
'race' => "种族",
'races' => "种族",
'skill' => "技能",
'skills' => "技能",
'currency' => "货币",
'currencies' => "货币",
'sound' => "声音",
'sounds' => "声音",
'icon' => "图标",
'icons' => "图标",
'profile' => "简介",
'profiles' => "简介",
'guide' => "指南",
'guides' => "指南",
'emote' => "表情",
'emotes' => "表情",
'enchantment' => "附魔",
'enchantments' => "附魔",
'areatrigger' => "areatrigger",
'areatriggers' => "Areatrigger",
'mail' => "mail",
'mails' => "Mails",
'cooldown' => "%s冷却时间",
'difficulty' => "难度",
'dispelType' => "驱散类型",
'duration' => "持续时间",
'eventShort' => "事件",
'flags' => "标记",
'glyphType' => "雕文类型",
'level' => "等级",
'mechanic' => "机制",
'mechAbbr' => "机制",
'meetingStone' => "集合石",
'npc' => "NPC",
'npcs' => "NPC",
'pet' => "猎人宠物",
'pets' => "猎人宠物",
'profile' => "简介",
'profiles' => "简介",
'quest' => "任务",
'quests' => "任务",
'requires' => "需要%s",
'requires2' => "需要",
'reqLevel' => "需要等级%s",
'reqSkillLevel' => "需要技能等级",
'level' => "等级",
'school' => "类型",
'skill' => "技能",
'skills' => "技能",
'sound' => "声音",
'sounds' => "声音",
'spell' => "法术",
'spells' => "法术",
'type' => "类型",
'valueDelim' => "到",
'zone' => "区域",
'zones' => "区域",
'pvp' => "PvP",
'honorPoints' => "荣誉点数",

12
pages/guide.php
View File

@@ -106,7 +106,7 @@ class GuidePage extends GenericPage
if (User::canWriteGuide())
{
if (!$this->initEdit())
$this->notFound(Lang::guide('guide'), Lang::guide('notFound'));
$this->notFound(Lang::game('guide'), Lang::guide('notFound'));
$this->show = self::SHOW_EDITOR;
}
@@ -128,7 +128,7 @@ class GuidePage extends GenericPage
$this->subject = new GuideList(array(['id', $this->typeId]));
if ($this->subject->error)
$this->notFound(Lang::guide('guide'), Lang::guide('notFound'));
$this->notFound(Lang::game('guide'), Lang::guide('notFound'));
if (!$this->subject->canBeViewed() && !$this->subject->userCanView())
header('Location: ?guides='.$this->subject->getField('category'), true, 302);
@@ -188,7 +188,7 @@ class GuidePage extends GenericPage
{
// can't check in init as subject is unknown
if ($this->subject->getField('status') == GUIDE_STATUS_ARCHIVED)
$this->notFound(Lang::guide('guide'), Lang::guide('notFound'));
$this->notFound(Lang::game('guide'), Lang::guide('notFound'));
$status = GUIDE_STATUS_NONE;
$rev = DB::Aowow()->selectCell('SELECT `rev` FROM ?_articles WHERE `type` = ?d AND `typeId` = ?d ORDER BY `rev` DESC LIMIT 1', Type::GUIDE, $this->typeId);
@@ -537,11 +537,11 @@ class GuidePage extends GenericPage
protected function generateTitle() : void
{
if ($this->show == self::SHOW_EDITOR)
array_unshift($this->title, Lang::guide('editTitle').Lang::main('colon').$this->subject->getField('title'), Lang::guide('guides'));
array_unshift($this->title, Lang::guide('editTitle').Lang::main('colon').$this->subject->getField('title'), Lang::game('guides'));
if ($this->show == self::SHOW_NEW)
array_unshift($this->title, Lang::guide('newTitle'), Lang::guide('guides'));
array_unshift($this->title, Lang::guide('newTitle'), Lang::game('guides'));
else
array_unshift($this->title, $this->subject->getField('title'), Lang::guide('guides'));
array_unshift($this->title, $this->subject->getField('title'), Lang::game('guides'));
}
protected function postCache() : void

4
pages/guides.php
View File

@@ -34,7 +34,7 @@ class GuidesPage extends GenericPage
$this->myGuides = true;
}
else
$this->name = Util::ucFirst(Lang::guide('guides'));
$this->name = Util::ucFirst(Lang::game('guides'));
}
protected function generateContent()
@@ -71,7 +71,7 @@ class GuidesPage extends GenericPage
$tabData = array(
'data' => $data,
'name' => Util::ucFirst(Lang::guide('guides')),
'name' => Util::ucFirst(Lang::game('guides')),
'hiddenCols' => $hCols,
'visibleCols' => $vCols,
'extraCols' => $xCols

18
prQueue
View File

@@ -28,11 +28,11 @@ $tCycle = microtime(true);
$error = function ($type, $realmGUID, $realmId)
{
$what = '';
if ($type == TYPE_PROFILE)
if ($type == Type::PROFILE)
$what = 'char';
if ($type == TYPE_GUILD)
if ($type == Type::GUILD)
$what = 'guild';
if ($type == TYPE_ARENA_TEAM)
if ($type == Type::ARENA_TEAM)
$what = 'arena team';
DB::Aowow()->query('UPDATE ?_profiler_sync SET status = ?d, errorCode = ?d WHERE realm = ?d AND realmGUID = ?d AND type = ?d', PR_QUEUE_STATUS_ERROR, PR_QUEUE_ERROR_CHAR, $realmId, $realmGUID, $type);
@@ -73,28 +73,28 @@ while (DB::Aowow()->selectCell('SELECT value FROM ?_config WHERE `key` = "profil
switch ($row['type'])
{
case TYPE_PROFILE:
case Type::PROFILE:
if (!Profiler::getCharFromRealm($row['realm'], $row['realmGUID']))
{
$error(TYPE_PROFILE, $row['realmGUID'], $row['realm']);
$error(Type::PROFILE, $row['realmGUID'], $row['realm']);
DB::Aowow()->query('DELETE FROM ?_profiler_profiles WHERE realm = ?d AND realmGUID = ?d', $row['realm'], $row['realmGUID']);
continue 2;
}
break;
case TYPE_GUILD:
case Type::GUILD:
if (!Profiler::getGuildFromRealm($row['realm'], $row['realmGUID']))
{
$error(TYPE_GUILD, $row['realmGUID'], $row['realm']);
$error(Type::GUILD, $row['realmGUID'], $row['realm']);
DB::Aowow()->query('DELETE FROM ?_profiler_guild WHERE realm = ?d AND realmGUID = ?d', $row['realm'], $row['realmGUID']);
continue 2;
}
break;
case TYPE_ARENA_TEAM:
case Type::ARENA_TEAM:
if (!Profiler::getArenaTeamFromRealm($row['realm'], $row['realmGUID']))
{
$error(TYPE_ARENA_TEAM, $row['realmGUID'], $row['realm']);
$error(Type::ARENA_TEAM, $row['realmGUID'], $row['realm']);
DB::Aowow()->query('DELETE FROM ?_profiler_arena_team WHERE realm = ?d AND realmGUID = ?d', $row['realm'], $row['realmGUID']);
continue 2;
}