From d1eb256f35c9a64abc70968b36c83b4f3c9478d8 Mon Sep 17 00:00:00 2001
From: gnaegi <none@none>
Date: Thu, 19 Apr 2018 12:13:53 +0200
Subject: [PATCH] OO-3444 fix i18n key setter for FormCancel
---
.../components/form/flexible/impl/elements/FormCancel.java | 2 +-
.../java/org/olat/registration/DisclaimerFormController.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FormCancel.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FormCancel.java
index 3348cce1408..eec2bfb1643 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FormCancel.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FormCancel.java
@@ -153,7 +153,7 @@ public class FormCancel extends FormItemImpl implements Disposable, Cancel {
* @see org.olat.core.gui.components.form.flexible.elements.Cancel#setI18nKey(java.lang.String)
*/
public void setI18nKey(String i18n) {
- cancelLink.setTitle(i18n);
+ cancelLink.setCustomDisplayText(translator.translate(i18n));
}
/**
diff --git a/src/main/java/org/olat/registration/DisclaimerFormController.java b/src/main/java/org/olat/registration/DisclaimerFormController.java
index 60f3b70d457..04695bd02af 100644
--- a/src/main/java/org/olat/registration/DisclaimerFormController.java
+++ b/src/main/java/org/olat/registration/DisclaimerFormController.java
@@ -24,6 +24,7 @@ import org.olat.core.gui.components.form.flexible.FormItemContainer;
import org.olat.core.gui.components.form.flexible.elements.MultipleSelectionElement;
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.components.form.flexible.impl.elements.FormCancel;
import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.Event;
import org.olat.core.gui.control.WindowControl;
@@ -118,7 +119,8 @@ public class DisclaimerFormController extends FormBasicController {
formLayout.add(buttonLayout);
buttonLayout.setElementCssClass("o_sel_disclaimer_buttons");
uifactory.addFormSubmitButton(DCL_ACCEPT, NLS_DISCLAIMER_OK, buttonLayout);
- uifactory.addFormCancelButton(NLS_DISCLAIMER_NOK, buttonLayout, ureq, getWindowControl());
+ FormCancel cancelButton = uifactory.addFormCancelButton(NLS_DISCLAIMER_NOK, buttonLayout, ureq, getWindowControl());
+ cancelButton.setI18nKey(NLS_DISCLAIMER_NOK);
}
}
}
--
GitLab