diff --git a/includes/types/guild.class.php b/includes/types/guild.class.php index c6136261..06629210 100644 --- a/includes/types/guild.class.php +++ b/includes/types/guild.class.php @@ -16,14 +16,14 @@ class GuildList extends BaseType foreach ($this->iterate() as $__) { $data[$this->id] = array( - 'name' => "$'".$this->curTpl['name']."'", // MUST be a string + 'name' => '$"'.str_replace ('"', '', $this->curTpl['name']).'"', // MUST be a string, omit any quotes in name 'members' => $this->curTpl['members'], 'faction' => $this->curTpl['faction'], 'achievementpoints' => $this->getField('achievementpoints'), 'gearscore' => $this->getField('gearscore'), 'realm' => Profiler::urlize($this->curTpl['realmName']), 'realmname' => $this->curTpl['realmName'], - // 'battlegroup' => Profiler::urlize($this->curTpl['battlegroup']), // was renamed to subregion somewhere around cata release + // 'battlegroup' => Profiler::urlize($this->curTpl['battlegroup']), // was renamed to subregion somewhere around cata release // 'battlegroupname' => $this->curTpl['battlegroup'], 'region' => Profiler::urlize($this->curTpl['region']) ); diff --git a/includes/types/profile.class.php b/includes/types/profile.class.php index 02561231..c72bd575 100644 --- a/includes/types/profile.class.php +++ b/includes/types/profile.class.php @@ -33,18 +33,17 @@ class ProfileList extends BaseType 'talenttree1' => $this->getField('talenttree1'), 'talenttree2' => $this->getField('talenttree2'), 'talenttree3' => $this->getField('talenttree3'), - 'talentspec' => $this->getField('activespec') + 1, // 0 => 1; 1 => 2 + 'talentspec' => $this->getField('activespec') + 1, // 0 => 1; 1 => 2 'achievementpoints' => $this->getField('achievementpoints'), - 'guild' => '$"'.$this->getField('guildname').'"', // force this to be a string + 'guild' => '$"'.str_replace ('"', '', $this->curTpl['name']).'"', // force this to be a string 'guildrank' => $this->getField('guildrank'), 'realm' => Profiler::urlize($this->getField('realmName')), 'realmname' => $this->getField('realmName'), - // 'battlegroup' => Profiler::urlize($this->getField('battlegroup')), // was renamed to subregion somewhere around cata release + // 'battlegroup' => Profiler::urlize($this->getField('battlegroup')), // was renamed to subregion somewhere around cata release // 'battlegroupname' => $this->getField('battlegroup'), 'gearscore' => $this->getField('gearscore') ); - // for the lv this determins if the link is profile= or profile=.. if ($this->isCustom()) $data[$this->id]['published'] = (int)!!($this->getField('cuFlags') & PROFILER_CU_PUBLISHED); @@ -92,7 +91,7 @@ class ProfileList extends BaseType $title = (new TitleList(array(['bitIdx', $_])))->getField($this->getField('gender') ? 'female' : 'male', true); if ($this->isCustom()) - $name .= ' (Custom Profile)'; + $name .= Lang::profiler('customProfile'); else if ($title) $name = sprintf($title, $name); diff --git a/localization/locale_dede.php b/localization/locale_dede.php index 9c4ab46f..fe03789c 100644 --- a/localization/locale_dede.php +++ b/localization/locale_dede.php @@ -156,7 +156,7 @@ $lang = array( '_cpFooter' => "Falls Ihr eine genauere Suche möchtet, probiert unsere erweiterten Suchoptionen. Ihr könnt außerdem ein neues individuelles Profil erstellen.", 'firstUseTitle' => "%s von %s", 'complexFilter' => "Komplexer Filter ausgewählt! Suchergebnisse sind auf gecachte Charaktere beschränkt.", - + 'customProfile' => " (Benutzerprofil)", 'resync' => "Resynchronisieren", 'guildRoster' => "Gildenliste für <%s>", 'arenaRoster' => "Arena-Teamliste für <%s>", diff --git a/localization/locale_enus.php b/localization/locale_enus.php index e12e9978..4a82d882 100644 --- a/localization/locale_enus.php +++ b/localization/locale_enus.php @@ -156,7 +156,7 @@ $lang = array( '_cpFooter' => "If you want a more refined search try out our advanced search options. You can also create a new custom profile.", 'firstUseTitle' => "%s of %s", 'complexFilter' => "Complex filter selected! Search results are limited to cached Characters.", - + 'customProfile' => " (Custom Profile)", 'resync' => "Resync", 'guildRoster' => "Guild Roster for <%s>", 'arenaRoster' => "Arena Team Roster for <%s>", diff --git a/localization/locale_eses.php b/localization/locale_eses.php index 774e6704..657dd3b1 100644 --- a/localization/locale_eses.php +++ b/localization/locale_eses.php @@ -156,7 +156,7 @@ $lang = array( '_cpFooter' => "Si quieres una búsqueda más refinada, prueba con nuestras opciones de búsqueda avanzada. También puedes crear un perfil nuevo personalizado.", 'firstUseTitle' => "%s de %s", 'complexFilter' => "[Complex filter selected! Search results are limited to cached Characters.]", - + 'customProfile' => " ([Custom Profile])", 'resync' => "Resincronizar", 'guildRoster' => "Lista de miembros de hermandad para <%s>", 'arenaRoster' => "Personajes del Equipo de Arena para <%s>", diff --git a/localization/locale_frfr.php b/localization/locale_frfr.php index f0cf9920..52fd58b0 100644 --- a/localization/locale_frfr.php +++ b/localization/locale_frfr.php @@ -156,7 +156,7 @@ $lang = array( '_cpFooter' => "Si vous voulez une recherche plus raffinée, essayez nos options de recherche avancée. Vous pouvez aussi créer un nouveau profile personnalisé.", 'firstUseTitle' => "%s de %s", 'complexFilter' => "[Complex filter selected! Search results are limited to cached Characters.]", - + 'customProfile' => " ([Custom Profile])", 'resync' => "Resynchronisation", 'guildRoster' => "Liste des membres pour la guilde de <%s>", 'arenaRoster' => "[Arena Team Roster for <%s>]", // string probably lost diff --git a/localization/locale_ruru.php b/localization/locale_ruru.php index 72003066..96a225b6 100644 --- a/localization/locale_ruru.php +++ b/localization/locale_ruru.php @@ -156,7 +156,7 @@ $lang = array( '_cpFooter' => "Если вам нужен более точный поиск, вы можете использовать дополнительные опции. Также, вы можете создать новый собственный профиль.", 'firstUseTitle' => "%s", // yes, thats correct. No nonsense, just the name 'complexFilter' => "[Complex filter selected! Search results are limited to cached Characters.]", - + 'customProfile' => " ([Custom Profile])", 'resync' => "Ресинхронизация", 'guildRoster' => "Список членов гильдии <%s>", 'arenaRoster' => "[Arena Team Roster for <%s>]", // string probably lost diff --git a/pages/profile.php b/pages/profile.php index 1c1c1d2e..3b349981 100644 --- a/pages/profile.php +++ b/pages/profile.php @@ -164,13 +164,12 @@ class ProfilePage extends GenericPage $ra = $this->subject->getField('race'); $cl = $this->subject->getField('class'); $gender = $this->subject->getField('gender'); - // $desc = $this->subject->getField('description'); $title = ''; if ($_ = $this->subject->getField('chosenTitle')) $title = (new TitleList(array(['bitIdx', $_])))->getField($gender ? 'female' : 'male', true); if ($this->isCustom) - $name .= ' (Custom Profile)'; + $name .= Lang::profiler('customProfile'); else if ($title) $name = sprintf($title, $name);