Improve titles/description of input fields for "Language"

diff --git a/com.woltlab.wcf/templates/register.tpl b/com.woltlab.wcf/templates/register.tpl
index a8f057cd6d80b5188e21535e2d97d3a1c3ffd578..dccaee16f69bc6a197b10bf129cf8e0133800920 100644 (file)
--- a/com.woltlab.wcf/templates/register.tpl
+++ b/com.woltlab.wcf/templates/register.tpl
@@ -149,7 +149,7 @@
                        <h2 class="sectionTitle">{lang}wcf.user.language{/lang}</h2>
                        
                        <dl>
-                               <dt><label for="languageID">{lang}wcf.user.language{/lang}</label></dt>
+                               <dt><label for="languageID">{lang}wcf.user.language.description{/lang}</label></dt>
                                <dd id="languageIDContainer">
                                        <script data-relocate="true">
                                                $(function() {
@@ -164,10 +164,6 @@
                                                        
                                                        require(['WoltLabSuite/Core/Language/Chooser'], function(LanguageChooser) {
                                                                LanguageChooser.init('languageIDContainer', 'languageID', {@$languageID}, $languages);
-                                                               
-                                                               var small = elCreate('small');
-                                                               small.innerHTML = '{jslang}wcf.user.language.description{/jslang}';
-                                                               elById('languageIDContainer').appendChild(small);
                                                        });
                                                });
                                        </script>

diff --git a/com.woltlab.wcf/templates/settings.tpl b/com.woltlab.wcf/templates/settings.tpl
index 3f973d4cbdc4c6c182c54d01d351a2b9c84e5402..481070105f0ea09a0ba65f5a4f3a4bb13efd7599 100644 (file)
--- a/com.woltlab.wcf/templates/settings.tpl
+++ b/com.woltlab.wcf/templates/settings.tpl
@@ -19,7 +19,7 @@
                                <h2 class="sectionTitle">{lang}wcf.user.language{/lang}</h2>
                                
                                <dl>
-                                       <dt><label>{lang}wcf.user.language{/lang}</label></dt>
+                                       <dt><label>{lang}wcf.user.language.description{/lang}</label></dt>
                                        <dd id="languageIDContainer">
                                                <script data-relocate="true">
                                                        $(function() {
@@ -34,10 +34,6 @@
                                                                
                                                                require(['WoltLabSuite/Core/Language/Chooser'], function(LanguageChooser) {
                                                                        LanguageChooser.init('languageIDContainer', 'languageID', {@$languageID}, $languages);
-                                                                       
-                                                                       var small = elCreate('small');
-                                                                       small.innerHTML = '{jslang}wcf.user.language.description{/jslang}';
-                                                                       elById('languageIDContainer').appendChild(small);
                                                                });
                                                        });
                                                </script>

diff --git a/wcfsetup/install/files/lib/acp/form/LanguageAddForm.class.php b/wcfsetup/install/files/lib/acp/form/LanguageAddForm.class.php
index 680e228ceb5b9d16a48fa6f7da6fa623f3d9b3e7..ef92ab2676cbd462124b25bdefc8d3ea81fd0eab 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/LanguageAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LanguageAddForm.class.php
@@ -88,8 +88,7 @@ class LanguageAddForm extends AbstractFormBuilderForm
             FormContainer::create('data')
                 ->appendChildren([
                     TextFormField::create('languageName')
-                        ->label('wcf.global.name')
-                        ->description('wcf.acp.language.name.description')
+                        ->label('wcf.acp.language.name')
                         ->maximumLength(255)
                         ->required(),
                     TextFormField::create('languageCode')

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 5f30e36c34e53e8056d33dc61fc1aa11442f18f2..eb275f59f5670558c0fbffc20904fec7677657ac 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1046,7 +1046,7 @@ Sie erreichen das Fehlerprotokoll unter: {link controller='ExceptionLogView' isE
                <item name="wcf.acp.language.item.useCustomValue"><![CDATA[Eigene Version verwenden]]></item>
                <item name="wcf.acp.language.item.customValues"><![CDATA[Veränderte Inhalte finden]]></item>
                <item name="wcf.acp.language.item.disabledCustomValues"><![CDATA[Deaktivierte veränderte Inhalte finden]]></item>
-               <item name="wcf.acp.language.name.description"><![CDATA[Name der Sprache]]></item>
+               <item name="wcf.acp.language.name"><![CDATA[Name der Sprache]]></item>
                <item name="wcf.acp.language.add.source.description"><![CDATA[Falls die hochgeladene Sprachdatei eine komplett neue Sprache enthält, wird die ausgewählte Sprache als Vorlage benutzt. Fehlende Texte werden aus der Vorlage in die neue Sprache übernommen.]]></item>
                <item name="wcf.acp.language.item.oldValue"><![CDATA[Ursprünglicher Inhalt]]></item>
                <item name="wcf.acp.language.item.oldValue.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Deine{else}Ihre{/if} veränderte Fassung basierte auf dem unten stehenden Stand{if $item->languageCustomItemDisableTime} vom {$item->languageCustomItemDisableTime|date}{/if}.]]></item>
@@ -5844,7 +5844,6 @@ Benachrichtigungen auf <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phra
        <item name="wcf.acp.language.item.noItems"/>
        <item name="wcf.acp.language.list.count"/>
        <item name="wcf.acp.language.multilingualism.success"/>
-       <item name="wcf.acp.language.name"/>
        <item name="wcf.acp.login"/>
        <item name="wcf.acp.login.data"/>
        <item name="wcf.acp.masterPassword"/>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 437b64f532f9f11f14b96c4afadc689ffe6ec83c..80db36f51226506ab02f06ee26b6a2e4c9df3396 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1025,7 +1025,7 @@ You can access the error log at: {link controller='ExceptionLogView' isEmail=tru
                <item name="wcf.acp.language.item.useCustomValue"><![CDATA[Use custom value]]></item>
                <item name="wcf.acp.language.item.customValues"><![CDATA[Customized values]]></item>
                <item name="wcf.acp.language.item.disabledCustomValues"><![CDATA[Disabled customized values]]></item>
-               <item name="wcf.acp.language.name.description"><![CDATA[Language Name]]></item>
+               <item name="wcf.acp.language.name"><![CDATA[Language Name]]></item>
                <item name="wcf.acp.language.add.source.description"><![CDATA[If the uploaded language file contains a completely new language the selected language will be used as a blueprint. Any missing phrases will be copied from the blueprint into the new language.]]></item>
                <item name="wcf.acp.language.item.oldValue"><![CDATA[Original Content]]></item>
                <item name="wcf.acp.language.item.oldValue.description"><![CDATA[Your custom value was based on the original content that has changed{if $item->languageCustomItemDisableTime} on {$item->languageCustomItemDisableTime|date}{/if}.]]></item>
@@ -4579,7 +4579,7 @@ Attachments:
                <item name="wcf.user.login.register.registerNow"><![CDATA[Register Yourself]]></item>
                <item name="wcf.user.password.error.false"><![CDATA[The entered password is wrong.]]></item>
                <item name="wcf.user.language"><![CDATA[Language]]></item>
-               <item name="wcf.user.language.description"><![CDATA[User interface language]]></item>
+               <item name="wcf.user.language.description"><![CDATA[User Interface Language]]></item>
                <item name="wcf.user.logout"><![CDATA[Logout]]></item>
                <item name="wcf.user.password"><![CDATA[Password]]></item>
                <item name="wcf.user.registrationDate"><![CDATA[Registration Date]]></item>