Consistently use `getTitle()` in templates and language items
authorMatthias Schmidt <gravatronics@live.com>
Sat, 13 Jul 2019 15:25:29 +0000 (17:25 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 13 Jul 2019 15:25:29 +0000 (17:25 +0200)
See #2976

64 files changed:
com.woltlab.wcf/templates/__labelFormField.tpl
com.woltlab.wcf/templates/__menu.tpl
com.woltlab.wcf/templates/ampFooter.tpl
com.woltlab.wcf/templates/article.tpl
com.woltlab.wcf/templates/articleAdd.tpl
com.woltlab.wcf/templates/articleList.tpl
com.woltlab.wcf/templates/articleListItems.tpl
com.woltlab.wcf/templates/boxPaidSubscriptions.tpl
com.woltlab.wcf/templates/boxPaidSubscriptionsSidebar.tpl
com.woltlab.wcf/templates/captchaQuestion.tpl
com.woltlab.wcf/templates/categoryArticleList.tpl
com.woltlab.wcf/templates/customOptionFieldList.tpl
com.woltlab.wcf/templates/messageFormSmilies.tpl
com.woltlab.wcf/templates/pageHeaderUser.tpl
com.woltlab.wcf/templates/pageMenuMobile.tpl
com.woltlab.wcf/templates/paidSubscriptionList.tpl
com.woltlab.wcf/templates/team.tpl
com.woltlab.wcf/templates/unreadArticleList.tpl
com.woltlab.wcf/templates/userMenuSidebar.tpl
com.woltlab.wcf/templates/watchedArticleList.tpl
com.woltlab.wcf/templates/wysiwygToolbar.tpl
wcfsetup/install/files/acp/templates/__labelFormField.tpl
wcfsetup/install/files/acp/templates/__messageFormSmilies.tpl
wcfsetup/install/files/acp/templates/articleAdd.tpl
wcfsetup/install/files/acp/templates/articleList.tpl
wcfsetup/install/files/acp/templates/captchaQuestion.tpl
wcfsetup/install/files/acp/templates/captchaQuestionList.tpl
wcfsetup/install/files/acp/templates/contactSettings.tpl
wcfsetup/install/files/acp/templates/cronjobList.tpl
wcfsetup/install/files/acp/templates/labelList.tpl
wcfsetup/install/files/acp/templates/languageExport.tpl
wcfsetup/install/files/acp/templates/menuItemAdd.tpl
wcfsetup/install/files/acp/templates/menuItemList.tpl
wcfsetup/install/files/acp/templates/menuList.tpl
wcfsetup/install/files/acp/templates/messageFormSmilies.tpl
wcfsetup/install/files/acp/templates/package.tpl
wcfsetup/install/files/acp/templates/packageList.tpl
wcfsetup/install/files/acp/templates/pageAdd.tpl
wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl
wcfsetup/install/files/acp/templates/paidSubscriptionList.tpl
wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLog.tpl
wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLogList.tpl
wcfsetup/install/files/acp/templates/paidSubscriptionUserAdd.tpl
wcfsetup/install/files/acp/templates/paidSubscriptionUserList.tpl
wcfsetup/install/files/acp/templates/smileyList.tpl
wcfsetup/install/files/acp/templates/userGroupList.tpl
wcfsetup/install/files/acp/templates/userGroupOption.tpl
wcfsetup/install/files/acp/templates/userRankAdd.tpl
wcfsetup/install/files/acp/templates/userRankList.tpl
wcfsetup/install/files/acp/templates/wysiwygToolbar.tpl
wcfsetup/install/files/lib/data/bbcode/BBCode.class.php
wcfsetup/install/files/lib/data/captcha/question/CaptchaQuestion.class.php
wcfsetup/install/files/lib/data/cronjob/Cronjob.class.php
wcfsetup/install/files/lib/data/custom/option/CustomOption.class.php
wcfsetup/install/files/lib/data/menu/Menu.class.php
wcfsetup/install/files/lib/data/menu/item/MenuItem.class.php
wcfsetup/install/files/lib/data/package/Package.class.php
wcfsetup/install/files/lib/data/smiley/Smiley.class.php
wcfsetup/install/files/lib/data/user/group/UserGroup.class.php
wcfsetup/install/files/lib/data/user/menu/item/UserMenuItem.class.php
wcfsetup/install/files/lib/data/user/rank/UserRank.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml

index 971066d4b1413b5282a7fa99d7d667f97bea5837..e683b7a9bcd6ad7418e500ceb1b80d520c5d5de1 100644 (file)
@@ -9,7 +9,7 @@
                        <ul class="scrollableDropdownMenu">
                                {foreach from=$field->getLabelGroup() item=label}
                                        <li data-label-id="{@$label->labelID}">
-                                               <span><span class="badge label{if $label->getClassNames()} {@$label->getClassNames()}{/if}">{lang}{$label->label}{/lang}</span></span>
+                                               <span><span class="badge label{if $label->getClassNames()} {@$label->getClassNames()}{/if}">{$label->getTitle()}</span></span>
                                        </li>
                                {/foreach}
                        </ul>
@@ -20,7 +20,7 @@
 <noscript>
        <select name="{@$field->getPrefixedId()}[{@$field->getLabelGroup()->groupID}]">
                {foreach from=$field->getLabelGroup() item=label}
-                       <option value="{@$label->labelID}">{lang}{$label->label}{/lang}</option>
+                       <option value="{@$label->labelID}">{$label->getTitle()}</option>
                {/foreach}
        </select>
 </noscript>
index 679849316289c7155fc65ae7b8898389a561f465..e3db63dc83f34e9c6db6f6f49470798fe2ef34bd 100644 (file)
@@ -5,19 +5,19 @@
                {foreach from=$menuItemNodeList item=menuItemNode}
                        <li class="{if $menuItemNode->isActiveNode()}active{/if}{if $menuItemNode->hasChildren()} boxMenuHasChildren{/if}" data-identifier="{@$menuItemNode->identifier}">
                                <a href="{$menuItemNode->getURL()}" class="boxMenuLink"{if $menuItemNode->isExternalLink()}{if EXTERNAL_LINK_REL_NOFOLLOW} rel="nofollow"{/if}{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}{/if}{if $menuItemNode->isActiveNode()} aria-current="page"{/if}>
-                                       <span class="boxMenuLinkTitle">{lang}{$menuItemNode->title}{/lang}</span>
+                                       <span class="boxMenuLinkTitle">{$menuItemNode->getTitle()}</span>
                                        {if $menuItemNode->getOutstandingItems() > 0}
                                                <span class="boxMenuLinkOutstandingItems badge badgeUpdate" aria-label="{lang}wcf.page.menu.outstandingItems{/lang}">{#$menuItemNode->getOutstandingItems()}</span>
                                        {/if}
                                </a>
                                
                                {if $menuItemNode->hasChildren()}<ol class="boxMenuDepth{@$menuItemNode->getDepth()}">{else}</li>{/if}
-                                       
+                               
                                {if !$menuItemNode->hasChildren() && $menuItemNode->isLastSibling()}
                                        {@"</ol></li>"|str_repeat:$menuItemNode->getOpenParentNodes()}
                                {/if}
                {/foreach}
-                                       
+               
                {event name='menuAfter'}
        </ol>
 </nav>
index 5b68e6a8c04f5908a8c612400924b599a5d80d5a..68dfff497e7def488d945626cd67d68bf54a535b 100644 (file)
@@ -8,7 +8,7 @@
                                {foreach from=$__wcf->getBoxHandler()->getBoxByIdentifier('com.woltlab.wcf.MainMenu')->getMenu()->getMenuItemNodeList() item=menuItemNode}
                                        {if $menuItemNode->getDepth() == 1 || $menuItemNode->getParentNode()->isActiveNode()}
                                        <li>
-                                               <a href="{$menuItemNode->getURL()}">{lang}{$menuItemNode->title}{/lang}</a>
+                                               <a href="{$menuItemNode->getURL()}">{$menuItemNode->getTitle()}</a>
                                        
                                                {if $menuItemNode->hasChildren() && $menuItemNode->isActiveNode()}<ol>{else}</li>{/if}
                                                
@@ -21,7 +21,7 @@
                        {if $__wcf->getBoxHandler()->getBoxByIdentifier('com.woltlab.wcf.FooterMenu')}
                                <ol>
                                        {foreach from=$__wcf->getBoxHandler()->getBoxByIdentifier('com.woltlab.wcf.FooterMenu')->getMenu()->getMenuItemNodeList() item=menuItemNode}
-                                               <li><a href="{$menuItemNode->getURL()}">{lang}{$menuItemNode->title}{/lang}</a></li>
+                                               <li><a href="{$menuItemNode->getURL()}">{$menuItemNode->getTitle()}</a></li>
                                        {/foreach}
                                </ol>
                        {/if}
index 31e8509263f652c839fabcc4f2124921d37f8d18..4b317e87e8d37f12b7fed8324261d9de598cf3bd 100644 (file)
@@ -12,7 +12,7 @@
                                                <span class="icon icon16 fa-tags"></span>
                                                <ul class="labelList">
                                                        {foreach from=$article->getLabels() item=label}
-                                                               <li><span class="label badge{if $label->getClassNames()} {$label->getClassNames()}{/if}">{lang}{$label->label}{/lang}</span></li>
+                                                               <li><span class="label badge{if $label->getClassNames()} {$label->getClassNames()}{/if}">{$label->getTitle()}</span></li>
                                                        {/foreach}
                                                </ul>
                                        </li>
index 355012dcdc4d0414ccee4ac081b3fe05b6211da9..9f9e8dec19990d4dff8404b36b50100355c3dd16 100644 (file)
                                                                        <div class="dropdownMenu">
                                                                                <ul class="scrollableDropdownMenu">
                                                                                        {foreach from=$labelGroup item=label}
-                                                                                               <li data-label-id="{@$label->labelID}"><span><span class="badge label{if $label->getClassNames()} {@$label->getClassNames()}{/if}">{lang}{$label->label}{/lang}</span></span></li>
+                                                                                               <li data-label-id="{@$label->labelID}"><span><span class="badge label{if $label->getClassNames()} {@$label->getClassNames()}{/if}">{$label->getTitle()}</span></span></li>
                                                                                        {/foreach}
                                                                                </ul>
                                                                        </div>
                                                        <noscript>
                                                                <select name="labelIDs[{@$labelGroup->groupID}]">
                                                                        {foreach from=$labelGroup item=label}
-                                                                               <option value="{@$label->labelID}">{lang}{$label->label}{/lang}</option>
+                                                                               <option value="{@$label->labelID}">{$label->getTitle()}</option>
                                                                        {/foreach}
                                                                </select>
                                                        </noscript>
index c6d18d18ddca922a1b0f247fa99210783401b6c7..e580bd3499321a603e3f0b7e88274aed9289b8f6 100644 (file)
@@ -54,7 +54,7 @@
                                                                                        <div class="dropdownMenu">
                                                                                                <ul class="scrollableDropdownMenu">
                                                                                                        {foreach from=$labelGroup item=label}
-                                                                                                               <li data-label-id="{@$label->labelID}"><span><span class="badge label{if $label->getClassNames()} {@$label->getClassNames()}{/if}">{lang}{$label->label}{/lang}</span></span></li>
+                                                                                                               <li data-label-id="{@$label->labelID}"><span><span class="badge label{if $label->getClassNames()} {@$label->getClassNames()}{/if}">{$label->getTitle()}</span></span></li>
                                                                                                        {/foreach}
                                                                                                </ul>
                                                                                        </div>
@@ -66,7 +66,7 @@
                                                                                                <option value="0">{lang}wcf.label.none{/lang}</option>
                                                                                                <option value="-1">{lang}wcf.label.withoutSelection{/lang}</option>
                                                                                                {foreach from=$labelGroup item=label}
-                                                                                                       <option value="{@$label->labelID}"{if $labelIDs[$labelGroup->groupID]|isset && $labelIDs[$labelGroup->groupID] == $label->labelID} selected{/if}>{lang}{$label->label}{/lang}</option>
+                                                                                                       <option value="{@$label->labelID}"{if $labelIDs[$labelGroup->groupID]|isset && $labelIDs[$labelGroup->groupID] == $label->labelID} selected{/if}>{$label->getTitle()}</option>
                                                                                                {/foreach}
                                                                                        </select>
                                                                                {/foreach}
index 13f4a11144a870e3844a348cb464c6b6da6cf321..c967515ace531c230335ac21f7ece40e1ac3a0ef 100644 (file)
@@ -21,7 +21,7 @@
                                        {if $article->hasLabels()}
                                                <div class="contentItemLabels">
                                                        {foreach from=$article->getLabels() item=label}
-                                                               <span class="label badge contentItemLabel{if $label->getClassNames()} {$label->getClassNames()}{/if}">{lang}{$label->label}{/lang}</span>
+                                                               <span class="label badge contentItemLabel{if $label->getClassNames()} {$label->getClassNames()}{/if}">{$label->getTitle()}</span>
                                                        {/foreach}
                                                </div>
                                        {/if}
index 15a0555d9d53c00454e2c25358e7056af5db8432..a5ecf3aeb339c1b8a48e34dff04bc7d3903fcc6f 100644 (file)
@@ -2,7 +2,7 @@
        {foreach from=$subscriptions item=subscription}
                <li>
                        <div class="containerHeadline" title="{$subscription->description|language}">
-                               <h3>{$subscription->title|language}</h3>
+                               <h3>{$subscription->getTitle()}</h3>
                                <small>{lang}wcf.paidSubscription.formattedCost{/lang}</small>
                        </div>
                        
index 1d67d59fb94bfb696e44b7617d0d69e076a95ad5..15d3696670c01cf5f6f618bdb3b1b6bf3eaa4a17 100644 (file)
@@ -2,7 +2,7 @@
        {foreach from=$subscriptions item=subscription}
                <li>
                        <div class="sidebarItemTitle" title="{$subscription->description|language}">
-                               <h3>{$subscription->title|language}</h3>
+                               <h3>{$subscription->getTitle()}</h3>
                                <small>{lang}wcf.paidSubscription.formattedCost{/lang}</small>
                        </div>
                        
index 92a6763ad52d844759e1e4503337acffafd278f9..af441f48f57f511a85d332b8308887468e8876de 100644 (file)
@@ -6,7 +6,7 @@
                </header>
                
                <dl class="{if (($errorType|isset && $errorType|is_array && $errorType[captchaAnswer]|isset) || ($errorField|isset && $errorField == 'captchaAnswer'))} formError{/if}">
-                       <dt><label for="captchaAnswer">{lang}{$captchaQuestionObject->question}{/lang}</label></dt>
+                       <dt><label for="captchaAnswer">{$captchaQuestionObject->getQuestion()}</label></dt>
                        <dd>
                                <input type="text" id="captchaAnswer" name="captchaAnswer" class="medium">
                                {if (($errorType|isset && $errorType|is_array && $errorType[captchaAnswer]|isset) || ($errorField|isset && $errorField == 'captchaAnswer'))}
index a6d7cac427a696076b6461fc065c0f3ce0c73813..7ff59dd4269c8694d71beaa310d29485bab69f4c 100644 (file)
@@ -52,7 +52,7 @@
                                                                                        <div class="dropdownMenu">
                                                                                                <ul class="scrollableDropdownMenu">
                                                                                                        {foreach from=$labelGroup item=label}
-                                                                                                               <li data-label-id="{@$label->labelID}"><span><span class="badge label{if $label->getClassNames()} {@$label->getClassNames()}{/if}">{lang}{$label->label}{/lang}</span></span></li>
+                                                                                                               <li data-label-id="{@$label->labelID}"><span><span class="badge label{if $label->getClassNames()} {@$label->getClassNames()}{/if}">{$label->getTitle()}</span></span></li>
                                                                                                        {/foreach}
                                                                                                </ul>
                                                                                        </div>
@@ -64,7 +64,7 @@
                                                                                                <option value="0">{lang}wcf.label.none{/lang}</option>
                                                                                                <option value="-1">{lang}wcf.label.withoutSelection{/lang}</option>
                                                                                                {foreach from=$labelGroup item=label}
-                                                                                                       <option value="{@$label->labelID}"{if $labelIDs[$labelGroup->groupID]|isset && $labelIDs[$labelGroup->groupID] == $label->labelID} selected{/if}>{lang}{$label->label}{/lang}</option>
+                                                                                                       <option value="{@$label->labelID}"{if $labelIDs[$labelGroup->groupID]|isset && $labelIDs[$labelGroup->groupID] == $label->labelID} selected{/if}>{$label->getTitle()}</option>
                                                                                                {/foreach}
                                                                                        </select>
                                                                                {/foreach}
index 23fb04c808d1d77ccafe4491ff5c33b44a24b936..d8c25f5cacffa844d4e6a9da8f0dc01e07192971 100644 (file)
@@ -1,9 +1,9 @@
 {foreach from=$options item=optionData}
        {assign var=option value=$optionData[object]}
        <dl class="{if $errorType|is_array && $errorType[$option->optionName]|isset} formError{/if}">
-               <dt{if $optionData[cssClassName]} class="{$optionData[cssClassName]}"{/if}><label for="{$option->optionName}">{lang}{$option->optionTitle}{/lang}</label>{if $option->required} <span class="customOptionRequired">*</span>{/if}</dt>
+               <dt{if $optionData[cssClassName]} class="{$optionData[cssClassName]}"{/if}><label for="{$option->optionName}">{$option->getTitle()}</label>{if $option->required} <span class="customOptionRequired">*</span>{/if}</dt>
                <dd>{@$optionData[html]}
-                       <small>{lang __optional=true}{$option->optionDescription}{/lang}</small>
+                       <small>{$option->getDescription()}</small>
                        
                        {if $errorType|is_array && $errorType[$option->optionName]|isset}
                                <small class="innerError">
index cf632e523a605c4d344216f153212d097418b0aa..593c5a80b9d5c26e2b795b048459e3ae97b616ce 100644 (file)
@@ -3,7 +3,7 @@
        {foreach from=$smileyCategories item=smileyCategory}
                {assign var=__tabCount value=$__tabCount + 1}
                {assign var='__smileyAnchor' value='smilies-'|concat:$smileyCategory->categoryID}
-               <li data-name="smilies-{@$smileyCategory->categoryID}" data-smiley-category-id="{@$smileyCategory->categoryID}"><a>{$smileyCategory->title|language}</a></li>
+               <li data-name="smilies-{@$smileyCategory->categoryID}" data-smiley-category-id="{@$smileyCategory->categoryID}"><a>{$smileyCategory->getTitle()}</a></li>
        {/foreach}
 {/capture}
 
index 17732d83e3708a785309076bfed607b759045ba3..3432a0a627ba773268cc7253c5f322787b84e03d 100644 (file)
@@ -56,7 +56,7 @@
                                                                                <div><span class="icon icon48 {@$menuCategory->getIconClassName()}"></span></div>
                                                                                
                                                                                <div class="containerHeadline">
-                                                                                       <h3>{lang}{$menuCategory->menuItem}{/lang}</h3>
+                                                                                       <h3>{$menuCategory->getTitle()}</h3>
                                                                                        
                                                                                        <ul class="inlineList dotSeparated">
                                                                                                {foreach from=$__wcf->getUserMenu()->getMenuItems($menuCategory->menuItem) item=menuItem}
index 03be406cd34b8c1e4b535e65da80a01048f60dac..587d4cd3ea989ad276c04803126acb81aedc56ae 100644 (file)
@@ -9,7 +9,7 @@
                        <li class="menuOverlayItem" data-mobile-identifier="{@$menuItemNode->identifier}">
                                {assign var=__outstandingItems value=$menuItemNode->getOutstandingItems()}
                                <a href="{$menuItemNode->getURL()}" class="menuOverlayItemLink{if $__outstandingItems} menuOverlayItemBadge{/if}{if $menuItemNode->isActiveNode()} active{/if}"{if $menuItemNode->isExternalLink() && EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>
-                                       <span class="menuOverlayItemTitle">{lang}{$menuItemNode->title}{/lang}</span>
+                                       <span class="menuOverlayItemTitle">{$menuItemNode->getTitle()}</span>
                                        {if $__outstandingItems}
                                                <span class="badge badgeUpdate">{#$__outstandingItems}</span>
                                        {/if}
@@ -77,7 +77,7 @@
                                        {event name='userMenuItemsBefore'}
                                        
                                        {foreach from=$__wcf->getUserMenu()->getMenuItems('') item=menuCategory}
-                                               <li class="menuOverlayTitle">{lang}{$menuCategory->menuItem}{/lang}</li>
+                                               <li class="menuOverlayTitle">{$menuCategory->getTitle()}</li>
                                                {foreach from=$__wcf->getUserMenu()->getMenuItems($menuCategory->menuItem) item=menuItem}
                                                        <li class="menuOverlayItem">
                                                                <a href="{$menuItem->getProcessor()->getLink()}" class="menuOverlayItemLink">{@$menuItem}</a>
index 039008898a848c79ca6ff77d69c8f0a9187fa6c4..620ab04e121fefb2c22417e0e66ae56457449281 100644 (file)
@@ -41,7 +41,7 @@
                        {foreach from=$subscriptions item=subscription}
                                <li>
                                        <div class="containerHeadline">
-                                               <h3>{$subscription->title|language} <span class="badge label">{lang}wcf.paidSubscription.formattedCost{/lang}</span></h3>
+                                               <h3>{$subscription->getTitle()} <span class="badge label">{lang}wcf.paidSubscription.formattedCost{/lang}</span></h3>
                                                <div class="htmlContent">{@$subscription->getFormattedDescription()}</div>
                                        </div>
                                        
@@ -66,7 +66,7 @@
                        {foreach from=$userSubscriptions item=userSubscription}
                                <li>
                                        <div class="containerHeadline">
-                                               <h3>{$userSubscription->getSubscription()->title|language}</h3>
+                                               <h3>{$userSubscription->getSubscription()->getTitle()}</h3>
                                                <div class="htmlContent">{@$userSubscription->getSubscription()->getFormattedDescription()}</div>
                                        </div>
                                        
index 117b3aa8b38ab1489c78fac7583353381b2459a5..5be88c3716823a78a486a85a3d4944524e16cdb3 100644 (file)
@@ -3,8 +3,8 @@
 {foreach from=$objects->getTeams() item=team}
        <section class="section sectionContainerList">
                <header class="sectionHeader">
-                       <h2 class="sectionTitle" id="group{@$team->groupID}">{$team->groupName|language} <span class="badge">{#$team->getMembers()|count}</span></h2>
-                       <p class="sectionDescription">{$team->groupDescription|language}</p>
+                       <h2 class="sectionTitle" id="group{@$team->groupID}">{$team->getTitle()} <span class="badge">{#$team->getMembers()|count}</span></h2>
+                       <p class="sectionDescription">{$team->getDescription()}</p>
                </header>
                        
                <ol class="containerList userList">
index 144cd8894478937f1c464f05b85275efbb9185c2..4d8dd072ebd4c9f1b38735eb9642e3c3f4e3a941 100644 (file)
@@ -31,7 +31,7 @@
                                                                                        <div class="dropdownMenu">
                                                                                                <ul class="scrollableDropdownMenu">
                                                                                                        {foreach from=$labelGroup item=label}
-                                                                                                               <li data-label-id="{@$label->labelID}"><span><span class="badge label{if $label->getClassNames()} {@$label->getClassNames()}{/if}">{lang}{$label->label}{/lang}</span></span></li>
+                                                                                                               <li data-label-id="{@$label->labelID}"><span><span class="badge label{if $label->getClassNames()} {@$label->getClassNames()}{/if}">{$label->getTitle()}</span></span></li>
                                                                                                        {/foreach}
                                                                                                </ul>
                                                                                        </div>
@@ -43,7 +43,7 @@
                                                                                                <option value="0">{lang}wcf.label.none{/lang}</option>
                                                                                                <option value="-1">{lang}wcf.label.withoutSelection{/lang}</option>
                                                                                                {foreach from=$labelGroup item=label}
-                                                                                                       <option value="{@$label->labelID}"{if $labelIDs[$labelGroup->groupID]|isset && $labelIDs[$labelGroup->groupID] == $label->labelID} selected{/if}>{lang}{$label->label}{/lang}</option>
+                                                                                                       <option value="{@$label->labelID}"{if $labelIDs[$labelGroup->groupID]|isset && $labelIDs[$labelGroup->groupID] == $label->labelID} selected{/if}>{$label->getTitle()}</option>
                                                                                                {/foreach}
                                                                                        </select>
                                                                                {/foreach}
index 964ca303f949642e80a4d538483c1c65ee3504af..a94cd4e9bc702defc42aa9b6c6f4d6f56665ab13 100644 (file)
@@ -12,7 +12,7 @@
        
        <section class="box" data-static-box-identifier="com.woltlab.wcf.UserMenu">
                {foreach from=$__wcf->getUserMenu()->getMenuItems('') item=menuCategory}
-                       <h2 class="boxTitle">{lang}{$menuCategory->menuItem}{/lang}</h2>
+                       <h2 class="boxTitle">{$menuCategory->getTitle()}</h2>
                        
                        <nav class="boxContent">
                                <ol class="boxMenu">
index 8f6df4fb06ccfa489b0f7e7df84711bcadb5503d..673801159445c898c73692c75a6363a6a33a57e0 100644 (file)
@@ -31,7 +31,7 @@
                                                                                        <div class="dropdownMenu">
                                                                                                <ul class="scrollableDropdownMenu">
                                                                                                        {foreach from=$labelGroup item=label}
-                                                                                                               <li data-label-id="{@$label->labelID}"><span><span class="badge label{if $label->getClassNames()} {@$label->getClassNames()}{/if}">{lang}{$label->label}{/lang}</span></span></li>
+                                                                                                               <li data-label-id="{@$label->labelID}"><span><span class="badge label{if $label->getClassNames()} {@$label->getClassNames()}{/if}">{$label->getTitle()}</span></span></li>
                                                                                                        {/foreach}
                                                                                                </ul>
                                                                                        </div>
@@ -43,7 +43,7 @@
                                                                                                <option value="0">{lang}wcf.label.none{/lang}</option>
                                                                                                <option value="-1">{lang}wcf.label.withoutSelection{/lang}</option>
                                                                                                {foreach from=$labelGroup item=label}
-                                                                                                       <option value="{@$label->labelID}"{if $labelIDs[$labelGroup->groupID]|isset && $labelIDs[$labelGroup->groupID] == $label->labelID} selected{/if}>{lang}{$label->label}{/lang}</option>
+                                                                                                       <option value="{@$label->labelID}"{if $labelIDs[$labelGroup->groupID]|isset && $labelIDs[$labelGroup->groupID] == $label->labelID} selected{/if}>{$label->getTitle()}</option>
                                                                                                {/foreach}
                                                                                        </select>
                                                                                {/foreach}
index 642d5076d3e5947f5389023c430c833874a188df..155af844e2d4b833ee13b695980cd5af905ef747 100644 (file)
@@ -80,11 +80,11 @@ buttons.push('woltlabQuote');
 {foreach from=$__wcf->getBBCodeHandler()->getButtonBBCodes(true) item=__bbcode}
        {* the HTML bbcode must be handled differently, it conflicts with the `source` toggle-button *}
        {if $__bbcode->bbcodeTag === 'html'}
-               buttonOptions['woltlabHtml'] = { icon: '{$__bbcode->wysiwygIcon}', title: '{lang}{$__bbcode->buttonLabel}{/lang}' };
+               buttonOptions['woltlabHtml'] = { icon: '{$__bbcode->wysiwygIcon}', title: '{$__bbcode->getButtonLabel()}' };
                buttons.push('woltlabHtml');
                customButtons.push('woltlabHtml');
        {else}
-               buttonOptions['{$__bbcode->bbcodeTag}'] = { icon: '{$__bbcode->wysiwygIcon}', title: '{lang}{$__bbcode->buttonLabel}{/lang}' };
+               buttonOptions['{$__bbcode->bbcodeTag}'] = { icon: '{$__bbcode->wysiwygIcon}', title: '{$__bbcode->getButtonLabel()}' };
                buttons.push('{$__bbcode->bbcodeTag}');
                customButtons.push('{$__bbcode->bbcodeTag}');
        {/if}
index 971066d4b1413b5282a7fa99d7d667f97bea5837..e683b7a9bcd6ad7418e500ceb1b80d520c5d5de1 100644 (file)
@@ -9,7 +9,7 @@
                        <ul class="scrollableDropdownMenu">
                                {foreach from=$field->getLabelGroup() item=label}
                                        <li data-label-id="{@$label->labelID}">
-                                               <span><span class="badge label{if $label->getClassNames()} {@$label->getClassNames()}{/if}">{lang}{$label->label}{/lang}</span></span>
+                                               <span><span class="badge label{if $label->getClassNames()} {@$label->getClassNames()}{/if}">{$label->getTitle()}</span></span>
                                        </li>
                                {/foreach}
                        </ul>
@@ -20,7 +20,7 @@
 <noscript>
        <select name="{@$field->getPrefixedId()}[{@$field->getLabelGroup()->groupID}]">
                {foreach from=$field->getLabelGroup() item=label}
-                       <option value="{@$label->labelID}">{lang}{$label->label}{/lang}</option>
+                       <option value="{@$label->labelID}">{$label->getTitle()}</option>
                {/foreach}
        </select>
 </noscript>
index bb35e8e2e40f0dae3f7d19166400b50724153fc1..a21624127fd12774ce86f8cac416512f780df115 100644 (file)
@@ -1,5 +1,5 @@
 <ul class="inlineList smileyList">
        {foreach from=$smilies item=smiley name=smilies}
-               <li><a title="{lang}{$smiley->smileyTitle}{/lang}" class="jsTooltip jsSmiley" role="button" tabindex="{if $tpl.foreach.smilies.iteration === 1}0{else}-1{/if}">{@$smiley->getHtml()}</a></li>
+               <li><a title="{$smiley->getTitle()}" class="jsTooltip jsSmiley" role="button" tabindex="{if $tpl.foreach.smilies.iteration === 1}0{else}-1{/if}">{@$smiley->getHtml()}</a></li>
        {/foreach}
 </ul>
index 355012dcdc4d0414ccee4ac081b3fe05b6211da9..9f9e8dec19990d4dff8404b36b50100355c3dd16 100644 (file)
                                                                        <div class="dropdownMenu">
                                                                                <ul class="scrollableDropdownMenu">
                                                                                        {foreach from=$labelGroup item=label}
-                                                                                               <li data-label-id="{@$label->labelID}"><span><span class="badge label{if $label->getClassNames()} {@$label->getClassNames()}{/if}">{lang}{$label->label}{/lang}</span></span></li>
+                                                                                               <li data-label-id="{@$label->labelID}"><span><span class="badge label{if $label->getClassNames()} {@$label->getClassNames()}{/if}">{$label->getTitle()}</span></span></li>
                                                                                        {/foreach}
                                                                                </ul>
                                                                        </div>
                                                        <noscript>
                                                                <select name="labelIDs[{@$labelGroup->groupID}]">
                                                                        {foreach from=$labelGroup item=label}
-                                                                               <option value="{@$label->labelID}">{lang}{$label->label}{/lang}</option>
+                                                                               <option value="{@$label->labelID}">{$label->getTitle()}</option>
                                                                        {/foreach}
                                                                </select>
                                                        </noscript>
index 85c1a64c52b7356afe5d5435f0f572a4e9b2da38..d9d4c904c28d8f3eb466eb31e67f7b5ea5becd53 100644 (file)
                                                                        {if $article->hasLabels()}
                                                                                <ul class="labelList" style="float: right; padding-left: 7px;">
                                                                                        {foreach from=$article->getLabels() item=label}
-                                                                                               <li><span class="badge label{if $label->getClassNames()} {$label->getClassNames()}{/if}">{lang}{$label->label}{/lang}</span></li>
+                                                                                               <li><span class="badge label{if $label->getClassNames()} {$label->getClassNames()}{/if}">{$label->getTitle()}</span></li>
                                                                                        {/foreach}
                                                                                </ul>
                                                                        {/if}
index b9515c1d4cc49bf98fc2109f7fa0a3f7f0d012b2..ddda8416494fa602bb9337116c75125cf2599184 100644 (file)
@@ -8,7 +8,7 @@
                </header>
                
                <dl{if (($errorType|isset && $errorType|is_array && $errorType[captchaAnswer]|isset) || ($errorField|isset && $errorField == 'captchaAnswer'))} class="formError"{/if}>
-                       <dt><label for="captchaAnswer">{lang}{$captchaQuestionObject->question}{/lang}</label></dt>
+                       <dt><label for="captchaAnswer">{$captchaQuestionObject->getQuestion()}</label></dt>
                        <dd>
                                <input type="text" id="captchaAnswer" name="captchaAnswer" class="medium">
                                {if (($errorType|isset && $errorType|is_array && $errorType[captchaAnswer]|isset) || ($errorField|isset && $errorField == 'captchaAnswer'))}
index 080b2c9eb2fe4f87345f91f0bb3ebdc3092ae1c0..7d2d372d0e9b6b9e11578ac2088f7b82387fd8fa 100644 (file)
@@ -63,7 +63,7 @@
                                                                {event name='rowButtons'}
                                                        </td>
                                                        <td class="columnID columnQuestionID">{$question->questionID}</td>
-                                                       <td class="columnText columnQuestion"><a href="{link controller='CaptchaQuestionEdit' id=$question->questionID}{/link}">{lang}{$question->question}{/lang}</a></td>
+                                                       <td class="columnText columnQuestion"><a href="{link controller='CaptchaQuestionEdit' id=$question->questionID}{/link}">{$question->getQuestion()}</a></td>
                                                        
                                                        {event name='columns'}
                                                </tr>
index a5e3fdc31a949d20730e4559a81a31581c323834..4739e832fd4ff24012fdf78b0447a4d34f703b38 100644 (file)
@@ -69,7 +69,7 @@
                                                        {event name='rowButtons'}
                                                </td>
                                                <td class="columnID">{@$option->optionID}</td>
-                                               <td class="columnTitle columnOptionTitle"><a href="{link controller='ContactOptionEdit' id=$option->optionID}{/link}">{$option->optionTitle|language}</a></td>
+                                               <td class="columnTitle columnOptionTitle"><a href="{link controller='ContactOptionEdit' id=$option->optionID}{/link}">{$option->getTitle()}</a></td>
                                                <td class="columnText columnOptionType">{lang}wcf.acp.customOption.optionType.{$option->optionType}{/lang}</td>
                                                <td class="columnDigits columnShowOrder">{#$option->showOrder}</td>
                                                
@@ -93,7 +93,7 @@
                        {foreach from=$recipientList item=recipient}
                                <li class="sortableNode sortableNoNesting jsRecipient" data-object-id="{@$recipient->recipientID}">
                                        <span class="sortableNodeLabel">
-                                               <a href="{link controller='ContactRecipientEdit' id=$recipient->recipientID}{/link}">{lang}{$recipient}{/lang}</a>
+                                               <a href="{link controller='ContactRecipientEdit' id=$recipient->recipientID}{/link}">{$recipient}</a>
                                                
                                                <span class="statusDisplay sortableButtonContainer">
                                                        <span class="icon icon16 fa-arrows sortableNodeHandle"></span>
index 3a3c1a28f3450e4b871ea5b51b26754169c29be7..762a4c15267b5a0b86f43e966d7517450235719b 100644 (file)
                                                        <td class="columnDate columnStartDom">{$cronjob->startDom|truncate:30}</td>
                                                        <td class="columnDate columnStartMonth">{$cronjob->startMonth|truncate:30}</td>
                                                        <td class="columnDate columnStartDow">{$cronjob->startDow|truncate:30}</td>
-                                                       <td class="columnText columnDescription" title="{$cronjob->description|language}">
+                                                       <td class="columnText columnDescription" title="{$cronjob->getDescription()}">
                                                                {if $cronjob->isEditable()}
-                                                                       <a title="{lang}wcf.acp.cronjob.edit{/lang}" href="{link controller='CronjobEdit' id=$cronjob->cronjobID}{/link}">{$cronjob->description|language}</a>
+                                                                       <a title="{lang}wcf.acp.cronjob.edit{/lang}" href="{link controller='CronjobEdit' id=$cronjob->cronjobID}{/link}">{$cronjob->getDescription()}</a>
                                                                {else}
-                                                                       {$cronjob->description|language}
+                                                                       {$cronjob->getDescription()}
                                                                {/if}
                                                        </td>
                                                        <td class="columnDate columnNextExec">
index 3a1567a983109957c2cb5f17a90636aa3eef135f..88f856bcdd01aa6e28585920e596ad70e2403192 100644 (file)
                                                </td>
                                                <td class="columnID">{@$label->labelID}</td>
                                                <td class="columnTitle columnLabel"><a href="{link controller='LabelEdit' object=$label}{/link}" title="{$label}" class="badge label{if $label->getClassNames()} {$label->getClassNames()}{/if}">{$label}</a></td>
-                                               <td class="columnText columnGroup">{lang}{$label->groupName}{/lang}{if $label->groupDescription} / {$label->groupDescription}{/if}</td>
+                                               <td class="columnText columnGroup">{$label->groupName|language}{if $label->groupDescription} / {$label->groupDescription}{/if}</td>
                                                {if $labelGroup && !$labelSearch && !$cssClassName && $items > 1}
                                                        <td class="columnDigits columnShowOrder">{#$label->showOrder}</td>
                                                {/if}
index 80d3b19dffc31eaaf37accb488850389cf4762dd..13228d88a24f63b5a52026c6852f61b913e60c51 100644 (file)
@@ -42,7 +42,7 @@
                                        <option value="-">--------------------</option>
                                        {foreach from=$packages item=package}
                                                {assign var=loop value=$packageNameLength-$package->packageNameLength}
-                                               <option value="{@$package->packageID}"{if $selectedPackages[$package->packageID]|isset} selected{/if}>{lang}{$package->packageName}{/lang} {section name=i loop=$loop}&nbsp;{/section}&nbsp;&nbsp;{$package->package}</option>
+                                               <option value="{@$package->packageID}"{if $selectedPackages[$package->packageID]|isset} selected{/if}>{$package->getName()} {section name=i loop=$loop}&nbsp;{/section}&nbsp;&nbsp;{$package->package}</option>
                                        {/foreach}
                                </select>
                                <small>{lang}wcf.global.multiSelect{/lang}</small>
index 86b4f716d9b07b30013a2e12b878e5d99d410c4e..a6caa6536cf31d1ad11462491c4726c6001605bd 100644 (file)
@@ -57,7 +57,7 @@
                                        <option value="0">{lang}wcf.global.noSelection{/lang}</option>
                                        
                                        {foreach from=$menuItemNodeList item=menuItemNode}
-                                               <option value="{@$menuItemNode->itemID}"{if $menuItemNode->itemID == $parentItemID} selected{/if}>{if $menuItemNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($menuItemNode->getDepth() - 1)}{/if}{lang}{$menuItemNode->title}{/lang}</option>
+                                               <option value="{@$menuItemNode->itemID}"{if $menuItemNode->itemID == $parentItemID} selected{/if}>{if $menuItemNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($menuItemNode->getDepth() - 1)}{/if}{$menuItemNode->getTitle()}</option>
                                        {/foreach}
                                </select>
                                {if $errorField == 'parentItemID'}
index 8ef6ca8fef04f014d49bdf0586626b24fe85c293..c71f1a38dbdf96352e32dc7b79273dc97c3c0d94 100644 (file)
@@ -36,7 +36,7 @@
 <header class="contentHeader">
        <div class="contentHeaderTitle">
                <h1 class="contentTitle">{lang}wcf.acp.menu.item.list{/lang}</h1>
-               <p class="contentHeaderDescription">{lang}{$menu->title}{/lang}</p>
+               <p class="contentHeaderDescription">{$menu->getTitle()}</p>
        </div>
        
        <nav class="contentHeaderNavigation">
@@ -56,7 +56,7 @@
                                {foreach from=$menuItemNodeList item=menuItemNode}
                                        <li class="sortableNode" data-object-id="{@$menuItemNode->itemID}">
                                                <span class="sortableNodeLabel">
-                                                       <a href="{link controller='MenuItemEdit' id=$menuItemNode->itemID}{/link}">{lang}{$menuItemNode->title}{/lang}</a>
+                                                       <a href="{link controller='MenuItemEdit' id=$menuItemNode->itemID}{/link}">{$menuItemNode->getTitle()}</a>
                                                        <span class="statusDisplay sortableButtonContainer">
                                                                <span class="icon icon16 fa-arrows sortableNodeHandle"></span>
                                                                {if $menuItemNode->canDisable()}
index 9f85a2226feefa4cafc294e7276dde4a393de7b4..e40114bb8bf29adf9986cc9b67f531c0f3f78f0d 100644 (file)
@@ -56,7 +56,7 @@
                                                        {event name='rowButtons'}
                                                </td>
                                                <td class="columnID columnPageID">{@$menu->menuID}</td>
-                                               <td class="columnTitle"><a href="{link controller='MenuEdit' id=$menu->menuID}{/link}">{lang}{$menu->title}{/lang}</a></td>
+                                               <td class="columnTitle"><a href="{link controller='MenuEdit' id=$menu->menuID}{/link}">{$menu->getTitle()}</a></td>
                                                <td class="columnDigits columnItems"><a href="{link controller='MenuItemList' id=$menu->menuID}{/link}">{#$menu->items}</a></td>
                                                <td class="columnText columnPosition">{lang}wcf.acp.box.position.{@$menu->position}{/lang}</td>
                                                <td class="columnDigits columnShowOrder">{#$menu->showOrder}</td>
index a5d0d5250fa651adcb97067fd31d673721bcfdc0..de34490bf838ef72fbedb99abe04f8aa5f2cc657 100644 (file)
@@ -9,7 +9,7 @@
        {foreach from=$smileyCategories item=smileyCategory}
                {assign var=__tabCount value=$__tabCount + 1}
                {assign var='__smileyAnchor' value='smilies-'|concat:$smileyCategory->categoryID}
-               <li data-name="smilies-{@$smileyCategory->categoryID}" data-smiley-category-id="{@$smileyCategory->categoryID}"><a>{$smileyCategory->title|language}</a></li>
+               <li data-name="smilies-{@$smileyCategory->categoryID}" data-smiley-category-id="{@$smileyCategory->categoryID}"><a>{$smileyCategory->getTitle()}</a></li>
        {/foreach}
 {/capture}
 
index 50a66ebcfc65a0682e58c176ef37960e59494eb9..2c2155fb9d06e476ca5116c7c5cf18a7bbdf4d13 100644 (file)
@@ -41,7 +41,7 @@
                        {if $package->packageDescription|language}
                                <dl>
                                        <dt>{lang}wcf.acp.package.description{/lang}</dt>
-                                       <dd>{$package->packageDescription|language}</dd>
+                                       <dd>{$package->getDescription()}</dd>
                                </dl>
                        {/if}
                        
                                                                                        {/if}
                                                                                </td>
                                                                                <td class="columnID">{@$requiredPackage->packageID}</td>
-                                                                               <td class="columnTitle" title="{$requiredPackage->packageDescription|language}"><a href="{link controller='Package' id=$requiredPackage->packageID}{/link}">{$requiredPackage}</a></td>
+                                                                               <td class="columnTitle" title="{$requiredPackage->getDescription()}"><a href="{link controller='Package' id=$requiredPackage->packageID}{/link}">{$requiredPackage}</a></td>
                                                                                <td class="columnText">{if $requiredPackage->authorURL}<a href="{$requiredPackage->authorURL}" class="externalURL">{$requiredPackage->author}</a>{else}{$requiredPackage->author}{/if}</td>
                                                                                <td class="columnText">{$requiredPackage->packageVersion}</td>
                                                                                <td class="columnDate">{@$requiredPackage->packageDate|date}</td>
                                                                                        {/if}
                                                                                </td>
                                                                                <td class="columnID">{@$dependentPackage->packageID}</td>
-                                                                               <td class="columnTitle" title="{$dependentPackage->packageDescription|language}"><a href="{link controller='Package' id=$dependentPackage->packageID}{/link}">{$dependentPackage}</a></td>
+                                                                               <td class="columnTitle" title="{$dependentPackage->getDescription()}"><a href="{link controller='Package' id=$dependentPackage->packageID}{/link}">{$dependentPackage}</a></td>
                                                                                <td class="columnText">{if $dependentPackage->authorURL}<a href="{$dependentPackage->authorURL}" class="externalURL">{$dependentPackage->author}</a>{else}{$dependentPackage->author}{/if}</td>
                                                                                <td class="columnText">{$dependentPackage->packageVersion}</td>
                                                                                <td class="columnDate">{@$dependentPackage->packageDate|date}</td>
index dac294c1a64621c1c5d2ba00d3d4cbf157b1d394..cfa7e41ac1089277027eddcf4e64e74508c5368c 100644 (file)
@@ -92,7 +92,7 @@
                                                        {event name='rowButtons'}
                                                </td>
                                                <td class="columnID">{@$package->packageID}</td>
-                                               <td id="packageName{@$package->packageID}" class="columnTitle" title="{$package->packageDescription|language}">
+                                               <td id="packageName{@$package->packageID}" class="columnTitle" title="{$package->getDescription()}">
                                                        <a href="{link controller='Package' id=$package->packageID}{/link}"><span>{$package}</span></a>
                                                </td>
                                                <td class="columnText">{if $package->authorURL}<a href="{$package->authorURL}" class="externalURL">{$package->author}</a>{else}{$package->author}{/if}</td>
index c889c3e3541682c3e3551825724a17f277a95b51..8e2aedf873ee6a43fdcc34a4de70b942b06580b0 100644 (file)
                                                                <option value="0">{lang}wcf.global.noSelection{/lang}</option>
                                                                
                                                                {foreach from=$menuItemNodeList item=menuItemNode}
-                                                                       <option value="{@$menuItemNode->itemID}"{if $menuItemNode->itemID == $parentMenuItemID} selected{/if}>{if $menuItemNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($menuItemNode->getDepth() - 1)}{/if}{lang}{$menuItemNode->title}{/lang}</option>
+                                                                       <option value="{@$menuItemNode->itemID}"{if $menuItemNode->itemID == $parentMenuItemID} selected{/if}>{if $menuItemNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($menuItemNode->getDepth() - 1)}{/if}{$menuItemNode->getTitle()}</option>
                                                                {/foreach}
                                                        </select>
                                                        {if $errorField == 'parentMenuItemID'}
index 56fe83fd83145d4da958297122b9d3105e37c66f..9e65e44b8b9266ecb9213bcbeba017d61ca0baa7 100644 (file)
@@ -21,7 +21,7 @@
                                        <ul class="dropdownMenu" data-dropdown-alignment-horizontal="right">
                                                {foreach from=$__wcf->getFrontendMenu()->getMenuItemNodeList() item=_menuItem}
                                                        {if !$_menuItem->parentItemID && $_menuItem->getPage()}
-                                                               <li><a href="{$_menuItem->getURL()}">{lang}{$_menuItem->title}{/lang}</a></li>
+                                                               <li><a href="{$_menuItem->getURL()}">{$_menuItem->getTitle()}</a></li>
                                                        {/if}
                                                {/foreach}
                                        </ul>
index 38ec67feba770edb25dd6e9ea18cd364a4740add..387ababbc65e8a46a0532c846c921c64becb7f2d 100644 (file)
@@ -98,7 +98,7 @@
                                <dt>{lang}wcf.acp.paidSubscription.excludedSubscriptions{/lang}</dt>
                                <dd>
                                        {foreach from=$availableSubscriptions item=availableSubscription}
-                                               <label><input type="checkbox" name="excludedSubscriptionIDs[]" value="{@$availableSubscription->subscriptionID}"{if $availableSubscription->subscriptionID|in_array:$excludedSubscriptionIDs} checked{/if}> {$availableSubscription->title|language}</label>
+                                               <label><input type="checkbox" name="excludedSubscriptionIDs[]" value="{@$availableSubscription->subscriptionID}"{if $availableSubscription->subscriptionID|in_array:$excludedSubscriptionIDs} checked{/if}> {$availableSubscription->getTitle()}</label>
                                        {/foreach}
                                        <small>{lang}wcf.acp.paidSubscription.excludedSubscriptions.description{/lang}</small>
                                </dd>
                        <dt><label>{lang}wcf.acp.paidSubscription.userGroups{/lang}</label></dt>
                        <dd>
                                {foreach from=$availableUserGroups item=userGroup}
-                                       <label><input type="checkbox" name="groupIDs[]" value="{@$userGroup->groupID}"{if $userGroup->groupID|in_array:$groupIDs} checked{/if}> {$userGroup->groupName|language}</label>
+                                       <label><input type="checkbox" name="groupIDs[]" value="{@$userGroup->groupID}"{if $userGroup->groupID|in_array:$groupIDs} checked{/if}> {$userGroup->getTitle()}</label>
                                {/foreach}
                                {if $errorField == 'groupIDs'}
                                        <small class="innerError">
index ede6e27449c3e4a1b2ea398bdf031c70eb50cc17..c73a604af3b830b762f5b171be92c474cd699a6d 100644 (file)
@@ -54,7 +54,7 @@
                                                        {event name='itemButtons'}
                                                </td>
                                                <td class="columnID columnSubscriptionID">{@$subscription->subscriptionID}</td>
-                                               <td class="columnTitle"><a href="{link controller='PaidSubscriptionEdit' id=$subscription->subscriptionID}{/link}" title="{lang}wcf.acp.paidSubscription.edit{/lang}">{$subscription->title|language}</a></td>
+                                               <td class="columnTitle"><a href="{link controller='PaidSubscriptionEdit' id=$subscription->subscriptionID}{/link}" title="{lang}wcf.acp.paidSubscription.edit{/lang}">{$subscription->getTitle()}</a></td>
                                                <td class="columnDigits columnCost">{@$subscription->currency} {$subscription->cost|currency}</td>
                                                <td class="columnDigits columnSubscriptionLength">{if $subscription->subscriptionLength}{@$subscription->subscriptionLength} {lang}wcf.acp.paidSubscription.subscriptionLengthUnit.{@$subscription->subscriptionLengthUnit}{/lang}{else}&infin;{/if}</td>
                                                <td class="columnDigits columnShowOrder">{@$subscription->showOrder}</td>
index 73e58de760950cd5d298a1b417b031de9935db50..5f4d0aaf2d9087e6d965f40d558cb6ffb448170c 100644 (file)
@@ -29,7 +29,7 @@
                
                {if $log->subscriptionID}
                        <dt>{lang}wcf.acp.paidSubscription.subscription{/lang}</dt>
-                       <dd>{$log->getSubscription()->title|language}</dd>
+                       <dd>{$log->getSubscription()->getTitle()}</dd>
                {/if}
                
                <dt>{lang}wcf.acp.paidSubscription.transactionLog.paymentMethod{/lang}</dt>
index 3e822714fbb95cf9a9a5b94c197f664800090968..322bf03c5b56782f1bfd61860d3c6a99f2f45fea 100644 (file)
@@ -46,7 +46,7 @@
                                                <select name="subscriptionID" id="subscriptionID">
                                                        <option value="0">{lang}wcf.acp.paidSubscription.subscription{/lang}</option>
                                                        {foreach from=$availableSubscriptions item=availableSubscription}
-                                                               <option value="{@$availableSubscription->subscriptionID}"{if $availableSubscription->subscriptionID == $subscriptionID} selected{/if}>{$availableSubscription->title|language}</option>
+                                                               <option value="{@$availableSubscription->subscriptionID}"{if $availableSubscription->subscriptionID == $subscriptionID} selected{/if}>{$availableSubscription->getTitle()}</option>
                                                        {/foreach}
                                                </select>
                                        </dd>
index afbd3ae05b8d2408c3540c2793bb0d3eec4c96bd..30832b927ff5664a401c355b070e4db41fe17633 100644 (file)
@@ -12,7 +12,7 @@
        <div class="contentHeaderTitle">
                <h1 class="contentTitle">{lang}wcf.acp.paidSubscription.user.{$action}{/lang}</h1>
                {if $action == 'add'}
-                       <p class="contentHeaderDescription">{$subscription->title|language}</p>
+                       <p class="contentHeaderDescription">{$subscription->getTitle()}</p>
                {else}
                        <p class="contentHeaderDescription">{$subscriptionUser->getUser()->username}</p>
                {/if}
index d11f471df1387659761b344656aa170379ce0168..cb83104517b6c29b24befd5c9cb0ff491f9a10f8 100644 (file)
@@ -40,7 +40,7 @@
                                                <select name="subscriptionID" id="subscriptionID">
                                                        <option value="0">{lang}wcf.acp.paidSubscription.subscription{/lang}</option>
                                                        {foreach from=$availableSubscriptions item=availableSubscription}
-                                                               <option value="{@$availableSubscription->subscriptionID}"{if $availableSubscription->subscriptionID == $subscriptionID} selected{/if}>{$availableSubscription->title|language}</option>
+                                                               <option value="{@$availableSubscription->subscriptionID}"{if $availableSubscription->subscriptionID == $subscriptionID} selected{/if}>{$availableSubscription->getTitle()}</option>
                                                        {/foreach}
                                                </select>
                                        </dd>
index a9dff1627e7517e632290461434f95bfb2559ffd..ac9d5421071cb20c9366319da62211e6e1ff5276 100644 (file)
@@ -41,7 +41,7 @@
                <nav class="tabMenu">
                        <ul>
                                {foreach from=$categories item=categoryLoop}
-                                       <li{if (!$category && !$categoryLoop->categoryID) || ($category && $category->categoryID == $categoryLoop->categoryID)} class="active"{/if}><a href="{if $categoryLoop->categoryID}{link controller='SmileyList' object=$categoryLoop}{/link}{else}{link controller='SmileyList'}{/link}{/if}">{$categoryLoop->title|language}</a></li>
+                                       <li{if (!$category && !$categoryLoop->categoryID) || ($category && $category->categoryID == $categoryLoop->categoryID)} class="active"{/if}><a href="{if $categoryLoop->categoryID}{link controller='SmileyList' object=$categoryLoop}{/link}{else}{link controller='SmileyList'}{/link}{/if}">{$categoryLoop->getTitle()}</a></li>
                                {/foreach}
                        </ul>
                </nav>
@@ -52,7 +52,7 @@
                                                {foreach from=$objects item=smiley}
                                                        <li class="sortableNode sortableNoNesting smileyRow" data-object-id="{@$smiley->smileyID}">
                                                                <span class="sortableNodeLabel">
-                                                                       <a href="{link controller='SmileyEdit' id=$smiley->smileyID}{/link}">{@$smiley->getHtml()} {lang}{$smiley->smileyTitle}{/lang}</a> <span class="badge">{$smiley->smileyCode}</span>{foreach from=$smiley->getAliases() item='alias'} <span class="badge" style="margin-left: 5px">{$alias}</span>{/foreach}
+                                                                       <a href="{link controller='SmileyEdit' id=$smiley->smileyID}{/link}">{@$smiley->getHtml()} {$smiley->getTitle()}</a> <span class="badge">{$smiley->smileyCode}</span>{foreach from=$smiley->getAliases() item='alias'} <span class="badge" style="margin-left: 5px">{$alias}</span>{/foreach}
                                                                        
                                                                        <span class="statusDisplay sortableButtonContainer">
                                                                                <span class="icon icon16 fa-arrows sortableNodeHandle"></span>
index d525eb1438a545c7ed1e42bc57e7d9d11d01eb3b..a1c0383d1f02f5e1fbf12b880209f04c32b2ae46 100644 (file)
@@ -65,9 +65,9 @@
                                        <td class="columnID columnGroupID">{@$group->groupID}</td>
                                        <td class="columnTitle columnGroupName">
                                                {if $group->isEditable()}
-                                                       <a title="{lang}wcf.acp.group.edit{/lang}" href="{link controller='UserGroupEdit' id=$group->groupID}{/link}">{lang}{$group->groupName}{/lang}</a>
+                                                       <a title="{lang}wcf.acp.group.edit{/lang}" href="{link controller='UserGroupEdit' id=$group->groupID}{/link}">{$group->getTitle()}</a>
                                                {else}
-                                                       {lang}{$group->groupName}{/lang}
+                                                       {$group->getTitle()}
                                                {/if}
                                                {if $group->isOwner()}
                                                        <span class="icon icon16 fa-shield jsTooltip" title="{lang}wcf.acp.group.type.owner{/lang}"></span>
index b7be485a444fd12be37999d0aa81c1a3a4b58ae6..9b5031d90426dc390bc022b7eae8d06505b610a0 100644 (file)
                                <dt>
                                        {if VISITOR_USE_TINY_BUILD && $guestGroupID == $group->groupID && $userGroupOption->excludedInTinyBuild}<span class="icon icon16 fa-bolt red jsTooltip" title="{lang}wcf.acp.group.excludedInTinyBuild{/lang}"></span> {/if}
                                        {if $ownerGroupID == $group->groupID && $userGroupOption->optionName|in_array:$ownerGroupPermissions}<span class="icon icon16 fa-shield jsTooltip" title="{lang}wcf.acp.group.ownerGroupPermission{/lang}"></span> {/if}
-                                       <label for="userGroupOption{@$group->groupID}">{lang}{$group->groupName}{/lang}</label>
+                                       <label for="userGroupOption{@$group->groupID}">{$group->getTitle()}</label>
                                </dt>
                                <dd>
                                        {@$formElements[$group->groupID]}
index 035791ca85f565419505bf6e015b2490f794fc53..7758939831ea3003aaa1bfff48ff004b885932a5 100644 (file)
                        <dd>
                                <select id="groupID" name="groupID">
                                        {foreach from=$availableGroups item=group}
-                                               <option value="{@$group->groupID}"{if $group->groupID == $groupID} selected{/if}>{$group->groupName|language}</option>
+                                               <option value="{@$group->groupID}"{if $group->groupID == $groupID} selected{/if}>{$group->getTitle()}</option>
                                        {/foreach}
                                </select>
                                {if $errorField == 'groupID'}
index 320466f694c2e21160f0d64745fbab1b85531be7..0aa2d4765d40dc1fae18cd6a9315036e6f8e12b6 100644 (file)
@@ -52,7 +52,7 @@
                                                        {event name='rowButtons'}
                                                </td>
                                                <td class="columnID columnRankID">{@$userRank->rankID}</td>
-                                               <td class="columnTitle columnRankTitle"><a href="{link controller='UserRankEdit' id=$userRank->rankID}{/link}" title="{lang}wcf.acp.user.rank.edit{/lang}" class="badge label{if $userRank->cssClassName} {$userRank->cssClassName}{/if}">{$userRank->rankTitle|language}</a></td>
+                                               <td class="columnTitle columnRankTitle"><a href="{link controller='UserRankEdit' id=$userRank->rankID}{/link}" title="{lang}wcf.acp.user.rank.edit{/lang}" class="badge label{if $userRank->cssClassName} {$userRank->cssClassName}{/if}">{$userRank->getTitle()}</a></td>
                                                <td class="columnText columnRankImage">{if $userRank->rankImage}{@$userRank->getImage()}{/if}</td>
                                                <td class="columnText columnGroupID">{$userRank->groupName|language}</td>
                                                <td class="columnText columnRequiredGender">{if $userRank->requiredGender}{if $userRank->requiredGender == 1}{lang}wcf.user.gender.male{/lang}{else}{lang}wcf.user.gender.female{/lang}{/if}{/if}</td>
index 642d5076d3e5947f5389023c430c833874a188df..155af844e2d4b833ee13b695980cd5af905ef747 100644 (file)
@@ -80,11 +80,11 @@ buttons.push('woltlabQuote');
 {foreach from=$__wcf->getBBCodeHandler()->getButtonBBCodes(true) item=__bbcode}
        {* the HTML bbcode must be handled differently, it conflicts with the `source` toggle-button *}
        {if $__bbcode->bbcodeTag === 'html'}
-               buttonOptions['woltlabHtml'] = { icon: '{$__bbcode->wysiwygIcon}', title: '{lang}{$__bbcode->buttonLabel}{/lang}' };
+               buttonOptions['woltlabHtml'] = { icon: '{$__bbcode->wysiwygIcon}', title: '{$__bbcode->getButtonLabel()}' };
                buttons.push('woltlabHtml');
                customButtons.push('woltlabHtml');
        {else}
-               buttonOptions['{$__bbcode->bbcodeTag}'] = { icon: '{$__bbcode->wysiwygIcon}', title: '{lang}{$__bbcode->buttonLabel}{/lang}' };
+               buttonOptions['{$__bbcode->bbcodeTag}'] = { icon: '{$__bbcode->wysiwygIcon}', title: '{$__bbcode->getButtonLabel()}' };
                buttons.push('{$__bbcode->bbcodeTag}');
                customButtons.push('{$__bbcode->bbcodeTag}');
        {/if}
index 007c7600d7cc49a427fcf70764aa7e364e6f2b3a..21366d516527dab71439bc9bf8d2acc20bbd8ff0 100644 (file)
@@ -78,6 +78,16 @@ class BBCode extends ProcessibleDatabaseObject implements IRouteController {
                return $this->bbcodeTag;
        }
        
+       /**
+        * Returns the button label in the active user's language.
+        * 
+        * @return      string
+        * @since       5.2
+        */
+       public function getButtonLabel() {
+               return WCF::getLanguage()->get($this->buttonLabel);
+       }
+       
        /**
         * Returns BBCode object with the given tag.
         * 
index ddc745108fc4f7233e7fd9818d868592a95a2864..279722cfbc647ce69a3151481d893bbf564bf8f3 100644 (file)
@@ -19,6 +19,16 @@ use wcf\util\StringUtil;
  * @property-read      integer         $isDisabled     is `1` if the captcha question is disabled and thus not offered to answer, otherwise `0`
  */
 class CaptchaQuestion extends DatabaseObject {
+       /**
+        * Returns the question in the active user's language.
+        * 
+        * @return      string
+        * @since       5.2
+        */
+       public function getQuestion() {
+               return WCF::getLanguage()->get($this->question);
+       }
+       
        /**
         * Returns true if the given user input is an answer to this question.
         * 
index d0341ef3f6f5ca677db7ae87b04cb7bdaeaa4e65..ae552fd811be123a8615dd42e7782885e3617fb6 100644 (file)
@@ -2,6 +2,7 @@
 namespace wcf\data\cronjob;
 use wcf\data\DatabaseObject;
 use wcf\data\TDatabaseObjectOptions;
+use wcf\system\WCF;
 use wcf\util\CronjobUtil;
 
 /**
@@ -120,4 +121,14 @@ class Cronjob extends DatabaseObject {
        public function canBeDisabled() {
                return $this->canBeDisabled;
        }
+       
+       /**
+        * Returns the cronjob description in the active user's language.
+        * 
+        * @return      string
+        * @since       5.2
+        */
+       public function getDescription() {
+               return WCF::getLanguage()->get($this->description);
+       }
 }
index 3ddf2886881035fd3ea9d964eadf4068812ff416..2f620972353e6c3714da84d0274380ccb336b903 100644 (file)
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\data\custom\option;
+use wcf\data\ITitledObject;
 use wcf\data\language\Language;
 use wcf\data\option\Option;
 use wcf\system\bbcode\MessageParser;
@@ -31,13 +32,31 @@ use wcf\util\StringUtil;
  * @property-read      integer         $isDisabled             is `1` if the option is disabled, otherwise `0`
  * @property-read      integer         $originIsSystem         is `1` if the option has been delivered by a package, otherwise `0` (i.e. the option has been created in the ACP)
  */
-abstract class CustomOption extends Option {
+abstract class CustomOption extends Option implements ITitledObject {
        /**
         * option value
         * @var string
         */
        protected $optionValue = '';
        
+       /**
+        * @inheritDoc
+        * @since       5.2
+        */
+       public function getTitle() {
+               return WCF::getLanguage()->get($this->optionTitle);
+       }
+
+       /**
+        * Returns the option description in the active user's language.
+        * 
+        * @return      string
+        * @since       5.2
+        */
+       public function getDescription() {
+               return WCF::getLanguage()->get($this->optionDescription);
+       }
+       
        /**
         * Returns true if the option is visible
         *
index 889b3ff5dcd4f42ae6ac831d902e880265b64a2f..77b86a5bcfc10e40238a6084a8979591d9be9cd4 100644 (file)
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\data\menu;
 use wcf\data\box\Box;
+use wcf\data\ITitledObject;
 use wcf\data\menu\item\MenuItemNodeTree;
 use wcf\data\DatabaseObject;
 use wcf\system\WCF;
@@ -20,7 +21,7 @@ use wcf\system\WCF;
  * @property-read      integer         $originIsSystem         is `1` if the menu has been delivered by a package, otherwise `0` (if the menu has been created by an admin in the ACP)
  * @property-read      integer         $packageID              id of the package the which delivers the menu or `1` if it has been created in the ACP
  */
-class Menu extends DatabaseObject {
+class Menu extends DatabaseObject implements ITitledObject {
        /**
         * menu item node tree
         * @var MenuItemNodeTree
@@ -65,9 +66,8 @@ class Menu extends DatabaseObject {
        }
        
        /**
-        * Returns the title for the rendered version of this menu.
-        *
-        * @return      string
+        * @inheritDoc
+        * @since       5.2
         */
        public function getTitle() {
                return WCF::getLanguage()->get($this->title);
index 20aae681390846b392c13b34ca67306e5c019e4f..ca9b48f8ea22bd45484be6ea21d10d1a434f9b65 100644 (file)
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\data\menu\item;
+use wcf\data\ITitledObject;
 use wcf\data\page\Page;
 use wcf\data\page\PageCache;
 use wcf\data\DatabaseObject;
@@ -31,7 +32,7 @@ use wcf\system\WCF;
  * @property-read      integer         $originIsSystem         is `1` if the menu item has been delivered by a package, otherwise `0` (if the menu item has been created by an admin in the ACP)
  * @property-read      integer         $packageID              id of the package the which delivers the menu item or `1` if it has been created in the ACP
  */
-class MenuItem extends DatabaseObject {
+class MenuItem extends DatabaseObject implements ITitledObject {
        /**
         * @var IMenuPageHandler
         */
@@ -43,6 +44,14 @@ class MenuItem extends DatabaseObject {
         */
        protected $page;
        
+       /**
+        * @inheritDoc
+        * @since       5.2
+        */
+       public function getTitle() {
+               return WCF::getLanguage()->get($this->title);
+       }
+       
        /**
         * Returns true if the active user can delete this menu item.
         *
index 1a4a2872237b6054794eb75282a5b1dced867491..9c5d9e0c42753617d782624e00c530466fbf9213 100644 (file)
@@ -111,6 +111,16 @@ class Package extends DatabaseObject {
                return $this->getName();
        }
        
+       /**
+        * Returns the description of this package in the active user's language.
+        * 
+        * @return      string
+        * @since       5.2
+        */
+       public function getDescription() {
+               return WCF::getLanguage()->get($this->packageDescription);
+       }
+       
        /**
         * Returns the abbreviation of the package name.
         * 
index 77dfe9010c16f9e808a2c1522a18defa72c9ff5a..7e0dd94bf5d7fddaf1f4e1f5bcaf5dcec33e0287 100644 (file)
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\data\smiley;
 use wcf\data\DatabaseObject;
+use wcf\data\ITitledObject;
 use wcf\system\WCF;
 use wcf\util\StringUtil;
 
@@ -17,16 +18,24 @@ use wcf\util\StringUtil;
  * @property-read      integer|null    $categoryID     id of the category the smiley belongs to or `null` if it belongs to the default category
  * @property-read      string          $smileyPath     path to the smiley file relative to wcf's default path
  * @property-read       string          $smileyPath2x   path to the smiley file relative to wcf's default path (2x version)
- * @property-read      string          $smileyTitle    title of the smiley
+ * @property-read      string          $smileyTitle    title of the smiley or name of language item that contains the title
  * @property-read      string          $smileyCode     code used for displaying the smiley
  * @property-read      string          $aliases        alternative codes used for displaying the smiley
  * @property-read      integer         $showOrder      position of the smiley in relation to the other smileys in the same category
  */
-class Smiley extends DatabaseObject {
+class Smiley extends DatabaseObject implements ITitledObject {
        protected $height;
        
        public $smileyCodes;
        
+       /**
+        * @inheritDoc
+        * @since       5.2
+        */
+       public function getTitle() {
+               return WCF::getLanguage()->get($this->smileyTitle);
+       }
+       
        /**
         * Returns the url to this smiley.
         * 
index 43a9e4312c65be13a5e18d8c4fc3743f2ba7f919..d9b9313785fdc0a7f2ef1a72094a9166565f6536 100644 (file)
@@ -444,6 +444,16 @@ class UserGroup extends DatabaseObject implements ITitledObject {
                return WCF::getLanguage()->get($this->groupName);
        }
        
+       /**
+        * Returns the user group description in the active user's language.
+        * 
+        * @return      string
+        * @since       5.2
+        */
+       public function getDescription() {
+               return WCF::getLanguage()->get($this->groupDescription);
+       }
+       
        /**
         * The `Everyone`, `Guests` and `Users` group can never be mentioned.
         * 
index a633cdd8dcf5348b91c9f6ab3dce9f7b9300a0d4..147602ff9d11bc5cebb6a4fec92cbd65d38f4ca1 100644 (file)
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\data\user\menu\item;
+use wcf\data\ITitledObject;
 use wcf\data\ProcessibleDatabaseObject;
 use wcf\system\menu\user\DefaultUserMenuItemProvider;
 use wcf\system\menu\user\IUserMenuItemProvider;
@@ -28,7 +29,7 @@ use wcf\system\WCF;
  * @property-read      string          $className              name of the class implementing the user menu item provider interface or empty if there is no specific user menu item provider
  * @property-read      string          $iconClassName          FontAwesome CSS class name for user menu items on the first level
  */
-class UserMenuItem extends ProcessibleDatabaseObject implements ITreeMenuItem {
+class UserMenuItem extends ProcessibleDatabaseObject implements ITitledObject, ITreeMenuItem {
        /**
         * @inheritDoc
         */
@@ -75,6 +76,14 @@ class UserMenuItem extends ProcessibleDatabaseObject implements ITreeMenuItem {
                return LinkHandler::getInstance()->getLink($this->controller, ['application' => $this->application], $this->menuItemLink);
        }
        
+       /**
+        * @inheritDoc
+        * @since       5.2
+        */
+       public function getTitle() {
+               return WCF::getLanguage()->get($this->menuItem);
+       }
+       
        /**
         * Returns application abbreviation.
         * 
index f7b2ea0870b2a72bb28e7ab8e0b7e90bfd66fdb3..513e4c42598bc84ab351fc3a26f81d5b7c3b8bdb 100644 (file)
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\data\user\rank;
 use wcf\data\DatabaseObject;
+use wcf\data\ITitledObject;
 use wcf\system\WCF;
 use wcf\util\StringUtil;
 
@@ -22,7 +23,7 @@ use wcf\util\StringUtil;
  * @property-read      integer         $requiredGender         numeric representation of the user's gender required for the user rank (see `UserProfile::GENDER_*` constants) or 0 if no specific gender is required
  * @property-read      integer         $hideTitle              hides the generic title of the rank, but not custom titles, `0` to show the title at all times
  */
-class UserRank extends DatabaseObject {
+class UserRank extends DatabaseObject implements ITitledObject {
        /**
         * Returns the image of this user rank.
         * 
@@ -38,6 +39,14 @@ class UserRank extends DatabaseObject {
                return '';
        }
        
+       /**
+        * @inheritDoc
+        * @since       5.2
+        */
+       public function getTitle() {
+               return WCF::getLanguage()->get($this->rankTitle);
+       }
+       
        /**
         * Returns true if the generic rank title should be displayed.
         * 
index e1b7c0b917b676e8a519a8aa88a33e5db7483c58..40c18fb7c638c0ed2cea262a874217602730b528 100644 (file)
                <item name="wcf.acp.captcha.question.answers"><![CDATA[Antworten]]></item>
                <item name="wcf.acp.captcha.question.answers.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Gib{else}Geben Sie{/if} pro Zeile eine mögliche Antwort ein. Antworten, die mit „~“ beginnen und enden, werden als reguläre Ausdrücke interpretiert.]]></item>
                <item name="wcf.acp.captcha.question.answers.error.invalidRegex"><![CDATA[Der reguläre Ausdruck „{$invalidRegex}“ ist ungültig.]]></item>
-               <item name="wcf.acp.captcha.question.delete.confirmMessage"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} die Frage <span class="confirmationObject">{$question->question|language}</span> wirklich löschen?]]></item>
+               <item name="wcf.acp.captcha.question.delete.confirmMessage"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} die Frage <span class="confirmationObject">{$question->getQuestion()}</span> wirklich löschen?]]></item>
                <item name="wcf.acp.captcha.question.edit"><![CDATA[Captcha-Frage bearbeiten]]></item>
                <item name="wcf.acp.captcha.question.isDisabled"><![CDATA[Frage deaktivieren]]></item>
                <item name="wcf.acp.captcha.question.list"><![CDATA[Captcha-Fragen]]></item>
                <item name="wcf.acp.cronjob.execute"><![CDATA[Cronjob jetzt ausführen]]></item>
                <item name="wcf.acp.cronjob.className.error.doesNotExist"><![CDATA[Eine Klasse mit dem angegebenen Namen existiert nicht.]]></item>
                <item name="wcf.acp.cronjob.timing.error.invalid"><![CDATA[Das Zeitformat ist ungültig.]]></item>
-               <item name="wcf.acp.cronjob.delete.sure"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} den Cronjob <span class="confirmationObject">{$cronjob->description|language}</span> wirklich löschen?]]></item>
+               <item name="wcf.acp.cronjob.delete.sure"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} den Cronjob <span class="confirmationObject">{$cronjob->getDescription()}</span> wirklich löschen?]]></item>
                <item name="wcf.acp.cronjob.log"><![CDATA[Protokoll der ausgeführten Cronjobs]]></item>
                <item name="wcf.acp.cronjob.log.clear"><![CDATA[Protokoll leeren]]></item>
                <item name="wcf.acp.cronjob.log.clear.confirm"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} alle Protokoll-Einträge wirklich löschen?]]></item>
@@ -653,7 +653,7 @@ Das Fehlerprotokoll enthält {$data[count]} neue Einträge. Die ersten drei, in
        </category>
        <category name="wcf.acp.group">
                <item name="wcf.acp.group.add"><![CDATA[Benutzergruppe hinzufügen]]></item>
-               <item name="wcf.acp.group.delete.sure"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} die Benutzergruppe <span class="confirmationObject">{$group->groupName|language}</span> wirklich löschen?]]></item>
+               <item name="wcf.acp.group.delete.sure"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} die Benutzergruppe <span class="confirmationObject">{$group->getTitle()}</span> wirklich löschen?]]></item>
                <item name="wcf.acp.group.edit"><![CDATA[Benutzergruppe bearbeiten]]></item>
                <item name="wcf.acp.group.option.editingOption"><![CDATA[Benutzergruppeneinstellung bearbeiten]]></item>
                <item name="wcf.acp.group.edit.warning.selfIsMember"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du bist{else}Sie sind{/if} Mitglied dieser Benutzergruppe! Änderungen an den Zugriffsrechten dieser Benutzergruppe können dazu führen, dass {if LANGUAGE_USE_INFORMAL_VARIANT}du{else}Sie{/if} aus der Administrationsoberfläche ausgeschlossen {if LANGUAGE_USE_INFORMAL_VARIANT}wirst{else}werden{/if}. Bitte {if LANGUAGE_USE_INFORMAL_VARIANT}sei{else}seien Sie{/if} entsprechend vorsichtig!]]></item>
@@ -939,7 +939,7 @@ Das Fehlerprotokoll enthält {$data[count]} neue Einträge. Die ersten drei, in
                <item name="wcf.acp.label.group"><![CDATA[Labelgruppe]]></item>
                <item name="wcf.acp.label.group.add"><![CDATA[Labelgruppe hinzufügen]]></item>
                <item name="wcf.acp.label.group.category.connect"><![CDATA[Verfügbarkeit]]></item>
-               <item name="wcf.acp.label.group.delete.sure"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} die Labelgruppe <span class="confirmationObject">{$group->groupName|language}</span> wirklich löschen?]]></item>
+               <item name="wcf.acp.label.group.delete.sure"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} die Labelgruppe <span class="confirmationObject">{$group->getTitle()}</span> wirklich löschen?]]></item>
                <item name="wcf.acp.label.group.edit"><![CDATA[Labelgruppe bearbeiten]]></item>
                <item name="wcf.acp.label.group.error.invalid"><![CDATA[Die gewählte Labelgruppe ist ungültig.]]></item>
                <item name="wcf.acp.label.group.forceSelection"><![CDATA[Label aus dieser Gruppe muss zwingend ausgewählt werden]]></item>
@@ -1151,7 +1151,7 @@ Das Fehlerprotokoll enthält {$data[count]} neue Einträge. Die ersten drei, in
                <item name="wcf.acp.menu.edit"><![CDATA[Menü bearbeiten]]></item>
                <item name="wcf.acp.menu.list"><![CDATA[Menüs]]></item>
                <item name="wcf.acp.menu.item.add"><![CDATA[Menüpunkt hinzufügen]]></item>
-               <item name="wcf.acp.menu.item.delete.confirmMessage"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} den Menüpunkt <span class="confirmationObject">{$menuItemNode->title|language}</span> wirklich löschen?]]></item>
+               <item name="wcf.acp.menu.item.delete.confirmMessage"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} den Menüpunkt <span class="confirmationObject">{$menuItemNode->getTitle()}</span> wirklich löschen?]]></item>
                <item name="wcf.acp.menu.item.edit"><![CDATA[Menüpunkt bearbeiten]]></item>
                <item name="wcf.acp.menu.item.externalURL"><![CDATA[Externe URL]]></item>
                <item name="wcf.acp.menu.item.isDisabled"><![CDATA[Menüpunkt deaktivieren]]></item>
@@ -1773,7 +1773,7 @@ Die Datenbestände werden sorgfältig gepflegt, aber es ist nicht ausgeschlossen
                <item name="wcf.acp.customOption.edit"><![CDATA[Eingabefeld bearbeiten]]></item>
                <item name="wcf.acp.customOption.error.validationFailed"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du hast{else}Sie haben{/if} einen ungültigen Inhalt eingegeben.]]></item>
                <item name="wcf.acp.customOption.showOrder"><![CDATA[Reihenfolge]]></item>
-               <item name="wcf.acp.customOption.delete.confirmMessage"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} das Eingabefeld <span class="confirmationObject">{$option->optionTitle|language}</span> wirklich löschen?]]></item>
+               <item name="wcf.acp.customOption.delete.confirmMessage"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} das Eingabefeld <span class="confirmationObject">{$option->getTitle()}</span> wirklich löschen?]]></item>
                <item name="wcf.acp.customOption.defaultValue"><![CDATA[Standardwert]]></item>
                <item name="wcf.acp.customOption.defaultValue.description"><![CDATA[Wert, der beim erstmaligen Ausfüllen als Standard vorgegeben ist.]]></item>
                <item name="wcf.acp.customOption.typeData"><![CDATA[Eigenschaften]]></item>
@@ -1811,7 +1811,7 @@ Die Datenbestände werden sorgfältig gepflegt, aber es ist nicht ausgeschlossen
                <item name="wcf.acp.package.error.sql.dropTable.description"><![CDATA[Die oben genannten Tabellen existieren bereits und werden beim Fortfahren der Installation entfernt. Alle Daten dieser Tabellen gehen unwiderruflich verloren.]]></item>
                <item name="wcf.acp.package.error.uniqueAlreadyInstalled"><![CDATA[Dieses Paket ist bereits installiert und kann nicht mehrfach installiert werden.]]></item>
                <item name="wcf.acp.package.error.noValidInstall"><![CDATA[Das angegebene Paket lässt keine Neuinstallation zu.]]></item>
-               <item name="wcf.acp.package.error.noValidUpdate"><![CDATA[Paket „{$package->packageName|language}“ kann mit dem angegebenen Archiv nicht aktualisiert werden.]]></item>
+               <item name="wcf.acp.package.error.noValidUpdate"><![CDATA[Paket „{$package->getName()}“ kann mit dem angegebenen Archiv nicht aktualisiert werden.]]></item>
                <item name="wcf.acp.package.identifier"><![CDATA[Bezeichner]]></item>
                <item name="wcf.acp.package.information.properties"><![CDATA[Eigenschaften]]></item>
                <item name="wcf.acp.package.information.title"><![CDATA[Informationen]]></item>
@@ -2749,7 +2749,7 @@ Kein Abschnitt darf leer sein und alle Abschnitten dürfen nur folgende Zeichen
        </category>
        <category name="wcf.acp.smiley">
                <item name="wcf.acp.smiley.list"><![CDATA[Smileys]]></item>
-               <item name="wcf.acp.smiley.delete.sure"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} das Smiley <span class="confirmationObject">{$smiley->smileyTitle|language}</span> wirklich löschen?]]></item>
+               <item name="wcf.acp.smiley.delete.sure"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} das Smiley <span class="confirmationObject">{$smiley->getTitle()}</span> wirklich löschen?]]></item>
                <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>
@@ -3073,7 +3073,7 @@ Wenn {if LANGUAGE_USE_INFORMAL_VARIANT}du{else}Sie{/if} unter „Konfiguration 
                <item name="wcf.acp.user.rank.cssClassName.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst{else}Sie können{/if} aus den vorgegebenen Darstellungen wählen oder eine eigene Darstellung durch Angabe einer <abbr title="Cascading Style Sheets">CSS</abbr>-Klasse nutzen.]]></item>
                <item name="wcf.acp.user.rank.cssClassName.error.invalid"><![CDATA[Die gewählte CSS-Klasse ist ungültig.]]></item>
                <item name="wcf.acp.user.rank.currentImage"><![CDATA[Aktuelle Ranggrafik]]></item>
-               <item name="wcf.acp.user.rank.delete.sure"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} den Benutzerrang <span class="confirmationObject">{$userRank->rankTitle|language}</span> wirklich löschen?]]></item>
+               <item name="wcf.acp.user.rank.delete.sure"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} den Benutzerrang <span class="confirmationObject">{$userRank->getTitle()}</span> wirklich löschen?]]></item>
                <item name="wcf.acp.user.rank.edit"><![CDATA[Benutzerrang bearbeiten]]></item>
                <item name="wcf.acp.user.rank.hideTitle"><![CDATA[Rangbezeichnung ausblenden]]></item>
                <item name="wcf.acp.user.rank.hideTitle.description"><![CDATA[Es wird nur die Ranggrafik angezeigt. Dies gilt nicht, wenn der Benutzer einen individuellen Titel eingestellt hat.]]></item>
index 3a602f4714d5cc7f932c6decfc8ade37adf3ea3f..f90ce2edb36c58a62ac6d8dadc429b24979614df 100644 (file)
                <item name="wcf.acp.captcha.question.answers"><![CDATA[Answers]]></item>
                <item name="wcf.acp.captcha.question.answers.description"><![CDATA[Answers beginning and ending with “~” will be interpreted as regular expressions. Enter one answer per line.]]></item>
                <item name="wcf.acp.captcha.question.answers.error.invalidRegex"><![CDATA[The regular expression “{$invalidRegex}” is invalid.]]></item>
-               <item name="wcf.acp.captcha.question.delete.confirmMessage"><![CDATA[Do you really want to delete the question “{$question->question|language}”?]]></item>
+               <item name="wcf.acp.captcha.question.delete.confirmMessage"><![CDATA[Do you really want to delete the question “{$question->getQuestion()}”?]]></item>
                <item name="wcf.acp.captcha.question.edit"><![CDATA[Edit Captcha Question]]></item>
                <item name="wcf.acp.captcha.question.isDisabled"><![CDATA[Disable Captcha Question]]></item>
                <item name="wcf.acp.captcha.question.list"><![CDATA[Captcha Questions]]></item>
                <item name="wcf.acp.cronjob.execute"><![CDATA[Run Cronjob]]></item>
                <item name="wcf.acp.cronjob.className.error.doesNotExist"><![CDATA[Unable to find the specified class.]]></item>
                <item name="wcf.acp.cronjob.timing.error.invalid"><![CDATA[Invalid time format.]]></item>
-               <item name="wcf.acp.cronjob.delete.sure"><![CDATA[Do you really want to delete the cronjob <span class="confirmationObject">{$cronjob->description|language}</span>?]]></item>
+               <item name="wcf.acp.cronjob.delete.sure"><![CDATA[Do you really want to delete the cronjob <span class="confirmationObject">{$cronjob->getDescription()}</span>?]]></item>
                <item name="wcf.acp.cronjob.log"><![CDATA[Cronjob Log]]></item>
                <item name="wcf.acp.cronjob.log.clear"><![CDATA[Clear Protocol]]></item>
                <item name="wcf.acp.cronjob.log.clear.confirm"><![CDATA[Do you really want to clear the cronjob log?]]></item>
@@ -629,7 +629,7 @@ This protocol file contains {$data[count]} new entries. The first three error me
        </category>
        <category name="wcf.acp.group">
                <item name="wcf.acp.group.add"><![CDATA[Add User Group]]></item>
-               <item name="wcf.acp.group.delete.sure"><![CDATA[Do you really want to delete the user group <span class="confirmationObject">{$group->groupName|language}</span>?]]></item>
+               <item name="wcf.acp.group.delete.sure"><![CDATA[Do you really want to delete the user group <span class="confirmationObject">{$group->getTitle()}</span>?]]></item>
                <item name="wcf.acp.group.edit"><![CDATA[Edit User Group]]></item>
                <item name="wcf.acp.group.option.editingOption"><![CDATA[Edit User Group Option]]></item>
                <item name="wcf.acp.group.edit.warning.selfIsMember"><![CDATA[Warning! You are a member of this user group, any changes could result in yourself being locked out of the Administration Control Panel.]]></item>
@@ -916,7 +916,7 @@ This protocol file contains {$data[count]} new entries. The first three error me
                <item name="wcf.acp.label.group"><![CDATA[Label Group]]></item>
                <item name="wcf.acp.label.group.add"><![CDATA[Add Label Group]]></item>
                <item name="wcf.acp.label.group.category.connect"><![CDATA[Availability]]></item>
-               <item name="wcf.acp.label.group.delete.sure"><![CDATA[Do you really want to delete the label group <span class="confirmationObject">{$group->groupName|language}</span>?]]></item>
+               <item name="wcf.acp.label.group.delete.sure"><![CDATA[Do you really want to delete the label group <span class="confirmationObject">{$group->getTitle()}</span>?]]></item>
                <item name="wcf.acp.label.group.edit"><![CDATA[Edit Label Group]]></item>
                <item name="wcf.acp.label.group.error.invalid"><![CDATA[The selected label group is invalid.]]></item>
                <item name="wcf.acp.label.group.forceSelection"><![CDATA[Force selection of a label]]></item>
@@ -1128,7 +1128,7 @@ This protocol file contains {$data[count]} new entries. The first three error me
                <item name="wcf.acp.menu.edit"><![CDATA[Edit Menu]]></item>
                <item name="wcf.acp.menu.list"><![CDATA[Menus]]></item>
                <item name="wcf.acp.menu.item.add"><![CDATA[Add Menu Item]]></item>
-               <item name="wcf.acp.menu.item.delete.confirmMessage"><![CDATA[Do you really want to delete the menu item <span class="confirmationObject">{$menuItemNode->title|language}</span>?]]></item>
+               <item name="wcf.acp.menu.item.delete.confirmMessage"><![CDATA[Do you really want to delete the menu item <span class="confirmationObject">{$menuItemNode->getTitle()}</span>?]]></item>
                <item name="wcf.acp.menu.item.edit"><![CDATA[Edit Menu Item]]></item>
                <item name="wcf.acp.menu.item.externalURL"><![CDATA[External URL]]></item>
                <item name="wcf.acp.menu.item.isDisabled"><![CDATA[Disable menu item]]></item>
@@ -1758,7 +1758,7 @@ The database is carefully maintained, but there will be always be a margin of er
                <item name="wcf.acp.customOption.edit"><![CDATA[Edit Option Field]]></item>
                <item name="wcf.acp.customOption.error.validationFailed"><![CDATA[You have entered an invalid value.]]></item>
                <item name="wcf.acp.customOption.showOrder"><![CDATA[Display Order]]></item>
-               <item name="wcf.acp.customOption.delete.confirmMessage"><![CDATA[Do you really want to delete the option field <span class="confirmationObject">{$option->optionTitle|language}</span>?]]></item>
+               <item name="wcf.acp.customOption.delete.confirmMessage"><![CDATA[Do you really want to delete the option field <span class="confirmationObject">{$option->getTitle()}</span>?]]></item>
                <item name="wcf.acp.customOption.defaultValue"><![CDATA[Default Value]]></item>
                <item name="wcf.acp.customOption.defaultValue.description"><![CDATA[Default option value suggested on initial request.]]></item>
                <item name="wcf.acp.customOption.typeData"><![CDATA[Properties]]></item>
@@ -1796,7 +1796,7 @@ The database is carefully maintained, but there will be always be a margin of er
                <item name="wcf.acp.package.error.sql.dropTable.description"><![CDATA[The tables above already exist and will be removed during the installation. Any contained data will be lost.]]></item>
                <item name="wcf.acp.package.error.uniqueAlreadyInstalled"><![CDATA[This package is already installed.]]></item>
                <item name="wcf.acp.package.error.noValidInstall"><![CDATA[The selected package does not support an installation.]]></item>
-               <item name="wcf.acp.package.error.noValidUpdate"><![CDATA[Package “{$package->packageName|language}” cannot be updated using the selected archive.]]></item>
+               <item name="wcf.acp.package.error.noValidUpdate"><![CDATA[Package “{$package->getName()}” cannot be updated using the selected archive.]]></item>
                <item name="wcf.acp.package.identifier"><![CDATA[Identifier]]></item>
                <item name="wcf.acp.package.information.properties"><![CDATA[Properties]]></item>
                <item name="wcf.acp.package.information.title"><![CDATA[Details]]></item>
@@ -2677,7 +2677,7 @@ If you have <strong>already bought the licenses for the listed apps</strong>, th
        </category>
        <category name="wcf.acp.smiley">
                <item name="wcf.acp.smiley.list"><![CDATA[Smilies]]></item>
-               <item name="wcf.acp.smiley.delete.sure"><![CDATA[Do you really want to delete the smiley <span class="confirmationObject">{$smiley->smileyTitle|language}</span>?]]></item>
+               <item name="wcf.acp.smiley.delete.sure"><![CDATA[Do you really want to delete the smiley <span class="confirmationObject">{$smiley->getTitle()}</span>?]]></item>
                <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>
@@ -3001,7 +3001,7 @@ You can define the default sender in “Configuration » Options » General » E
                <item name="wcf.acp.user.rank.cssClassName.description"><![CDATA[You can select a predefined appearance or provide your own <abbr title="Cascading Style Sheets">CSS</abbr> class name.]]></item>
                <item name="wcf.acp.user.rank.cssClassName.error.invalid"><![CDATA[The entered CSS class name is invalid.]]></item>
                <item name="wcf.acp.user.rank.currentImage"><![CDATA[Current Rank Image]]></item>
-               <item name="wcf.acp.user.rank.delete.sure"><![CDATA[Do you really want to delete the user rank <span class="confirmationObject">{$userRank->rankTitle|language}</span>?]]></item>
+               <item name="wcf.acp.user.rank.delete.sure"><![CDATA[Do you really want to delete the user rank <span class="confirmationObject">{$userRank->getTitle()}</span>?]]></item>
                <item name="wcf.acp.user.rank.edit"><![CDATA[Edit User Rank]]></item>
                <item name="wcf.acp.user.rank.hideTitle"><![CDATA[Hide title]]></item>
                <item name="wcf.acp.user.rank.hideTitle.description"><![CDATA[Hides the title of this rank. Does not work for users that have an individual title set.]]></item>