From 285902971374de4995ef9eaa2abe95c4af9980c1 Mon Sep 17 00:00:00 2001
From: Julian Prud'homme <j.prudhomme@elixir-interactive.com>
Date: Thu, 25 Jan 2007 16:33:23 +0100
Subject: [PATCH] [svn r10906] Set the correct language when a user is
 registering.

---
 main/auth/inscription.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/main/auth/inscription.php b/main/auth/inscription.php
index 8a20fd7c73..2d586e5a4e 100644
--- a/main/auth/inscription.php
+++ b/main/auth/inscription.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: inscription.php 10454 2006-12-11 14:19:18Z elixir_inter $
+// $Id: inscription.php 10906 2007-01-25 15:33:23Z elixir_julian $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -95,7 +95,12 @@ if (get_setting('allow_registration_as_teacher') <> 'false')
 	$form->addElement('radio', 'status', null, get_lang('RegAdmin'), COURSEMANAGER);
 }
 $form->addElement('submit', 'submit', get_lang('Ok'));
-//$defaults['language'] = api_get_setting('platformLanguage');
+if(isset($_SESSION["user_language_choice"]) && $_SESSION["user_language_choice"]!=""){
+	$defaults['language'] = $_SESSION["user_language_choice"];
+}
+else{
+	$defaults['language'] = api_get_setting('platformLanguage');
+}
 $defaults['status'] = STUDENT;
 $form->setDefaults($defaults);