diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index c022e8e..80208f7 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -2631,7 +2631,6 @@ function language_default() {
(object) array(
'language' => 'en',
'name' => 'English',
- 'native' => 'English',
'direction' => 0,
'enabled' => 1,
'plurals' => 0,
diff --git a/includes/install.core.inc b/includes/install.core.inc
index 7405f9f..a0dd173 100644
--- a/includes/install.core.inc
+++ b/includes/install.core.inc
@@ -1395,7 +1395,6 @@ function install_import_locales(&$install_state) {
$language = (object) array(
'language' => $install_locale,
'name' => $install_locale,
- 'native' => $install_locale,
'default' => TRUE,
);
locale_language_save($language);
diff --git a/includes/language.inc b/includes/language.inc
index c729ec2..685a4d4 100644
--- a/includes/language.inc
+++ b/includes/language.inc
@@ -300,7 +300,7 @@ function language_negotiation_info() {
'callbacks' => array('language' => 'language_from_default'),
'weight' => 10,
'name' => t('Default language'),
- 'description' => t('Use the default site language (@language_name).', array('@language_name' => language_default()->native)),
+ 'description' => t('Use the default site language (@language_name).', array('@language_name' => language_default()->name)),
'config' => 'admin/config/regional/language',
);
diff --git a/includes/locale.inc b/includes/locale.inc
index 9714319..faffebd 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -283,7 +283,7 @@ function locale_language_switcher_url($type, $path) {
foreach ($languages[1] as $language) {
$links[$language->language] = array(
'href' => $path,
- 'title' => $language->native,
+ 'title' => $language->name,
'language' => $language,
'attributes' => array('class' => array('language-link')),
);
@@ -311,7 +311,7 @@ function locale_language_switcher_session($type, $path) {
$langcode = $language->language;
$links[$langcode] = array(
'href' => $path,
- 'title' => $language->native,
+ 'title' => $language->name,
'attributes' => array('class' => array('language-link')),
'query' => $query,
);
@@ -446,7 +446,6 @@ function locale_language_save($language) {
include_once DRUPAL_ROOT . '/includes/standard.inc';
$predefined = standard_language_list();
$language->name = $predefined[$language->language][0];
- $language->native = isset($predefined[$language->language][1]) ? $predefined[$language->language][1] : $predefined[$language->language][0];
$language->direction = isset($predefined[$language->language][2]) ? $predefined[$language->language][2] : LANGUAGE_LTR;
}
@@ -700,20 +699,20 @@ function _locale_rebuild_js($langcode = NULL) {
// Log the operation and return success flag.
switch ($status) {
case 'updated':
- watchdog('locale', 'Updated JavaScript translation file for the language %language.', array('%language' => t($language->name)));
+ watchdog('locale', 'Updated JavaScript translation file for the language %language.', array('%language' => $language->name));
return TRUE;
case 'rebuilt':
watchdog('locale', 'JavaScript translation file %file.js was lost.', array('%file' => $language->javascript), WATCHDOG_WARNING);
// Proceed to the 'created' case as the JavaScript translation file has
// been created again.
case 'created':
- watchdog('locale', 'Created JavaScript translation file for the language %language.', array('%language' => t($language->name)));
+ watchdog('locale', 'Created JavaScript translation file for the language %language.', array('%language' => $language->name));
return TRUE;
case 'deleted':
- watchdog('locale', 'Removed JavaScript translation file for the language %language because no translations currently exist for that language.', array('%language' => t($language->name)));
+ watchdog('locale', 'Removed JavaScript translation file for the language %language because no translations currently exist for that language.', array('%language' => $language->name));
return TRUE;
case 'error':
- watchdog('locale', 'An error occurred during creation of the JavaScript translation file for the language %language.', array('%language' => t($language->name)), WATCHDOG_ERROR);
+ watchdog('locale', 'An error occurred during creation of the JavaScript translation file for the language %language.', array('%language' => $language->name), WATCHDOG_ERROR);
return FALSE;
default:
// No operation needed.
diff --git a/modules/field/tests/field.test b/modules/field/tests/field.test
index 99eeb8a..f4be7d5 100644
--- a/modules/field/tests/field.test
+++ b/modules/field/tests/field.test
@@ -2647,7 +2647,6 @@ class FieldTranslationsTestCase extends FieldTestCase {
$language = (object) array(
'language' => 'l' . $i,
'name' => $this->randomString(),
- 'native' => $this->randomString(),
);
locale_language_save($language);
}
diff --git a/modules/locale/locale.admin.inc b/modules/locale/locale.admin.inc
index f2da1e5..8cbc87d 100644
--- a/modules/locale/locale.admin.inc
+++ b/modules/locale/locale.admin.inc
@@ -37,7 +37,6 @@ function locale_languages_overview_form() {
'#attributes' => array('class' => array('language-order-weight')),
);
$form['name'][$langcode] = array('#markup' => check_plain($language->name));
- $form['native'][$langcode] = array('#markup' => check_plain($language->native));
$form['direction'][$langcode] = array('#markup' => ($language->direction == LANGUAGE_RTL ? t('Right to left') : t('Left to right')));
}
$form['enabled'] = array(
@@ -93,7 +92,6 @@ function theme_locale_languages_overview_form($variables) {
$rows[] = array(
'data' => array(
'' . $title . '',
- drupal_render($form['native'][$key]),
check_plain($key),
drupal_render($form['direction'][$key]),
array('data' => drupal_render($form['enabled'][$key]), 'align' => 'center'),
@@ -105,7 +103,7 @@ function theme_locale_languages_overview_form($variables) {
);
}
}
- $header = array(array('data' => t('English name')), array('data' => t('Native name')), array('data' => t('Code')), array('data' => t('Direction')), array('data' => t('Enabled')), array('data' => t('Default')), array('data' => t('Weight')), array('data' => t('Operations')));
+ $header = array(array('data' => t('English name')), array('data' => t('Code')), array('data' => t('Direction')), array('data' => t('Enabled')), array('data' => t('Default')), array('data' => t('Weight')), array('data' => t('Operations')));
$output = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'language-order')));
$output .= drupal_render_children($form);
@@ -248,7 +246,8 @@ function _locale_languages_common_controls(&$form, $language = NULL) {
);
}
else {
- $form['langcode'] = array('#type' => 'textfield',
+ $form['langcode'] = array(
+ '#type' => 'textfield',
'#title' => t('Language code'),
'#size' => 12,
'#maxlength' => 60,
@@ -258,33 +257,29 @@ function _locale_languages_common_controls(&$form, $language = NULL) {
'#description' => t('Use language codes as defined by the W3C for interoperability. Examples: "en", "en-gb" and "zh-hant".', array('@w3ctags' => 'http://www.w3.org/International/articles/language-tags/')),
);
}
- $form['name'] = array('#type' => 'textfield',
- '#title' => t('Language name in English'),
+ $form['name'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Language name'),
'#maxlength' => 64,
'#default_value' => @$language->name,
'#required' => TRUE,
- '#description' => t('Name of the language in English. Will be available for translation in all languages.'),
- );
- $form['native'] = array('#type' => 'textfield',
- '#title' => t('Native language name'),
- '#maxlength' => 64,
- '#default_value' => @$language->native,
- '#required' => TRUE,
- '#description' => t('Name of the language in the language being added.'),
);
- $form['prefix'] = array('#type' => 'textfield',
+ $form['prefix'] = array(
+ '#type' => 'textfield',
'#title' => t('Path prefix language code'),
'#maxlength' => 64,
'#default_value' => @$language->prefix,
'#description' => t('Language code or other custom text to use as a path prefix for URL language detection, if your Detection and selection settings use URL path prefixes. For the default language, this value may be left blank. Modifying this value may break existing URLs. Use with caution in a production environment. Example: Specifying "deutsch" as the path prefix code for German results in URLs like "example.com/deutsch/contact".')
);
- $form['domain'] = array('#type' => 'textfield',
+ $form['domain'] = array(
+ '#type' => 'textfield',
'#title' => t('Language domain'),
'#maxlength' => 128,
'#default_value' => @$language->domain,
'#description' => t('The domain name to use for this language if URL domains are used for Detection and selection. Leave blank for the default language. Changing this value may break existing URLs. Example: Specifying "de.example.com" as language domain for German will result in an URL like "http://de.example.com/contact".'),
);
- $form['direction'] = array('#type' => 'radios',
+ $form['direction'] = array(
+ '#type' => 'radios',
'#title' => t('Direction'),
'#required' => TRUE,
'#description' => t('Direction that text in this language is presented.'),
@@ -328,13 +323,12 @@ function locale_languages_predefined_form_submit($form, &$form_state) {
$language = (object) array(
'language' => $langcode,
'name' => $form_state['values']['name'],
- 'native' => $form_state['values']['native'],
'direction' => $form_state['values']['direction'],
'domain' => $form_state['values']['domain'],
'prefix' => $form_state['values']['prefix'],
);
locale_language_save($language);
- drupal_set_message(t('The language %language has been created and can now be used. More information is available on the help screen.', array('%language' => t($form_state['values']['name']), '@locale-help' => url('admin/help/locale'))));
+ drupal_set_message(t('The language %language has been created and can now be used. More information is available on the help screen.', array('%language' => $form_state['values']['name'], '@locale-help' => url('admin/help/locale'))));
}
else {
// Predefined language selection.
@@ -361,16 +355,13 @@ 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) {
- // Ensure sane field values for langcode, name, and native.
+ // Ensure sane field values for langcode and name.
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'])));
}
if ($form_state['values']['name'] != check_plain($form_state['values']['name'])) {
form_set_error('name', t('%field cannot contain any markup.', array('%field' => $form['name']['#title'])));
}
- if ($form_state['values']['native'] != check_plain($form_state['values']['native'])) {
- form_set_error('native', t('%field cannot contain any markup.', array('%field' => $form['native']['#title'])));
- }
if (!empty($form_state['values']['domain']) && !empty($form_state['values']['prefix'])) {
form_set_error('prefix', t('Domain and path prefix values should not be set at the same time.'));
@@ -395,7 +386,6 @@ function locale_languages_edit_form_submit($form, &$form_state) {
$langcode = $form_state['values']['langcode'];
$language = $languages[$langcode];
$language->name = $form_state['values']['name'];
- $language->native = $form_state['values']['native'];
$language->direction = $form_state['values']['direction'];
$language->domain = $form_state['values']['domain'];
$language->prefix = $form_state['values']['prefix'];
@@ -428,7 +418,7 @@ function locale_languages_delete_form($form, &$form_state, $langcode) {
}
else {
$form['langcode'] = array('#type' => 'value', '#value' => $langcode);
- return confirm_form($form, t('Are you sure you want to delete the language %name?', array('%name' => t($languages[$langcode]->name))), 'admin/config/regional/language', t('Deleting a language will remove all interface translations associated with it, and posts in this language will be set to be language neutral. This action cannot be undone.'), t('Delete'), t('Cancel'));
+ return confirm_form($form, t('Are you sure you want to delete the language %name?', array('%name' => $languages[$langcode]->name)), 'admin/config/regional/language', t('Deleting a language will remove all interface translations associated with it, and posts in this language will be set to be language neutral. This action cannot be undone.'), t('Delete'), t('Cancel'));
}
}
@@ -741,7 +731,7 @@ function locale_date_format_language_overview_page() {
);
// Get list of languages.
- $languages = locale_language_list('native');
+ $languages = locale_language_list();
foreach ($languages as $langcode => $info) {
$row = array();
@@ -758,7 +748,7 @@ function locale_date_format_language_overview_page() {
* Provide date localization configuration options to users.
*/
function locale_date_format_form($form, &$form_state, $langcode) {
- $languages = locale_language_list('native');
+ $languages = locale_language_list();
$language_name = $languages[$langcode];
// Display the current language name.
diff --git a/modules/locale/locale.install b/modules/locale/locale.install
index 7fbc81d..145ef91 100644
--- a/modules/locale/locale.install
+++ b/modules/locale/locale.install
@@ -17,7 +17,6 @@ function locale_install() {
->fields(array(
'language' => 'en',
'name' => 'English',
- 'native' => 'English',
'direction' => 0,
'enabled' => 1,
'weight' => 0,
@@ -95,14 +94,7 @@ function locale_schema() {
'length' => 64,
'not null' => TRUE,
'default' => '',
- 'description' => 'Language name in English.',
- ),
- 'native' => array(
- 'type' => 'varchar',
- 'length' => 64,
- 'not null' => TRUE,
- 'default' => '',
- 'description' => 'Native language name.',
+ 'description' => 'Language name.',
),
'direction' => array(
'type' => 'int',
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index 6bb697d..fd3a747 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -272,8 +272,7 @@ function locale_language_selector_form(&$form, &$form_state, $user) {
$names = array();
foreach ($languages as $langcode => $item) {
- $name = t($item->name);
- $names[$langcode] = $name . ($item->native != $name ? ' (' . $item->native . ')' : '');
+ $names[$langcode] = $item->name;
}
$form['locale'] = array(
'#type' => 'fieldset',
@@ -744,8 +743,7 @@ function locale_language_name($lang) {
* Returns array of language names
*
* @param $field
- * 'name' => names in current language, localized
- * 'native' => native names
+ * Name of language object field.
* @param $all
* Boolean to return all languages or only enabled ones
*/
@@ -759,7 +757,7 @@ function locale_language_list($field = 'name', $all = FALSE) {
}
$list = array();
foreach ($languages as $language) {
- $list[$language->language] = ($field == 'name') ? t($language->name) : $language->$field;
+ $list[$language->language] = $language->$field;
}
return $list;
}
diff --git a/modules/locale/locale.pages.inc b/modules/locale/locale.pages.inc
index 3e6590e..331f91a 100644
--- a/modules/locale/locale.pages.inc
+++ b/modules/locale/locale.pages.inc
@@ -18,7 +18,7 @@ function locale_translate_overview_screen() {
$rows = array();
foreach ($languages as $langcode => $language) {
$rows[$langcode] = array(
- 'name' => ($langcode == 'en' ? t('English (built-in)') : t($language->name)),
+ 'name' => ($langcode == 'en' ? t('English (built-in)') : $language->name),
'status' => ($langcode == 'en' ? t('n/a') : '0/' . $num_strings . ' (0%)'),
);
}
@@ -335,7 +335,7 @@ function locale_translate_edit_form($form, &$form_state, $lid) {
foreach ($languages as $langcode => $language) {
$form['translations'][$langcode] = array(
'#type' => 'textarea',
- '#title' => t($language->name),
+ '#title' => $language->name,
'#rows' => $rows,
'#default_value' => '',
);
diff --git a/modules/locale/locale.test b/modules/locale/locale.test
index 31556cb..d8ba8a1 100644
--- a/modules/locale/locale.test
+++ b/modules/locale/locale.test
@@ -60,14 +60,11 @@ class LocaleConfigurationTest extends DrupalWebTestCase {
$langcode = 'xx';
// The English name for the language.
$name = $this->randomName(16);
- // The native name for the language.
- $native = $this->randomName(16);
// The domain prefix.
$prefix = $langcode;
$edit = array(
'langcode' => $langcode,
'name' => $name,
- 'native' => $native,
'prefix' => $prefix,
'direction' => '0',
);
@@ -75,8 +72,7 @@ class LocaleConfigurationTest extends DrupalWebTestCase {
$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.'));
- $this->assertText($native, t('Native found.'));
- $this->assertText($native, t('Test language added.'));
+ $this->assertText($name, t('Test language added.'));
// Check if we can change the default language.
$path = 'admin/config/regional/language';
@@ -209,8 +205,6 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase {
$langcode = 'xx';
// The English name for the language. This will be translated.
$name = $this->randomName(16);
- // The native name for the language.
- $native = $this->randomName(16);
// The domain prefix.
$prefix = $langcode;
// This is the language indicator on the translation search screen for
@@ -224,7 +218,6 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase {
$edit = array(
'langcode' => $langcode,
'name' => $name,
- 'native' => $native,
'prefix' => $prefix,
'direction' => '0',
);
@@ -235,10 +228,7 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase {
locale_reset();
$this->assertText($langcode, t('Language code found.'));
$this->assertText($name, t('Name found.'));
- $this->assertText($native, t('Native found.'));
- // No t() here, we do not want to add this string to the database and it's
- // surely not translated yet.
- $this->assertText($native, t('Test language added.'));
+ $this->assertText($name, t('Test language added.'));
$this->drupalLogout();
// Search for the name and translate it.
@@ -331,8 +321,6 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase {
$langcode = 'xx';
// The English name for the language. This will be translated.
$name = $this->randomName(16);
- // The native name for the language.
- $native = $this->randomName(16);
// The domain prefix.
$prefix = $langcode;
@@ -340,7 +328,6 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase {
$edit = array(
'langcode' => $langcode,
'name' => $name,
- 'native' => $native,
'prefix' => $prefix,
'direction' => '0',
);
@@ -393,8 +380,6 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase {
$langcode = 'xx';
// The English name for the language. This will be translated.
$name = $this->randomName(16);
- // The native name for the language.
- $native = $this->randomName(16);
// The domain prefix.
$prefix = $langcode;
// This is the language indicator on the translation search screen for
@@ -414,7 +399,6 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase {
$edit = array(
'langcode' => $langcode,
'name' => $name,
- 'native' => $native,
'prefix' => $prefix,
'direction' => '0',
);
@@ -459,8 +443,6 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase {
$langcode = 'xx';
// The English name for the language. This will be translated.
$name = $this->randomName(16);
- // The native name for the language.
- $native = $this->randomName(16);
// The domain prefix.
$prefix = $langcode;
// This is the language indicator on the translation search screen for
@@ -474,7 +456,6 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase {
$edit = array(
'langcode' => $langcode,
'name' => $name,
- 'native' => $native,
'prefix' => $prefix,
'direction' => '0',
);
@@ -708,8 +689,6 @@ class LocaleImportFunctionalTest extends DrupalWebTestCase {
$langcode = 'xx';
// The English name for the language.
$name = $this->randomName(16);
- // The native name for the language.
- $native = $this->randomName(16);
// The domain prefix.
$prefix = $langcode;
@@ -717,7 +696,6 @@ class LocaleImportFunctionalTest extends DrupalWebTestCase {
$edit = array(
'langcode' => $langcode,
'name' => $name,
- 'native' => $native,
'prefix' => $prefix,
'direction' => '0',
);
@@ -1101,7 +1079,6 @@ class LocaleUninstallFunctionalTest extends DrupalWebTestCase {
$language = (object) array(
'language' => 'fr',
'name' => 'French',
- 'native' => 'Français',
'default' => $this->language == 'fr',
);
locale_language_save($language);
@@ -1329,14 +1306,11 @@ class LocaleUserLanguageFunctionalTest extends DrupalWebTestCase {
$langcode = 'xx';
// The English name for the language.
$name = $this->randomName(16);
- // The native name for the language.
- $native = $this->randomName(16);
// The domain prefix.
$prefix = 'xx';
$edit = array(
'langcode' => $langcode,
'name' => $name,
- 'native' => $native,
'prefix' => $prefix,
'direction' => '0',
);
@@ -1347,14 +1321,11 @@ class LocaleUserLanguageFunctionalTest extends DrupalWebTestCase {
$langcode_disabled = 'xx-yy';
// The English name for the language. This will be translated.
$name_disabled = $this->randomName(16);
- // The native name for the language.
- $native_disabled = $this->randomName(16);
// The domain prefix.
$prefix_disabled = $langcode_disabled;
$edit = array(
'langcode' => $langcode_disabled,
'name' => $name_disabled,
- 'native' => $native_disabled,
'prefix' => $prefix_disabled,
'direction' => '0',
);
@@ -1524,14 +1495,11 @@ class LocalePathFunctionalTest extends DrupalWebTestCase {
$langcode = 'xx';
// The English name for the language.
$name = $this->randomName(16);
- // The native name for the language.
- $native = $this->randomName(16);
// The domain prefix.
$prefix = $langcode;
$edit = array(
'langcode' => $langcode,
'name' => $name,
- 'native' => $native,
'prefix' => $prefix,
'direction' => '0',
);
@@ -1666,14 +1634,11 @@ class LocaleContentFunctionalTest extends DrupalWebTestCase {
$langcode = 'xx';
// The English name for the language.
$name = $this->randomName(16);
- // The native name for the language.
- $native = $this->randomName(16);
// The domain prefix.
$prefix = $langcode;
$edit = array(
'langcode' => $langcode,
'name' => $name,
- 'native' => $native,
'prefix' => $prefix,
'direction' => '0',
);
@@ -1684,14 +1649,11 @@ class LocaleContentFunctionalTest extends DrupalWebTestCase {
$langcode_disabled = 'xx-yy';
// The English name for the language.
$name_disabled = $this->randomName(16);
- // The native name for the language.
- $native_disabled = $this->randomName(16);
// The domain prefix.
$prefix_disabled = $langcode_disabled;
$edit = array(
'langcode' => $langcode_disabled,
'name' => $name_disabled,
- 'native' => $native_disabled,
'prefix' => $prefix_disabled,
'direction' => '0',
);
@@ -1999,7 +1961,7 @@ class LocaleUILanguageNegotiationTest extends DrupalWebTestCase {
// language.
$args = array(':url' => base_path() . (!empty($GLOBALS['conf']['clean_url']) ? $langcode_browser_fallback : "?q=$langcode_browser_fallback"));
$fields = $this->xpath('//div[@id="block-locale-language"]//a[@class="language-link active" and @href=:url]', $args);
- $this->assertTrue($fields[0] == $languages[$langcode_browser_fallback]->native, t('The browser language is the URL active language'));
+ $this->assertTrue($fields[0] == $languages[$langcode_browser_fallback]->name, t('The browser language is the URL active language'));
// Check that URLs are rewritten using the given browser language.
$fields = $this->xpath('//div[@id="site-name"]//a[@rel="home" and @href=:url]//span', $args);
@@ -2112,7 +2074,6 @@ class LocaleMultilingualFieldsFunctionalTest extends DrupalWebTestCase {
$language = (object) array(
'language' => 'it',
'name' => 'Italian',
- 'native' => 'Italiano',
);
locale_language_save($language);
@@ -2343,7 +2304,7 @@ class LocaleDateFormatsFunctionalTest extends DrupalWebTestCase {
// Configure date formats.
$this->drupalGet('admin/config/regional/date-time/locale');
- $this->assertText('Français', 'Configured languages appear.');
+ $this->assertText('French', 'Configured languages appear.');
$edit = array(
'date_format_long' => 'd.m.Y - H:i',
'date_format_medium' => 'd.m.Y - H:i',
diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc
index a6abb0b..62552a2 100644
--- a/modules/node/node.admin.inc
+++ b/modules/node/node.admin.inc
@@ -449,7 +449,7 @@ function node_admin_nodes() {
);
if ($multilanguage) {
if ($node->language == LANGUAGE_NONE || isset($languages[$node->language])) {
- $options[$node->nid]['language'] = $node->language == LANGUAGE_NONE ? t('Language neutral') : t($languages[$node->language]->name);
+ $options[$node->nid]['language'] = $node->language == LANGUAGE_NONE ? t('Language neutral') : $languages[$node->language]->name;
}
else {
$options[$node->nid]['language'] = t('Undefined language (@langcode)', array('@langcode' => $node->language));
diff --git a/modules/simpletest/tests/common.test b/modules/simpletest/tests/common.test
index 021e721..c8fbf4c 100644
--- a/modules/simpletest/tests/common.test
+++ b/modules/simpletest/tests/common.test
@@ -2248,7 +2248,6 @@ class FormatDateUnitTest extends DrupalWebTestCase {
$edit = array(
'langcode' => self::LANGCODE,
'name' => self::LANGCODE,
- 'native' => self::LANGCODE,
'direction' => LANGUAGE_LTR,
'prefix' => self::LANGCODE,
);
diff --git a/modules/translation/translation.module b/modules/translation/translation.module
index 697929f..7d47a6d 100644
--- a/modules/translation/translation.module
+++ b/modules/translation/translation.module
@@ -200,7 +200,7 @@ function translation_form_node_form_alter(&$form, &$form_state) {
/**
* Implements hook_node_view().
*
- * Display translation links with native language names, if this node is part of
+ * Display translation links with language names, if this node is part of
* a translation set. If no language provider is enabled "fall back" to the
* simple links built through the result of translation_node_get_translations().
*/
@@ -234,7 +234,7 @@ function translation_node_view($node, $view_mode) {
else {
$links[$key] = array(
'href' => "node/{$translation->nid}",
- 'title' => $language->native,
+ 'title' => $language->name,
'language' => $language,
);
}
diff --git a/modules/translation/translation.test b/modules/translation/translation.test
index fe320a9..b716b21 100644
--- a/modules/translation/translation.test
+++ b/modules/translation/translation.test
@@ -424,7 +424,7 @@ class TranslationTestCase extends DrupalWebTestCase {
$this->drupalGet("node/$node->nid", array('language' => $page_language));
foreach ($types as $type) {
- $args = array('%translation_language' => $translation_language->native, '%page_language' => $page_language->native, '%type' => $type);
+ $args = array('%translation_language' => $translation_language->name, '%page_language' => $page_language->name, '%type' => $type);
if ($find) {
$message = t('[%page_language] Language switch item found for %translation_language language in the %type page area.', $args);
}
@@ -439,7 +439,7 @@ class TranslationTestCase extends DrupalWebTestCase {
$xpath = '//div[contains(@class, :type)]//span[@class="locale-untranslated"]';
}
- $found = $this->findContentByXPath($xpath, array(':type' => $type, ':url' => $url), $translation_language->native);
+ $found = $this->findContentByXPath($xpath, array(':type' => $type, ':url' => $url), $translation_language->name);
$result = $this->assertTrue($found == $find, $message) && $result;
}