From 29d5cc38ed8a6eed9c495495aaba031433c5dbca Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Fri, 21 Oct 2011 08:15:54 +0000
Subject: [PATCH] issue 559 apply multilang in signup form

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9707 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/member.admin.controller.php | 3 ++-
 modules/member/member.class.php            | 2 +-
 modules/member/member.model.php            | 9 +++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index edb9505f8..c41eec23a 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -186,7 +186,8 @@
 					$signupItem->isDefaultForm = in_array($key, $items);
 					
 					$signupItem->name = $key;
-					$signupItem->title = $lang->{$key};
+					if(in_array($key, $items)) $signupItem->title = $key;
+					else $signupItem->title = $lang->{$key};
 					$signupItem->mustRequired = in_array($key, $mustRequireds);
 					$signupItem->imageType = (strpos($key, 'image') !== false);
 					$signupItem->required = ($all_args->{$key} == 'required') || $signupItem->mustRequired || $signupItem->isIdentifier;
diff --git a/modules/member/member.class.php b/modules/member/member.class.php
index 2f89cfdb8..43183350a 100644
--- a/modules/member/member.class.php
+++ b/modules/member/member.class.php
@@ -275,7 +275,7 @@
 					unset($signupItem);
 					$signupItem->isDefaultForm = true;
 					$signupItem->name = $key;
-					$signupItem->title = $lang->{$key};
+					$signupItem->title = $key;
 					$signupItem->mustRequired = in_array($key, $mustRequireds);
 					$signupItem->imageType = (strpos($key, 'image') !== false);
 					$signupItem->required = in_array($key, $orgRequireds);
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index 38afae980..0ecd02f38 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -25,6 +25,15 @@
             // Get member configuration stored in the DB
             $oModuleModel = &getModel('module');
             $config = $oModuleModel->getModuleConfig('member');
+			//for multi language
+			if(is_array($config->signupForm))
+			{
+				foreach($config->signupForm AS $key=>$value)
+				{
+					$config->signupForm[$key]->title = Context::getLang($value->title);
+				}
+			}
+
             // Get terms of user
             $agreement_file = _XE_PATH_.'files/member_extra_info/agreement.txt';
             if(file_exists($agreement_file)) $config->agreement = FileHandler::readFile($agreement_file);