Skip to content

Commit 4046975

Browse files
committed
Add missing language variables
1 parent 2107cfa commit 4046975

File tree

6 files changed

+71
-9
lines changed

6 files changed

+71
-9
lines changed

wcfsetup/install/files/lib/acp/form/ContactOptionAddForm.class.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use wcf\system\form\builder\IFormDocument;
1919
use wcf\system\form\option\FormOptionHandler;
2020
use wcf\system\form\option\SharedConfigurationFormFields;
21+
use wcf\system\WCF;
2122
use wcf\util\JSON;
2223

2324
/**
@@ -139,7 +140,15 @@ private function getContactOptions(): array
139140
*/
140141
private function getAvailableOptionTypes(): array
141142
{
142-
return \array_map(fn($option) => $option->getId(), FormOptionHandler::getInstance()->getOptions());
143+
$optionTypes = \array_map(fn($option) => $option->getTitle(), FormOptionHandler::getInstance()->getOptions());
144+
145+
$collator = new \Collator(WCF::getLanguage()->getLocale());
146+
\uasort(
147+
$optionTypes,
148+
static fn(string $a, string $b) => $collator->compare($a, $b)
149+
);
150+
151+
return $optionTypes;
143152
}
144153

145154
/**

wcfsetup/install/files/lib/system/form/option/AbstractFormOption.class.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use wcf\system\form\option\formatter\DefaultFormatter;
66
use wcf\system\form\option\formatter\DefaultPlainTextFormatter;
77
use wcf\system\form\option\formatter\IFormOptionFormatter;
8+
use wcf\system\WCF;
89

910
/**
1011
* Provides abstract implementations for form option types.
@@ -22,6 +23,12 @@ public function getConfigurationFormFields(): array
2223
return [];
2324
}
2425

26+
#[\Override]
27+
public function getTitle(): string
28+
{
29+
return WCF::getLanguage()->get('wcf.form.option.' . $this->getId());
30+
}
31+
2532
#[\Override]
2633
public function getFormatter(): IFormOptionFormatter
2734
{

wcfsetup/install/files/lib/system/form/option/IFormOption.class.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ interface IFormOption
1717
{
1818
public function getId(): string;
1919

20+
public function getTitle(): string;
21+
2022
/**
2123
* @param array<string, mixed> $configurationData
2224
*/

wcfsetup/install/files/lib/system/form/option/SharedConfigurationFormFields.class.php

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,25 @@ private function getDefaultFormFields(): array
3737
{
3838
return [
3939
'currency' => TextFormField::create('currency')
40-
->label('wcf.acp.customOption.currency')
40+
->label('wcf.form.option.shared.currency')
4141
->value('EUR')
42+
->addFieldClass('short')
4243
->required(),
4344
'defaultTextValue' => TextFormField::create('defaultTextValue')
44-
->label('wcf.acp.customOption.defaultValue'),
45+
->label('wcf.form.option.shared.defaultValue')
46+
->addFieldClass('medium'),
4547
'maxLength' => IntegerFormField::create('maxLength')
46-
->label('wcf.acp.customOption.maxLength'),
48+
->label('wcf.form.option.shared.maxLength'),
4749
'minIntegerValue' => IntegerFormField::create('minIntegerValue')
48-
->label('wcf.acp.customOption.minValue'),
50+
->label('wcf.form.option.shared.minValue'),
4951
'maxIntegerValue' => IntegerFormField::create('maxIntegerValue')
50-
->label('wcf.acp.customOption.maxValue'),
52+
->label('wcf.form.option.shared.maxValue'),
5153
'minFloatValue' => FloatFormField::create('minFloatValue')
52-
->label('wcf.acp.customOption.minValue'),
54+
->label('wcf.form.option.shared.minValue'),
5355
'maxFloatValue' => FloatFormField::create('maxFloatValue')
54-
->label('wcf.acp.customOption.maxValue'),
56+
->label('wcf.form.option.shared.maxValue'),
5557
'selectOptions' => SelectOptionsFormField::create('selectOptions')
56-
->label('wcf.acp.customOption.selectOptions')
58+
->label('wcf.form.option.shared.selectOptions')
5759
->required(),
5860
];
5961
}

