- Moved the locale settings from the user module to the locale module.

  Patch by Stefan.

- Moved the theme settings from the user module to the system module and
  made the code more intelligent.  Patch by Stefan.

1 files changed, 8 insertions, 0 deletions

diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index 588f860e0..f6e8851e2 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -87,6 +87,14 @@ function locale_link($type) {
   }
 }
 
+function locale_user($type, &$edit, &$user) {
+  global $languages;
+  if ($type == "edit_form" && count($languages) > 1) {
+    $output = form_select(t("Language"), "language", $user->language, $languages, t("Selecting a different language will change the language of the site."));
+  }
+  return $output;
+}
+
 function locale_delete($lid) {
   db_query("DELETE FROM {locales} WHERE lid = %d", $lid);
   locale_refresh_cache();