From 7de2f79e8e7afcf66c7489b85574c993ca275385 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?St=82phane=20Veyret?= <sveyret@axway.com>
Date: Fri, 3 Jul 2009 14:12:43 +0200
Subject: [PATCH] Fix 0010677: Signup message uses language of administrator

Using default language (or fallback if default is auto)
---
 core/email_api.php |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/email_api.php b/core/email_api.php
index 69c21fa..7d2daa1 100644
--- a/core/email_api.php
+++ b/core/email_api.php
@@ -375,9 +375,8 @@
 					return;
 		}
 
-#		@@@ thraxisp - removed to address #6084 - user won't have any settings yet,
-#       use same language as display for the email
-#       lang_push( user_pref_get_language( $p_user_id ) );
+		# Use default language for signup since user doesn't have settings yet
+		lang_push( config_get( 'default_language' ) );
 
 		# retrieve the username and email
 		$t_username = user_get_field( $p_user_id, 'username' );
@@ -403,7 +402,7 @@
 			}
 		}
 
-#		lang_pop(); # see above
+		lang_pop();
 	}
 
 	# --------------------
-- 
1.6.3.2

From 78df78afe6addb92d99f60062d52abc10911c6ec Mon Sep 17 00:00:00 2001
From: =?utf-8?q?St=82phane=20Veyret?= <sveyret@axway.com>
Date: Fri, 3 Jul 2009 14:15:56 +0200
Subject: [PATCH] Fix 0010677: Signup message uses language of administrator

Using default language (or fallback if default is auto)
---
 core/email_api.php |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/email_api.php b/core/email_api.php
index 4d9f623..c061cb6 100644
--- a/core/email_api.php
+++ b/core/email_api.php
@@ -408,10 +408,9 @@ function email_signup( $p_user_id, $p_password, $p_confirm_hash, $p_admin_name =
 		return;
 	}
 
-	#	@@@ thraxisp - removed to address #6084 - user won't have any settings yet,
-	#  use same language as display for the email
-	#  lang_push( user_pref_get_language( $p_user_id ) );
-	# retrieve the username and email
+	# Use default language for signup since user doesn't have settings yet
+	lang_push( config_get( 'default_language' ) );
+
 	$t_username = user_get_field( $p_user_id, 'username' );
 	$t_email = user_get_email( $p_user_id );
 
@@ -438,7 +437,7 @@ function email_signup( $p_user_id, $p_password, $p_confirm_hash, $p_admin_name =
 		}
 	}
 
-	#		lang_pop(); # see above
+	lang_pop();
 }
 
 /**
-- 
1.6.3.2