Commit a1ce6942 authored by webchick's avatar webchick
Browse files

Issue #1811216 by sebsebseb123, mgifford, David_Rothstein, falcon03: Fixed...

Issue #1811216 by sebsebseb123, mgifford, David_Rothstein, falcon03: Fixed Missing labels for profile and language selectors.
parent a31517e1
...@@ -1229,18 +1229,18 @@ function install_select_profile_form($form, &$form_state, $install_state) { ...@@ -1229,18 +1229,18 @@ function install_select_profile_form($form, &$form_state, $install_state) {
$names = array('standard' => $names['standard']) + $names; $names = array('standard' => $names['standard']) + $names;
} }
foreach ($names as $profile => $name) {
// The profile name and description are extracted for translation from the // 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 // .info file, so we can use st() on them even though they are dynamic data
// at this point. // at this point.
$form['profile'][$name] = array( $form['profile'] = array(
'#type' => 'radio', '#type' => 'radios',
'#value' => 'standard', '#title' => st('Select an installation profile'),
'#return_value' => $profile, '#title_display' => 'invisible',
'#title' => st($name), '#options' => array_map('st', $names),
'#description' => isset($profiles[$profile]['description']) ? st($profiles[$profile]['description']) : '', '#default_value' => 'standard',
'#parents' => array('profile'),
); );
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'] = array('#type' => 'actions');
$form['actions']['submit'] = array( $form['actions']['submit'] = array(
...@@ -1403,6 +1403,8 @@ function install_select_language_form($form, &$form_state, $files = array()) { ...@@ -1403,6 +1403,8 @@ function install_select_language_form($form, &$form_state, $files = array()) {
$browser_langcode = language_from_browser($browser_options); $browser_langcode = language_from_browser($browser_options);
$form['langcode'] = array( $form['langcode'] = array(
'#type' => 'select', '#type' => 'select',
'#title' => st('Choose language'),
'#title_display' => 'invisible',
'#options' => $select_options, '#options' => $select_options,
// Use the browser detected language as default or English if nothing found. // Use the browser detected language as default or English if nothing found.
'#default_value' => !empty($browser_langcode) ? $browser_langcode : 'en', '#default_value' => !empty($browser_langcode) ? $browser_langcode : 'en',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment