From 98733aa2bd27cbce98af11884fd5a33c8233d6d6 Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Thu, 28 Nov 2013 01:07:11 -0800
Subject: [PATCH] Issue #2143013 by ti2m: 'Not specified' and 'Not applicable'
appear as children of previous item.
---
core/modules/language/language.module | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index 6d4be7e26750..b0dd21626b24 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -216,18 +216,17 @@ function language_element_info() {
* An array containing the default options.
*/
function language_configuration_element_default_options() {
- $language_options = array();
+ $language_options = array(
+ 'site_default' => t("Site's default language (!language)", array('!language' => language_default()->name)),
+ 'current_interface' => t('Current interface language'),
+ 'authors_default' => t("Author's preferred language"),
+ );
$languages = language_list(Language::STATE_ALL);
foreach ($languages as $langcode => $language) {
$language_options[$langcode] = $language->locked ? t('- @name -', array('@name' => $language->name)) : $language->name;
}
- $language_options += array(
- 'site_default' => t("Site's default language (!language)", array('!language' => language_default()->name)),
- 'current_interface' => t('Current interface language'),
- 'authors_default' => t("Author's preferred language"),
- );
return $language_options;
}
--
GitLab