summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwebchick2013-01-29 19:38:25 -0800
committerwebchick2013-01-29 19:38:25 -0800
commita1ce6942faca19d7bbb4414b8f6dd938abafd2ed (patch)
tree768a44e6b0603d5f6d9f8706690bc4171833c249
parenta31517e109d20fab1cdbc95d3bead18c1aec9761 (diff)
Issue #1811216 by sebsebseb123, mgifford, David_Rothstein, falcon03: Fixed Missing labels for profile and language selectors.
-rw-r--r--core/includes/install.core.inc26
1 files changed, 14 insertions, 12 deletions
diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index e3dec6b..86a45f7 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -1229,18 +1229,18 @@ function install_select_profile_form($form, &$form_state, $install_state) {
$names = array('standard' => $names['standard']) + $names;
}
- foreach ($names as $profile => $name) {
- // The profile name and description are extracted for translation from the
- // .info file, so we can use st() on them even though they are dynamic data
- // at this point.
- $form['profile'][$name] = array(
- '#type' => 'radio',
- '#value' => 'standard',
- '#return_value' => $profile,
- '#title' => st($name),
- '#description' => isset($profiles[$profile]['description']) ? st($profiles[$profile]['description']) : '',
- '#parents' => array('profile'),
- );
+ // The profile name and description are extracted for translation from the
+ // .info file, so we can use st() on them even though they are dynamic data
+ // at this point.
+ $form['profile'] = array(
+ '#type' => 'radios',
+ '#title' => st('Select an installation profile'),
+ '#title_display' => 'invisible',
+ '#options' => array_map('st', $names),
+ '#default_value' => 'standard',
+ );
+ foreach (array_keys($names) as $profile) {
+ $form['profile'][$profile]['#description'] = isset($profiles[$profile]['description']) ? st($profiles[$profile]['description']) : '';
}
$form['actions'] = array('#type' => 'actions');
$form['actions']['submit'] = array(
@@ -1403,6 +1403,8 @@ function install_select_language_form($form, &$form_state, $files = array()) {
$browser_langcode = language_from_browser($browser_options);
$form['langcode'] = array(
'#type' => 'select',
+ '#title' => st('Choose language'),
+ '#title_display' => 'invisible',
'#options' => $select_options,
// Use the browser detected language as default or English if nothing found.
'#default_value' => !empty($browser_langcode) ? $browser_langcode : 'en',