wcfsetup/install/lang/de.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4114,6 +4114,27 @@ Dateianhänge:
41144114
<item name="wcf.form.field.upload.error.fileExtension"><![CDATA[Die Datei „{$filename}“ hat eine ungültige Dateiendung. Erlaubt sind: {implode from=$allowedFileExtensions item=extension}{$extension}{/implode}.]]></item>
41154115
<item name="wcf.form.selectOptions.key"><![CDATA[Bezeichner]]></item>
41164116
<item name="wcf.form.selectOptions.value"><![CDATA[Wert]]></item>
4117+
<item name="wcf.form.option.boolean"><![CDATA[Ja/Nein]]></item>
4118+
<item name="wcf.form.option.checkboxes"><![CDATA[Checkboxen]]></item>
4119+
<item name="wcf.form.option.currency"><![CDATA[Währung]]></item>
4120+
<item name="wcf.form.option.date"><![CDATA[Datum]]></item>
4121+
<item name="wcf.form.option.email"><![CDATA[E-Mail-Adresse]]></item>
4122+
<item name="wcf.form.option.integer"><![CDATA[Ganze Zahl]]></item>
4123+
<item name="wcf.form.option.float"><![CDATA[Dezimalzahl]]></item>
4124+
<item name="wcf.form.option.icon"><![CDATA[Icon]]></item>
4125+
<item name="wcf.form.option.radioButton"><![CDATA[Radio-Buttons]]></item>
4126+
<item name="wcf.form.option.rating"><![CDATA[Sterne-Bewertung]]></item>
4127+
<item name="wcf.form.option.select"><![CDATA[Auswahlmöglichkeit]]></item>
4128+
<item name="wcf.form.option.text"><![CDATA[Text]]></item>
4129+
<item name="wcf.form.option.textarea"><![CDATA[Mehrzeiliger Text]]></item>
4130+
<item name="wcf.form.option.sourceCode"><![CDATA[Quellcode]]></item>
4131+
<item name="wcf.form.option.url"><![CDATA[Link]]></item>
4132+
<item name="wcf.form.option.shared.currency"><![CDATA[Währung]]></item>
4133+
<item name="wcf.form.option.shared.defaultValue"><![CDATA[Standardwert]]></item>
4134+
<item name="wcf.form.option.shared.maxLength"><![CDATA[Maximale Textlänge]]></item>
4135+
<item name="wcf.form.option.shared.minValue"><![CDATA[Minimum]]></item>
4136+
<item name="wcf.form.option.shared.maxValue"><![CDATA[Maximum]]></item>
4137+
<item name="wcf.form.option.shared.selectOptions"><![CDATA[Auswahloptionen]]></item>
41174138
</category>
41184139
<category name="wcf.image">
41194140
<item name="wcf.image.coverPhoto"><![CDATA[Titelbild]]></item>

wcfsetup/install/lang/en.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4060,6 +4060,27 @@ Attachments:
40604060
<item name="wcf.form.field.upload.error.fileExtension"><![CDATA[The file “{$filename}” has an invalid file extension. Allowed are: {implode from=$allowedFileExtensions item=extension}{$extension}{/implode}.]]></item>
40614061
<item name="wcf.form.selectOptions.key"><![CDATA[Key]]></item>
40624062
<item name="wcf.form.selectOptions.value"><![CDATA[Value]]></item>
4063+
<item name="wcf.form.option.boolean"><![CDATA[Yes/No]]></item>
4064+
<item name="wcf.form.option.checkboxes"><![CDATA[Multiple selection]]></item>
4065+
<item name="wcf.form.option.currency"><![CDATA[Currency]]></item>
4066+
<item name="wcf.form.option.date"><![CDATA[Date]]></item>
4067+
<item name="wcf.form.option.email"><![CDATA[Email address]]></item>
4068+
<item name="wcf.form.option.integer"><![CDATA[Integer]]></item>
4069+
<item name="wcf.form.option.float"><![CDATA[Decimal]]></item>
4070+
<item name="wcf.form.option.icon"><![CDATA[Icon]]></item>
4071+
<item name="wcf.form.option.radioButton"><![CDATA[Radio selection]]></item>
4072+
<item name="wcf.form.option.rating"><![CDATA[Rating]]></item>
4073+
<item name="wcf.form.option.select"><![CDATA[Single selection]]></item>
4074+
<item name="wcf.form.option.text"><![CDATA[Short text]]></item>
4075+
<item name="wcf.form.option.textarea"><![CDATA[Multiline text]]></item>
4076+
<item name="wcf.form.option.sourceCode"><![CDATA[Source code]]></item>
4077+
<item name="wcf.form.option.url"><![CDATA[Link]]></item>
4078+
<item name="wcf.form.option.shared.currency"><![CDATA[Currency]]></item>
4079+
<item name="wcf.form.option.shared.defaultValue"><![CDATA[Default Value]]></item>
4080+
<item name="wcf.form.option.shared.maxLength"><![CDATA[Maximum Text Length]]></item>
4081+
<item name="wcf.form.option.shared.minValue"><![CDATA[Minimum]]></item>
4082+
<item name="wcf.form.option.shared.maxValue"><![CDATA[Maximum]]></item>
4083+
<item name="wcf.form.option.shared.selectOptions"><![CDATA[Options]]></item>
40634084
</category>
40644085
<category name="wcf.image">
40654086
<item name="wcf.image.coverPhoto"><![CDATA[Cover Photo]]></item>

0 commit comments

Comments
 (0)