diff options
| author | Nathaniel <catch@35733.no-reply.drupal.org> | 2011-10-26 16:48:38 +0900 |
|---|---|---|
| committer | Nathaniel <catch@35733.no-reply.drupal.org> | 2011-10-26 16:48:38 +0900 |
| commit | 879b5357cd6c8cb9a62ee63e5b06e72b82fa05ae (patch) | |
| tree | dcbf3603508b9e18322b7ed8258457c083a95896 /modules/locale/locale.module | |
| parent | 8e967deef0e244d9dbe79e058d404a86b4b8248e (diff) | |
| download | drupal-879b5357cd6c8cb9a62ee63e5b06e72b82fa05ae.tar.gz drupal-879b5357cd6c8cb9a62ee63e5b06e72b82fa05ae.zip | |
Issue #1301148 by Gábor Hojtsy: Stop pretending we have configuration translation for languages.
Diffstat (limited to 'modules/locale/locale.module')
| -rw-r--r-- | modules/locale/locale.module | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/modules/locale/locale.module b/modules/locale/locale.module index 2037c35c6f0..03757ac0cec 100644 --- a/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -285,8 +285,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', @@ -762,8 +761,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 */ @@ -777,7 +775,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; } |