From f2ec843f7e8c87400f315a407bb0b41d2c28b36a Mon Sep 17 00:00:00 2001 From: Sarjuuk Date: Sun, 5 Jul 2015 21:17:55 +0200 Subject: [PATCH] Lang rename /gameObjects?/ => /objects?/ so it can be localized via typeString --- localization/locale_dede.php | 4 ++-- localization/locale_enus.php | 4 ++-- localization/locale_eses.php | 4 ++-- localization/locale_frfr.php | 4 ++-- localization/locale_ruru.php | 4 ++-- pages/object.php | 4 ++-- pages/objects.php | 2 +- pages/spell.php | 2 +- static/js/locale_dede.js | 2 +- static/js/locale_enus.js | 2 +- static/js/locale_eses.js | 2 +- static/js/locale_frfr.js | 2 +- static/js/locale_ruru.js | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/localization/locale_dede.php b/localization/locale_dede.php index bffd2daf..bcf88373 100644 --- a/localization/locale_dede.php +++ b/localization/locale_dede.php @@ -179,8 +179,8 @@ $lang = array( 'difficulty' => "Modus", 'dispelType' => "Bannart", 'duration' => "Dauer", - 'gameObject' => "Objekt", - 'gameObjects' => "Objekte", + 'object' => "Objekt", + 'objects' => "Objekte", 'glyphType' => "Glyphenart", 'race' => "Volk", 'races' => "Völker", diff --git a/localization/locale_enus.php b/localization/locale_enus.php index 3408ce57..46388f03 100644 --- a/localization/locale_enus.php +++ b/localization/locale_enus.php @@ -174,8 +174,8 @@ $lang = array( 'difficulty' => "Difficulty", 'dispelType' => "Dispel type", 'duration' => "Duration", - 'gameObject' => "object", - 'gameObjects' => "Objects", + 'object' => "object", + 'objects' => "Objects", 'glyphType' => "Glyph type", 'race' => "race", 'races' => "Races", diff --git a/localization/locale_eses.php b/localization/locale_eses.php index 8885c034..653f58d3 100644 --- a/localization/locale_eses.php +++ b/localization/locale_eses.php @@ -179,8 +179,8 @@ $lang = array( 'difficulty' => "Dificultad", 'dispelType' => "Tipo de disipación", 'duration' => "Duración", - 'gameObject' => "entidad", - 'gameObjects' => "Entidades", + 'object' => "entidad", + 'objects' => "Entidades", 'glyphType' => "Tipo de glifo", 'race' => "raza", 'races' => "Razas", diff --git a/localization/locale_frfr.php b/localization/locale_frfr.php index bdc9ede7..975b917f 100644 --- a/localization/locale_frfr.php +++ b/localization/locale_frfr.php @@ -179,8 +179,8 @@ $lang = array( 'difficulty' => "Difficulté", 'dispelType' => "Type de dissipation", 'duration' => "Durée", - 'gameObject' => "entité", - 'gameObjects' => "Entités", + 'object' => "entité", + 'objects' => "Entités", 'glyphType' => "Type de glyphe", 'race' => "race", 'races' => "Races", diff --git a/localization/locale_ruru.php b/localization/locale_ruru.php index b5b03719..4e0e2d8a 100644 --- a/localization/locale_ruru.php +++ b/localization/locale_ruru.php @@ -179,8 +179,8 @@ $lang = array( 'difficulty' => "Сложность", 'dispelType' => "Тип рассеивания", 'duration' => "Длительность", - 'gameObject' => "объект", - 'gameObjects' => "Объекты", + 'object' => "объект", + 'objects' => "Объекты", 'glyphType' => "Тип символа", 'race' => "раса", 'races' => "Расы", diff --git a/pages/object.php b/pages/object.php index 0a1f324d..96d5ce2e 100644 --- a/pages/object.php +++ b/pages/object.php @@ -49,7 +49,7 @@ class ObjectPage extends GenericPage protected function generateTitle() { - array_unshift($this->title, $this->name, Util::ucFirst(Lang::game('gameObject'))); + array_unshift($this->title, $this->name, Util::ucFirst(Lang::game('object'))); } protected function generateContent() @@ -489,7 +489,7 @@ class ObjectPage extends GenericPage public function notFound() { if ($this->mode != CACHE_TYPE_TOOLTIP) - return parent::notFound(Lang::game('gameObject'), Lang::gameObject('notFound')); + return parent::notFound(Lang::game('object'), Lang::gameObject('notFound')); header('Content-type: application/x-javascript; charset=utf-8'); echo $this->generateTooltip(true); diff --git a/pages/objects.php b/pages/objects.php index 4a90c44e..10d9a7bc 100644 --- a/pages/objects.php +++ b/pages/objects.php @@ -25,7 +25,7 @@ class ObjectsPage extends GenericPage parent::__construct($pageCall, $pageParam); - $this->name = Util::ucFirst(Lang::game('gameObjects')); + $this->name = Util::ucFirst(Lang::game('objects')); $this->subCat = $pageParam ? '='.$pageParam : ''; } diff --git a/pages/spell.php b/pages/spell.php index 6f8ce548..07b2854b 100644 --- a/pages/spell.php +++ b/pages/spell.php @@ -1690,7 +1690,7 @@ class SpellPage extends GenericPage case 105: // Summon Object (slot 2) case 106: // Summon Object (slot 3) case 107: // Summon Object (slot 4) - $_ = Util::ucFirst(Lang::game('gameObject')).' #'.$effMV; + $_ = Util::ucFirst(Lang::game('object')).' #'.$effMV; if ($summon = $this->subject->getModelInfo($this->typeId, $i)) { $_ = $summon['typeId'] ? ' ('.$summon['displayName'].')' : ' (#0)'; diff --git a/static/js/locale_dede.js b/static/js/locale_dede.js index aa4e10ee..0b4065ad 100644 --- a/static/js/locale_dede.js +++ b/static/js/locale_dede.js @@ -2235,7 +2235,7 @@ var g_operators = { var g_world_object_types = { 3: 'Kreatur', 4: 'Spieler', - 5: 'Gameobject', + 5: 'Objekt', 7: 'Spielerleiche' }; diff --git a/static/js/locale_enus.js b/static/js/locale_enus.js index 14be7ad5..b2e5f697 100644 --- a/static/js/locale_enus.js +++ b/static/js/locale_enus.js @@ -2282,7 +2282,7 @@ var g_operators = { var g_world_object_types = { 3: 'Creature', 4: 'Player', - 5: 'Gameobject', + 5: 'Object', 7: 'Player Corpse' }; diff --git a/static/js/locale_eses.js b/static/js/locale_eses.js index 5ddd19b2..338c63e2 100644 --- a/static/js/locale_eses.js +++ b/static/js/locale_eses.js @@ -2238,7 +2238,7 @@ var g_operators = { var g_world_object_types = { 3: 'Creature', 4: 'Player', - 5: 'Gameobject', + 5: 'Entidad', 7: 'Player Corpse' }; diff --git a/static/js/locale_frfr.js b/static/js/locale_frfr.js index 738f351b..43533018 100644 --- a/static/js/locale_frfr.js +++ b/static/js/locale_frfr.js @@ -2225,7 +2225,7 @@ var g_operators = { var g_world_object_types = { 3: 'Creature', 4: 'Player', - 5: 'Gameobject', + 5: 'Entité', 7: 'Player Corpse' }; diff --git a/static/js/locale_ruru.js b/static/js/locale_ruru.js index c174fec5..83a5613a 100644 --- a/static/js/locale_ruru.js +++ b/static/js/locale_ruru.js @@ -2225,7 +2225,7 @@ var g_operators = { var g_world_object_types = { 3: 'Creature', 4: 'Player', - 5: 'Gameobject', + 5: 'Объект', 7: 'Player Corpse' };