diff --git a/includes/install.core.inc b/includes/install.core.inc
index 9364bcc039bdff6600e5958c8c18b1235c968346..1040bf3e550d00b452fb752698156c7f538186a4 100644
--- a/includes/install.core.inc
+++ b/includes/install.core.inc
@@ -1234,8 +1234,8 @@ function install_select_locale(&$install_state) {
* Form API array definition for language selection.
*/
function install_select_locale_form($form, &$form_state, $locales, $profilename) {
- include_once DRUPAL_ROOT . '/includes/iso.inc';
- $languages = _locale_get_predefined_list();
+ include_once DRUPAL_ROOT . '/includes/standard.inc';
+ $languages = standard_language_list();
foreach ($locales as $locale) {
$name = $locale->langcode;
if (isset($languages[$name])) {
@@ -1376,8 +1376,8 @@ function install_import_locales(&$install_state) {
include_once drupal_get_path('module', 'locale') . '/locale.bulk.inc';
$install_locale = $install_state['parameters']['locale'];
- include_once DRUPAL_ROOT . '/includes/iso.inc';
- $predefined = _locale_get_predefined_list();
+ include_once DRUPAL_ROOT . '/includes/standard.inc';
+ $predefined = standard_language_list();
if (!isset($predefined[$install_locale])) {
// Drupal does not know about this language, so we prefill its values with
// our best guess. The user will be able to edit afterwards.
diff --git a/includes/iso.inc b/includes/iso.inc
deleted file mode 100644
index dabbefdd5b6f2acce5341e0142b00056e2f09c99..0000000000000000000000000000000000000000
--- a/includes/iso.inc
+++ /dev/null
@@ -1,482 +0,0 @@
-<?php
-
-/**
- * @file
- * Provides a list of countries and languages based on ISO standards.
- */
-
-/**
- * Get an array of all country code => country name pairs.
- *
- * Get an array of all country code => country name pairs as laid out
- * in ISO 3166-1 alpha-2.
- * Grabbed from location project (http://drupal.org/project/location).
- * @return
- * An array of all country code => country name pairs.
- */
-function _country_get_predefined_list() {
- static $countries;
-
- if (isset($countries)) {
- return $countries;
- }
- $t = get_t();
-
- $countries = array(
- 'AD' => $t('Andorra'),
- 'AE' => $t('United Arab Emirates'),
- 'AF' => $t('Afghanistan'),
- 'AG' => $t('Antigua and Barbuda'),
- 'AI' => $t('Anguilla'),
- 'AL' => $t('Albania'),
- 'AM' => $t('Armenia'),
- 'AN' => $t('Netherlands Antilles'),
- 'AO' => $t('Angola'),
- 'AQ' => $t('Antarctica'),
- 'AR' => $t('Argentina'),
- 'AS' => $t('American Samoa'),
- 'AT' => $t('Austria'),
- 'AU' => $t('Australia'),
- 'AW' => $t('Aruba'),
- 'AX' => $t('Aland Islands'),
- 'AZ' => $t('Azerbaijan'),
- 'BA' => $t('Bosnia and Herzegovina'),
- 'BB' => $t('Barbados'),
- 'BD' => $t('Bangladesh'),
- 'BE' => $t('Belgium'),
- 'BF' => $t('Burkina Faso'),
- 'BG' => $t('Bulgaria'),
- 'BH' => $t('Bahrain'),
- 'BI' => $t('Burundi'),
- 'BJ' => $t('Benin'),
- 'BL' => $t('Saint Barthélemy'),
- 'BM' => $t('Bermuda'),
- 'BN' => $t('Brunei'),
- 'BO' => $t('Bolivia'),
- 'BR' => $t('Brazil'),
- 'BS' => $t('Bahamas'),
- 'BT' => $t('Bhutan'),
- 'BV' => $t('Bouvet Island'),
- 'BW' => $t('Botswana'),
- 'BY' => $t('Belarus'),
- 'BZ' => $t('Belize'),
- 'CA' => $t('Canada'),
- 'CC' => $t('Cocos (Keeling) Islands'),
- 'CD' => $t('Congo (Kinshasa)'),
- 'CF' => $t('Central African Republic'),
- 'CG' => $t('Congo (Brazzaville)'),
- 'CH' => $t('Switzerland'),
- 'CI' => $t('Ivory Coast'),
- 'CK' => $t('Cook Islands'),
- 'CL' => $t('Chile'),
- 'CM' => $t('Cameroon'),
- 'CN' => $t('China'),
- 'CO' => $t('Colombia'),
- 'CR' => $t('Costa Rica'),
- 'CU' => $t('Cuba'),
- 'CV' => $t('Cape Verde'),
- 'CX' => $t('Christmas Island'),
- 'CY' => $t('Cyprus'),
- 'CZ' => $t('Czech Republic'),
- 'DE' => $t('Germany'),
- 'DJ' => $t('Djibouti'),
- 'DK' => $t('Denmark'),
- 'DM' => $t('Dominica'),
- 'DO' => $t('Dominican Republic'),
- 'DZ' => $t('Algeria'),
- 'EC' => $t('Ecuador'),
- 'EE' => $t('Estonia'),
- 'EG' => $t('Egypt'),
- 'EH' => $t('Western Sahara'),
- 'ER' => $t('Eritrea'),
- 'ES' => $t('Spain'),
- 'ET' => $t('Ethiopia'),
- 'FI' => $t('Finland'),
- 'FJ' => $t('Fiji'),
- 'FK' => $t('Falkland Islands'),
- 'FM' => $t('Micronesia'),
- 'FO' => $t('Faroe Islands'),
- 'FR' => $t('France'),
- 'GA' => $t('Gabon'),
- 'GB' => $t('United Kingdom'),
- 'GD' => $t('Grenada'),
- 'GE' => $t('Georgia'),
- 'GF' => $t('French Guiana'),
- 'GG' => $t('Guernsey'),
- 'GH' => $t('Ghana'),
- 'GI' => $t('Gibraltar'),
- 'GL' => $t('Greenland'),
- 'GM' => $t('Gambia'),
- 'GN' => $t('Guinea'),
- 'GP' => $t('Guadeloupe'),
- 'GQ' => $t('Equatorial Guinea'),
- 'GR' => $t('Greece'),
- 'GS' => $t('South Georgia and the South Sandwich Islands'),
- 'GT' => $t('Guatemala'),
- 'GU' => $t('Guam'),
- 'GW' => $t('Guinea-Bissau'),
- 'GY' => $t('Guyana'),
- 'HK' => $t('Hong Kong S.A.R., China'),
- 'HM' => $t('Heard Island and McDonald Islands'),
- 'HN' => $t('Honduras'),
- 'HR' => $t('Croatia'),
- 'HT' => $t('Haiti'),
- 'HU' => $t('Hungary'),
- 'ID' => $t('Indonesia'),
- 'IE' => $t('Ireland'),
- 'IL' => $t('Israel'),
- 'IM' => $t('Isle of Man'),
- 'IN' => $t('India'),
- 'IO' => $t('British Indian Ocean Territory'),
- 'IQ' => $t('Iraq'),
- 'IR' => $t('Iran'),
- 'IS' => $t('Iceland'),
- 'IT' => $t('Italy'),
- 'JE' => $t('Jersey'),
- 'JM' => $t('Jamaica'),
- 'JO' => $t('Jordan'),
- 'JP' => $t('Japan'),
- 'KE' => $t('Kenya'),
- 'KG' => $t('Kyrgyzstan'),
- 'KH' => $t('Cambodia'),
- 'KI' => $t('Kiribati'),
- 'KM' => $t('Comoros'),
- 'KN' => $t('Saint Kitts and Nevis'),
- 'KP' => $t('North Korea'),
- 'KR' => $t('South Korea'),
- 'KW' => $t('Kuwait'),
- 'KY' => $t('Cayman Islands'),
- 'KZ' => $t('Kazakhstan'),
- 'LA' => $t('Laos'),
- 'LB' => $t('Lebanon'),
- 'LC' => $t('Saint Lucia'),
- 'LI' => $t('Liechtenstein'),
- 'LK' => $t('Sri Lanka'),
- 'LR' => $t('Liberia'),
- 'LS' => $t('Lesotho'),
- 'LT' => $t('Lithuania'),
- 'LU' => $t('Luxembourg'),
- 'LV' => $t('Latvia'),
- 'LY' => $t('Libya'),
- 'MA' => $t('Morocco'),
- 'MC' => $t('Monaco'),
- 'MD' => $t('Moldova'),
- 'ME' => $t('Montenegro'),
- 'MF' => $t('Saint Martin (French part)'),
- 'MG' => $t('Madagascar'),
- 'MH' => $t('Marshall Islands'),
- 'MK' => $t('Macedonia'),
- 'ML' => $t('Mali'),
- 'MM' => $t('Myanmar'),
- 'MN' => $t('Mongolia'),
- 'MO' => $t('Macao S.A.R., China'),
- 'MP' => $t('Northern Mariana Islands'),
- 'MQ' => $t('Martinique'),
- 'MR' => $t('Mauritania'),
- 'MS' => $t('Montserrat'),
- 'MT' => $t('Malta'),
- 'MU' => $t('Mauritius'),
- 'MV' => $t('Maldives'),
- 'MW' => $t('Malawi'),
- 'MX' => $t('Mexico'),
- 'MY' => $t('Malaysia'),
- 'MZ' => $t('Mozambique'),
- 'NA' => $t('Namibia'),
- 'NC' => $t('New Caledonia'),
- 'NE' => $t('Niger'),
- 'NF' => $t('Norfolk Island'),
- 'NG' => $t('Nigeria'),
- 'NI' => $t('Nicaragua'),
- 'NL' => $t('Netherlands'),
- 'NO' => $t('Norway'),
- 'NP' => $t('Nepal'),
- 'NR' => $t('Nauru'),
- 'NU' => $t('Niue'),
- 'NZ' => $t('New Zealand'),
- 'OM' => $t('Oman'),
- 'PA' => $t('Panama'),
- 'PE' => $t('Peru'),
- 'PF' => $t('French Polynesia'),
- 'PG' => $t('Papua New Guinea'),
- 'PH' => $t('Philippines'),
- 'PK' => $t('Pakistan'),
- 'PL' => $t('Poland'),
- 'PM' => $t('Saint Pierre and Miquelon'),
- 'PN' => $t('Pitcairn'),
- 'PR' => $t('Puerto Rico'),
- 'PS' => $t('Palestinian Territory'),
- 'PT' => $t('Portugal'),
- 'PW' => $t('Palau'),
- 'PY' => $t('Paraguay'),
- 'QA' => $t('Qatar'),
- 'RE' => $t('Reunion'),
- 'RO' => $t('Romania'),
- 'RS' => $t('Serbia'),
- 'RU' => $t('Russia'),
- 'RW' => $t('Rwanda'),
- 'SA' => $t('Saudi Arabia'),
- 'SB' => $t('Solomon Islands'),
- 'SC' => $t('Seychelles'),
- 'SD' => $t('Sudan'),
- 'SE' => $t('Sweden'),
- 'SG' => $t('Singapore'),
- 'SH' => $t('Saint Helena'),
- 'SI' => $t('Slovenia'),
- 'SJ' => $t('Svalbard and Jan Mayen'),
- 'SK' => $t('Slovakia'),
- 'SL' => $t('Sierra Leone'),
- 'SM' => $t('San Marino'),
- 'SN' => $t('Senegal'),
- 'SO' => $t('Somalia'),
- 'SR' => $t('Suriname'),
- 'ST' => $t('Sao Tome and Principe'),
- 'SV' => $t('El Salvador'),
- 'SY' => $t('Syria'),
- 'SZ' => $t('Swaziland'),
- 'TC' => $t('Turks and Caicos Islands'),
- 'TD' => $t('Chad'),
- 'TF' => $t('French Southern Territories'),
- 'TG' => $t('Togo'),
- 'TH' => $t('Thailand'),
- 'TJ' => $t('Tajikistan'),
- 'TK' => $t('Tokelau'),
- 'TL' => $t('Timor-Leste'),
- 'TM' => $t('Turkmenistan'),
- 'TN' => $t('Tunisia'),
- 'TO' => $t('Tonga'),
- 'TR' => $t('Turkey'),
- 'TT' => $t('Trinidad and Tobago'),
- 'TV' => $t('Tuvalu'),
- 'TW' => $t('Taiwan'),
- 'TZ' => $t('Tanzania'),
- 'UA' => $t('Ukraine'),
- 'UG' => $t('Uganda'),
- 'UM' => $t('United States Minor Outlying Islands'),
- 'US' => $t('United States'),
- 'UY' => $t('Uruguay'),
- 'UZ' => $t('Uzbekistan'),
- 'VA' => $t('Vatican'),
- 'VC' => $t('Saint Vincent and the Grenadines'),
- 'VE' => $t('Venezuela'),
- 'VG' => $t('British Virgin Islands'),
- 'VI' => $t('U.S. Virgin Islands'),
- 'VN' => $t('Vietnam'),
- 'VU' => $t('Vanuatu'),
- 'WF' => $t('Wallis and Futuna'),
- 'WS' => $t('Samoa'),
- 'YE' => $t('Yemen'),
- 'YT' => $t('Mayotte'),
- 'ZA' => $t('South Africa'),
- 'ZM' => $t('Zambia'),
- 'ZW' => $t('Zimbabwe'),
- );
-
- // Sort the list.
- natcasesort($countries);
-
- return $countries;
-}
-
-/**
- * @ingroup locale-api-predefined List of predefined languages
- * @{
- */
-
-/**
- * Some of the common languages with their English and native names
- *
- * Based on ISO 639 and http://people.w3.org/rishida/names/languages.html
- */
-function _locale_get_predefined_list() {
- return array(
- 'aa' => array('Afar'),
- 'ab' => array('Abkhazian', 'аҧÑуа бызшәа'),
- 'ae' => array('Avestan'),
- 'af' => array('Afrikaans'),
- 'ak' => array('Akan'),
- 'am' => array('Amharic', 'አማáˆáŠ›'),
- 'ar' => array('Arabic', /* Left-to-right marker "â€" */ 'العربية', LANGUAGE_RTL),
- 'as' => array('Assamese'),
- 'ast' => array('Asturian'),
- 'av' => array('Avar'),
- 'ay' => array('Aymara'),
- 'az' => array('Azerbaijani', 'azərbaycan'),
- 'ba' => array('Bashkir'),
- 'be' => array('Belarusian', 'БеларуÑкаÑ'),
- 'bg' => array('Bulgarian', 'БългарÑки'),
- 'bh' => array('Bihari'),
- 'bi' => array('Bislama'),
- 'bm' => array('Bambara', 'Bamanankan'),
- 'bn' => array('Bengali'),
- 'bo' => array('Tibetan'),
- 'br' => array('Breton'),
- 'bs' => array('Bosnian', 'Bosanski'),
- 'ca' => array('Catalan', 'Català '),
- 'ce' => array('Chechen'),
- 'ch' => array('Chamorro'),
- 'co' => array('Corsican'),
- 'cr' => array('Cree'),
- 'cs' => array('Czech', 'Čeština'),
- 'cu' => array('Old Slavonic'),
- 'cv' => array('Chuvash'),
- 'cy' => array('Welsh', 'Cymraeg'),
- 'da' => array('Danish', 'Dansk'),
- 'de' => array('German', 'Deutsch'),
- 'dv' => array('Maldivian'),
- 'dz' => array('Bhutani'),
- 'ee' => array('Ewe', 'ÆÊ‹É›'),
- 'el' => array('Greek', 'Ελληνικά'),
- 'en' => array('English'),
- 'en-gb' => array('English, British'),
- 'eo' => array('Esperanto'),
- 'es' => array('Spanish', 'Español'),
- 'et' => array('Estonian', 'Eesti'),
- 'eu' => array('Basque', 'Euskera'),
- 'fa' => array('Persian', /* Left-to-right marker "â€" */ 'Ùارسی', LANGUAGE_RTL),
- 'ff' => array('Fulah', 'Fulfulde'),
- 'fi' => array('Finnish', 'Suomi'),
- 'fil' => array('Filipino'),
- 'fj' => array('Fiji'),
- 'fo' => array('Faeroese'),
- 'fr' => array('French', 'Français'),
- 'fy' => array('Frisian', 'Frysk'),
- 'ga' => array('Irish', 'Gaeilge'),
- 'gd' => array('Scots Gaelic'),
- 'gl' => array('Galician', 'Galego'),
- 'gn' => array('Guarani'),
- 'gsw-berne' => array('Swiss German'),
- 'gu' => array('Gujarati'),
- 'gv' => array('Manx'),
- 'ha' => array('Hausa'),
- 'he' => array('Hebrew', /* Left-to-right marker "â€" */ 'עברית', LANGUAGE_RTL),
- 'hi' => array('Hindi', 'हिनà¥à¤¦à¥€'),
- 'ho' => array('Hiri Motu'),
- 'hr' => array('Croatian', 'Hrvatski'),
- 'ht' => array('Haitian Creole'),
- 'hu' => array('Hungarian', 'Magyar'),
- 'hy' => array('Armenian', 'Õ€Õ¡ÕµÕ¥Ö€Õ¥Õ¶'),
- 'hz' => array('Herero'),
- 'ia' => array('Interlingua'),
- 'id' => array('Indonesian', 'Bahasa Indonesia'),
- 'ie' => array('Interlingue'),
- 'ig' => array('Igbo'),
- 'ik' => array('Inupiak'),
- 'is' => array('Icelandic', 'Ãslenska'),
- 'it' => array('Italian', 'Italiano'),
- 'iu' => array('Inuktitut'),
- 'ja' => array('Japanese', '日本語'),
- 'jv' => array('Javanese'),
- 'ka' => array('Georgian'),
- 'kg' => array('Kongo'),
- 'ki' => array('Kikuyu'),
- 'kj' => array('Kwanyama'),
- 'kk' => array('Kazakh', 'Қазақ'),
- 'kl' => array('Greenlandic'),
- 'km' => array('Cambodian'),
- 'kn' => array('Kannada', 'ಕನà³à²¨à²¡'),
- 'ko' => array('Korean', 'í•œêµì–´'),
- 'kr' => array('Kanuri'),
- 'ks' => array('Kashmiri'),
- 'ku' => array('Kurdish', 'Kurdî'),
- 'kv' => array('Komi'),
- 'kw' => array('Cornish'),
- 'ky' => array('Kyrgyz', 'Кыргызча'),
- 'la' => array('Latin', 'Latina'),
- 'lb' => array('Luxembourgish'),
- 'lg' => array('Luganda'),
- 'ln' => array('Lingala'),
- 'lo' => array('Laothian'),
- 'lt' => array('Lithuanian', 'Lietuvių'),
- 'lv' => array('Latvian', 'Latviešu'),
- 'mg' => array('Malagasy'),
- 'mh' => array('Marshallese'),
- 'mi' => array('MÄori'),
- 'mk' => array('Macedonian', 'МакедонÑки'),
- 'ml' => array('Malayalam', 'മലയാളം'),
- 'mn' => array('Mongolian'),
- 'mo' => array('Moldavian'),
- 'mr' => array('Marathi'),
- 'ms' => array('Malay', 'Bahasa Melayu'),
- 'mt' => array('Maltese', 'Malti'),
- 'my' => array('Burmese'),
- 'na' => array('Nauru'),
- 'nd' => array('North Ndebele'),
- 'ne' => array('Nepali'),
- 'ng' => array('Ndonga'),
- 'nl' => array('Dutch', 'Nederlands'),
- 'nb' => array('Norwegian Bokmål', 'Bokmål'),
- 'nn' => array('Norwegian Nynorsk', 'Nynorsk'),
- 'nr' => array('South Ndebele'),
- 'nv' => array('Navajo'),
- 'ny' => array('Chichewa'),
- 'oc' => array('Occitan'),
- 'om' => array('Oromo'),
- 'or' => array('Oriya'),
- 'os' => array('Ossetian'),
- 'pa' => array('Punjabi'),
- 'pi' => array('Pali'),
- 'pl' => array('Polish', 'Polski'),
- 'ps' => array('Pashto', /* Left-to-right marker "â€" */ 'پښتو', LANGUAGE_RTL),
- 'pt' => array('Portuguese, International'),
- 'pt-pt' => array('Portuguese, Portugal', 'Português'),
- 'pt-br' => array('Portuguese, Brazil', 'Português'),
- 'qu' => array('Quechua'),
- 'rm' => array('Rhaeto-Romance'),
- 'rn' => array('Kirundi'),
- 'ro' => array('Romanian', 'Română'),
- 'ru' => array('Russian', 'РуÑÑкий'),
- 'rw' => array('Kinyarwanda'),
- 'sa' => array('Sanskrit'),
- 'sc' => array('Sardinian'),
- 'sco' => array('Scots'),
- 'sd' => array('Sindhi'),
- 'se' => array('Northern Sami'),
- 'sg' => array('Sango'),
- 'sh' => array('Serbo-Croatian'),
- 'si' => array('Sinhala', 'සිංහල'),
- 'sk' => array('Slovak', 'SlovenÄina'),
- 'sl' => array('Slovenian', 'SlovenÅ¡Äina'),
- 'sm' => array('Samoan'),
- 'sn' => array('Shona'),
- 'so' => array('Somali'),
- 'sq' => array('Albanian', 'Shqip'),
- 'sr' => array('Serbian', 'СрпÑки'),
- 'ss' => array('Siswati'),
- 'st' => array('Sesotho'),
- 'su' => array('Sudanese'),
- 'sv' => array('Swedish', 'Svenska'),
- 'sw' => array('Swahili', 'Kiswahili'),
- 'ta' => array('Tamil', 'தமிழà¯'),
- 'te' => array('Telugu', 'తెలà±à°—à±'),
- 'tg' => array('Tajik'),
- 'th' => array('Thai', 'ภาษาไทย'),
- 'ti' => array('Tigrinya'),
- 'tk' => array('Turkmen'),
- 'tl' => array('Tagalog'),
- 'tn' => array('Setswana'),
- 'to' => array('Tonga'),
- 'tr' => array('Turkish', 'Türkçe'),
- 'ts' => array('Tsonga'),
- 'tt' => array('Tatar', 'Tatarça'),
- 'tw' => array('Twi'),
- 'ty' => array('Tahitian'),
- 'ug' => array('Uighur'),
- 'uk' => array('Ukrainian', 'УкраїнÑька'),
- 'ur' => array('Urdu', /* Left-to-right marker "â€" */ 'اردو', LANGUAGE_RTL),
- 'uz' => array('Uzbek', "o'zbek"),
- 've' => array('Venda'),
- 'vi' => array('Vietnamese', 'Tiếng Việt'),
- 'wo' => array('Wolof'),
- 'xh' => array('Xhosa', 'isiXhosa'),
- 'xx-lolspeak' => array('Lolspeak'),
- 'yi' => array('Yiddish'),
- 'yo' => array('Yoruba', 'Yorùbá'),
- 'za' => array('Zhuang'),
- 'zh-hans' => array('Chinese, Simplified', '简体ä¸æ–‡'),
- 'zh-hant' => array('Chinese, Traditional', 'ç¹é«”ä¸æ–‡'),
- 'zu' => array('Zulu', 'isiZulu'),
- );
-}
-/**
- * @} End of "locale-api-languages-predefined"
- */
diff --git a/includes/locale.inc b/includes/locale.inc
index fabde9025af8be9bd764583b505cd80e4c185b71..199edd1918e03f1cc106f79ebc9e181f0a904b14 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -466,8 +466,8 @@ function locale_add_language($langcode, $name = NULL, $native = NULL, $direction
// If name was not set, we add a predefined language.
if (!isset($name)) {
- include_once DRUPAL_ROOT . '/includes/iso.inc';
- $predefined = _locale_get_predefined_list();
+ include_once DRUPAL_ROOT . '/includes/standard.inc';
+ $predefined = standard_language_list();
$name = $predefined[$langcode][0];
$native = isset($predefined[$langcode][1]) ? $predefined[$langcode][1] : $predefined[$langcode][0];
$direction = isset($predefined[$langcode][2]) ? $predefined[$langcode][2] : LANGUAGE_LTR;
@@ -750,9 +750,9 @@ function _locale_rebuild_js($langcode = NULL) {
* Prepares the language code list for a select form item with only the unsupported ones
*/
function _locale_prepare_predefined_list() {
- include_once DRUPAL_ROOT . '/includes/iso.inc';
+ include_once DRUPAL_ROOT . '/includes/standard.inc';
$languages = language_list();
- $predefined = _locale_get_predefined_list();
+ $predefined = standard_language_list();
foreach ($predefined as $key => $value) {
if (isset($languages[$key])) {
unset($predefined[$key]);
@@ -782,8 +782,8 @@ function _locale_prepare_predefined_list() {
* An array of all country code => country name pairs.
*/
function country_get_list() {
- include_once DRUPAL_ROOT . '/includes/iso.inc';
- $countries = _country_get_predefined_list();
+ include_once DRUPAL_ROOT . '/includes/standard.inc';
+ $countries = standard_country_list();
// Allow other modules to modify the country list.
drupal_alter('countries', $countries);
return $countries;
diff --git a/modules/locale/locale.admin.inc b/modules/locale/locale.admin.inc
index 3e8f707004f2f8ff5bc4200090a0b95bd01ae389..ecf9f1f607f1ffe5c38b9a9e0ee322f7088435af 100644
--- a/modules/locale/locale.admin.inc
+++ b/modules/locale/locale.admin.inc
@@ -280,7 +280,7 @@ function _locale_languages_common_controls(&$form, $language = NULL) {
'#required' => TRUE,
'#default_value' => @$language->language,
'#disabled' => (isset($language->language)),
- '#description' => t('<a href="@rfc4646">RFC 4646</a> compliant language identifier. Language codes typically use a country code, and optionally, a script or regional variant name. <em>Examples: "en", "en-US" and "zh-Hant".</em>', array('@rfc4646' => 'http://www.ietf.org/rfc/rfc4646.txt')),
+ '#description' => t('Use language codes as <a href="@w3ctags">defined by the W3C</a> for interoperability. <em>Examples: "en", "en-gb" and "zh-hant".</em>', array('@w3ctags' => 'http://www.w3.org/International/articles/language-tags/')),
);
}
$form['name'] = array('#type' => 'textfield',
@@ -331,8 +331,8 @@ function locale_languages_predefined_form_validate($form, &$form_state) {
if (!isset($form_state['values']['name'])) {
// Predefined language selection.
- include_once DRUPAL_ROOT . '/includes/iso.inc';
- $predefined = _locale_get_predefined_list();
+ include_once DRUPAL_ROOT . '/includes/standard.inc';
+ $predefined = standard_language_list();
if (!isset($predefined[$langcode])) {
form_set_error('langcode', t('Invalid language code.'));
}
@@ -355,8 +355,8 @@ function locale_languages_predefined_form_submit($form, &$form_state) {
}
else {
// Predefined language selection.
- include_once DRUPAL_ROOT . '/includes/iso.inc';
- $predefined = _locale_get_predefined_list();
+ include_once DRUPAL_ROOT . '/includes/standard.inc';
+ $predefined = standard_language_list();
locale_add_language($langcode);
drupal_set_message(t('The language %language has been created and can now be used. More information is available on the <a href="@locale-help">help screen</a>.', array('%language' => t($predefined[$langcode][0]), '@locale-help' => url('admin/help/locale'))));
}
diff --git a/modules/locale/locale.bulk.inc b/modules/locale/locale.bulk.inc
index 8d6ed8f3c173ef18f84c3802e963a57f879990bf..d27c80a5ad2d6021bcbcf99bb7bc5afdc783e2eb 100644
--- a/modules/locale/locale.bulk.inc
+++ b/modules/locale/locale.bulk.inc
@@ -68,8 +68,8 @@ function locale_translate_import_form_submit($form, &$form_state) {
$languages = language_list('language');
$langcode = $form_state['values']['langcode'];
if (!isset($languages[$langcode])) {
- include_once DRUPAL_ROOT . '/includes/iso.inc';
- $predefined = _locale_get_predefined_list();
+ include_once DRUPAL_ROOT . '/includes/standard.inc';
+ $predefined = standard_language_list();
locale_add_language($langcode);
drupal_set_message(t('The language %language has been created.', array('%language' => t($predefined[$langcode][0]))));
}
diff --git a/modules/system/system.api.php b/modules/system/system.api.php
index bcdd923220e89d68cd59d7df97fd337aa091a133..fc7b73783b1817a606686ffb1660903f6bcdfc6f 100644
--- a/modules/system/system.api.php
+++ b/modules/system/system.api.php
@@ -4383,7 +4383,7 @@ function hook_updater_info_alter(&$updaters) {
* The associative array of countries keyed by ISO 3166-1 country code.
*
* @see country_get_list()
- * @see _country_get_predefined_list()
+ * @see standard_country_list()
*/
function hook_countries_alter(&$countries) {
// Elbonia is now independent, so add it to the country list.