Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{include file='header' pageTitle='wcf.acp.user.option.category.'|concat:$action}
{include file='header' pageTitle='wcf.category.'|concat:$action}

<header class="contentHeader">
<div class="contentHeaderTitle">
<h1 class="contentTitle">{lang}wcf.acp.user.option.category.{$action}{/lang}</h1>
<h1 class="contentTitle">{lang}wcf.category.{$action}{/lang}</h1>
</div>

<nav class="contentHeaderNavigation">
<ul>
<li><a href="{link controller='UserOptionCategoryList'}{/link}" class="button">{icon name='list'} <span>{lang}wcf.acp.menu.link.user.option.category.list{/lang}</span></a></li>
<li><a href="{link controller='UserOptionCategoryList'}{/link}" class="button">{icon name='list'} <span>{lang}wcf.category.list{/lang}</span></a></li>

{event name='contentHeaderNavigation'}
</ul>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{include file='header' pageTitle='wcf.acp.user.option.category.list'}
{include file='header' pageTitle='wcf.category.list'}

<header class="contentHeader">
<div class="contentHeaderTitle">
<h1 class="contentTitle">{lang}wcf.acp.user.option.category.list{/lang}{if $items} <span class="badge badgeInverse">{#$items}</span>{/if}</h1>
<h1 class="contentTitle">{lang}wcf.category.list{/lang}{if $items} <span class="badge badgeInverse">{#$items}</span>{/if}</h1>
</div>

<nav class="contentHeaderNavigation">
<ul>
<li><a href="{link controller='UserOptionCategoryAdd'}{/link}" class="button">{icon name='plus'} <span>{lang}wcf.acp.user.option.category.add{/lang}</span></a></li>
<li><a href="{link controller='UserOptionCategoryAdd'}{/link}" class="button">{icon name='plus'} <span>{lang}wcf.category.add{/lang}</span></a></li>

{event name='contentHeaderNavigation'}
</ul>
Expand Down Expand Up @@ -71,7 +71,7 @@

<nav class="contentFooterNavigation">
<ul>
<li><a href="{link controller='UserOptionCategoryAdd'}{/link}" class="button">{icon name='plus'} <span>{lang}wcf.acp.user.option.category.add{/lang}</span></a></li>
<li><a href="{link controller='UserOptionCategoryAdd'}{/link}" class="button">{icon name='plus'} <span>{lang}wcf.category.add{/lang}</span></a></li>

{event name='contentFooterNavigation'}
</ul>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class SmileyCategoryAddForm extends CategoryAddFormBuilderForm
/**
* @inheritDoc
*/
public string $pageTitle = 'wcf.acp.smiley.category.add';
public string $pageTitle = 'wcf.category.add';

/**
* @inheritDoc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class SmileyCategoryEditForm extends SmileyCategoryAddForm
/**
* @inheritDoc
*/
public string $pageTitle = 'wcf.acp.smiley.category.edit';
public string $pageTitle = 'wcf.category.edit';

/**
* @inheritDoc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ class SmileyCategoryListPage extends AbstractCategoryListPage
*/
public $objectTypeName = 'com.woltlab.wcf.bbcode.smiley';

/**
* @inheritDoc
*/
public $pageTitle = 'wcf.acp.smiley.category.list';

/**
* @inheritDoc
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -448,11 +448,13 @@ private function addUserOptionItems(ItemCollecting $event): void
));
$event->register(new AcpMenuItem(
'wcf.acp.menu.link.user.option.category.list',
title: WCF::getLanguage()->get('wcf.category.list'),
parentMenuItem: 'wcf.acp.menu.link.user.option',
link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\UserOptionCategoryListPage::class),
));
$event->register(new AcpMenuItem(
'wcf.acp.menu.link.user.option.category.add',
title: WCF::getLanguage()->get('wcf.category.add'),
parentMenuItem: 'wcf.acp.menu.link.user.option.category.list',
link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\UserOptionCategoryAddForm::class),
icon: FontAwesomeIcon::fromValues('plus')
Expand Down Expand Up @@ -540,11 +542,13 @@ private function addTrophyItems(ItemCollecting $event): void
));
$event->register(new AcpMenuItem(
'wcf.acp.menu.link.trophy.category.list',
title: WCF::getLanguage()->get('wcf.category.list'),
parentMenuItem: 'wcf.acp.menu.link.trophy',
link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\TrophyCategoryListPage::class),
));
$event->register(new AcpMenuItem(
'wcf.acp.menu.link.trophy.category.add',
title: WCF::getLanguage()->get('wcf.category.add'),
parentMenuItem: 'wcf.acp.menu.link.trophy.category.list',
link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\TrophyCategoryAddForm::class),
icon: FontAwesomeIcon::fromValues('plus')
Expand Down Expand Up @@ -641,11 +645,13 @@ private function addMediaItems(ItemCollecting $event): void
));
$event->register(new AcpMenuItem(
'wcf.acp.menu.link.media.category.list',
title: WCF::getLanguage()->get('wcf.category.list'),
parentMenuItem: 'wcf.acp.menu.link.media',
link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\MediaCategoryListPage::class),
));
$event->register(new AcpMenuItem(
'wcf.acp.menu.link.media.category.add',
title: WCF::getLanguage()->get('wcf.category.add'),
parentMenuItem: 'wcf.acp.menu.link.media.category.list',
link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\MediaCategoryAddForm::class),
icon: FontAwesomeIcon::fromValues('plus')
Expand Down Expand Up @@ -684,11 +690,13 @@ private function addArticleItems(ItemCollecting $event): void
if (WCF::getSession()->getPermission('admin.content.article.canManageCategory')) {
$event->register(new AcpMenuItem(
'wcf.acp.menu.link.article.category.list',
title: WCF::getLanguage()->get('wcf.category.list'),
parentMenuItem: 'wcf.acp.menu.link.article',
link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\ArticleCategoryListPage::class),
));
$event->register(new AcpMenuItem(
'wcf.acp.menu.link.article.category.add',
title: WCF::getLanguage()->get('wcf.category.add'),
parentMenuItem: 'wcf.acp.menu.link.article.category.list',
link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\ArticleCategoryAddForm::class),
icon: FontAwesomeIcon::fromValues('plus')
Expand Down Expand Up @@ -944,11 +952,13 @@ private function addSmileyItems(ItemCollecting $event): void
));
$event->register(new AcpMenuItem(
'wcf.acp.menu.link.smiley.category.list',
title: WCF::getLanguage()->get('wcf.category.list'),
parentMenuItem: 'wcf.acp.menu.link.smiley',
link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\SmileyCategoryListPage::class),
));
$event->register(new AcpMenuItem(
'wcf.acp.menu.link.smiley.category.add',
title: WCF::getLanguage()->get('wcf.category.add'),
parentMenuItem: 'wcf.acp.menu.link.smiley.category.list',
link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\SmileyCategoryAddForm::class),
icon: FontAwesomeIcon::fromValues('plus')
Expand Down
32 changes: 16 additions & 16 deletions wcfsetup/install/lang/de.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1143,8 +1143,6 @@ Sie erreichen das Fehlerprotokoll unter: {link controller='ExceptionLogView' isE
<item name="wcf.acp.menu.link.user.option"><![CDATA[Profilfelder]]></item>
<item name="wcf.acp.menu.link.user.option.list"><![CDATA[Profilfelder]]></item>
<item name="wcf.acp.menu.link.user.option.add"><![CDATA[Profilfeld hinzufügen]]></item>
<item name="wcf.acp.menu.link.user.option.category.list"><![CDATA[Profilfeld-Kategorien]]></item>
<item name="wcf.acp.menu.link.user.option.category.add"><![CDATA[Profilfeld-Kategorie hinzufügen]]></item>
<item name="wcf.acp.menu.link.userOptionDefaults"><![CDATA[Benutzerprofil-Einstellungen]]></item>
<item name="wcf.acp.menu.link.user.profileMenu"><![CDATA[Benutzerprofil-Menü]]></item>
<item name="wcf.acp.menu.link.template"><![CDATA[Templates]]></item>
Expand All @@ -1162,8 +1160,6 @@ Sie erreichen das Fehlerprotokoll unter: {link controller='ExceptionLogView' isE
<item name="wcf.acp.menu.link.smiley"><![CDATA[Smileys]]></item>
<item name="wcf.acp.menu.link.smiley.add"><![CDATA[Smiley hinzufügen]]></item>
<item name="wcf.acp.menu.link.smiley.list"><![CDATA[Smileys]]></item>
<item name="wcf.acp.menu.link.smiley.category.add"><![CDATA[Smiley-Kategorie hinzufügen]]></item>
<item name="wcf.acp.menu.link.smiley.category.list"><![CDATA[Smiley-Kategorien]]></item>
<item name="wcf.acp.menu.link.activityPoint"><![CDATA[Aktivitätspunkte]]></item>
<item name="wcf.acp.menu.link.user.rank"><![CDATA[Benutzerränge]]></item>
<item name="wcf.acp.menu.link.user.rank.list"><![CDATA[Benutzerränge]]></item>
Expand Down Expand Up @@ -1207,13 +1203,9 @@ Sie erreichen das Fehlerprotokoll unter: {link controller='ExceptionLogView' isE
<item name="wcf.acp.menu.link.cms.box.add"><![CDATA[Box hinzufügen]]></item>
<item name="wcf.acp.menu.link.media"><![CDATA[Medien]]></item>
<item name="wcf.acp.menu.link.media.list"><![CDATA[Medien]]></item>
<item name="wcf.acp.menu.link.media.category.list"><![CDATA[Kategorien]]></item>
<item name="wcf.acp.menu.link.media.category.add"><![CDATA[Kategorie hinzufügen]]></item>
<item name="wcf.acp.menu.link.article"><![CDATA[Artikel]]></item>
<item name="wcf.acp.menu.link.article.list"><![CDATA[Artikel]]></item>
<item name="wcf.acp.menu.link.article.add"><![CDATA[Artikel hinzufügen]]></item>
<item name="wcf.acp.menu.link.article.category.list"><![CDATA[Kategorien]]></item>
<item name="wcf.acp.menu.link.article.category.add"><![CDATA[Kategorie hinzufügen]]></item>
<item name="wcf.acp.menu.link.maintenance.sitemap"><![CDATA[Sitemaps]]></item>
<item name="wcf.acp.menu.add"><![CDATA[Menü hinzufügen]]></item>
<item name="wcf.acp.menu.edit"><![CDATA[Menü bearbeiten]]></item>
Expand All @@ -1235,8 +1227,6 @@ Sie erreichen das Fehlerprotokoll unter: {link controller='ExceptionLogView' isE
<item name="wcf.acp.menu.link.contact.options"><![CDATA[Eingabefelder]]></item>
<item name="wcf.acp.menu.link.contact.recipients"><![CDATA[Empfänger]]></item>
<item name="wcf.acp.menu.link.trophy"><![CDATA[Trophäen]]></item>
<item name="wcf.acp.menu.link.trophy.category.list"><![CDATA[Kategorien]]></item>
<item name="wcf.acp.menu.link.trophy.category.add"><![CDATA[Kategorie hinzufügen]]></item>
<item name="wcf.acp.menu.link.trophy.list"><![CDATA[Trophäen]]></item>
<item name="wcf.acp.menu.link.trophy.add"><![CDATA[Trophäe hinzufügen]]></item>
<item name="wcf.acp.menu.link.trophy.edit"><![CDATA[Trophäe bearbeiten]]></item>
Expand Down Expand Up @@ -2883,9 +2873,6 @@ Abschnitte dürfen nicht leer sein und nur folgende Zeichen enthalten: <kbd>[a-z
<item name="wcf.acp.smiley.add"><![CDATA[Smiley hinzufügen]]></item>
<item name="wcf.acp.smiley.edit"><![CDATA[Smiley bearbeiten]]></item>
<item name="wcf.acp.smiley.title"><![CDATA[Titel]]></item>
<item name="wcf.acp.smiley.category.add"><![CDATA[Smiley-Kategorie hinzufügen]]></item>
<item name="wcf.acp.smiley.category.edit"><![CDATA[Smiley-Kategorie bearbeiten]]></item>
<item name="wcf.acp.smiley.category.list"><![CDATA[Smiley-Kategorien]]></item>
<item name="wcf.acp.smiley.categoryID.default"><![CDATA[Standard-Kategorie]]></item>
<item name="wcf.acp.smiley.categoryID.error.invalid"><![CDATA[Die gewählte Kategorie ist ungültig.]]></item>
<item name="wcf.acp.smiley.smileyCode"><![CDATA[Primärer Smiley-Code]]></item>
Expand Down Expand Up @@ -3150,10 +3137,7 @@ Abschnitte dürfen nicht leer sein und nur folgende Zeichen enthalten: <kbd>[a-z
<item name="wcf.acp.user.quickSearch.newest"><![CDATA[Neueste Benutzer]]></item>
<item name="wcf.acp.user.option.access"><![CDATA[Zugriff]]></item>
<item name="wcf.acp.user.option.add"><![CDATA[Benutzerprofilfeld hinzufügen]]></item>
<item name="wcf.acp.user.option.category.add"><![CDATA[Benutzerprofilfeld-Kategorie hinzufügen]]></item>
<item name="wcf.acp.user.option.category.edit"><![CDATA[Benutzerprofilfeld-Kategorie bearbeiten]]></item>
<item name="wcf.acp.user.option.category.options"><![CDATA[Felder]]></item>
<item name="wcf.acp.user.option.category.list"><![CDATA[Benutzerprofilfeld-Kategorien]]></item>
<item name="wcf.acp.user.option.defaultValue"><![CDATA[Standardwert]]></item>
<item name="wcf.acp.user.option.defaultValue.description"><![CDATA[Wert, der beim erstmaligen Ausfüllen als Standard vorgegeben ist.]]></item>
<item name="wcf.acp.user.option.description"><![CDATA[Beschreibung]]></item>
Expand Down Expand Up @@ -5714,5 +5698,21 @@ Erlaubte Dateiendungen: {', '|implode:$allowedFileExtensions}]]></item>
<item name="wcf.user.option.skype"/>
<item name="wcf.user.profileHits"/>
<item name="wcf.user.profileHits.hitsPerDay"/>
<item name="wcf.acp.menu.link.smiley.category.list"/>
<item name="wcf.acp.smiley.category.list"/>
<item name="wcf.acp.menu.link.smiley.category.add"/>
<item name="wcf.acp.smiley.category.add"/>
<item name="wcf.acp.smiley.category.edit"/>
<item name="wcf.acp.menu.link.user.option.category.list"/>
<item name="wcf.acp.user.option.category.list"/>
<item name="wcf.acp.user.option.category.add"/>
<item name="wcf.acp.user.option.category.edit"/>
<item name="wcf.acp.menu.link.user.option.category.add"/>
<item name="wcf.acp.menu.link.media.category.list"/>
<item name="wcf.acp.menu.link.article.category.list"/>
<item name="wcf.acp.menu.link.trophy.category.list"/>
<item name="wcf.acp.menu.link.media.category.add"/>
<item name="wcf.acp.menu.link.article.category.add"/>
<item name="wcf.acp.menu.link.trophy.category.add"/>
</delete>
</language>
32 changes: 16 additions & 16 deletions wcfsetup/install/lang/en.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1119,8 +1119,6 @@ You can access the error log at: {link controller='ExceptionLogView' isEmail=tru
<item name="wcf.acp.menu.link.user.option"><![CDATA[Custom User Fields]]></item>
<item name="wcf.acp.menu.link.user.option.list"><![CDATA[Custom User Fields]]></item>
<item name="wcf.acp.menu.link.user.option.add"><![CDATA[Add Custom User Field]]></item>
<item name="wcf.acp.menu.link.user.option.category.list"><![CDATA[Field Categories]]></item>
<item name="wcf.acp.menu.link.user.option.category.add"><![CDATA[Add Field Category]]></item>
<item name="wcf.acp.menu.link.userOptionDefaults"><![CDATA[User Field Settings]]></item>
<item name="wcf.acp.menu.link.user.profileMenu"><![CDATA[User Profile Menu]]></item>
<item name="wcf.acp.menu.link.template"><![CDATA[Templates]]></item>
Expand All @@ -1138,8 +1136,6 @@ You can access the error log at: {link controller='ExceptionLogView' isEmail=tru
<item name="wcf.acp.menu.link.smiley"><![CDATA[Smilies]]></item>
<item name="wcf.acp.menu.link.smiley.add"><![CDATA[Add Smiley]]></item>
<item name="wcf.acp.menu.link.smiley.list"><![CDATA[Smilies]]></item>
<item name="wcf.acp.menu.link.smiley.category.add"><![CDATA[Add Smiley Category]]></item>
<item name="wcf.acp.menu.link.smiley.category.list"><![CDATA[Smiley Categories]]></item>
<item name="wcf.acp.menu.link.activityPoint"><![CDATA[Activity Points]]></item>
<item name="wcf.acp.menu.link.user.rank"><![CDATA[User Ranks]]></item>
<item name="wcf.acp.menu.link.user.rank.list"><![CDATA[User Ranks]]></item>
Expand Down Expand Up @@ -1183,13 +1179,9 @@ You can access the error log at: {link controller='ExceptionLogView' isEmail=tru
<item name="wcf.acp.menu.link.cms.box.add"><![CDATA[Add Box]]></item>
<item name="wcf.acp.menu.link.media"><![CDATA[Media]]></item>
<item name="wcf.acp.menu.link.media.list"><![CDATA[Media]]></item>
<item name="wcf.acp.menu.link.media.category.list"><![CDATA[Categories]]></item>
<item name="wcf.acp.menu.link.media.category.add"><![CDATA[Add Category]]></item>
<item name="wcf.acp.menu.link.article"><![CDATA[Articles]]></item>
<item name="wcf.acp.menu.link.article.list"><![CDATA[Articles]]></item>
<item name="wcf.acp.menu.link.article.add"><![CDATA[Add Article]]></item>
<item name="wcf.acp.menu.link.article.category.list"><![CDATA[Categories]]></item>
<item name="wcf.acp.menu.link.article.category.add"><![CDATA[Add Category]]></item>
<item name="wcf.acp.menu.link.maintenance.sitemap"><![CDATA[Sitemaps]]></item>
<item name="wcf.acp.menu.add"><![CDATA[Add Menu]]></item>
<item name="wcf.acp.menu.edit"><![CDATA[Edit Menu]]></item>
Expand All @@ -1211,8 +1203,6 @@ You can access the error log at: {link controller='ExceptionLogView' isEmail=tru
<item name="wcf.acp.menu.link.contact.options"><![CDATA[Option Fields]]></item>
<item name="wcf.acp.menu.link.contact.recipients"><![CDATA[Recipient]]></item>
<item name="wcf.acp.menu.link.trophy"><![CDATA[Trophies]]></item>
<item name="wcf.acp.menu.link.trophy.category.list"><![CDATA[Categories]]></item>
<item name="wcf.acp.menu.link.trophy.category.add"><![CDATA[Add Category]]></item>
<item name="wcf.acp.menu.link.trophy.list"><![CDATA[Trophies]]></item>
<item name="wcf.acp.menu.link.trophy.add"><![CDATA[Add Trophy]]></item>
<item name="wcf.acp.menu.link.trophy.edit"><![CDATA[Edit Trophy]]></item>
Expand Down Expand Up @@ -2810,9 +2800,6 @@ If you have <strong>already bought the licenses for the listed apps</strong>, th
<item name="wcf.acp.smiley.add"><![CDATA[Add Smiley]]></item>
<item name="wcf.acp.smiley.edit"><![CDATA[Edit Smiley]]></item>
<item name="wcf.acp.smiley.title"><![CDATA[Title]]></item>
<item name="wcf.acp.smiley.category.add"><![CDATA[Add Smiley Category]]></item>
<item name="wcf.acp.smiley.category.edit"><![CDATA[Edit Smiley Category]]></item>
<item name="wcf.acp.smiley.category.list"><![CDATA[Smiley Categories]]></item>
<item name="wcf.acp.smiley.categoryID.default"><![CDATA[Default Category]]></item>
<item name="wcf.acp.smiley.categoryID.error.invalid"><![CDATA[The selected category is invalid.]]></item>
<item name="wcf.acp.smiley.smileyCode"><![CDATA[Primary Smiley Code]]></item>
Expand Down Expand Up @@ -3077,10 +3064,7 @@ If you have <strong>already bought the licenses for the listed apps</strong>, th
<item name="wcf.acp.user.quickSearch.newest"><![CDATA[Newest users]]></item>
<item name="wcf.acp.user.option.access"><![CDATA[Access]]></item>
<item name="wcf.acp.user.option.add"><![CDATA[Add Custom User Field]]></item>
<item name="wcf.acp.user.option.category.add"><![CDATA[Add Custom User Field Category]]></item>
<item name="wcf.acp.user.option.category.edit"><![CDATA[Edit Custom User Field Category]]></item>
<item name="wcf.acp.user.option.category.options"><![CDATA[Fields]]></item>
<item name="wcf.acp.user.option.category.list"><![CDATA[Custom User Field Categories]]></item>
<item name="wcf.acp.user.option.defaultValue"><![CDATA[Default Value]]></item>
<item name="wcf.acp.user.option.defaultValue.description"><![CDATA[Default option value suggested on first edit.]]></item>
<item name="wcf.acp.user.option.description"><![CDATA[Description]]></item>
Expand Down Expand Up @@ -5716,5 +5700,21 @@ Allowed extensions: {', '|implode:$allowedFileExtensions}]]></item>
<item name="wcf.user.option.skype"/>
<item name="wcf.user.profileHits"/>
<item name="wcf.user.profileHits.hitsPerDay"/>
<item name="wcf.acp.menu.link.smiley.category.list"/>
<item name="wcf.acp.smiley.category.list"/>
<item name="wcf.acp.menu.link.smiley.category.add"/>
<item name="wcf.acp.smiley.category.add"/>
<item name="wcf.acp.smiley.category.edit"/>
<item name="wcf.acp.menu.link.user.option.category.list"/>
<item name="wcf.acp.user.option.category.list"/>
<item name="wcf.acp.user.option.category.add"/>
<item name="wcf.acp.user.option.category.edit"/>
<item name="wcf.acp.menu.link.user.option.category.add"/>
<item name="wcf.acp.menu.link.media.category.list"/>
<item name="wcf.acp.menu.link.article.category.list"/>
<item name="wcf.acp.menu.link.trophy.category.list"/>
<item name="wcf.acp.menu.link.media.category.add"/>
<item name="wcf.acp.menu.link.article.category.add"/>
<item name="wcf.acp.menu.link.trophy.category.add"/>
</delete>
</language>