API i18n::$common_languages and i18n::$common_locales converted to Config API

They are now accessed via the Config API, and contain associative rather than indexed arrays.
Before: `array('de_DE' => array('German', 'Deutsch'))`, after: `array('de_DE' => array('name' => 'German', 'native' => 'Deutsch'))`.

Also fixed a i18n.js_i18n config accessor
This commit is contained in:
Ingo Schommer 2013-03-27 20:42:46 +01:00
parent c1a543feb2
commit e97c034922
3 changed files with 689 additions and 178 deletions

View File

@ -426,3 +426,5 @@ you can enable those warnings and future-proof your code already.
* `ScheduledTask`, `QuarterHourlyTask`, `HourlyTask`, `DailyTask`, `MonthlyTask`, `WeeklyTask` and * `ScheduledTask`, `QuarterHourlyTask`, `HourlyTask`, `DailyTask`, `MonthlyTask`, `WeeklyTask` and
`YearlyTask` are deprecated, please extend from `BuildTask` or `CliController`, `YearlyTask` are deprecated, please extend from `BuildTask` or `CliController`,
and invoke them in self-defined frequencies through Unix cronjobs etc. and invoke them in self-defined frequencies through Unix cronjobs etc.
* `i18n::$common_locales` and `i18n::$common_languages` are now accessed via the Config API, and contain associative rather than indexed arrays.
Before: `array('de_DE' => array('German', 'Deutsch'))`, after: `array('de_DE' => array('name' => 'German', 'native' => 'Deutsch'))`.

View File

