Index: domain_user_default.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain_user_default/domain_user_default.inc,v
retrieving revision 1.2.2.6
diff -u -r1.2.2.6 domain_user_default.inc
--- domain_user_default.inc	19 Sep 2008 17:47:27 -0000	1.2.2.6
+++ domain_user_default.inc	18 Oct 2008 00:49:11 -0000
@@ -17,7 +17,10 @@
 
   if ($domain) {
     // goto new domain
-    drupal_goto(domain_get_path($domain));
+    global $language;
+    // Redirect to language specific front page
+    $page_url = substr(url('<front>', array('language'=>$language)), 1);
+    drupal_goto(domain_get_path($domain).$page_url);
   }
 }
 
@@ -51,11 +54,15 @@
       unset($_SESSION['domain_user_default_location_set']);
     }
     // set user's location to this domain if it hasn't already been done
-    drupal_set_message(t('Default domain has been changed to @domain', array('@domain' => $domain['sitename'])));
+    if(variable_get('domain_user_default_display_domain_set_message', TRUE)) {
+      drupal_set_message(t('Default domain has been changed to @domain', array('@domain' => $domain['sitename'])));
+    }
   }
   elseif ($domain_id == $_domain['domain_id']) {
-    $domain = domain_lookup($domain_id);
-    drupal_set_message(t('Default domain is already set to @domain', array('@domain' => $domain['sitename'])));
+    if(variable_get('domain_user_default_display_domain_set_message', TRUE)) {
+      $domain = domain_lookup($domain_id);
+      drupal_set_message(t('Default domain is already set to @domain', array('@domain' => $domain['sitename'])));
+    }
   }
   else {
     $domain = domain_lookup($domain_id);
Index: domain_user_default.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain_user_default/domain_user_default.module,v
retrieving revision 1.1.2.10
diff -u -r1.1.2.10 domain_user_default.module
--- domain_user_default.module	17 Oct 2008 17:57:22 -0000	1.1.2.10
+++ domain_user_default.module	18 Oct 2008 00:49:39 -0000
@@ -287,7 +287,13 @@
     '#options' => array(0 => t('No'), 1 => t('Yes')),
     '#default_value' => variable_get('domain_user_default_display_redirect_message', 0),
   );
-
+  $form['domain_user_default']['domain_user_default_display_domain_set_message'] = array(
+    '#type' => 'radios',
+    '#title' => t('Display message when default domain is set'),
+    '#description' => t('Setting this option to <em>yes</em> will a message when user default domain is updated.'),
+    '#options' => array(0 => t('No'), 1 => t('Yes')),
+    '#default_value' => variable_get('domain_user_default_display_domain_set_message', 0),
+  );
   if (module_exists('domain_geolocalization')) {
     // Add option to automatically set on a search that only returns 1 result.
     $form['domain_user_default']['domain_user_default_geolocalization_search_result_behavior'] = array(
@@ -334,7 +340,7 @@
     // authenticated user
     return user_access('set own domain default');
   }
-  
+
   // unauthenticated user must have permissions, and sessions enabled, and the
   // Domain Session Default module must be enabled.
   return module_exists('domain_session_default') && user_access('set own domain default') && session_api_available();