diff --git a/modules/locale/locale.admin.inc b/modules/locale/locale.admin.inc index f2da1e5..ae4baf6 100644 --- a/modules/locale/locale.admin.inc +++ b/modules/locale/locale.admin.inc @@ -17,7 +17,7 @@ /** * User interface for the language overview screen. */ -function locale_languages_overview_form() { +function locale_language_overview_form() { drupal_static_reset('language'); $languages = language_list('language'); @@ -56,7 +56,7 @@ function locale_languages_overview_form() { ); $form['actions'] = array('#type' => 'actions'); $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration')); - $form['#theme'] = 'locale_languages_overview_form'; + $form['#theme'] = 'locale_language_overview_form'; return $form; } @@ -70,7 +70,7 @@ function locale_languages_overview_form() { * * @ingroup themeable */ -function theme_locale_languages_overview_form($variables) { +function theme_locale_language_overview_form($variables) { $form = $variables['form']; $default = language_default(); foreach ($form['name'] as $key => $element) { @@ -117,7 +117,7 @@ function theme_locale_languages_overview_form($variables) { /** * Process language overview form submissions, updating existing languages. */ -function locale_languages_overview_form_submit($form, &$form_state) { +function locale_language_overview_form_submit($form, &$form_state) { $languages = language_list(); $old_default = language_default(); $url_prefixes = variable_get('locale_language_negotiation_url_part', LOCALE_LANGUAGE_NEGOTIATION_URL_PREFIX) == LOCALE_LANGUAGE_NEGOTIATION_URL_PREFIX; @@ -153,51 +153,43 @@ function locale_languages_overview_form_submit($form, &$form_state) { /** * User interface for the language addition screen. */ -function locale_languages_add_screen() { - $build['predefined'] = drupal_get_form('locale_languages_predefined_form'); - $build['custom'] = drupal_get_form('locale_languages_custom_form'); - return $build; -} - -/** - * Predefined language setup form. - */ -function locale_languages_predefined_form($form) { - $predefined = _locale_prepare_predefined_list(); - $form['language list'] = array('#type' => 'fieldset', - '#title' => t('Predefined language'), - '#collapsible' => TRUE, - ); - $form['language list']['langcode'] = array('#type' => 'select', +function locale_language_add_form() { + $predefined_languages = _locale_prepare_predefined_list(); + $predefined_languages['custom'] = t('Custom language...'); + $form['predefined_langcode'] = array('#type' => 'select', '#title' => t('Language name'), - '#default_value' => key($predefined), - '#options' => $predefined, - '#description' => t('Use the Custom language section below if your desired language does not appear in this list.'), + '#default_value' => key($predefined_languages), + '#options' => $predefined_languages, ); - $form['language list']['actions'] = array('#type' => 'actions'); - $form['language list']['actions']['submit'] = array('#type' => 'submit', '#value' => t('Add language')); + + $form['custom_language'] = array( + '#type' => 'container', + '#states' => array( + 'visible' => array( + 'select#edit-predefined-langcode' => array('value' => 'custom'), + ) + ), + ); + $form['custom_language']['#after_build'][] = 'locale_language_add_form_after_build'; + _locale_language_common_controls($form['custom_language']); + + $form['actions'] = array('#type' => 'actions'); + $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Add language')); return $form; } /** - * Custom language addition form. + * After-build callback for language addition form. + * + * Make all custom language fields "hidden" if no custom language selected + * to avoid their required field validations kicking in. */ -function locale_languages_custom_form($form) { - $form['custom language'] = array('#type' => 'fieldset', - '#title' => t('Custom language'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - ); - _locale_languages_common_controls($form['custom language']); - $form['custom language']['actions'] = array('#type' => 'actions'); - $form['custom language']['actions']['submit'] = array( - '#type' => 'submit', - '#value' => t('Add custom language') - ); - // Reuse the validation and submit functions of the predefined language setup form. - $form['#submit'][] = 'locale_languages_predefined_form_submit'; - $form['#validate'][] = 'locale_languages_predefined_form_validate'; - return $form; +function locale_language_add_form_after_build($element, &$form_state) { + if ($form_state['process_input'] && $form_state['values']['predefined_langcode'] !== 'custom') { + // Remove this whole container in the form. + $element = array(); + } + return $element; } /** @@ -206,16 +198,16 @@ function locale_languages_custom_form($form) { * @param $langcode * Language code of the language to edit. */ -function locale_languages_edit_form($form, &$form_state, $langcode) { +function locale_language_edit_form($form, &$form_state, $langcode) { if ($language = db_query("SELECT * FROM {languages} WHERE language = :language", array(':language' => $langcode))->fetchObject()) { - _locale_languages_common_controls($form, $language); + _locale_language_common_controls($form, $language); $form['actions'] = array('#type' => 'actions'); $form['actions']['submit'] = array( '#type' => 'submit', '#value' => t('Save language') ); - $form['#submit'][] = 'locale_languages_edit_form_submit'; - $form['#validate'][] = 'locale_languages_edit_form_validate'; + $form['#submit'][] = 'locale_language_edit_form_submit'; + $form['#validate'][] = 'locale_language_edit_form_validate'; return $form; } else { @@ -232,7 +224,7 @@ function locale_languages_edit_form($form, &$form_state, $langcode) { * @param $language * Language object to edit. */ -function _locale_languages_common_controls(&$form, $language = NULL) { +function _locale_language_common_controls(&$form, $language = NULL) { if (!is_object($language)) { $language = new stdClass(); } @@ -297,14 +289,18 @@ function _locale_languages_common_controls(&$form, $language = NULL) { /** * Validate the language addition form. */ -function locale_languages_predefined_form_validate($form, &$form_state) { - $langcode = $form_state['values']['langcode']; +function locale_language_add_form_validate($form, &$form_state) { + $langcode = $form_state['values']['predefined_langcode']; + $custom = ($langcode == 'custom'); + if ($custom) { + $langcode = $form_state['values']['langcode']; + } if (($duplicate = db_query("SELECT COUNT(*) FROM {languages} WHERE language = :language", array(':language' => $langcode))->fetchField()) != 0) { form_set_error('langcode', t('The language %language (%code) already exists.', array('%language' => $form_state['values']['name'], '%code' => $langcode))); } - if (!isset($form_state['values']['name'])) { + if (!$custom) { // Predefined language selection. include_once DRUPAL_ROOT . '/includes/standard.inc'; $predefined = standard_language_list(); @@ -314,16 +310,17 @@ function locale_languages_predefined_form_validate($form, &$form_state) { } else { // Reuse the editing form validation routine if we add a custom language. - locale_languages_edit_form_validate($form, $form_state); + locale_language_edit_form_validate($form, $form_state); } } /** * Process the language addition form submission. */ -function locale_languages_predefined_form_submit($form, &$form_state) { - $langcode = $form_state['values']['langcode']; - if (isset($form_state['values']['name'])) { +function locale_language_add_form_submit($form, &$form_state) { + $langcode = $form_state['values']['predefined_langcode']; + if ($langcode == 'custom') { + $langcode = $form_state['values']['langcode']; // Custom language form. $language = (object) array( 'language' => $langcode, @@ -360,7 +357,7 @@ function locale_languages_predefined_form_submit($form, &$form_state) { /** * Validate the language editing form. Reused for custom language addition too. */ -function locale_languages_edit_form_validate($form, &$form_state) { +function locale_language_edit_form_validate($form, &$form_state) { // Ensure sane field values for langcode, name, and native. if (!isset($form['langcode_view']) && preg_match('@[^a-zA-Z_-]@', $form_state['values']['langcode'])) { form_set_error('langcode', t('%field may only contain characters a-z, underscores, or hyphens.', array('%field' => $form['langcode']['#title']))); @@ -389,7 +386,7 @@ function locale_languages_edit_form_validate($form, &$form_state) { /** * Process the language editing form submission. */ -function locale_languages_edit_form_submit($form, &$form_state) { +function locale_language_edit_form_submit($form, &$form_state) { // Prepare a language object for saving $languages = language_list(); $langcode = $form_state['values']['langcode']; @@ -406,7 +403,7 @@ function locale_languages_edit_form_submit($form, &$form_state) { /** * User interface for the language deletion confirmation screen. */ -function locale_languages_delete_form($form, &$form_state, $langcode) { +function locale_language_delete_form($form, &$form_state, $langcode) { // Do not allow deletion of English locale. if ($langcode == 'en') { @@ -435,7 +432,7 @@ function locale_languages_delete_form($form, &$form_state, $langcode) { /** * Process language deletion submissions. */ -function locale_languages_delete_form_submit($form, &$form_state) { +function locale_language_delete_form_submit($form, &$form_state) { $langcode = $form_state['values']['langcode']; $languages = language_list(); $language = $languages[$langcode]; @@ -453,19 +450,19 @@ function locale_languages_delete_form_submit($form, &$form_state) { /** * Setting for language negotiation options */ -function locale_languages_configure_form() { +function locale_language_configure_form() { include_once DRUPAL_ROOT . '/includes/language.inc'; $form = array( - '#submit' => array('locale_languages_configure_form_submit'), - '#theme' => 'locale_languages_configure_form', + '#submit' => array('locale_language_configure_form_submit'), + '#theme' => 'locale_language_configure_form', '#language_types' => language_types_configurable(FALSE), '#language_types_info' => language_types_info(), '#language_providers' => language_negotiation_info(), ); foreach ($form['#language_types'] as $type) { - _locale_languages_configure_form_language_table($form, $type); + _locale_language_configure_form_language_table($form, $type); } $form['actions'] = array('#type' => 'actions'); @@ -480,7 +477,7 @@ function locale_languages_configure_form() { /** * Helper function to build a language provider table. */ -function _locale_languages_configure_form_language_table(&$form, $type) { +function _locale_language_configure_form_language_table(&$form, $type) { $info = $form['#language_types_info'][$type]; $table_form = array( @@ -570,7 +567,7 @@ function _locale_languages_configure_form_language_table(&$form, $type) { * * @ingroup themeable */ -function theme_locale_languages_configure_form($variables) { +function theme_locale_language_configure_form($variables) { $form = $variables['form']; $output = ''; @@ -631,7 +628,7 @@ function theme_locale_languages_configure_form($variables) { /** * Submit handler for language negotiation settings. */ -function locale_languages_configure_form_submit($form, &$form_state) { +function locale_language_configure_form_submit($form, &$form_state) { $configurable_types = $form['#language_types']; foreach ($configurable_types as $type) { diff --git a/modules/locale/locale.module b/modules/locale/locale.module index 6bb697d..65a1126 100644 --- a/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -40,7 +40,7 @@ function locale_help($path, $arg) { $output = '

' . t('With multiple languages enabled, interface text can be translated, registered users may select their preferred language, and authors can assign a specific language to content. Download contributed translations from Drupal.org.', array('@translations' => 'http://localize.drupal.org')) . '

'; return $output; case 'admin/config/regional/language/add': - return '

' . t('Add a language to be supported by your site. If your desired language is not available in the Language name drop-down, click Custom language and provide a language code and other details manually. When providing a language code manually, be sure to enter a standardized language code, since this code may be used by browsers to determine an appropriate display language.') . '

'; + return '

' . t('Add a language to be supported by your site. If your desired language is not available, pick Custom language... at the end and provide a language code and other details manually.') . '

'; case 'admin/config/regional/language/configure': $output = '

' . t("Define how to decide which language is used to display page elements (primarily text provided by Drupal and modules, such as field labels and help text). This decision is made by evaluating a series of detection methods for languages; the first detection method that gets a result will determine which language is used for that type of text. Define the order of evaluation of language detection methods on this page.") . '

'; return $output; @@ -75,7 +75,7 @@ function locale_menu() { 'title' => 'Languages', 'description' => 'Configure languages for content and the user interface.', 'page callback' => 'drupal_get_form', - 'page arguments' => array('locale_languages_overview_form'), + 'page arguments' => array('locale_language_overview_form'), 'access arguments' => array('administer languages'), 'file' => 'locale.admin.inc', 'weight' => -10, @@ -87,7 +87,8 @@ function locale_menu() { ); $items['admin/config/regional/language/add'] = array( 'title' => 'Add language', - 'page callback' => 'locale_languages_add_screen', // two forms concatenated + 'page callback' => 'drupal_get_form', + 'page arguments' => array('locale_language_add_form'), 'access arguments' => array('administer languages'), 'weight' => 5, 'type' => MENU_LOCAL_ACTION, @@ -96,7 +97,7 @@ function locale_menu() { $items['admin/config/regional/language/configure'] = array( 'title' => 'Detection and selection', 'page callback' => 'drupal_get_form', - 'page arguments' => array('locale_languages_configure_form'), + 'page arguments' => array('locale_language_configure_form'), 'access arguments' => array('administer languages'), 'weight' => 10, 'file' => 'locale.admin.inc', @@ -121,14 +122,14 @@ function locale_menu() { $items['admin/config/regional/language/edit/%'] = array( 'title' => 'Edit language', 'page callback' => 'drupal_get_form', - 'page arguments' => array('locale_languages_edit_form', 5), + 'page arguments' => array('locale_language_edit_form', 5), 'access arguments' => array('administer languages'), 'file' => 'locale.admin.inc', ); $items['admin/config/regional/language/delete/%'] = array( 'title' => 'Confirm', 'page callback' => 'drupal_get_form', - 'page arguments' => array('locale_languages_delete_form', 5), + 'page arguments' => array('locale_language_delete_form', 5), 'access arguments' => array('administer languages'), 'file' => 'locale.admin.inc', ); @@ -393,10 +394,10 @@ function locale_field_node_form_submit($form, &$form_state) { */ function locale_theme() { return array( - 'locale_languages_overview_form' => array( + 'locale_language_overview_form' => array( 'render element' => 'form', ), - 'locale_languages_configure_form' => array( + 'locale_language_configure_form' => array( 'render element' => 'form', ), 'locale_date_format_form' => array( diff --git a/modules/locale/locale.test b/modules/locale/locale.test index 31556cb..5b0d0be 100644 --- a/modules/locale/locale.test +++ b/modules/locale/locale.test @@ -49,7 +49,7 @@ class LocaleConfigurationTest extends DrupalWebTestCase { // Add predefined language. $edit = array( - 'langcode' => 'fr', + 'predefined_langcode' => 'fr', ); $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); $this->assertText('fr', t('Language added successfully.')); @@ -65,13 +65,14 @@ class LocaleConfigurationTest extends DrupalWebTestCase { // The domain prefix. $prefix = $langcode; $edit = array( + 'predefined_langcode' => 'custom', 'langcode' => $langcode, 'name' => $name, 'native' => $native, 'prefix' => $prefix, 'direction' => '0', ); - $this->drupalPost('admin/config/regional/language/add', $edit, t('Add custom language')); + $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); $this->assertEqual($this->getUrl(), url('admin/config/regional/language', array('absolute' => TRUE)), t('Correct page redirection.')); $this->assertText($langcode, t('Language code found.')); $this->assertText($name, t('Name found.')); @@ -222,13 +223,14 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase { // Add custom language. $this->drupalLogin($admin_user); $edit = array( + 'predefined_langcode' => 'custom', 'langcode' => $langcode, 'name' => $name, 'native' => $native, 'prefix' => $prefix, 'direction' => '0', ); - $this->drupalPost('admin/config/regional/language/add', $edit, t('Add custom language')); + $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); // Add string. t($name, array(), array('langcode' => $langcode)); // Reset locale cache. @@ -338,13 +340,14 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase { // Add custom language. $edit = array( + 'predefined_langcode' => 'custom', 'langcode' => $langcode, 'name' => $name, 'native' => $native, 'prefix' => $prefix, 'direction' => '0', ); - $this->drupalPost('admin/config/regional/language/add', $edit, t('Add custom language')); + $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); drupal_static_reset('language_list'); // Build the JavaScript translation file. @@ -412,13 +415,14 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase { // Add custom language. $edit = array( + 'predefined_langcode' => 'custom', 'langcode' => $langcode, 'name' => $name, 'native' => $native, 'prefix' => $prefix, 'direction' => '0', ); - $this->drupalPost('admin/config/regional/language/add', $edit, t('Add custom language')); + $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); // Add string. t($name, array(), array('langcode' => $langcode)); // Reset locale cache. @@ -472,13 +476,14 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase { // Add custom language. $this->drupalLogin($admin_user); $edit = array( + 'predefined_langcode' => 'custom', 'langcode' => $langcode, 'name' => $name, 'native' => $native, 'prefix' => $prefix, 'direction' => '0', ); - $this->drupalPost('admin/config/regional/language/add', $edit, t('Add custom language')); + $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); // Add string. t($name, array(), array('langcode' => $langcode)); // Reset locale cache. @@ -715,13 +720,14 @@ class LocaleImportFunctionalTest extends DrupalWebTestCase { // Create a custom language. $edit = array( + 'predefined_langcode' => 'custom', 'langcode' => $langcode, 'name' => $name, 'native' => $native, 'prefix' => $prefix, 'direction' => '0', ); - $this->drupalPost('admin/config/regional/language/add', $edit, t('Add custom language')); + $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); // Ensure the translation file was automatically imported when language was // added. @@ -1252,7 +1258,7 @@ class LocaleLanguageSwitchingFunctionalTest extends DrupalWebTestCase { // Add language. $edit = array( - 'langcode' => 'fr', + 'predefined_langcode' => 'fr', ); $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); @@ -1334,13 +1340,14 @@ class LocaleUserLanguageFunctionalTest extends DrupalWebTestCase { // The domain prefix. $prefix = 'xx'; $edit = array( + 'predefined_langcode' => 'custom', 'langcode' => $langcode, 'name' => $name, 'native' => $native, 'prefix' => $prefix, 'direction' => '0', ); - $this->drupalPost('admin/config/regional/language/add', $edit, t('Add custom language')); + $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); // Add custom language and disable it. // Code for the language. @@ -1352,13 +1359,14 @@ class LocaleUserLanguageFunctionalTest extends DrupalWebTestCase { // The domain prefix. $prefix_disabled = $langcode_disabled; $edit = array( + 'predefined_langcode' => 'custom', 'langcode' => $langcode_disabled, 'name' => $name_disabled, 'native' => $native_disabled, 'prefix' => $prefix_disabled, 'direction' => '0', ); - $this->drupalPost('admin/config/regional/language/add', $edit, t('Add custom language')); + $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); // Disable the language. $edit = array( 'enabled[' . $langcode_disabled . ']' => FALSE, @@ -1420,7 +1428,7 @@ class LocaleUserCreationTest extends DrupalWebTestCase { // Add predefined language. $langcode = 'fr'; $edit = array( - 'langcode' => 'fr', + 'predefined_langcode' => 'fr', ); $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); $this->assertText($langcode, t('Language added successfully.')); @@ -1529,13 +1537,14 @@ class LocalePathFunctionalTest extends DrupalWebTestCase { // The domain prefix. $prefix = $langcode; $edit = array( + 'predefined_langcode' => 'custom', 'langcode' => $langcode, 'name' => $name, 'native' => $native, 'prefix' => $prefix, 'direction' => '0', ); - $this->drupalPost('admin/config/regional/language/add', $edit, t('Add custom language')); + $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); // Check that the "xx" front page is not available when path prefixes are // not enabled yet. @@ -1671,13 +1680,14 @@ class LocaleContentFunctionalTest extends DrupalWebTestCase { // The domain prefix. $prefix = $langcode; $edit = array( + 'predefined_langcode' => 'custom', 'langcode' => $langcode, 'name' => $name, 'native' => $native, 'prefix' => $prefix, 'direction' => '0', ); - $this->drupalPost('admin/config/regional/language/add', $edit, t('Add custom language')); + $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); // Add disabled custom language. // Code for the language. @@ -1689,13 +1699,14 @@ class LocaleContentFunctionalTest extends DrupalWebTestCase { // The domain prefix. $prefix_disabled = $langcode_disabled; $edit = array( + 'predefined_langcode' => 'custom', 'langcode' => $langcode_disabled, 'name' => $name_disabled, 'native' => $native_disabled, 'prefix' => $prefix_disabled, 'direction' => '0', ); - $this->drupalPost('admin/config/regional/language/add', $edit, t('Add custom language')); + $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); // Disable second custom language. $path = 'admin/config/regional/language'; $edit = array( @@ -2028,12 +2039,12 @@ class LocaleUrlRewritingTest extends DrupalWebTestCase { // Install French language. $edit = array(); - $edit['langcode'] = 'fr'; + $edit['predefined_langcode'] = 'fr'; $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); // Install Italian language. $edit = array(); - $edit['langcode'] = 'it'; + $edit['predefined_langcode'] = 'it'; $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); // Disable Italian language. @@ -2232,7 +2243,7 @@ class LocaleCommentLanguageFunctionalTest extends DrupalWebTestCase { $this->drupalLogin($admin_user); // Add language. - $edit = array('langcode' => 'fr'); + $edit = array('predefined_langcode' => 'fr'); $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); // Set "Article" content type to use multilingual support. @@ -2330,7 +2341,7 @@ class LocaleDateFormatsFunctionalTest extends DrupalWebTestCase { function testLocalizeDateFormats() { // Add language. $edit = array( - 'langcode' => 'fr', + 'predefined_langcode' => 'fr', ); $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); @@ -2390,7 +2401,7 @@ class LocaleLanguageNegotiationInfoFunctionalTest extends DrupalWebTestCase { require_once DRUPAL_ROOT .'/includes/language.inc'; $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages', 'view the administration theme')); $this->drupalLogin($admin_user); - $this->drupalPost('admin/config/regional/language/add', array('langcode' => 'it'), t('Add language')); + $this->drupalPost('admin/config/regional/language/add', array('predefined_langcode' => 'it'), t('Add language')); } /** diff --git a/modules/path/path.test b/modules/path/path.test index 241f532..abb7643 100644 --- a/modules/path/path.test +++ b/modules/path/path.test @@ -246,7 +246,7 @@ class PathLanguageTestCase extends DrupalWebTestCase { // Enable French language. $edit = array(); - $edit['langcode'] = 'fr'; + $edit['predefined_langcode'] = 'fr'; $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); @@ -387,7 +387,7 @@ class PathLanguageUITestCase extends DrupalWebTestCase { // Enable French language. $edit = array(); - $edit['langcode'] = 'fr'; + $edit['predefined_langcode'] = 'fr'; $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); @@ -464,7 +464,7 @@ class PathMonolingualTestCase extends DrupalWebTestCase { // Enable French language. $edit = array(); - $edit['langcode'] = 'fr'; + $edit['predefined_langcode'] = 'fr'; $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); // Make French the default language. diff --git a/modules/search/search.test b/modules/search/search.test index a6ed0df..5998aa7 100644 --- a/modules/search/search.test +++ b/modules/search/search.test @@ -450,7 +450,7 @@ class SearchRankingTestCase extends DrupalWebTestCase { function testHTMLRankings() { // Login with sufficient privileges. $this->drupalLogin($this->drupalCreateUser(array('create page content'))); - + // Test HTML tags with different weights. $sorted_tags = array('h1', 'h2', 'h3', 'h4', 'a', 'h5', 'h6', 'notag'); $shuffled_tags = $sorted_tags; @@ -482,7 +482,7 @@ class SearchRankingTestCase extends DrupalWebTestCase { // Refresh variables after the treatment. $this->refreshVariables(); - + // Disable all other rankings. $node_ranks = array('sticky', 'promote', 'recent', 'comments', 'views'); foreach ($node_ranks as $node_rank) { @@ -520,7 +520,7 @@ class SearchRankingTestCase extends DrupalWebTestCase { // Assert the results. $this->assertEqual($set[0]['node']->nid, $node->nid, 'Search tag ranking for "<' . $tag . '>" order.'); - + // Delete node so it doesn't show up in subsequent search results. node_delete($node->nid); } @@ -861,7 +861,7 @@ class SearchCommentTestCase extends DrupalWebTestCase { $this->setRolePermissions(DRUPAL_AUTHENTICATED_RID, TRUE, TRUE); $this->setRolePermissions($this->admin_role, TRUE, FALSE); $this->checkCommentAccess('Admin user has access comments permission and no search permission, but comments should be indexed because admin user inherits authenticated user\'s permission to search', TRUE); - + } /** @@ -1912,7 +1912,7 @@ class SearchLanguageTestCase extends DrupalWebTestCase { $this->assertNoText(t('Languages'), t('No languages to choose from.')); // Add predefined language. - $edit = array('langcode' => 'fr'); + $edit = array('predefined_langcode' => 'fr'); $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); $this->assertText('fr', t('Language added successfully.')); diff --git a/modules/simpletest/tests/common.test b/modules/simpletest/tests/common.test index 021e721..0783999 100644 --- a/modules/simpletest/tests/common.test +++ b/modules/simpletest/tests/common.test @@ -2246,13 +2246,14 @@ class FormatDateUnitTest extends DrupalWebTestCase { $admin_user = $this->drupalCreateUser(array('administer languages')); $this->drupalLogin($admin_user); $edit = array( + 'predefined_langcode' => 'custom', 'langcode' => self::LANGCODE, 'name' => self::LANGCODE, 'native' => self::LANGCODE, 'direction' => LANGUAGE_LTR, 'prefix' => self::LANGCODE, ); - $this->drupalPost('admin/config/regional/language/add', $edit, t('Add custom language')); + $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); // Create a test user to carry out the tests. $test_user = $this->drupalCreateUser(); diff --git a/modules/translation/translation.test b/modules/translation/translation.test index fe320a9..f98af59 100644 --- a/modules/translation/translation.test +++ b/modules/translation/translation.test @@ -281,7 +281,7 @@ class TranslationTestCase extends DrupalWebTestCase { if (strpos($this->drupalGetContent(), 'enabled[' . $language_code . ']') === FALSE) { // Doesn't have language installed so add it. $edit = array(); - $edit['langcode'] = $language_code; + $edit['predefined_langcode'] = $language_code; $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); // Make sure we are not using a stale list.