Skip to content
Snippets Groups Projects
Commit 0c07cef5 authored by srosse's avatar srosse
Browse files

OO-1068: fix RS in registration process if user change the language

parent 0138b490
No related branches found
No related tags found
No related merge requests found
...@@ -142,8 +142,7 @@ public class OLATAuthenticationController extends AuthenticationController imple ...@@ -142,8 +142,7 @@ public class OLATAuthenticationController extends AuthenticationController imple
subController = new RegistrationController(ureq, getWindowControl()); subController = new RegistrationController(ureq, getWindowControl());
listenTo(subController); listenTo(subController);
String title = ((RegistrationController)subController).getWizardTitle(); cmc = new CloseableModalController(getWindowControl(), translate("close"), subController.getInitialComponent());
cmc = new CloseableModalController(getWindowControl(), translate("close"), subController.getInitialComponent(), true, title);
listenTo(cmc); listenTo(cmc);
cmc.activate(); cmc.activate();
return (RegistrationController)subController; return (RegistrationController)subController;
......
...@@ -99,10 +99,6 @@ public class LanguageChooserController extends FormBasicController { ...@@ -99,10 +99,6 @@ public class LanguageChooserController extends FormBasicController {
setLocale(loc, true); setLocale(loc, true);
ureq.getUserSession().setLocale(loc); ureq.getUserSession().setLocale(loc);
ureq.getUserSession().putEntry(LocaleNegotiator.NEGOTIATED_LOCALE, 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()); nextButton.setTranslator(getTranslator());
if(fireStandardEvent) { if(fireStandardEvent) {
......
$r.render("regwizard") $r.render("regwizard")
<h4>$r.translate("step1.reg.title")</h4>
<p>$text</p> <p>$text</p>
#if ($loginhelp) #if ($loginhelp)
<p>$loginhelp</p> <p>$loginhelp</p>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment