diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/common.inc | 17 | ||||
| -rw-r--r-- | includes/install.inc | 4 | ||||
| -rw-r--r-- | includes/locale.inc | 2 |
3 files changed, 3 insertions, 20 deletions
diff --git a/includes/common.inc b/includes/common.inc index 82368d8dd..47e4308aa 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -534,23 +534,6 @@ function fix_gpc_magic() { } /** - * @name Messages - * @{ - * Frequently used messages. - */ - -/** - * Return a string with a "not applicable" message. - */ -function message_na() { - return t('n/a'); -} - -/** - * @} End of "Messages". - */ - -/** * Initialize the localization system. */ function locale_initialize() { diff --git a/includes/install.inc b/includes/install.inc index 08aa55154..be8bc8944 100644 --- a/includes/install.inc +++ b/includes/install.inc @@ -276,14 +276,14 @@ function drupal_install_profile($profile) { // Get a list of modules required by this profile. $function = $profile .'_profile_modules'; $module_list = $function(); - + // If anyone has added modules that we automatically install, filter them out. $module_list = array_diff($module_list, $bootstrap_list); // Verify that all required modules exist. $bootstrap_modules = drupal_find_modules($bootstrap_list); $profile_modules = drupal_find_modules($module_list); - + // Install the essential system modules and bootstrap Drupal. drupal_install_modules($bootstrap_list); drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); diff --git a/includes/locale.inc b/includes/locale.inc index b8e289f4d..c4ab038a2 100644 --- a/includes/locale.inc +++ b/includes/locale.inc @@ -86,7 +86,7 @@ function theme_locale_admin_manage_screen($form) { foreach ($form['name'] as $key => $element) { // Do not take form control structures. if (is_array($element) && element_child($key)) { - $rows[] = array(check_plain($key), form_render($form['name'][$key]), form_render($form['enabled'][$key]), form_render($form['site_default'][$key]), ($key != 'en' ? form_render($form['translation'][$key]) : message_na()), ($key != 'en' ? l(t('delete'), 'admin/locale/language/delete/'. $key) : '')); + $rows[] = array(check_plain($key), form_render($form['name'][$key]), form_render($form['enabled'][$key]), form_render($form['site_default'][$key]), ($key != 'en' ? form_render($form['translation'][$key]) : t('n/a')), ($key != 'en' ? l(t('delete'), 'admin/locale/language/delete/'. $key) : '')); } } $header = array(array('data' => t('Code')), array('data' => t('English name')), array('data' => t('Enabled')), array('data' => t('Default')), array('data' => t('Translated')), array('data' => t('Operations'))); |