aboutsummaryrefslogtreecommitdiff
path: root/engine/lib
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-06-26 12:44:22 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-06-26 12:44:22 +0000
commitf750cdf33e7717fdb4fc6caf72361e76385fd6ae (patch)
tree9dc0fd85e1fc9e89ab9fe65060fe76a8378cf164 /engine/lib
parent890f6ac71bb19a9693b92584f4c3989303769785 (diff)
downloadelgg-f750cdf33e7717fdb4fc6caf72361e76385fd6ae.tar.gz
elgg-f750cdf33e7717fdb4fc6caf72361e76385fd6ae.tar.bz2
Closes #92: Settings: Set user language
http://trac.elgg.org/elgg/ticket/92 git-svn-id: https://code.elgg.org/elgg/trunk@1145 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib')
-rw-r--r--engine/lib/languages.php5
-rw-r--r--engine/lib/users.php6
2 files changed, 9 insertions, 2 deletions
diff --git a/engine/lib/languages.php b/engine/lib/languages.php
index be3cf6e54..781fe2e6e 100644
--- a/engine/lib/languages.php
+++ b/engine/lib/languages.php
@@ -57,7 +57,10 @@
function elgg_echo($message_key, $language = "") {
global $CONFIG;
-
+
+ if ((empty($language)) && ($_SESSION['user']->language))
+ $language = $_SESSION['user']->language;
+
if ((empty($language)) && (isset($CONFIG->language)))
$language = $CONFIG->language;
diff --git a/engine/lib/users.php b/engine/lib/users.php
index b3ed4be55..644c5000b 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -925,7 +925,11 @@
// Add email settings
extend_elgg_settings_page('user/settings/email', 'usersettings/user', 1);
- register_action("email/save");
+ register_action("email/save");
+
+ // Add language settings
+ extend_elgg_settings_page('user/settings/language', 'usersettings/user', 1);
+ register_action("user/language");
}
//register actions *************************************************************