diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 18f1902a9cbdfd41b28d340a9b493f32365c9d32..048efcd44eba624f0fcca10051f2583e7e39f26d 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -1083,7 +1083,7 @@ function language_list($field = 'language', $reset = FALSE) { * Optional property of the language object to return */ function language_default($property = NULL) { - $language = variable_get('language_default', (object) array('language' => 'en', 'name' => 'English', 'native' => 'English', 'direction' => 0, 'enabled' => 1, 'plurals' => 0, 'formula' => '', 'domain' => '', 'prefix' => '', 'weight' => 0)); + $language = variable_get('language_default', (object) array('language' => 'en', 'name' => 'English', 'native' => 'English', 'direction' => 0, 'enabled' => 1, 'plurals' => 0, 'formula' => '', 'domain' => '', 'prefix' => '', 'weight' => 0, 'javascript' => '')); return $property ? $language->$property : $language; } diff --git a/includes/form.inc b/includes/form.inc index 783f6b603f9ce991cd128e76d670506bf0e33c9d..27e9dd056a8487ab29e7dbee95b449bc3ddd052a 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -565,6 +565,9 @@ function drupal_redirect_form($form, $redirect = NULL) { * theming, and hook_form_alter functions. */ function _form_validate($elements, &$form_state, $form_id = NULL) { + // Also used in the installer, pre-database setup. + $t = get_t(); + // Recurse through all children. foreach (element_children($elements) as $key) { if (isset($elements[$key]) && $elements[$key]) { @@ -578,12 +581,12 @@ function _form_validate($elements, &$form_state, $form_id = NULL) { // and a textfield could return '0' and empty('0') returns TRUE so we // need a special check for the '0' string. if ($elements['#required'] && empty($elements['#value']) && $elements['#value'] !== '0') { - form_error($elements, t('!name field is required.', array('!name' => $elements['#title']))); + form_error($elements, $t('!name field is required.', array('!name' => $elements['#title']))); } // Verify that the value is not longer than #maxlength. if (isset($elements['#maxlength']) && drupal_strlen($elements['#value']) > $elements['#maxlength']) { - form_error($elements, t('!name cannot be longer than %max characters but is currently %length characters long.', array('!name' => empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title'], '%max' => $elements['#maxlength'], '%length' => drupal_strlen($elements['#value'])))); + form_error($elements, $t('!name cannot be longer than %max characters but is currently %length characters long.', array('!name' => empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title'], '%max' => $elements['#maxlength'], '%length' => drupal_strlen($elements['#value'])))); } if (isset($elements['#options']) && isset($elements['#value'])) { @@ -597,13 +600,13 @@ function _form_validate($elements, &$form_state, $form_id = NULL) { $value = $elements['#type'] == 'checkboxes' ? array_keys(array_filter($elements['#value'])) : $elements['#value']; foreach ($value as $v) { if (!isset($options[$v])) { - form_error($elements, t('An illegal choice has been detected. Please contact the site administrator.')); + form_error($elements, $t('An illegal choice has been detected. Please contact the site administrator.')); watchdog('form', 'Illegal choice %choice in !name element.', array('%choice' => $v, '!name' => empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title']), WATCHDOG_ERROR); } } } elseif (!isset($options[$elements['#value']])) { - form_error($elements, t('An illegal choice has been detected. Please contact the site administrator.')); + form_error($elements, $t('An illegal choice has been detected. Please contact the site administrator.')); watchdog('form', 'Illegal choice %choice in %name element.', array('%choice' => $elements['#value'], '%name' => empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title']), WATCHDOG_ERROR); } } @@ -1969,20 +1972,23 @@ function theme_file($element) { * A string representing the form element. */ function theme_form_element($element, $value) { + // This is also used in the installer, pre-database setup. + $t = get_t(); + $output = '<div class="form-item"'; if (!empty($element['#id'])) { $output .= ' id="'. $element['#id'] .'-wrapper"'; } $output .= ">\n"; - $required = !empty($element['#required']) ? '<span class="form-required" title="'. t('This field is required.') .'">*</span>' : ''; + $required = !empty($element['#required']) ? '<span class="form-required" title="'. $t('This field is required.') .'">*</span>' : ''; if (!empty($element['#title'])) { $title = $element['#title']; if (!empty($element['#id'])) { - $output .= ' <label for="'. $element['#id'] .'">'. t('!title: !required', array('!title' => $title, '!required' => $required)) ."</label>\n"; + $output .= ' <label for="'. $element['#id'] .'">'. $t('!title: !required', array('!title' => $title, '!required' => $required)) ."</label>\n"; } else { - $output .= ' <label>'. t('!title: !required', array('!title' => $title, '!required' => $required)) ."</label>\n"; + $output .= ' <label>'. $t('!title: !required', array('!title' => $title, '!required' => $required)) ."</label>\n"; } } diff --git a/includes/install.inc b/includes/install.inc index 9860a20cc7792546538c66db5863ec607e5de1aa..f034dda851024ef11cfc46292342d1dcf885f102 100644 --- a/includes/install.inc +++ b/includes/install.inc @@ -595,8 +595,9 @@ function install_goto($path) { } /** - * Hardcoded function for doing the equivalent of theme('placeholder') - * when the theme system is not available. + * Hardcoded function for doing the equivalent of t() during + * the install process, when database, theme, and localization + * system is possibly not yet available. */ function st($string, $args = array()) { static $locale_strings = NULL; diff --git a/includes/locale.inc b/includes/locale.inc index 1bf66ea13186132d02a7b59dbbbfefaced8c3abb..7d30afa921fe02e66eb48727d530071c33ddee1f 100644 --- a/includes/locale.inc +++ b/includes/locale.inc @@ -917,7 +917,7 @@ function locale_add_language($langcode, $name = NULL, $native = NULL, $direction // Only set it as default if enabled. if ($enabled && $default) { - variable_set('language_default', (object) array('language' => $langcode, 'name' => $name, 'native' => $native, 'direction' => $direction, 'enabled' => (int) $enabled, 'plurals' => 0, 'formula' => '', 'domain' => '', 'prefix' => $prefix, 'weight' => 0)); + variable_set('language_default', (object) array('language' => $langcode, 'name' => $name, 'native' => $native, 'direction' => $direction, 'enabled' => (int) $enabled, 'plurals' => 0, 'formula' => '', 'domain' => '', 'prefix' => $prefix, 'weight' => 0, 'javascript' => '')); } if ($enabled) {