#147640 by Jose A Reyero with further cleanup by myself: add language code to localization functions

This makes it possible to call these functions with a given language code when sending emails to multiple users with different languages in a request for example.

1 files changed, 3 insertions, 6 deletions

diff --git a/includes/locale.inc b/includes/locale.inc
index 141279c4a..f2ff4e088 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -37,10 +37,9 @@ function locale_languages_overview_form() {
     '#options' => $options,
     '#default_value' => $enabled,
   );
-  $default = language_default();
   $form['site_default'] = array('#type' => 'radios',
     '#options' => $options,
-    '#default_value' => $default->language,
+    '#default_value' => language_default('language'),
   );
   $form['submit'] = array('#type' => 'submit', '#value' => t('Save configuration'));
   $form['#theme'] = 'locale_languages_overview_form';
@@ -323,8 +322,7 @@ function locale_languages_edit_form_validate($form, &$form_state, $form_values)
   if (!empty($form_values['domain']) && $duplicate = db_fetch_object(db_query("SELECT language FROM {languages} WHERE domain = '%s' AND language != '%s'", $form_values['domain'], $form_values['langcode']))) {
     form_set_error('domain', t('The domain (%domain) is already tied to a language (%language).', array('%domain' => $form_values['domain'], '%language' => $duplicate->language)));
   }
-  $default = language_default();
-  if (empty($form_values['prefix']) && $default->language != $form_values['langcode'] && empty($form_values['domain'])) {
+  if (empty($form_values['prefix']) && language_default('language') != $form_values['langcode'] && empty($form_values['domain'])) {
     form_set_error('prefix', t('Only the default language can have both the domain and prefix empty.'));
   }
   if (!empty($form_values['prefix']) && $duplicate = db_fetch_object(db_query("SELECT language FROM {languages} WHERE prefix = '%s' AND language != '%s'", $form_values['prefix'], $form_values['langcode']))) {
@@ -368,8 +366,7 @@ function locale_languages_delete_form($langcode) {
     drupal_goto('admin/settings/language');
   }
 
-  $default = language_default();
-  if ($default->language == $langcode) {
+  if (language_default('language') == $langcode) {
     drupal_set_message(t('The default language cannot be deleted.'));
     drupal_goto('admin/settings/language');
   }