diff --git a/UPDATE b/UPDATE index d760b20..f33d2ca 100644 --- a/UPDATE +++ b/UPDATE @@ -76,4 +76,4 @@ Updating from 0.1.0 - 0.1.2 Updating from 0.0.1 - 0.0.3 ------------------------------ -- general update instructions \ No newline at end of file +- general update instructions diff --git a/demos/login-system/protected/data/config.main.tpl b/demos/login-system/protected/data/config.main.tpl index 794cbc6..b4c733f 100644 --- a/demos/login-system/protected/data/config.main.tpl +++ b/demos/login-system/protected/data/config.main.tpl @@ -31,7 +31,7 @@ return array( // Default email settings 'email' => array( 'mailer' => 'smtpMailer', /* phpMail | phpMailer | smtpMailer */ - 'from' => 'info@email.me', + 'from' => 'info@example.com', 'fromName' => '', /* John Smith */ 'isHtml' => true, 'smtp' => array( diff --git a/demos/simple-blog/protected/data/config.main.tpl b/demos/simple-blog/protected/data/config.main.tpl index 850392c..5ff929a 100644 --- a/demos/simple-blog/protected/data/config.main.tpl +++ b/demos/simple-blog/protected/data/config.main.tpl @@ -34,7 +34,7 @@ return array( // Default email settings 'email' => array( 'mailer' => 'smtpMailer', /* phpMail | phpMailer | smtpMailer */ - 'from' => 'info@email.me', + 'from' => 'info@example.com', 'fromName' => '', /* John Smith */ 'isHtml' => true, 'smtp' => array( diff --git a/demos/simple-cms/protected/data/config.main.tpl b/demos/simple-cms/protected/data/config.main.tpl index 73f523d..bf37921 100644 --- a/demos/simple-cms/protected/data/config.main.tpl +++ b/demos/simple-cms/protected/data/config.main.tpl @@ -31,7 +31,7 @@ return array( // Default email settings 'email' => array( 'mailer' => 'smtpMailer', /* phpMail | phpMailer | smtpMailer */ - 'from' => 'info@email.me', + 'from' => 'info@example.com', 'fromName' => '', /* John Smith */ 'isHtml' => true, 'smtp' => array( diff --git a/demos/static-site/protected/config/main.php b/demos/static-site/protected/config/main.php index 37f25a8..daf6561 100644 --- a/demos/static-site/protected/config/main.php +++ b/demos/static-site/protected/config/main.php @@ -31,7 +31,7 @@ // Default email settings 'email' => array( 'mailer' => 'smtpMailer', /* phpMail | phpMailer | smtpMailer */ - 'from' => 'info@email.me', + 'from' => 'info@example.com', 'fromName' => '', /* John Smith */ 'isHtml' => true, 'smtp' => array( diff --git a/docs/pages/coding-standards.html b/docs/pages/coding-standards.html index 4114385..3aab980 100644 --- a/docs/pages/coding-standards.html +++ b/docs/pages/coding-standards.html @@ -83,7 +83,7 @@
$sql = "SELECT `id`, `first_name`, `last_name` FRON `users` WHERE email = 'admin@email.me'";+
$sql = "SELECT `id`, `first_name`, `last_name` FRON `users` WHERE email = 'admin@example.com'";Variable Substitution
main.php
$userData = array(
'username' => 'johnsmith',
- 'email' => 'johnsmith@email.me',
+ 'email' => 'johnsmith@example.com',
'logged_at' => date('Y-m-d H:i:s'),
'logged_in' => true
);
diff --git a/framework/i18n/gr.php b/framework/i18n/gr.php
new file mode 100644
index 0000000..b5a422f
--- /dev/null
+++ b/framework/i18n/gr.php
@@ -0,0 +1,575 @@
+ [
+ 'wide' => [
+ 1 => 'Ιανουάριος',
+ 2 => 'Φεβρουάριος',
+ 3 => 'Μάρτιος',
+ 4 => 'Απρίλιος',
+ 5 => 'Μάιος',
+ 6 => 'Ιούνιος',
+ 7 => 'Ιούλιος',
+ 8 => 'Αύγουστος',
+ 9 => 'Σεπτέμβριος',
+ 10 => 'Οκτώβριος',
+ 11 => 'Νοέμβριος',
+ 12 => 'Δεκέμβριος',
+ ],
+ 'abbreviated' => [
+ 1 => 'Jan',
+ 2 => 'Feb',
+ 3 => 'Mar',
+ 4 => 'Apr',
+ 5 => 'May',
+ 6 => 'Jun',
+ 7 => 'Jul',
+ 8 => 'Aug',
+ 9 => 'Sep',
+ 10 => 'Oct',
+ 11 => 'Nov',
+ 12 => 'Dec',
+ ],
+ 'narrow' => [
+ 1 => 'J',
+ 2 => 'F',
+ 3 => 'M',
+ 4 => 'A',
+ 5 => 'M',
+ 6 => 'J',
+ 7 => 'J',
+ 8 => 'A',
+ 9 => 'S',
+ 10 => 'O',
+ 11 => 'N',
+ 12 => 'D',
+ ],
+ ],
+ 'amName' => 'AM',
+ 'pmName' => 'PM',
+ 'weekDayNames' => [
+ 'wide' => [
+ 1 => 'Sunday',
+ 2 => 'Monday',
+ 3 => 'Tuesday',
+ 4 => 'Wednesday',
+ 5 => 'Thursday',
+ 6 => 'Friday',
+ 7 => 'Saturday',
+ ],
+ 'abbreviated' => [
+ 1 => 'Sun',
+ 2 => 'Mon',
+ 3 => 'Tue',
+ 4 => 'Wed',
+ 5 => 'Thu',
+ 6 => 'Fri',
+ 7 => 'Sat',
+ ],
+ 'narrow' => [
+ 1 => 'S',
+ 2 => 'M',
+ 3 => 'T',
+ 4 => 'W',
+ 5 => 'T',
+ 6 => 'F',
+ 7 => 'S',
+ ],
+ ],
+ 'orientation' => 'ltr',
+ 'languages' => [
+ 'aa' => 'Afar',
+ 'ab' => 'Abkhazian',
+ 'ae' => 'Avestan',
+ 'af' => 'Afrikaans',
+ 'ak' => 'Akan',
+ 'am' => 'Amharic',
+ 'an' => 'Aragonese',
+ 'ar' => 'Arabic',
+ 'as' => 'Assamese',
+ 'av' => 'Avaric',
+ 'ay' => 'Aymara',
+ 'az' => 'Azeri',
+ 'ba' => 'Bashkir',
+ 'be' => 'Belarusian',
+ 'bg' => 'Bulgarian',
+ 'bh' => 'Bihari',
+ 'bi' => 'Bislama',
+ 'bm' => 'Bambara',
+ 'bn' => 'Bengali',
+ 'bo' => 'Tibetan',
+ 'br' => 'Breton',
+ 'bs' => 'Bosnian',
+ 'ca' => 'Catalan',
+ 'ce' => 'Chechen',
+ 'ch' => 'Chamorro',
+ 'co' => 'Corsican',
+ 'cr' => 'Cree',
+ 'cs' => 'Czech',
+ 'cu' => 'Church Slavic',
+ 'cv' => 'Chuvash',
+ 'cy' => 'Welsh',
+ 'da' => 'Danish',
+ 'de' => 'German',
+ 'dv' => 'Divehi',
+ 'dz' => 'Dzongkha',
+ 'ee' => 'Ewe',
+ 'el' => 'Greek',
+ 'en' => 'English',
+ 'eo' => 'Esperanto',
+ 'es' => 'Spanish',
+ 'et' => 'Estonian',
+ 'eu' => 'Basque',
+ 'fa' => 'Persian',
+ 'ff' => 'Fulah',
+ 'fi' => 'Finnish',
+ 'fj' => 'Fijian',
+ 'fo' => 'Faroese',
+ 'fr' => 'French',
+ 'fy' => 'Western Frisian',
+ 'ga' => 'Irish',
+ 'gd' => 'Scottish Gaelic',
+ 'gl' => 'Galician',
+ 'gn' => 'Guarani',
+ 'gu' => 'Gujarati',
+ 'gv' => 'Manx',
+ 'ha' => 'Hausa',
+ 'he' => 'Hebrew',
+ 'hi' => 'Hindi',
+ 'ho' => 'Hiri Motu',
+ 'hr' => 'Croatian',
+ 'ht' => 'Haitian',
+ 'hu' => 'Hungarian',
+ 'hy' => 'Armenian',
+ 'hz' => 'Herero',
+ 'ia' => 'Interlingua',
+ 'id' => 'Indonesian',
+ 'ie' => 'Interlingue',
+ 'ig' => 'Igbo',
+ 'ii' => 'Sichuan Yi',
+ 'ik' => 'Inupiaq',
+ 'io' => 'Ido',
+ 'is' => 'Icelandic',
+ 'it' => 'Italian',
+ 'iu' => 'Inuktitut',
+ 'ja' => 'Japanese',
+ 'jv' => 'Javanese',
+ 'ka' => 'Georgian',
+ 'kg' => 'Kongo',
+ 'ki' => 'Kikuyu',
+ 'kj' => 'Kuanyama',
+ 'kk' => 'Kazakh',
+ 'kl' => 'Kalaallisut',
+ 'km' => 'Khmer',
+ 'kn' => 'Kannada',
+ 'ko' => 'Korean',
+ 'kr' => 'Kanuri',
+ 'ks' => 'Kashmiri',
+ 'ku' => 'Kurdish',
+ 'kv' => 'Komi',
+ 'kw' => 'Cornish',
+ 'ky' => 'Kirghiz',
+ 'la' => 'Latin',
+ 'lb' => 'Luxembourgish',
+ 'lg' => 'Ganda',
+ 'li' => 'Limburgish',
+ 'ln' => 'Lingala',
+ 'lo' => 'Lao',
+ 'lt' => 'Lithuanian',
+ 'lu' => 'Luba-Katanga',
+ 'lv' => 'Latvian',
+ 'mg' => 'Malagasy',
+ 'mh' => 'Marshallese',
+ 'mi' => 'Maori',
+ 'mk' => 'Macedonian',
+ 'ml' => 'Malayalam',
+ 'mn' => 'Mongolian',
+ 'mo' => 'Moldavian',
+ 'mr' => 'Marathi',
+ 'ms' => 'Malay',
+ 'mt' => 'Maltese',
+ 'my' => 'Burmese',
+ 'na' => 'Nauru',
+ 'nb' => 'Norwegian Bokmål',
+ 'nd' => 'North Ndebele',
+ 'ne' => 'Nepali',
+ 'ng' => 'Ndonga',
+ 'nl' => 'Dutch',
+ 'nn' => 'Norwegian Nynorsk',
+ 'no' => 'Norwegian',
+ 'nr' => 'South Ndebele',
+ 'nv' => 'Navajo',
+ 'ny' => 'Nyanja',
+ 'oc' => 'Occitan',
+ 'oj' => 'Ojibwa',
+ 'om' => 'Oromo',
+ 'or' => 'Oriya',
+ 'os' => 'Ossetic',
+ 'pa' => 'Punjabi',
+ 'pi' => 'Pali',
+ 'pl' => 'Polish',
+ 'ps' => 'Pushto',
+ 'pt' => 'Portuguese',
+ 'qu' => 'Quechua',
+ 'rm' => 'Romansh',
+ 'rn' => 'Rundi',
+ 'ro' => 'Romanian',
+ 'ru' => 'Russian',
+ 'rw' => 'Kinyarwanda',
+ 'sa' => 'Sanskrit',
+ 'sc' => 'Sardinian',
+ 'sd' => 'Sindhi',
+ 'se' => 'Northern Sami',
+ 'sg' => 'Sango',
+ 'sh' => 'Serbo-Croatian',
+ 'si' => 'Sinhala',
+ 'sk' => 'Slovak',
+ 'sl' => 'Slovenian',
+ 'sm' => 'Samoan',
+ 'sn' => 'Shona',
+ 'so' => 'Somali',
+ 'sq' => 'Albanian',
+ 'sr' => 'Serbian',
+ 'ss' => 'Swati',
+ 'st' => 'Southern Sotho',
+ 'su' => 'Sundanese',
+ 'sv' => 'Swedish',
+ 'sw' => 'Swahili',
+ 'ta' => 'Tamil',
+ 'te' => 'Telugu',
+ 'tg' => 'Tajik',
+ 'th' => 'Thai',
+ 'ti' => 'Tigrinya',
+ 'tk' => 'Turkmen',
+ 'tl' => 'Tagalog',
+ 'tn' => 'Tswana',
+ 'to' => 'Tongan',
+ 'tr' => 'Turkish',
+ 'ts' => 'Tsonga',
+ 'tt' => 'Tatar',
+ 'tw' => 'Twi',
+ 'ty' => 'Tahitian',
+ 'ug' => 'Uyghur',
+ 'uk' => 'Ukrainian',
+ 'ur' => 'Urdu',
+ 'uz' => 'Uzbek',
+ 've' => 'Venda',
+ 'vi' => 'Vietnamese',
+ 'vo' => 'Volapük',
+ 'wa' => 'Walloon',
+ 'wo' => 'Wolof',
+ 'xh' => 'Xhosa',
+ 'yi' => 'Yiddish',
+ 'yo' => 'Yoruba',
+ 'za' => 'Zhuang',
+ 'zh' => 'Chinese',
+ 'zu' => 'Zulu',
+ ],
+ 'continents' => [
+ '001' => 'World',
+ '010' => 'Africa',
+ '011' => 'Western Africa',
+ '012' => 'Eastern Africa',
+ '013' => 'Northern Africa',
+ '014' => 'Middle Africa',
+ '015' => 'Southern Africa',
+ '020' => 'Americas',
+ '021' => 'North America',
+ '022' => 'South America',
+ '023' => 'Central America',
+ '024' => 'Latin America',
+ '025' => 'Caribbean',
+ '030' => 'Asia',
+ '031' => 'Central Asia',
+ '032' => 'Western Asia',
+ '033' => 'Eastern Asia',
+ '034' => 'Southern Asia',
+ '035' => 'South-Eastern Asia',
+ '036' => 'South-Central Asia',
+ '037' => 'Middle East',
+ '040' => 'Europe',
+ '041' => 'Eastern Europe',
+ '042' => 'Northern Europe',
+ '043' => 'Western Europe',
+ '044' => 'Southern Europe',
+ '050' => 'Australia and New Zealand',
+ '051' => 'Oceania',
+ '052' => 'Melanesia',
+ '053' => 'Micronesian Region',
+ '054' => 'Polynesia',
+ ],
+ 'countries' => [
+ 'ac' => 'Ascension Island',
+ 'ad' => 'Andorra',
+ 'ae' => 'United Arab Emirates',
+ 'af' => 'Afghanistan',
+ 'ag' => 'Antigua and Barbuda',
+ 'ai' => 'Anguilla',
+ 'al' => 'Albania',
+ 'am' => 'Armenia',
+ 'an' => 'Netherlands Antilles',
+ 'ao' => 'Angola',
+ 'aq' => 'Antarctica',
+ 'ar' => 'Argentina',
+ 'as' => 'American Samoa',
+ 'at' => 'Austria',
+ 'au' => 'Australia',
+ 'aw' => 'Aruba',
+ 'ax' => 'Åland Islands',
+ 'az' => 'Azerbaijan',
+ 'ba' => 'Bosnia and Herzegovina',
+ 'bb' => 'Barbados',
+ 'bd' => 'Bangladesh',
+ 'be' => 'Belgium',
+ 'bf' => 'Burkina Faso',
+ 'bg' => 'Bulgaria',
+ 'bh' => 'Bahrain',
+ 'bi' => 'Burundi',
+ 'bj' => 'Benin',
+ 'bl' => 'Saint Barthélemy',
+ 'bm' => 'Bermuda',
+ 'bn' => 'Brunei',
+ 'bo' => 'Bolivia',
+ 'bq' => 'Bonaire, Saint Eustatius, and Saba',
+ 'br' => 'Brazil',
+ 'bs' => 'Bahamas',
+ 'bt' => 'Bhutan',
+ 'bv' => 'Bouvet Island',
+ 'bw' => 'Botswana',
+ 'by' => 'Belarus',
+ 'bz' => 'Belize',
+ 'ca' => 'Canada',
+ 'cc' => 'Cocos [Keeling] Islands',
+ 'cd' => 'Congo [DRC]',
+ 'cf' => 'Central African Republic',
+ 'cg' => 'Congo [Republic]',
+ 'ch' => 'Switzerland',
+ 'ci' => 'Ivory Coast',
+ 'ck' => 'Cook Islands',
+ 'cl' => 'Chile',
+ 'cm' => 'Cameroon',
+ 'cn' => 'China',
+ 'co' => 'Colombia',
+ 'cp' => 'Clipperton Island',
+ 'cr' => 'Costa Rica',
+ 'cs' => 'Serbia and Montenegro',
+ 'ct' => 'Canton and Enderbury Islands',
+ 'cu' => 'Cuba',
+ 'cv' => 'Cape Verde',
+ 'cw' => 'Curacao',
+ 'cx' => 'Christmas Island',
+ 'cy' => 'Cyprus',
+ 'cz' => 'Czech Republic',
+ 'de' => 'Germany',
+ 'dg' => 'Diego Garcia',
+ 'dj' => 'Djibouti',
+ 'dk' => 'Denmark',
+ 'dm' => 'Dominica',
+ 'do' => 'Dominican Republic',
+ 'dz' => 'Algeria',
+ 'ea' => 'Ceuta and Melilla',
+ 'ec' => 'Ecuador',
+ 'ee' => 'Estonia',
+ 'eg' => 'Egypt',
+ 'eh' => 'Western Sahara',
+ 'er' => 'Eritrea',
+ 'es' => 'Spain',
+ 'et' => 'Ethiopia',
+ 'eu' => 'European Union',
+ 'fi' => 'Finland',
+ 'fj' => 'Fiji',
+ 'fk' => 'Falkland Islands [Islas Malvinas]',
+ 'fm' => 'Micronesia',
+ 'fo' => 'Faroe Islands',
+ 'fq' => 'French Southern and Antarctic Territories',
+ 'fr' => 'France',
+ 'fx' => 'Metropolitan France',
+ 'ga' => 'Gabon',
+ 'gb' => 'United Kingdom',
+ 'gd' => 'Grenada',
+ 'ge' => 'Georgia',
+ 'gf' => 'French Guiana',
+ 'gg' => 'Guernsey',
+ 'gh' => 'Ghana',
+ 'gi' => 'Gibraltar',
+ 'gl' => 'Greenland',
+ 'gm' => 'Gambia',
+ 'gn' => 'Guinea',
+ 'gp' => 'Guadeloupe',
+ 'gq' => 'Equatorial Guinea',
+ 'gr' => 'Greece',
+ 'gs' => 'South Georgia and the South Sandwich Islands',
+ 'gt' => 'Guatemala',
+ 'gu' => 'Guam',
+ 'gw' => 'Guinea-Bissau',
+ 'gy' => 'Guyana',
+ 'hk' => 'Hong Kong',
+ 'hm' => 'Heard Island and McDonald Islands',
+ 'hn' => 'Honduras',
+ 'hr' => 'Croatia',
+ 'ht' => 'Haiti',
+ 'hu' => 'Hungary',
+ 'ic' => 'Canary Islands',
+ 'id' => 'Indonesia',
+ 'ie' => 'Ireland',
+ 'il' => 'Israel',
+ 'im' => 'Isle of Man',
+ 'in' => 'India',
+ 'io' => 'British Indian Ocean Territory',
+ 'iq' => 'Iraq',
+ 'ir' => 'Iran',
+ 'is' => 'Iceland',
+ 'it' => 'Italy',
+ 'je' => 'Jersey',
+ 'jm' => 'Jamaica',
+ 'jo' => 'Jordan',
+ 'jp' => 'Japan',
+ 'jt' => 'Johnston Island',
+ 'ke' => 'Kenya',
+ 'kg' => 'Kyrgyzstan',
+ 'kh' => 'Cambodia',
+ 'ki' => 'Kiribati',
+ 'km' => 'Comoros',
+ 'kn' => 'Saint Kitts and Nevis',
+ 'kp' => 'North Korea',
+ 'kr' => 'South Korea',
+ 'kw' => 'Kuwait',
+ 'ky' => 'Cayman Islands',
+ 'kz' => 'Kazakhstan',
+ 'la' => 'Laos',
+ 'lb' => 'Lebanon',
+ 'lc' => 'Saint Lucia',
+ 'li' => 'Liechtenstein',
+ 'lk' => 'Sri Lanka',
+ 'lr' => 'Liberia',
+ 'ls' => 'Lesotho',
+ 'lt' => 'Lithuania',
+ 'lu' => 'Luxembourg',
+ 'lv' => 'Latvia',
+ 'ly' => 'Libya',
+ 'ma' => 'Morocco',
+ 'mc' => 'Monaco',
+ 'md' => 'Moldova',
+ 'me' => 'Montenegro',
+ 'mf' => 'Saint Martin',
+ 'mg' => 'Madagascar',
+ 'mh' => 'Marshall Islands',
+ 'mi' => 'Midway Islands',
+ 'mk' => 'Macedonia [FYROM]',
+ 'ml' => 'Mali',
+ 'mm' => 'Myanmar [Burma]',
+ 'mn' => 'Mongolia',
+ 'mo' => 'Macau',
+ 'mp' => 'Northern Mariana Islands',
+ 'mq' => 'Martinique',
+ 'mr' => 'Mauritania',
+ 'ms' => 'Montserrat',
+ 'mt' => 'Malta',
+ 'mu' => 'Mauritius',
+ 'mv' => 'Maldives',
+ 'mw' => 'Malawi',
+ 'mx' => 'Mexico',
+ 'my' => 'Malaysia',
+ 'mz' => 'Mozambique',
+ 'na' => 'Namibia',
+ 'nc' => 'New Caledonia',
+ 'ne' => 'Niger',
+ 'nf' => 'Norfolk Island',
+ 'ng' => 'Nigeria',
+ 'ni' => 'Nicaragua',
+ 'nl' => 'Netherlands',
+ 'no' => 'Norway',
+ 'np' => 'Nepal',
+ 'nq' => 'Dronning Maud Land',
+ 'nr' => 'Nauru',
+ 'nu' => 'Niue',
+ 'nz' => 'New Zealand',
+ 'om' => 'Oman',
+ 'pa' => 'Panama',
+ 'pc' => 'Pacific Islands Trust Territory',
+ 'pe' => 'Peru',
+ 'pf' => 'French Polynesia',
+ 'pg' => 'Papua New Guinea',
+ 'ph' => 'Philippines',
+ 'pk' => 'Pakistan',
+ 'pl' => 'Poland',
+ 'pm' => 'Saint Pierre and Miquelon',
+ 'pn' => 'Pitcairn Islands',
+ 'pr' => 'Puerto Rico',
+ 'ps' => 'Palestinian Territories',
+ 'pt' => 'Portugal',
+ 'pu' => 'U.S. Miscellaneous Pacific Islands',
+ 'pw' => 'Palau',
+ 'py' => 'Paraguay',
+ 'pz' => 'Panama Canal Zone',
+ 'qa' => 'Qatar',
+ 'qo' => 'Outlying Oceania',
+ 're' => 'Réunion',
+ 'ro' => 'Romania',
+ 'rs' => 'Serbia',
+ 'ru' => 'Russia',
+ 'rw' => 'Rwanda',
+ 'sa' => 'Saudi Arabia',
+ 'sb' => 'Solomon Islands',
+ 'sc' => 'Seychelles',
+ 'sd' => 'Sudan',
+ 'se' => 'Sweden',
+ 'sg' => 'Singapore',
+ 'sh' => 'Saint Helena',
+ 'si' => 'Slovenia',
+ 'sj' => 'Svalbard and Jan Mayen',
+ 'sk' => 'Slovakia',
+ 'sl' => 'Sierra Leone',
+ 'sm' => 'San Marino',
+ 'sn' => 'Senegal',
+ 'so' => 'Somalia',
+ 'sr' => 'Suriname',
+ 'st' => 'São Tomé and Príncipe',
+ 'sv' => 'El Salvador',
+ 'sx' => 'St. Maarten',
+ 'sy' => 'Syria',
+ 'sz' => 'Swaziland',
+ 'ta' => 'Tristan da Cunha',
+ 'tc' => 'Turks and Caicos Islands',
+ 'td' => 'Chad',
+ 'tf' => 'French Southern Territories',
+ 'tg' => 'Togo',
+ 'th' => 'Thailand',
+ 'tj' => 'Tajikistan',
+ 'tk' => 'Tokelau',
+ 'tl' => 'East Timor',
+ 'tm' => 'Turkmenistan',
+ 'tn' => 'Tunisia',
+ 'to' => 'Tonga',
+ 'tr' => 'Turkey',
+ 'tt' => 'Trinidad and Tobago',
+ 'tv' => 'Tuvalu',
+ 'tw' => 'Taiwan',
+ 'tz' => 'Tanzania',
+ 'ua' => 'Ukraine',
+ 'ug' => 'Uganda',
+ 'um' => 'U.S. Minor Outlying Islands',
+ 'us' => 'United States',
+ 'uy' => 'Uruguay',
+ 'uz' => 'Uzbekistan',
+ 'va' => 'Vatican City',
+ 'vc' => 'Saint Vincent and the Grenadines',
+ 've' => 'Venezuela',
+ 'vg' => 'British Virgin Islands',
+ 'vi' => 'U.S. Virgin Islands',
+ 'vn' => 'Vietnam',
+ 'vu' => 'Vanuatu',
+ 'wf' => 'Wallis and Futuna',
+ 'wk' => 'Wake Island',
+ 'ws' => 'Samoa',
+ 'ye' => 'Yemen',
+ 'yt' => 'Mayotte',
+ 'za' => 'South Africa',
+ 'zm' => 'Zambia',
+ 'zw' => 'Zimbabwe',
+ 'zz' => 'Unknown Region',
+ ],
+
+];
\ No newline at end of file
diff --git a/utils/tests/inc/filter/data.php b/utils/tests/inc/filter/data.php
index 872817f..3cbaa2e 100644
--- a/utils/tests/inc/filter/data.php
+++ b/utils/tests/inc/filter/data.php
@@ -8,7 +8,7 @@
['string', 'asd$56fgh', true],
['string', 'a_+sdTgg#$56fgh', true],
['email', "^()!#$%&'*+-/=?^_`{|}~@.[]", false],
- ['email', 'email.me@email.me', true],
+ ['email', 'emai.lme@example.com', true],
['email', 'email@e+-mail.me', true],
['url', "http://www.domain.com/$-_!2=+-", true],
['alpha', 'asd@#$23423234', false],
diff --git a/utils/tests/inc/validator/data.php b/utils/tests/inc/validator/data.php
index 6dff68d..75df3a3 100644
--- a/utils/tests/inc/validator/data.php
+++ b/utils/tests/inc/validator/data.php
@@ -32,9 +32,9 @@
'com.email@me' => false,
'me.email@.com' => false,
'me.email@example.com' => true,
- 'me.email.me@email.info' => true,
- 'me.e_mail99@email.info' => true,
- 'me.e_*mail@email.info' => false
+ 'me.emai.lme@example.info' => true,
+ 'me.e_mail99@example.com' => true,
+ 'me.e_*mail@example.com' => false
],
'validateRegex' => [
'abcDef' => ['expected' => true, 'pattern' => '^[a-zA-Z]+$'],