From af68f3f298e549f95620aa6207fd2960513fe511 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sat, 20 Oct 2007 23:49:14 +0000 Subject: [PATCH] FEATURE Sapphire files are now also scanned for _t calls ENHANCEMENT Revised locale list ENHANCEMENT Updated en_US generated files (and created for sapphire) BUGFIX Fixed some _t() calls in the cms module (merged from patch #1476 by bfojcapell) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43654 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/Core.php | 2 +- core/i18n.php | 123 ++++++------------------------------------------- lang/en_US.php | 7 +++ 3 files changed, 21 insertions(+), 111 deletions(-) create mode 100644 lang/en_US.php diff --git a/core/Core.php b/core/Core.php index ce5a7077d..1562a17ba 100755 --- a/core/Core.php +++ b/core/Core.php @@ -122,7 +122,7 @@ function _t($entity, $string = "", $priority = 40, $context = "") { $realEntity = array_pop($entityParts); $class = implode('.',$entityParts); if(!isset($lang[$locale][$class])) i18n::include_by_class($class); - $transEntity = $lang[i18n::get_locale()][$class][$realEntity]; + $transEntity = isset($lang[i18n::get_locale()][$class][$realEntity]) ? $lang[i18n::get_locale()][$class][$realEntity] : $string; return (is_array($transEntity) ? $transEntity[0] : $transEntity); } diff --git a/core/i18n.php b/core/i18n.php index 625c03d17..a58e786e0 100755 --- a/core/i18n.php +++ b/core/i18n.php @@ -36,15 +36,11 @@ class i18n extends Controller { 'am_ET' => 'Amharic (Ethiopia)', 'ar_AE' => 'Arabic (United Arab Emirates)', 'ar_BH' => 'Arabic (Bahrain)', - 'ar_DJ' => 'Arabic (Djibouti)', 'ar_DZ' => 'Arabic (Algeria)', 'ar_EG' => 'Arabic (Egypt)', 'ar_EH' => 'Arabic (Western Sahara)', - 'ar_ER' => 'Arabic (Eritrea)', - 'ar_IL' => 'Arabic (Israel)', 'ar_IQ' => 'Arabic (Iraq)', 'ar_JO' => 'Arabic (Jordan)', - 'ar_KM' => 'Arabic (Comoros)', 'ar_KW' => 'Arabic (Kuwait)', 'ar_LB' => 'Arabic (Lebanon)', 'ar_LY' => 'Arabic (Libya)', @@ -59,7 +55,6 @@ class i18n extends Controller { 'ar_TD' => 'Arabic (Chad)', 'ar_TN' => 'Arabic (Tunisia)', 'ar_YE' => 'Arabic (Yemen)', - 'ar_IR' => 'Arabic (Iran)', 'as_IN' => 'Assamese (India)', 'auv_FR' => 'Auvergnat (France)', 'av_RU' => 'Avaric (Russia)', @@ -117,8 +112,6 @@ class i18n extends Controller { 'de_DE' => 'German (Germany)', 'de_LI' => 'German (Liechtenstein)', 'de_LU' => 'German (Luxembourg)', - 'de_BR' => 'German (Brazil)', - 'de_US' => 'German (United States)', 'dgo_IN' => 'Dogri (India)', 'dhd_IN' => 'Dhundari (India)', 'diq_TR' => 'Dimli (Turkey)', @@ -128,94 +121,33 @@ class i18n extends Controller { 'ee_GH' => 'Ewe (Ghana)', 'el_CY' => 'Greek (Cyprus)', 'el_GR' => 'Greek (Greece)', - 'en_AG' => 'English (Antigua and Barbuda)', - 'en_AI' => 'English (Anguilla)', 'en_AS' => 'English (American Samoa)', 'en_AU' => 'English (Australia)', - 'en_BB' => 'English (Barbados)', 'en_BM' => 'English (Bermuda)', 'en_BS' => 'English (Bahamas)', - 'en_BW' => 'English (Botswana)', - 'en_BZ' => 'English (Belize)', 'en_CA' => 'English (Canada)', - 'en_CC' => 'English (Cocos Islands)', - 'en_CK' => 'English (Cook Islands)', - 'en_CM' => 'English (Cameroon)', - 'en_CX' => 'English (Christmas Island)', - 'en_DM' => 'English (Dominica)', - 'en_FJ' => 'English (Fiji)', - 'en_FK' => 'English (Falkland Islands)', - 'en_FM' => 'English (Micronesia)', 'en_GB' => 'English (United Kingdom)', - 'en_GD' => 'English (Grenada)', - 'en_GG' => 'English (Guernsey)', - 'en_GH' => 'English (Ghana)', - 'en_GI' => 'English (Gibraltar)', - 'en_GM' => 'English (Gambia)', - 'en_GU' => 'English (Guam)', - 'en_GY' => 'English (Guyana)', 'en_HK' => 'English (Hong Kong SAR China)', - 'en_HN' => 'English (Honduras)', 'en_IE' => 'English (Ireland)', - 'en_IM' => 'English (Isle of Man)', - 'en_JE' => 'English (Jersey)', + 'en_IN' => 'English (India)', 'en_JM' => 'English (Jamaica)', 'en_KE' => 'English (Kenya)', - 'en_KI' => 'English (Kiribati)', - 'en_KN' => 'English (Saint Kitts and Nevis)', - 'en_KY' => 'English (Cayman Islands)', - 'en_LC' => 'English (Saint Lucia)', 'en_LR' => 'English (Liberia)', - 'en_MH' => 'English (Marshall Islands)', - 'en_MP' => 'English (Northern Mariana Islands)', - 'en_MS' => 'English (Montserrat)', - 'en_MT' => 'English (Malta)', - 'en_MU' => 'English (Mauritius)', + 'en_MM' => 'English (Myanmar)', 'en_MW' => 'English (Malawi)', - 'en_NA' => 'English (Namibia)', - 'en_NF' => 'English (Norfolk Island)', - 'en_NG' => 'English (Nigeria)', - 'en_NR' => 'English (Nauru)', - 'en_NU' => 'English (Niue)', + 'en_MY' => 'English (Malaysia)', 'en_NZ' => 'English (New Zealand)', - 'en_PG' => 'English (Papua New Guinea)', 'en_PH' => 'English (Philippines)', - 'en_PK' => 'English (Pakistan)', - 'en_PN' => 'English (Pitcairn)', - 'en_PR' => 'English (Puerto Rico)', - 'en_PW' => 'English (Palau)', - 'en_RW' => 'English (Rwanda)', - 'en_SB' => 'English (Solomon Islands)', - 'en_SC' => 'English (Seychelles)', 'en_SG' => 'English (Singapore)', - 'en_SH' => 'English (Saint Helena)', - 'en_SL' => 'English (Sierra Leone)', - 'en_SZ' => 'English (Swaziland)', - 'en_TC' => 'English (Turks and Caicos Islands)', - 'en_TK' => 'English (Tokelau)', - 'en_TO' => 'English (Tonga)', 'en_TT' => 'English (Trinidad and Tobago)', - 'en_TV' => 'English (Tuvalu)', - 'en_TZ' => 'English (Tanzania)', - 'en_UG' => 'English (Uganda)', - 'en_UM' => 'English (United States Minor Outlying Islands)', 'en_US' => 'English (United States)', - 'en_VC' => 'English (Saint Vincent and the Grenadines)', - 'en_VG' => 'English (British Virgin Islands)', - 'en_VI' => 'English (U.S. Virgin Islands)', - 'en_VU' => 'English (Vanuatu)', - 'en_WS' => 'English (Samoa)', 'en_ZA' => 'English (South Africa)', - 'en_ZM' => 'English (Zambia)', - 'en_ZW' => 'English (Zimbabwe)', - 'en_BE' => 'English (Belgium)', 'en_DE' => 'English (Germany)', 'en_ES' => 'English (Spain)', 'en_FR' => 'English (France)', - 'en_IN' => 'English (India)', 'en_IT' => 'English (Italy)', - 'en_MY' => 'English (Malaysia)', 'en_NL' => 'English (Netherlands)', + 'es_419' => 'Spanish (Latin America)', 'es_AR' => 'Spanish (Argentina)', 'es_BO' => 'Spanish (Bolivia)', 'es_CL' => 'Spanish (Chile)', @@ -236,11 +168,9 @@ class i18n extends Controller { 'es_PR' => 'Spanish (Puerto Rico)', 'es_PY' => 'Spanish (Paraguay)', 'es_SV' => 'Spanish (El Salvador)', + 'es_US' => 'Spanish (United States)', 'es_UY' => 'Spanish (Uruguay)', 'es_VE' => 'Spanish (Venezuela)', - 'es_AD' => 'Spanish (Andorra)', - 'es_BZ' => 'Spanish (Belize)', - 'es_US' => 'Spanish (United States)', 'et_EE' => 'Estonian (Estonia)', 'eu_ES' => 'Basque (Spain)', 'fa_AF' => 'Persian (Afghanistan)', @@ -253,48 +183,25 @@ class i18n extends Controller { 'fj_FJ' => 'Fijian (Fiji)', 'fo_FO' => 'Faroese (Faroe Islands)', 'fon_BJ' => 'Fon (Benin)', + 'fr_002' => 'French (Africa)', 'fr_BE' => 'French (Belgium)', - 'fr_BF' => 'French (Burkina Faso)', - 'fr_BI' => 'French (Burundi)', - 'fr_BJ' => 'French (Benin)', 'fr_CA' => 'French (Canada)', - 'fr_CF' => 'French (Central African Republic)', - 'fr_CG' => 'French (Congo - Brazzaville)', 'fr_CH' => 'French (Switzerland)', - 'fr_CI' => 'French (Ivory Coast)', - 'fr_CM' => 'French (Cameroon)', - 'fr_DJ' => 'French (Djibouti)', 'fr_DZ' => 'French (Algeria)', 'fr_FR' => 'French (France)', - 'fr_GA' => 'French (Gabon)', 'fr_GF' => 'French (French Guiana)', - 'fr_GN' => 'French (Guinea)', 'fr_GP' => 'French (Guadeloupe)', 'fr_HT' => 'French (Haiti)', 'fr_KM' => 'French (Comoros)', - 'fr_LU' => 'French (Luxembourg)', 'fr_MA' => 'French (Morocco)', - 'fr_MC' => 'French (Monaco)', - 'fr_MG' => 'French (Madagascar)', - 'fr_ML' => 'French (Mali)', 'fr_MQ' => 'French (Martinique)', 'fr_MU' => 'French (Mauritius)', 'fr_NC' => 'French (New Caledonia)', - 'fr_NE' => 'French (Niger)', 'fr_PF' => 'French (French Polynesia)', 'fr_PM' => 'French (Saint Pierre and Miquelon)', 'fr_RE' => 'French (Reunion)', - 'fr_RW' => 'French (Rwanda)', 'fr_SC' => 'French (Seychelles)', 'fr_SN' => 'French (Senegal)', - 'fr_SY' => 'French (Syria)', - 'fr_TD' => 'French (Chad)', - 'fr_TG' => 'French (Togo)', - 'fr_TN' => 'French (Tunisia)', - 'fr_VU' => 'French (Vanuatu)', - 'fr_WF' => 'French (Wallis and Futuna)', - 'fr_YT' => 'French (Mayotte)', - 'fr_GB' => 'French (United Kingdom)', 'fr_US' => 'French (United States)', 'fuv_NG' => 'Fulfulde (Nigeria)', 'ga_IE' => 'Irish (Ireland)', @@ -342,7 +249,6 @@ class i18n extends Controller { 'it_FR' => 'Italian (France)', 'it_HR' => 'Italian (Croatia)', 'it_US' => 'Italian (United States)', - 'it_VA' => 'Italian (Vatican)', 'iu_CA' => 'Inuktitut (Canada)', 'ja_JP' => 'Japanese (Japan)', 'jv_ID' => 'Javanese (Indonesia)', @@ -361,9 +267,7 @@ class i18n extends Controller { 'kln_KE' => 'Kalenjin (Kenya)', 'km_KH' => 'Khmer (Cambodia)', 'kn_IN' => 'Kannada (India)', - 'ko_KP' => 'Korean (North Korea)', - 'ko_KR' => 'Korean (South Korea)', - 'ko_CN' => 'Korean (China)', + 'ko_KR' => 'Korean (Korea)', 'koi_RU' => 'Komi-Permyak (Russia)', 'kok_IN' => 'Konkani (India)', 'kos_FM' => 'Kosraean (Micronesia)', @@ -384,6 +288,8 @@ class i18n extends Controller { 'lbe_RU' => 'Lak (Russia)', 'lez_RU' => 'Lezghian (Russia)', 'lg_UG' => 'Ganda (Uganda)', + 'lij_IT' => 'Ligurian (Italy)', + 'lij_MC' => 'Ligurian (Monaco)', 'ljp_ID' => 'Lampung (Indonesia)', 'lmn_IN' => 'Lambadi (India)', 'ln_CD' => 'Lingala (Congo - Kinshasa)', @@ -425,8 +331,8 @@ class i18n extends Controller { 'my_MM' => 'Burmese (Myanmar)', 'myv_RU' => 'Erzya (Russia)', 'na_NR' => 'Nauru (Nauru)', - 'nb_NO' => 'Norwegian Bokm�l (Norway)', - 'nb_SJ' => 'Norwegian Bokm�l (Svalbard and Jan Mayen)', + 'nb_NO' => 'Norwegian Bokmål (Norway)', + 'nb_SJ' => 'Norwegian Bokmål (Svalbard and Jan Mayen)', 'nd_ZW' => 'North Ndebele (Zimbabwe)', 'ndc_MZ' => 'Ndau (Mozambique)', 'ne_NP' => 'Nepali (Nepal)', @@ -590,9 +496,6 @@ class i18n extends Controller { 'zh_MO' => 'Chinese (Macao SAR China)', 'zh_SG' => 'Chinese (Singapore)', 'zh_TW' => 'Chinese (Taiwan)', - 'zh_ID' => 'Chinese (Indonesia)', - 'zh_MY' => 'Chinese (Malaysia)', - 'zh_TH' => 'Chinese (Thailand)', 'zh_US' => 'Chinese (United States)', 'zu_ZA' => 'Zulu (South Africa)', ); @@ -1073,7 +976,7 @@ class i18n extends Controller { $entity = array_pop($entityParts); $class = implode('.',$entityParts); - if (isset($callMap[$class.'--'.$entity])) echo "Warning! Redeclaring entity $entity in file $file
"; + if (isset($callMap[$class.'--'.$entity])) user_error("Warning! Redeclaring entity $entity in file $file
", E_USER_WARNING); if (substr($regs[2],0,1) == '"') $regs[2] = addcslashes($regs[2],'\''); $mst .= '$lang[\'en_US\'][\'' . $class . '\'][\'' . $entity . '\'] = '; @@ -1112,7 +1015,7 @@ class i18n extends Controller { $entity = array_pop($entityParts); // Entity redeclaration check - if (isset($callMap[$index.'--'.$entity])) echo "Warning! Redeclaring entity $entity in file $file
"; + if (isset($callMap[$index.'--'.$entity])) user_error("Warning! Redeclaring entity $entity in file $file
", E_USER_WARNING); if (substr($regs[2],0,1) == '"') $regs[2] = addcslashes($regs[2],'\''); $mst .= '$lang[\'en_US\'][\'' . $index . '\'][\'' . $entity . '\'] = '; diff --git a/lang/en_US.php b/lang/en_US.php new file mode 100644 index 000000000..8e1129251 --- /dev/null +++ b/lang/en_US.php @@ -0,0 +1,7 @@ + \ No newline at end of file