diff --git a/js/forms/custom-elements/collection_entry.js b/js/forms/custom-elements/collection_entry.js index b4e9fd130d..190aa5300e 100644 --- a/js/forms/custom-elements/collection_entry.js +++ b/js/forms/custom-elements/collection_entry.js @@ -14,7 +14,7 @@ class CollectionEntryElement extends HTMLElement { connectedCallback() { if ((this.dataset.new || this.dataset.allowDelete) && this.#eBtnDelete === undefined) { - this.#eBtnDelete = this.#createButton('Delete', 'ibo-button ibo-is-regular ibo-is-danger'); + this.#eBtnDelete = this.#createButton('Remove', 'ibo-button ibo-is-regular ibo-is-danger'); this.#eBtnDelete.addEventListener('click', this.#removeCollectionItem.bind(this)); this.appendChild(this.#eBtnDelete); } diff --git a/sources/Forms/FormType/Base/CollectionFormType.php b/sources/Forms/FormType/Base/CollectionFormType.php index 7130be43fd..409f2a595a 100644 --- a/sources/Forms/FormType/Base/CollectionFormType.php +++ b/sources/Forms/FormType/Base/CollectionFormType.php @@ -7,6 +7,7 @@ namespace Combodo\iTop\Forms\FormType\Base; +use Dict; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\CollectionType; use Symfony\Component\Form\FormInterface; @@ -33,7 +34,7 @@ class CollectionFormType extends AbstractType parent::configureOptions($resolver); $resolver->setDefaults([ - 'button_label' => 'Add an item', + 'button_label' => Dict::S('UI:Links:Add:Button'), 'allow_ordering' => false, ]); } @@ -42,8 +43,11 @@ class CollectionFormType extends AbstractType public function buildView(FormView $view, FormInterface $form, array $options): void { parent::buildView($view, $form, $options); - - $view->vars['button_label'] = $options['button_label']; + if (\utils::IsNotNullOrEmptyString($options['button_label'])) { + $view->vars['button_label'] = $options['button_label']; + } else { + $view->vars['button_label'] = Dict::S('UI:Links:Add:Button'); + } $view->vars['allow_ordering'] = $options['allow_ordering']; }