From 0c07cef5648d1ece414519b3a1984f071b9ab484 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 16 Jul 2014 17:21:19 +0200
Subject: [PATCH] OO-1068: fix RS in registration process if user change the
language
---
.../java/org/olat/login/OLATAuthenticationController.java | 3 +--
.../java/org/olat/registration/LanguageChooserController.java | 4 ----
src/main/java/org/olat/registration/_content/reg.html | 1 +
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/olat/login/OLATAuthenticationController.java b/src/main/java/org/olat/login/OLATAuthenticationController.java
index f21dd1cb83a..e835bb3af26 100644
--- a/src/main/java/org/olat/login/OLATAuthenticationController.java
+++ b/src/main/java/org/olat/login/OLATAuthenticationController.java
@@ -142,8 +142,7 @@ public class OLATAuthenticationController extends AuthenticationController imple
subController = new RegistrationController(ureq, getWindowControl());
listenTo(subController);
- String title = ((RegistrationController)subController).getWizardTitle();
- cmc = new CloseableModalController(getWindowControl(), translate("close"), subController.getInitialComponent(), true, title);
+ cmc = new CloseableModalController(getWindowControl(), translate("close"), subController.getInitialComponent());
listenTo(cmc);
cmc.activate();
return (RegistrationController)subController;
diff --git a/src/main/java/org/olat/registration/LanguageChooserController.java b/src/main/java/org/olat/registration/LanguageChooserController.java
index bbd9b464923..a321d1cfa26 100644
--- a/src/main/java/org/olat/registration/LanguageChooserController.java
+++ b/src/main/java/org/olat/registration/LanguageChooserController.java
@@ -99,10 +99,6 @@ public class LanguageChooserController extends FormBasicController {
setLocale(loc, true);
ureq.getUserSession().setLocale(loc);
ureq.getUserSession().putEntry(LocaleNegotiator.NEGOTIATED_LOCALE, loc);
-
- FormLayoutContainer langLayout = (FormLayoutContainer)flc.getFormComponent("langLayout");
- langLayout.contextPut("languageCode", loc.toString());
- langLayout.contextPut("selectLanguage", translate("select.language"));
nextButton.setTranslator(getTranslator());
if(fireStandardEvent) {
diff --git a/src/main/java/org/olat/registration/_content/reg.html b/src/main/java/org/olat/registration/_content/reg.html
index b706f19a189..df156d53cb0 100644
--- a/src/main/java/org/olat/registration/_content/reg.html
+++ b/src/main/java/org/olat/registration/_content/reg.html
@@ -1,4 +1,5 @@
$r.render("regwizard")
+<h4>$r.translate("step1.reg.title")</h4>
<p>$text</p>
#if ($loginhelp)
<p>$loginhelp</p>
--
GitLab