diff --git a/src/main/java/org/olat/modules/forms/ui/ChoiceController.java b/src/main/java/org/olat/modules/forms/ui/ChoiceController.java
deleted file mode 100644
index 607095bbd8b4a3966ff589cbf00474e3f199b748..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/modules/forms/ui/ChoiceController.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * <a href="http://www.openolat.org">
- * OpenOLAT - Online Learning and Training</a><br>
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); <br>
- * you may not use this file except in compliance with the License.<br>
- * You may obtain a copy of the License at the
- * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
- * <p>
- * Unless required by applicable law or agreed to in writing,<br>
- * software distributed under the License is distributed on an "AS IS" BASIS, <br>
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
- * See the License for the specific language governing permissions and <br>
- * limitations under the License.
- * <p>
- * Initial code contributed and copyrighted by<br>
- * frentix GmbH, http://www.frentix.com
- * <p>
- */
-package org.olat.modules.forms.ui;
-
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.form.flexible.FormItemContainer;
-import org.olat.core.gui.components.form.flexible.elements.TextElement;
-import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
-import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
-import org.olat.core.gui.control.Controller;
-import org.olat.core.gui.control.Event;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.core.util.StringHelper;
-import org.olat.modules.forms.model.xml.Choice;
-
-/**
- *
- * Initial date: 10.04.2018<br>
- * @author uhensler, urs.hensler@frentix.com, http://www.frentix.com
- *
- */
-public class ChoiceController extends FormBasicController {
-
- private TextElement valueEl;
-
- private Choice choice;
-
- public ChoiceController(UserRequest ureq, WindowControl wControl, Choice choice) {
- super(ureq, wControl);
- this.choice = choice;
- initForm(ureq);
- }
-
- public Choice getChoice() {
- return choice;
- }
-
- @Override
- protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
- valueEl = uifactory.addTextElement("choice.value", 200, choice.getValue(), formLayout);
-
- FormLayoutContainer buttonLayout = FormLayoutContainer.createButtonLayout("buttons", getTranslator());
- formLayout.add("buttons", buttonLayout);
- uifactory.addFormCancelButton("cancel", buttonLayout, ureq, getWindowControl());
- uifactory.addFormSubmitButton("save", buttonLayout);
- }
-
- @Override
- protected boolean validateFormLogic(UserRequest ureq) {
- boolean allOk = true;
-
- if (!StringHelper.containsNonWhitespace(valueEl.getValue())) {
- valueEl.setErrorKey("form.legende.mandatory", null);
- allOk &= false;
- }
-
- return allOk & super.validateFormLogic(ureq);
- }
-
- @Override
- protected void formOK(UserRequest ureq) {
- choice.setValue(valueEl.getValue());
- fireEvent(ureq, Event.DONE_EVENT);
- }
-
- @Override
- protected void formCancelled(UserRequest ureq) {
- fireEvent(ureq, Event.CANCELLED_EVENT);
- }
-
- @Override
- protected void doDispose() {
- //
- }
-
-}
diff --git a/src/main/java/org/olat/modules/forms/ui/ChoiceDataModel.java b/src/main/java/org/olat/modules/forms/ui/ChoiceDataModel.java
index 9a76b445434450f0399fbabc3a0010e2776f5348..4cbb7feacc2a51a2ee3f1e10db4890614716489a 100644
--- a/src/main/java/org/olat/modules/forms/ui/ChoiceDataModel.java
+++ b/src/main/java/org/olat/modules/forms/ui/ChoiceDataModel.java
@@ -47,7 +47,7 @@ public class ChoiceDataModel extends DefaultFlexiTableDataModel<ChoiceRow> {
case move:
return choiceRow.getUpDown();
case value:
- return choiceRow.getChoice().getValue();
+ return choiceRow.getValueEl();
default:
return "";
}
@@ -56,7 +56,6 @@ public class ChoiceDataModel extends DefaultFlexiTableDataModel<ChoiceRow> {
enum ChoiceCols implements FlexiColumnDef {
move("choice.move"),
value("choice.value"),
- edit("choice.edit"),
delete("choice.delete");
private final String i18nKey;
diff --git a/src/main/java/org/olat/modules/forms/ui/ChoiceRow.java b/src/main/java/org/olat/modules/forms/ui/ChoiceRow.java
index ff7a0deeac3365ac9fa391afbd0fda23db36ad16..7b38b0a672d2d1a55c58ff0ecdad10750ed97828 100644
--- a/src/main/java/org/olat/modules/forms/ui/ChoiceRow.java
+++ b/src/main/java/org/olat/modules/forms/ui/ChoiceRow.java
@@ -20,6 +20,7 @@
package org.olat.modules.forms.ui;
import org.olat.core.gui.components.Component;
+import org.olat.core.gui.components.form.flexible.elements.TextElement;
import org.olat.modules.forms.model.xml.Choice;
/**
@@ -32,10 +33,12 @@ public class ChoiceRow {
private final Choice choice;
private final Component upDown;
+ private final TextElement valueEl;
- public ChoiceRow(Choice choice, Component upDown) {
+ public ChoiceRow(Choice choice, Component upDown, TextElement valueEl) {
this.choice = choice;
+ this.valueEl = valueEl;
this.upDown = upDown;
}
@@ -43,6 +46,10 @@ public class ChoiceRow {
return choice;
}
+ public TextElement getValueEl() {
+ return valueEl;
+ }
+
public Component getUpDown() {
return upDown;
}
diff --git a/src/main/java/org/olat/modules/forms/ui/MultipleChoiceEditorController.java b/src/main/java/org/olat/modules/forms/ui/MultipleChoiceEditorController.java
index d52a33454132016792b7051cba9ac3cde18db4d6..da412414daa201468402b4c96fca53d0bc6be0e5 100644
--- a/src/main/java/org/olat/modules/forms/ui/MultipleChoiceEditorController.java
+++ b/src/main/java/org/olat/modules/forms/ui/MultipleChoiceEditorController.java
@@ -30,6 +30,7 @@ import org.olat.core.gui.components.form.flexible.FormItemContainer;
import org.olat.core.gui.components.form.flexible.elements.FlexiTableElement;
import org.olat.core.gui.components.form.flexible.elements.FormLink;
import org.olat.core.gui.components.form.flexible.elements.MultipleSelectionElement;
+import org.olat.core.gui.components.form.flexible.elements.TextElement;
import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
import org.olat.core.gui.components.form.flexible.impl.FormEvent;
import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
@@ -39,13 +40,13 @@ import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTable
import org.olat.core.gui.components.form.flexible.impl.elements.table.SelectionEvent;
import org.olat.core.gui.components.form.flexible.impl.elements.table.StaticFlexiCellRenderer;
import org.olat.core.gui.components.link.Link;
+import org.olat.core.gui.components.updown.UpDown;
import org.olat.core.gui.components.updown.UpDownEvent;
import org.olat.core.gui.components.updown.UpDownEvent.Direction;
import org.olat.core.gui.components.updown.UpDownFactory;
import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.Event;
import org.olat.core.gui.control.WindowControl;
-import org.olat.core.gui.control.generic.closablewrapper.CloseableModalController;
import org.olat.core.util.CodeHelper;
import org.olat.modules.ceditor.PageElementEditorController;
import org.olat.modules.forms.model.xml.Choice;
@@ -62,7 +63,6 @@ public class MultipleChoiceEditorController extends FormBasicController implemen
private static final String WITH_OTHER_KEY = "multiple.choice.with.others.enabled";
private static final String[] WITH_OTHER_KEYS = new String[] {WITH_OTHER_KEY};
- private static final String CMD_EDIT = "edit";
private static final String CMD_DELETE = "delete";
private MultipleSelectionElement withOthersEl;
@@ -71,8 +71,6 @@ public class MultipleChoiceEditorController extends FormBasicController implemen
private ChoiceDataModel dataModel;
private MultipleChoiceController multipleChoiceCtrl;
- private CloseableModalController cmc;
- private ChoiceController choiceValueCtrl;
private final MultipleChoice multipleChoice;
private boolean editMode = false;
@@ -118,9 +116,8 @@ public class MultipleChoiceEditorController extends FormBasicController implemen
// choices
FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
+ columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ChoiceCols.move));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ChoiceCols.value));
- columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ChoiceCols.edit, CMD_EDIT,
- new StaticFlexiCellRenderer("", CMD_EDIT, "o_icon o_icon-lg o_icon_edit")));
if (!restrictedEdit) {
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ChoiceCols.delete, CMD_DELETE,
new StaticFlexiCellRenderer("", CMD_DELETE, "o_icon o_icon-lg o_icon_delete_item")));
@@ -141,9 +138,26 @@ public class MultipleChoiceEditorController extends FormBasicController implemen
private void loadModel() {
List<Choice> choices = multipleChoice.getChoices().asList();
List<ChoiceRow> rows = new ArrayList<>(choices.size());
- for (Choice choice : choices) {
- Component upDown = UpDownFactory.createUpDown("ud_" + CodeHelper.getRAMUniqueID(), flc.getFormItemComponent(), this);
- ChoiceRow choiceRow = new ChoiceRow(choice, upDown);
+ for (int i = 0; i < choices.size(); i++) {
+ Choice choice = choices.get(i);
+
+ // move
+ UpDown upDown = UpDownFactory.createUpDown("ud_" + CodeHelper.getRAMUniqueID(), flc.getFormItemComponent(),
+ this);
+ upDown.setUserObject(choice);
+ if (i == 0) {
+ upDown.setTopmost(true);
+ }
+ if (i == choices.size() - 1) {
+ upDown.setLowermost(true);
+ }
+
+ // value
+ TextElement valueEl = uifactory.addTextElement("o_value_" + CodeHelper.getRAMUniqueID(), 255, null, flc);
+ valueEl.setValue(choice.getValue());
+ valueEl.addActionListener(FormEvent.ONCHANGE);
+
+ ChoiceRow choiceRow = new ChoiceRow(choice, upDown, valueEl);
rows.add(choiceRow);
}
dataModel.setObjects(rows);
@@ -152,19 +166,16 @@ public class MultipleChoiceEditorController extends FormBasicController implemen
@Override
protected void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) {
- if (withOthersEl == source) {
- doSetWithOthers();
- multipleChoiceCtrl.updateForm();
+ if (source == withOthersEl || source instanceof TextElement) {
+ doSave();
} else if (addChoiceEl == source) {
- doAddChoice(ureq);
+ doAddChoice();
} else if(tableEl == source) {
if(event instanceof SelectionEvent) {
SelectionEvent se = (SelectionEvent)event;
String cmd = se.getCommand();
int index = se.getIndex();
- if (CMD_EDIT.equals(cmd)) {
- doEditChoice(ureq, index);
- } else if (CMD_DELETE.equals(cmd)) {
+ if (CMD_DELETE.equals(cmd)) {
doDelete(index);
}
}
@@ -181,58 +192,35 @@ public class MultipleChoiceEditorController extends FormBasicController implemen
}
super.event(ureq, source, event);
}
-
- @Override
- protected void event(UserRequest ureq, Controller source, Event event) {
- if (choiceValueCtrl == source) {
- if (event == Event.DONE_EVENT) {
- multipleChoice.getChoices().addNotPresent(choiceValueCtrl.getChoice());
- loadModel();
- multipleChoiceCtrl.updateForm();
- }
- cmc.deactivate();
- cleanUp();
- } else if(cmc == source) {
- cleanUp();
- }
- super.event(ureq, source, event);
- }
-
- private void cleanUp() {
- removeAsListenerAndDispose(choiceValueCtrl);
- removeAsListenerAndDispose(cmc);
- choiceValueCtrl = null;
- cmc = null;
+
+ private void doSave() {
+ doSaveWithOthers();
+ doSaveValues();
+ multipleChoiceCtrl.updateForm();
}
-
- private void doSetWithOthers() {
+
+ private void doSaveWithOthers() {
boolean withOthers = withOthersEl.getSelectedKeys().contains(WITH_OTHER_KEY);
multipleChoice.setWithOthers(withOthers);
}
+
+ private void doSaveValues() {
+ for (ChoiceRow choiceRow : dataModel.getObjects()) {
+ TextElement valueEl = choiceRow.getValueEl();
+ String value = valueEl.getValue();
+ choiceRow.getChoice().setValue(value);
+ }
+ }
- private void doAddChoice(UserRequest ureq) {
+ private void doAddChoice() {
Choice choice = new Choice();
choice.setId(UUID.randomUUID().toString());
- String title = translate("choice.add");
- doEditChoice(ureq, choice, title);
- }
-
- private void doEditChoice(UserRequest ureq, int index) {
- ChoiceRow row = dataModel.getObject(index);
- String title = translate("choice.edit.value");
- doEditChoice(ureq, row.getChoice(), title);
+ choice.setValue(translate("choice.example"));
+ multipleChoice.getChoices().addNotPresent(choice);
+ loadModel();
+ multipleChoiceCtrl.updateForm();
}
-
- private void doEditChoice(UserRequest ureq, Choice choice, String title) {
- choiceValueCtrl = new ChoiceController(ureq, getWindowControl(), choice);
- listenTo(choiceValueCtrl);
- cmc = new CloseableModalController(getWindowControl(), "close", choiceValueCtrl.getInitialComponent(), true,
- title, true);
- listenTo(cmc);
- cmc.activate();
- }
-
private void doMove(Choice choice, Direction direction) {
Integer index = multipleChoice.getChoices().getIndex(choice);
if (index != null) {
@@ -244,7 +232,6 @@ public class MultipleChoiceEditorController extends FormBasicController implemen
}
}
-
private void doUp(int index) {
multipleChoice.getChoices().swap(index - 1, index);
loadModel();
@@ -263,7 +250,7 @@ public class MultipleChoiceEditorController extends FormBasicController implemen
@Override
protected void formOK(UserRequest ureq) {
-
+ //
}
@Override
diff --git a/src/main/java/org/olat/modules/forms/ui/SingleChoiceEditorController.java b/src/main/java/org/olat/modules/forms/ui/SingleChoiceEditorController.java
index d601bde7875f70d8771af86da1d7f7a7b2550cc5..91019a76a02a81f3eaa621389c37c3447d7cbccf 100644
--- a/src/main/java/org/olat/modules/forms/ui/SingleChoiceEditorController.java
+++ b/src/main/java/org/olat/modules/forms/ui/SingleChoiceEditorController.java
@@ -31,6 +31,7 @@ import org.olat.core.gui.components.form.flexible.FormItemContainer;
import org.olat.core.gui.components.form.flexible.elements.FlexiTableElement;
import org.olat.core.gui.components.form.flexible.elements.FormLink;
import org.olat.core.gui.components.form.flexible.elements.SingleSelection;
+import org.olat.core.gui.components.form.flexible.elements.TextElement;
import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
import org.olat.core.gui.components.form.flexible.impl.FormEvent;
import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
@@ -47,7 +48,6 @@ import org.olat.core.gui.components.updown.UpDownFactory;
import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.Event;
import org.olat.core.gui.control.WindowControl;
-import org.olat.core.gui.control.generic.closablewrapper.CloseableModalController;
import org.olat.core.util.CodeHelper;
import org.olat.modules.ceditor.PageElementEditorController;
import org.olat.modules.forms.model.xml.Choice;
@@ -63,7 +63,6 @@ import org.olat.modules.forms.ui.ChoiceDataModel.ChoiceCols;
*/
public class SingleChoiceEditorController extends FormBasicController implements PageElementEditorController {
- private static final String CMD_EDIT = "edit";
private static final String CMD_DELETE = "delete";
private SingleSelection presentationEl;
@@ -72,8 +71,6 @@ public class SingleChoiceEditorController extends FormBasicController implements
private ChoiceDataModel dataModel;
private SingleChoiceController singleChoiceCtrl;
- private CloseableModalController cmc;
- private ChoiceController choiceValueCtrl;
private final SingleChoice singleChoice;
private boolean editMode = false;
@@ -122,8 +119,6 @@ public class SingleChoiceEditorController extends FormBasicController implements
FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ChoiceCols.move));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ChoiceCols.value));
- columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ChoiceCols.edit, CMD_EDIT,
- new StaticFlexiCellRenderer("", CMD_EDIT, "o_icon o_icon-lg o_icon_edit")));
if (!restrictedEdit) {
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ChoiceCols.delete, CMD_DELETE,
new StaticFlexiCellRenderer("", CMD_DELETE, "o_icon o_icon-lg o_icon_delete_item")));
@@ -146,6 +141,8 @@ public class SingleChoiceEditorController extends FormBasicController implements
List<ChoiceRow> rows = new ArrayList<>(choices.size());
for (int i = 0; i < choices.size(); i++) {
Choice choice = choices.get(i);
+
+ // move
UpDown upDown = UpDownFactory.createUpDown("ud_" + CodeHelper.getRAMUniqueID(), flc.getFormItemComponent(), this);
upDown.setUserObject(choice);
if (i == 0) {
@@ -154,7 +151,13 @@ public class SingleChoiceEditorController extends FormBasicController implements
if (i == choices.size() - 1) {
upDown.setLowermost(true);
}
- ChoiceRow choiceRow = new ChoiceRow(choice, upDown);
+
+ // value
+ TextElement valueEl = uifactory.addTextElement("o_value_" + CodeHelper.getRAMUniqueID(), 255, null, flc);
+ valueEl.setValue(choice.getValue());
+ valueEl.addActionListener(FormEvent.ONCHANGE);
+
+ ChoiceRow choiceRow = new ChoiceRow(choice, upDown, valueEl);
rows.add(choiceRow);
}
dataModel.setObjects(rows);
@@ -163,19 +166,16 @@ public class SingleChoiceEditorController extends FormBasicController implements
@Override
protected void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) {
- if (presentationEl == source) {
- doSetPresentation();
- singleChoiceCtrl.updateForm();
+ if (presentationEl == source || source instanceof TextElement) {
+ doSave();
} else if (addChoiceEl == source) {
- doAddChoice(ureq);
+ doAddChoice();
} else if(tableEl == source) {
if(event instanceof SelectionEvent) {
SelectionEvent se = (SelectionEvent)event;
String cmd = se.getCommand();
int index = se.getIndex();
- if (CMD_EDIT.equals(cmd)) {
- doEditChoice(ureq, index);
- } else if (CMD_DELETE.equals(cmd)) {
+ if (CMD_DELETE.equals(cmd)) {
doDelete(index);
}
}
@@ -189,34 +189,17 @@ public class SingleChoiceEditorController extends FormBasicController implements
UpDownEvent ude = (UpDownEvent) event;
doMove((Choice)ude.getUserObject(), ude.getDirection());
singleChoiceCtrl.updateForm();
- }
+ }
super.event(ureq, source, event);
}
-
- @Override
- protected void event(UserRequest ureq, Controller source, Event event) {
- if (choiceValueCtrl == source) {
- if (event == Event.DONE_EVENT) {
- singleChoice.getChoices().addNotPresent(choiceValueCtrl.getChoice());
- loadModel();
- singleChoiceCtrl.updateForm();
- }
- cmc.deactivate();
- cleanUp();
- } else if(cmc == source) {
- cleanUp();
- }
- super.event(ureq, source, event);
- }
-
- private void cleanUp() {
- removeAsListenerAndDispose(choiceValueCtrl);
- removeAsListenerAndDispose(cmc);
- choiceValueCtrl = null;
- cmc = null;
+
+ private void doSave() {
+ doSavePresentation();
+ doSaveValues();
+ singleChoiceCtrl.updateForm();
}
- private void doSetPresentation() {
+ private void doSavePresentation() {
Presentation presentation = null;
if (presentationEl.isOneSelected()) {
String selectedKey = presentationEl.getSelectedKey();
@@ -224,28 +207,22 @@ public class SingleChoiceEditorController extends FormBasicController implements
}
singleChoice.setPresentation(presentation);
}
+
+ private void doSaveValues() {
+ for (ChoiceRow choiceRow : dataModel.getObjects()) {
+ TextElement valueEl = choiceRow.getValueEl();
+ String value = valueEl.getValue();
+ choiceRow.getChoice().setValue(value);
+ }
+ }
- private void doAddChoice(UserRequest ureq) {
+ private void doAddChoice() {
Choice choice = new Choice();
choice.setId(UUID.randomUUID().toString());
- String title = translate("choice.add");
- doEditChoice(ureq, choice, title);
- }
-
- private void doEditChoice(UserRequest ureq, int index) {
- ChoiceRow row = dataModel.getObject(index);
- String title = translate("choice.edit.value");
- doEditChoice(ureq, row.getChoice(), title);
- }
-
- private void doEditChoice(UserRequest ureq, Choice choice, String title) {
- choiceValueCtrl = new ChoiceController(ureq, getWindowControl(), choice);
- listenTo(choiceValueCtrl);
-
- cmc = new CloseableModalController(getWindowControl(), "close", choiceValueCtrl.getInitialComponent(), true,
- title, true);
- listenTo(cmc);
- cmc.activate();
+ choice.setValue(translate("choice.example"));
+ singleChoice.getChoices().addNotPresent(choice);
+ loadModel();
+ singleChoiceCtrl.updateForm();
}
private void doMove(Choice choice, Direction direction) {
@@ -277,7 +254,7 @@ public class SingleChoiceEditorController extends FormBasicController implements
@Override
protected void formOK(UserRequest ureq) {
-
+ //
}
@Override
diff --git a/src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_de.properties
index fe10e929349673113a6697107e9e9da94da8efca..1dccacc2c24909904cadbf5dee7821ca95e76e76 100644
--- a/src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_de.properties
@@ -14,8 +14,6 @@ chart.avg=Durchschnitt
chart.count=Anzahl
choice.add=Eintrag hinzuf\u00FCgen
choice.delete=L\u00F6schen
-choice.edit.value=Eintrag bearbeiten
-choice.edit=Bearbeiten
choice.example=Beispielwert
choice.move=Verschieben
choice.value=Eintrag
diff --git a/src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_en.properties
index 2a853e07efbd9c364ffb13988b376a2cecfb0ef7..efd58be684c5e6b8fb00841d4d8df9fac5a46aa1 100644
--- a/src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_en.properties
@@ -14,8 +14,6 @@ chart.avg=Average
chart.count=Count
choice.add=Add choice
choice.delete=Delete
-choice.edit.value=Edit choice
-choice.edit=Edit
choice.example=Example value
choice.move=Move
choice.value=Choice
diff --git a/src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_fr.properties
index 8ad3bee46d56e96999476c331de3b2baed24d2ed..e4dc735287b68cc765c74a3fd6f2b1ff41b6c3c0 100644
--- a/src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_fr.properties
@@ -13,8 +13,6 @@ bar.chart.legend=L\u00E9gende
chart.count=Nombre
choice.add=Ajouter une entr\u00E9e
choice.delete=Effacer
-choice.edit=Editer
-choice.edit.value=Editer l'entr\u00E9e
choice.example=Example de valeur
choice.value=Entr\u00E9e
choice.values=Valeurs
diff --git a/src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_pt_BR.properties
index b27e5215eb3214a3db9490e38bdbee398b76445c..41826dc1e8d225dbca7823c95d59b51fca92c223 100644
--- a/src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_pt_BR.properties
@@ -10,11 +10,9 @@ add.formsessioninformations=Informa\u00E7\u00F5es
add.formsinglechoice=Escolha \u00FAnica
add.slider=Adicionar barra de rolagem
bar.chart.legend=Legenda
-chart.count=Contagem
choice.add=Adicionar escolha
+chart.count=Contagem
choice.delete=Excluir
-choice.edit=Editar
-choice.edit.value=Editar escolha
choice.example=Exemplo de valor
choice.value=Escolha
choice.values=Escolhas