@ -125,7 +125,7 @@ class i18n extends Object implements TemplateGlobalProvider {
*/ */
public static function get_js_i18n() { public static function get_js_i18n() {
Deprecation::notice('3.2', 'Use the "i18n.js_i18n" config setting instead'); Deprecation::notice('3.2', 'Use the "i18n.js_i18n" config setting instead');
return self::$js_i18n; return Config::inst()->get('i18n', 'js_i18n');
} }
/** /**
@ -653,96 +653,349 @@ class i18n extends Object implements TemplateGlobalProvider {
); );
/** /**
* @config
* @var array $common_languages A list of commonly used languages, in the form * @var array $common_languages A list of commonly used languages, in the form
* langcode => array( EnglishName, NativeName) * langcode => array( EnglishName, NativeName)
*/ */
public static $common_languages = array( private static $common_languages = array(
'af' => array('Afrikaans', 'Afrikaans'), 'af' => array(
'sq' => array('Albanian', 'shqip'), 'name' => 'Afrikaans',
'ar' => array('Arabic', 'العربية'), 'native' => 'Afrikaans'
'eu' => array('Basque', 'euskera'), ),
'be' => array('Belarusian', 'sq' => array(
'Беларуская мова'), 'name' => 'Albanian',
'bn' => array('Bengali', 'বাংলা'), 'native' => 'shqip'
'bg' => array('Bulgarian', 'български'), ),
'ca' => array('Catalan', 'català'), 'ar' => array(
'zh_yue' => array('Chinese (Cantonese)', '廣東話 [广东话]'), 'name' => 'Arabic',
'zh_cmn' => array('Chinese (Mandarin)', '普通話 [普通话]'), 'native' => 'العربية'
'hr' => array('Croatian', 'Hrvatski'), ),
'zh' => array('Chinese','中国的'), 'eu' => array(
'cs' => array('Czech', 'čeština'), 'name' => 'Basque',
'cy' => array('Welsh', 'Welsh/Cymraeg'), 'native' => 'euskera'
'da' => array('Danish', 'dansk'), ),
'nl' => array('Dutch', 'Nederlands'), 'be' => array(
'en' => array('English', 'English'), 'name' => 'Belarusian',
'eo' => array('Esperanto', 'Esperanto'), 'native' => 'Беларуская мова'
'et' => array('Estonian', 'eesti keel'), ),
'fo' => array('Faroese', 'Føroyska'), 'bn' => array(
'fi' => array('Finnish', 'suomi'), 'name' => 'Bengali',
'fr' => array('French', 'français'), 'native' => 'বাংলা'
'gd' => array('Gaelic', 'Gaeilge'), ),
'gl' => array('Galician', 'Galego'), 'bg' => array(
'de' => array('German', 'Deutsch'), 'name' => 'Bulgarian',
'el' => array('Greek', 'ελληνικά'), 'native' => 'български'
'gu' => array('Gujarati', 'ગુજરાતી'), ),
'ha' => array('Hausa', 'حَوْسَ'), 'ca' => array(
'he' => array('Hebrew', 'עברית'), 'name' => 'Catalan',
'hi' => array('Hindi', 'हिन्दी'), 'native' => 'català'
'hu' => array('Hungarian', 'magyar'), ),
'is' => array('Icelandic', 'Íslenska'), 'zh_yue' => array(
'io' => array('Ido', 'Ido'), 'name' => 'Chinese (Cantonese)',
'id' => array('Indonesian', 'Bahasa Indonesia'), 'native' => '廣東話 [广东话]'
'ga' => array('Irish', 'Irish'), ),
'it' => array('Italian', 'italiano'), 'zh_cmn' => array(
'ja' => array('Japanese', '日本語'), 'name' => 'Chinese (Mandarin)',
'jv' => array('Javanese', 'basa Jawa'), 'native' => '普通話 [普通话]'
'ko' => array('Korean', '한국어 [韓國語]'), ),
'ku' => array('Kurdish', 'Kurdí'), 'hr' => array(
'lv' => array('Latvian', 'latviešu'), 'name' => 'Croatian',
'lt' => array('Lithuanian', 'lietuviškai'), 'native' => 'Hrvatski'
'lmo' => array('Lombard', 'Lombardo'), ),
'mk' => array('Macedonian', 'македонски'), 'zh' => array(
'mi' => array('Maori', 'Māori'), 'name' => 'Chinese','中国的'
'ms' => array('Malay', 'Bahasa melayu'), ),
'mt' => array('Maltese', 'Malti'), 'cs' => array(
'mr' => array('Marathi', 'मराठी'), 'name' => 'Czech',
'ne' => array('Nepali', 'नेपाली'), 'native' => 'čeština'
'no' => array('Norwegian', 'Norsk'), ),
'om' => array('Oromo', 'Afaan Oromo'), 'cy' => array(
'fa' => array('Persian', 'فارسى'), 'name' => 'Welsh',
'pl' => array('Polish', 'polski'), 'native' => 'Welsh/Cymraeg'
'pt_PT' => array('Portuguese (Portugal)', 'português (Portugal)'), ),
'pt_BR' => array('Portuguese (Brazil)', 'português (Brazil)'), 'da' => array(
'pa' => array('Punjabi', 'ਪੰਜਾਬੀ'), 'name' => 'Danish',
'qu' => array('Quechua', 'Quechua'), 'native' => 'dansk'
'rm' => array('Romansh', 'rumantsch'), ),
'ro' => array('Romanian', 'român'), 'nl' => array(
'ru' => array('Russian', 'Русский'), 'name' => 'Dutch', 'Nederlands'
'sco' => array('Scots', 'Scoats leid, Lallans'), ),
'sr' => array('Serbian', 'српски'), 'en' => array(
'sk' => array('Slovak', 'slovenčina'), 'name' => 'English',
'sl' => array('Slovenian', 'slovenščina'), 'native' => 'English'
'es' => array('Spanish', 'español'), ),
'sv' => array('Swedish', 'Svenska'), 'eo' => array(
'tl' => array('Tagalog', 'Tagalog'), 'name' => 'Esperanto',
'ta' => array('Tamil', 'தமிழ்'), 'native' => 'Esperanto'
'te' => array('Telugu', 'తెలుగు'), ),
'to' => array('Tonga', 'chiTonga'), 'et' => array(
'ts' => array('Tsonga', 'xiTshonga'), 'name' => 'Estonian',
'tn' => array('Tswana', 'seTswana'), 'native' => 'eesti keel'
'tr' => array('Turkish', 'Türkçe'), ),
'tk' => array('Turkmen', 'түркmенче'), 'fo' => array(
'tw' => array('Twi', 'twi'), 'name' => 'Faroese',
'uk' => array('Ukrainian', 'Українська'), 'native' => 'Føroyska'
'ur' => array('Urdu', 'اردو'), ),
'uz' => array('Uzbek', 'ўзбек'), 'fi' => array(
've' => array('Venda', 'tshiVenḓa'), 'name' => 'Finnish',
'vi' => array('Vietnamese', 'tiếng việt'), 'native' => 'suomi'
'wa' => array('Walloon', 'walon'), ),
'wo' => array('Wolof', 'Wollof'), 'fr' => array(
'xh' => array('Xhosa', 'isiXhosa'), 'name' => 'French',
'yi' => array('Yiddish', 'ײִדיש'), 'native' => 'français'
'zu' => array('Zulu', 'isiZulu') ),
'gd' => array(
'name' => 'Gaelic',
'native' => 'Gaeilge'
),
'gl' => array(
'name' => 'Galician',
'native' => 'Galego'
),
'de' => array(
'name' => 'German',
'native' => 'Deutsch'
),
'el' => array(
'name' => 'Greek',
'native' => 'ελληνικά'
),
'gu' => array(
'name' => 'Gujarati',
'native' => 'ગુજરાતી'
),
'ha' => array(
'name' => 'Hausa',
'native' => 'حَوْسَ'
),
'he' => array(
'name' => 'Hebrew',
'native' => 'עברית'
),
'hi' => array(
'name' => 'Hindi',
'native' => 'हिन्दी'
),
'hu' => array(
'name' => 'Hungarian',
'native' => 'magyar'
),
'is' => array(
'name' => 'Icelandic',
'native' => 'Íslenska'
),
'io' => array(
'name' => 'Ido',
'native' => 'Ido'
),
'id' => array(
'name' => 'Indonesian',
'native' => 'Bahasa Indonesia'
),
'ga' => array(
'name' => 'Irish',
'native' => 'Irish'
),
'it' => array(
'name' => 'Italian',
'native' => 'italiano'
),
'ja' => array(
'name' => 'Japanese',
'native' => '日本語'
),
'jv' => array(
'name' => 'Javanese',
'native' => 'basa Jawa'
),
'ko' => array(
'name' => 'Korean',
'native' => '한국어 [韓國語]'
),
'ku' => array(
'name' => 'Kurdish',
'native' => 'Kurdí'
),
'lv' => array(
'name' => 'Latvian',
'native' => 'latviešu'
),
'lt' => array(
'name' => 'Lithuanian',
'native' => 'lietuviškai'
),
'lmo' => array(
'name' => 'Lombard',
'native' => 'Lombardo'
),
'mk' => array(
'name' => 'Macedonian',
'native' => 'македонски'
),
'mi' => array(
'name' => 'Maori',
'native' => 'Māori'
),
'ms' => array(
'name' => 'Malay',
'native' => 'Bahasa melayu'
),
'mt' => array(
'name' => 'Maltese',
'native' => 'Malti'
),
'mr' => array(
'name' => 'Marathi',
'native' => 'मराठी'
),
'ne' => array(
'name' => 'Nepali',
'native' => 'नेपाली'
),
'no' => array(
'name' => 'Norwegian',
'native' => 'Norsk'
),
'om' => array(
'name' => 'Oromo',
'native' => 'Afaan Oromo'
),
'fa' => array(
'name' => 'Persian',
'native' => 'فارسى'
),
'pl' => array(
'name' => 'Polish',
'native' => 'polski'
),
'pt_PT' => array(
'name' => 'Portuguese (Portugal)',
'native' => 'português (Portugal)'
),
'pt_BR' => array(
'name' => 'Portuguese (Brazil)',
'native' => 'português (Brazil)'
),
'pa' => array(
'name' => 'Punjabi',
'native' => 'ਪੰਜਾਬੀ'
),
'qu' => array(
'name' => 'Quechua',
'native' => 'Quechua'
),
'rm' => array(
'name' => 'Romansh',
'native' => 'rumantsch'
),
'ro' => array(
'name' => 'Romanian',
'native' => 'român'
),
'ru' => array(
'name' => 'Russian',
'native' => 'Русский'
),
'sco' => array(
'name' => 'Scots',
'native' => 'Scoats leid, Lallans'
),
'sr' => array(
'name' => 'Serbian',
'native' => 'српски'
),
'sk' => array(
'name' => 'Slovak',
'native' => 'slovenčina'
),
'sl' => array(
'name' => 'Slovenian',
'native' => 'slovenščina'
),
'es' => array(
'name' => 'Spanish',
'native' => 'español'
),
'sv' => array(
'name' => 'Swedish',
'native' => 'Svenska'
),
'tl' => array(
'name' => 'Tagalog',
'native' => 'Tagalog'
),
'ta' => array(
'name' => 'Tamil',
'native' => 'தமிழ்'
),
'te' => array(
'name' => 'Telugu',
'native' => 'తెలుగు'
),
'to' => array(
'name' => 'Tonga',
'native' => 'chiTonga'
),
'ts' => array(
'name' => 'Tsonga',
'native' => 'xiTshonga'
),
'tn' => array(
'name' => 'Tswana',
'native' => 'seTswana'
),
'tr' => array(
'name' => 'Turkish',
'native' => 'Türkçe'
),
'tk' => array(
'name' => 'Turkmen',
'native' => 'түркmенче'
),
'tw' => array(
'name' => 'Twi',
'native' => 'twi'
),
'uk' => array(
'name' => 'Ukrainian',
'native' => 'Українська'
),
'ur' => array(
'name' => 'Urdu',
'native' => 'اردو'
),
'uz' => array(
'name' => 'Uzbek',
'native' => 'ўзбек'
),
've' => array(
'name' => 'Venda',
'native' => 'tshiVenḓa'
),
'vi' => array(
'name' => 'Vietnamese',
'native' => 'tiếng việt'
),
'wa' => array(
'name' => 'Walloon',
'native' => 'walon'
),
'wo' => array(
'name' => 'Wolof',
'native' => 'Wollof'
),
'xh' => array(
'name' => 'Xhosa',
'native' => 'isiXhosa'
),
'yi' => array(
'name' => 'Yiddish',
'native' => 'ײִדיש'
),
'zu' => array(
'name' => 'Zulu',
'native' => 'isiZulu'
)
); );
/** /**
@ -752,90 +1005,337 @@ class i18n extends Object implements TemplateGlobalProvider {
* not the locale key. * not the locale key.
*/ */
private static $common_locales = array( private static $common_locales = array(
'af_ZA' => array('Afrikaans', 'Afrikaans'), 'af_ZA' => array(
'sq_AL' => array('Albanian', 'shqip'), 'name' => 'Afrikaans',
'ar_EG' => array('Arabic', 'العربية'), 'native' => 'Afrikaans'
'eu_ES' => array('Basque', 'euskera'), ),
'be_BY' => array('Belarusian', 'sq_AL' => array(
'Беларуская мова'), 'name' => 'Albanian',
'bn_BD' => array('Bengali', 'বাংলা'), 'native' => 'shqip'
'bg_BG' => array('Bulgarian', 'български'), ),
'ca_ES' => array('Catalan', 'català'), 'ar_EG' => array(
'zh_CN' => array('Chinese','中国的'), 'name' => 'Arabic',
'zh_yue' => array('Chinese (Cantonese)', '廣東話 [广东话]'), 'native' => 'العربية'
'zh_cmn' => array('Chinese (Mandarin)', '普通話 [普通话]'), ),
'hr_HR' => array('Croatian', 'Hrvatski'), 'eu_ES' => array(
'cs_CZ' => array('Czech', 'čeština'), 'name' => 'Basque',
'cy_GB' => array('Welsh', 'Welsh/Cymraeg'), 'native' => 'euskera'
'da_DK' => array('Danish', 'dansk'), ),
'nl_NL' => array('Dutch', 'Nederlands'), 'be_BY' => array(
'en_NZ' => array('English (NZ)', 'English (NZ)'), 'name' => 'Belarusian',
'en_US' => array('English (US)', 'English (US)'), 'Беларуская мова'
'en_GB' => array('English (UK)', 'English (UK)'), ),
'eo_XX' => array('Esperanto', 'Esperanto'), 'bn_BD' => array(
'et_EE' => array('Estonian', 'eesti keel'), 'name' => 'Bengali',
'fo_FO' => array('Faroese', 'Føroyska'), 'native' => 'বাংলা'
'fi_FI' => array('Finnish', 'suomi'), ),
'fr_FR' => array('French', 'français'), 'bg_BG' => array(
'gd_GB' => array('Gaelic', 'Gaeilge'), 'name' => 'Bulgarian',
'gl_ES' => array('Galician', 'Galego'), 'native' => 'български'
'de_DE' => array('German', 'Deutsch'), ),
'el_GR' => array('Greek', 'ελληνικά'), 'ca_ES' => array(
'gu_IN' => array('Gujarati', 'ગુજરાતી'), 'name' => 'Catalan',
'ha_NG' => array('Hausa', 'حَوْسَ'), 'native' => 'català'
'he_IL' => array('Hebrew', 'עברית'), ),
'hi_IN' => array('Hindi', 'हिन्दी'), 'zh_CN' => array(
'hu_HU' => array('Hungarian', 'magyar'), 'name' => 'Chinese','中国的'
'is_IS' => array('Icelandic', 'Íslenska'), ),
'id_ID' => array('Indonesian', 'Bahasa Indonesia'), 'zh_yue' => array(
'ga_IE' => array('Irish', 'Irish'), 'name' => 'Chinese (Cantonese)',
'it_IT' => array('Italian', 'italiano'), 'native' => '廣東話 [广东话]'
'ja_JP' => array('Japanese', '日本語'), ),
'jv_ID' => array('Javanese', 'basa Jawa'), 'zh_cmn' => array(
'ko_KR' => array('Korean', '한국어 [韓國語]'), 'name' => 'Chinese (Mandarin)',
'ku_IQ' => array('Kurdish', 'Kurdí'), 'native' => '普通話 [普通话]'
'lv_LV' => array('Latvian', 'latviešu'), ),
'lt_LT' => array('Lithuanian', 'lietuviškai'), 'hr_HR' => array(
'mk_MK' => array('Macedonian', 'македонски'), 'name' => 'Croatian',
'mi_NZ' => array('Maori', 'Māori'), 'native' => 'Hrvatski'
'ms_MY' => array('Malay', 'Bahasa melayu'), ),
'mt_MT' => array('Maltese', 'Malti'), 'cs_CZ' => array(
'mr_IN' => array('Marathi', 'मराठी'), 'name' => 'Czech',
'ne_NP' => array('Nepali', 'नेपाली'), 'native' => 'čeština'
'nb_NO' => array('Norwegian', 'Norsk'), ),
'om_ET' => array('Oromo', 'Afaan Oromo'), 'cy_GB' => array(
'fa_IR' => array('Persian', 'فارسى'), 'name' => 'Welsh',
'pl_PL' => array('Polish', 'polski'), 'native' => 'Welsh/Cymraeg'
'pt_PT' => array('Portuguese (Portugal)', 'português (Portugal)'), ),
'pt_BR' => array('Portuguese (Brazil)', 'português (Brazil)'), 'da_DK' => array(
'pa_IN' => array('Punjabi', 'ਪੰਜਾਬੀ'), 'name' => 'Danish',
'qu_PE' => array('Quechua', 'Quechua'), 'native' => 'dansk'
'rm_CH' => array('Romansh', 'rumantsch'), ),
'ro_RO' => array('Romanian', 'român'), 'nl_NL' => array(
'ru_RU' => array('Russian', 'Русский'), 'name' => 'Dutch',
'sco_SCO' => array('Scots', 'Scoats leid, Lallans'), 'native' => 'Nederlands'
'sr_RS' => array('Serbian', 'српски'), ),
'sk_SK' => array('Slovak', 'slovenčina'), 'en_NZ' => array(
'sl_SI' => array('Slovenian', 'slovenščina'), 'name' => 'English (NZ)',
'es_ES' => array('Spanish', 'español'), 'native' => 'English (NZ)'
'sv_SE' => array('Swedish', 'Svenska'), ),
'tl_PH' => array('Tagalog', 'Tagalog'), 'en_US' => array(
'ta_IN' => array('Tamil', 'தமிழ்'), 'name' => 'English (US)',
'te_IN' => array('Telugu', 'తెలుగు'), 'native' => 'English (US)'
'to_TO' => array('Tonga', 'chiTonga'), ),
'ts_ZA' => array('Tsonga', 'xiTshonga'), 'en_GB' => array(
'tn_ZA' => array('Tswana', 'seTswana'), 'name' => 'English (UK)',
'tr_TR' => array('Turkish', 'Türkçe'), 'native' => 'English (UK)'
'tk_TM' => array('Turkmen', 'түркmенче'), ),
'tw_GH' => array('Twi', 'twi'), 'eo_XX' => array(
'uk_UA' => array('Ukrainian', 'Українська'), 'name' => 'Esperanto',
'ur_PK' => array('Urdu', 'اردو'), 'native' => 'Esperanto'
'uz_UZ' => array('Uzbek', 'ўзбек'), ),
've_ZA' => array('Venda', 'tshiVenḓa'), 'et_EE' => array(
'vi_VN' => array('Vietnamese', 'tiếng việt'), 'name' => 'Estonian',
'wo_SN' => array('Wolof', 'Wollof'), 'native' => 'eesti keel'
'xh_ZA' => array('Xhosa', 'isiXhosa'), ),
'zu_ZA' => array('Zulu', 'isiZulu'), 'fo_FO' => array(
'name' => 'Faroese',
'native' => 'Føroyska'
),
'fi_FI' => array(
'name' => 'Finnish',
'native' => 'suomi'
),
'fr_FR' => array(
'name' => 'French',
'native' => 'français'
),
'gd_GB' => array(
'name' => 'Gaelic',
'native' => 'Gaeilge'
),
'gl_ES' => array(
'name' => 'Galician',
'native' => 'Galego'
),
'de_DE' => array(
'name' => 'German',
'native' => 'Deutsch'
),
'el_GR' => array(
'name' => 'Greek',
'native' => 'ελληνικά'
),
'gu_IN' => array(
'name' => 'Gujarati',
'native' => 'ગુજરાતી'
),
'ha_NG' => array(
'name' => 'Hausa',
'native' => 'حَوْسَ'
),
'he_IL' => array(
'name' => 'Hebrew',
'native' => 'עברית'
),
'hi_IN' => array(
'name' => 'Hindi',
'native' => 'हिन्दी'
),
'hu_HU' => array(
'name' => 'Hungarian',
'native' => 'magyar'
),
'is_IS' => array(
'name' => 'Icelandic',
'native' => 'Íslenska'
),
'id_ID' => array(
'name' => 'Indonesian',
'native' => 'Bahasa Indonesia'
),
'ga_IE' => array(
'name' => 'Irish',
'native' => 'Irish'
),
'it_IT' => array(
'name' => 'Italian',
'native' => 'italiano'
),
'ja_JP' => array(
'name' => 'Japanese',
'native' => '日本語'
),
'jv_ID' => array(
'name' => 'Javanese',
'native' => 'basa Jawa'
),
'ko_KR' => array(
'name' => 'Korean',
'native' => '한국어 [韓國語]'
),
'ku_IQ' => array(
'name' => 'Kurdish',
'native' => 'Kurdí'
),
'lv_LV' => array(
'name' => 'Latvian',
'native' => 'latviešu'
),
'lt_LT' => array(
'name' => 'Lithuanian',
'native' => 'lietuviškai'
),
'mk_MK' => array(
'name' => 'Macedonian',
'native' => 'македонски'
),
'mi_NZ' => array(
'name' => 'Maori',
'native' => 'Māori'
),
'ms_MY' => array(
'name' => 'Malay',
'native' => 'Bahasa melayu'
),
'mt_MT' => array(
'name' => 'Maltese',
'native' => 'Malti'
),
'mr_IN' => array(
'name' => 'Marathi',
'native' => 'मराठी'
),
'ne_NP' => array(
'name' => 'Nepali',
'native' => 'नेपाली'
),
'nb_NO' => array(
'name' => 'Norwegian',
'native' => 'Norsk'
),
'om_ET' => array(
'name' => 'Oromo',
'native' => 'Afaan Oromo'
),
'fa_IR' => array(
'name' => 'Persian',
'native' => 'فارسى'
),
'pl_PL' => array(
'name' => 'Polish',
'native' => 'polski'
),
'pt_PT' => array(
'name' => 'Portuguese (Portugal)',
'native' => 'português (Portugal)'
),
'pt_BR' => array(
'name' => 'Portuguese (Brazil)',
'native' => 'português (Brazil)'
),
'pa_IN' => array(
'name' => 'Punjabi',
'native' => 'ਪੰਜਾਬੀ'
),
'qu_PE' => array(
'name' => 'Quechua',
'native' => 'Quechua'
),
'rm_CH' => array(
'name' => 'Romansh',
'native' => 'rumantsch'
),
'ro_RO' => array(
'name' => 'Romanian',
'native' => 'român'
),
'ru_RU' => array(
'name' => 'Russian',
'native' => 'Русский'
),
'sco_SCO' => array(
'name' => 'Scots',
'native' => 'Scoats leid, Lallans'
),
'sr_RS' => array(
'name' => 'Serbian',
'native' => 'српски'
),
'sk_SK' => array(
'name' => 'Slovak',
'native' => 'slovenčina'
),
'sl_SI' => array(
'name' => 'Slovenian',
'native' => 'slovenščina'
),
'es_ES' => array(
'name' => 'Spanish',
'native' => 'español'
),
'sv_SE' => array(
'name' => 'Swedish',
'native' => 'Svenska'
),
'tl_PH' => array(
'name' => 'Tagalog',
'native' => 'Tagalog'
),
'ta_IN' => array(
'name' => 'Tamil',
'native' => 'தமிழ்'
),
'te_IN' => array(
'name' => 'Telugu',
'native' => 'తెలుగు'
),
'to_TO' => array(
'name' => 'Tonga',
'native' => 'chiTonga'
),
'ts_ZA' => array(
'name' => 'Tsonga',
'native' => 'xiTshonga'
),
'tn_ZA' => array(
'name' => 'Tswana',
'native' => 'seTswana'
),
'tr_TR' => array(
'name' => 'Turkish',
'native' => 'Türkçe'
),
'tk_TM' => array(
'name' => 'Turkmen',
'native' => 'түркmенче'
),
'tw_GH' => array(
'name' => 'Twi',
'native' => 'twi'
),
'uk_UA' => array(
'name' => 'Ukrainian',
'native' => 'Українська'
),
'ur_PK' => array(
'name' => 'Urdu',
'native' => 'اردو'
),
'uz_UZ' => array(
'name' => 'Uzbek',
'native' => 'ўзбек'
),
've_ZA' => array(
'name' => 'Venda',
'native' => 'tshiVenḓa'
),
'vi_VN' => array(
'name' => 'Vietnamese',
'native' => 'tiếng việt'
),
'wo_SN' => array(
'name' => 'Wolof',
'native' => 'Wollof'
),
'xh_ZA' => array(
'name' => 'Xhosa',
'native' => 'isiXhosa'
),
'zu_ZA' => array(
'name' => 'Zulu',
'native' => 'isiZulu'
),
); );
/** /**
@ -1673,8 +2173,8 @@ class i18n extends Object implements TemplateGlobalProvider {
*/ */
public static function get_common_languages($native = false) { public static function get_common_languages($native = false) {
$languages = array(); $languages = array();
foreach (self::$common_languages as $code => $name) { foreach (Config::inst()->get('i18n', 'common_languages') as $code => $name) {
$languages[$code] = ($native ? $name[1] : $name[0]); $languages[$code] = ($native ? $name['native'] : $name['name']);
} }
return $languages; return $languages;
} }
@ -1688,7 +2188,7 @@ class i18n extends Object implements TemplateGlobalProvider {
public static function get_common_locales($native = false) { public static function get_common_locales($native = false) {
$languages = array(); $languages = array();
foreach (Config::inst()->get('i18n', 'common_locales') as $code => $name) { foreach (Config::inst()->get('i18n', 'common_locales') as $code => $name) {
$languages[$code] = ($native ? $name[1] : $name[0]); $languages[$code] = ($native ? $name['native'] : $name['name']);
} }
return $languages; return $languages;
} }
@ -1748,11 +2248,11 @@ class i18n extends Object implements TemplateGlobalProvider {
* @return Name of the language * @return Name of the language
*/ */
public static function get_language_name($code, $native = false) { public static function get_language_name($code, $native = false) {
$langs = self::$common_languages; $langs = Config::inst()->get('i18n', 'common_languages');
if($native) { if($native) {
return (isset($langs[$code][1])) ? $langs[$code][1] : false; return (isset($langs[$code]['native'])) ? $langs[$code]['native'] : false;
} else { } else {
return (isset($langs[$code][0])) ? $langs[$code][0] : false; return (isset($langs[$code]['name'])) ? $langs[$code]['name'] : false;
} }
} }

View File

@ -563,6 +563,15 @@ class i18nTest extends SapphireTest {
SS_ClassLoader::instance()->popManifest(); SS_ClassLoader::instance()->popManifest();
} }
public function testGetLanguageName() {
Config::inst()->update(
'i18n',
'common_languages',
array('de_CGN' => array('name' => 'German (Cologne)', 'native' => 'Kölsch'))
);
$this->assertEquals('German (Cologne)', i18n::get_language_name('de_CGN'));
$this->assertEquals('Kölsch', i18n::get_language_name('de_CGN', true));
}
} }
class i18nTest_DataObject extends DataObject implements TestOnly { class i18nTest_DataObject extends DataObject implements TestOnly {