Skip to content
Extraits de code Groupes Projets
Valider 5f2e7f7f rédigé par Matthieu Napoli's avatar Matthieu Napoli
Parcourir les fichiers

Region and language data files do not use $GLOBALS anymore

parent b1aca506
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -13,6 +13,9 @@ namespace Piwik\Intl\Data\Provider; ...@@ -13,6 +13,9 @@ namespace Piwik\Intl\Data\Provider;
*/ */
class LanguageDataProvider class LanguageDataProvider
{ {
private $languageList;
private $languageToCountryList;
/** /**
* Returns the list of valid language codes. * Returns the list of valid language codes.
* *
...@@ -20,11 +23,13 @@ class LanguageDataProvider ...@@ -20,11 +23,13 @@ class LanguageDataProvider
* E.g. `array('en' => 'English', 'ja' => 'Japanese')`. * E.g. `array('en' => 'English', 'ja' => 'Japanese')`.
* @api * @api
*/ */
public static function getLanguageList() public function getLanguageList()
{ {
require __DIR__ . '/../Resources/Languages.php'; if ($this->languageList === null) {
$this->languageList = require __DIR__ . '/../Resources/Languages.php';
}
return $GLOBALS['Piwik_LanguageList']; return $this->languageList;
} }
/** /**
...@@ -34,10 +39,12 @@ class LanguageDataProvider ...@@ -34,10 +39,12 @@ class LanguageDataProvider
* E.g. `array('fr' => 'fr') // French => France`. * E.g. `array('fr' => 'fr') // French => France`.
* @api * @api
*/ */
public static function getLanguageToCountryList() public function getLanguageToCountryList()
{ {
require __DIR__ . '/../Resources/LanguageToCountry.php'; if ($this->languageToCountryList === null) {
$this->languageToCountryList = require __DIR__ . '/../Resources/LanguageToCountry.php';
}
return $GLOBALS['Piwik_LanguageToCountry']; return $this->languageToCountryList;
} }
} }
...@@ -13,6 +13,8 @@ namespace Piwik\Intl\Data\Provider; ...@@ -13,6 +13,8 @@ namespace Piwik\Intl\Data\Provider;
*/ */
class RegionDataProvider class RegionDataProvider
{ {
private $continentList;
/** /**
* Returns the list of continent codes. * Returns the list of continent codes.
* *
...@@ -21,9 +23,11 @@ class RegionDataProvider ...@@ -21,9 +23,11 @@ class RegionDataProvider
*/ */
public function getContinentList() public function getContinentList()
{ {
require __DIR__ . '/../Resources/Countries.php'; if ($this->continentList === null) {
$this->continentList = require __DIR__ . '/../Resources/continents.php';
}
return $GLOBALS['Piwik_ContinentList']; return $this->continentList;
} }
/** /**
...@@ -33,7 +37,7 @@ class RegionDataProvider ...@@ -33,7 +37,7 @@ class RegionDataProvider
* @return string[] Array of 2 letter country ISO codes => 3 letter continent code * @return string[] Array of 2 letter country ISO codes => 3 letter continent code
* @api * @api
*/ */
public static function getCountryList($includeInternalCodes = false) public function getCountryList($includeInternalCodes = false)
{ {
require __DIR__ . '/../Resources/Countries.php'; require __DIR__ . '/../Resources/Countries.php';
......
...@@ -309,18 +309,3 @@ if (!isset($GLOBALS['Piwik_CountryList'])) { ...@@ -309,18 +309,3 @@ if (!isset($GLOBALS['Piwik_CountryList'])) {
'cat' => 'eur', 'cat' => 'eur',
); );
} }
if (!isset($GLOBALS['Piwik_ContinentList'])) {
// Primary reference: ISO 3166-1 alpha-2
$GLOBALS['Piwik_ContinentList'] = array(
'unk', // unknown
'amn', // North America
'amc', // Central America
'ams', // South America
'eur', // Europe
'afr', // Africa
'asi', // Asia
'oce', // Oceania
'ant', // Antarctica
);
}
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
* *
* @link http://piwik.org * @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
*/ */
/** /**
...@@ -17,47 +16,45 @@ ...@@ -17,47 +16,45 @@
* *
* If you want to add a new entry, please email us at hello at piwik.org * If you want to add a new entry, please email us at hello at piwik.org
*/ */
if (!isset($GLOBALS['Piwik_LanguageToCountry'])) { return array(
$GLOBALS['Piwik_LanguageToCountry'] = array( 'bg' => 'bg', // Bulgarian => Bulgaria
'bg' => 'bg', // Bulgarian => Bulgaria 'ca' => 'es', // Catalan => Spain
'ca' => 'es', // Catalan => Spain 'cs' => 'cz', // Czech => Czech Republic
'cs' => 'cz', // Czech => Czech Republic 'da' => 'dk', // Danish => Denmark
'da' => 'dk', // Danish => Denmark 'de' => 'de', // German => Germany
'de' => 'de', // German => Germany 'el' => 'gr', // Greek => Greece
'el' => 'gr', // Greek => Greece 'es' => 'es', // Spanish => Spain
'es' => 'es', // Spanish => Spain 'et' => 'ee', // Estonian => Estonia
'et' => 'ee', // Estonian => Estonia 'fa' => 'ir', // Farsi => Iran
'fa' => 'ir', // Farsi => Iran 'fi' => 'fi', // Finnish => Finland
'fi' => 'fi', // Finnish => Finland 'fr' => 'fr', // French => France
'fr' => 'fr', // French => France 'he' => 'il', // Hebrew => Israel
'he' => 'il', // Hebrew => Israel 'hr' => 'hr', // Croatian => Croatia
'hr' => 'hr', // Croatian => Croatia 'hu' => 'hu', // Hungarian => Hungary
'hu' => 'hu', // Hungarian => Hungary 'id' => 'id', // Indonesian => Indonesia
'id' => 'id', // Indonesian => Indonesia 'is' => 'is', // Icelandic => Iceland
'is' => 'is', // Icelandic => Iceland 'it' => 'it', // Italian => Italy
'it' => 'it', // Italian => Italy 'ja' => 'jp', // Japanese => Japan
'ja' => 'jp', // Japanese => Japan 'ko' => 'kr', // Korean => South Korea
'ko' => 'kr', // Korean => South Korea 'lt' => 'lt', // Lithuanian => Lithuania
'lt' => 'lt', // Lithuanian => Lithuania 'lv' => 'lv', // Latvian => Latvia
'lv' => 'lv', // Latvian => Latvia 'mk' => 'mk', // Macedonian => Macedonia
'mk' => 'mk', // Macedonian => Macedonia 'ms' => 'my', // Malay => Malaysia
'ms' => 'my', // Malay => Malaysia 'nb' => 'no', // Bokmål => Norway
'nb' => 'no', // Bokmål => Norway 'nl' => 'nl', // Dutch => Netherlands
'nl' => 'nl', // Dutch => Netherlands 'nn' => 'no', // Nynorsk => Norway
'nn' => 'no', // Nynorsk => Norway 'no' => 'no', // Norwegian => Norway
'no' => 'no', // Norwegian => Norway 'pl' => 'pl', // Polish => Poland
'pl' => 'pl', // Polish => Poland 'pt' => 'pt', // Portugese => Portugal
'pt' => 'pt', // Portugese => Portugal 'ro' => 'ro', // Romanian => Romania
'ro' => 'ro', // Romanian => Romania 'ru' => 'ru', // Russian => Russia
'ru' => 'ru', // Russian => Russia 'sk' => 'sk', // Slovak => Slovakia
'sk' => 'sk', // Slovak => Slovakia 'sl' => 'si', // Slovene => Slovenia
'sl' => 'si', // Slovene => Slovenia 'sq' => 'al', // Albanian => Albania
'sq' => 'al', // Albanian => Albania 'sr' => 'rs', // Serbian => Serbia
'sr' => 'rs', // Serbian => Serbia 'sv' => 'se', // Swedish => Sweden
'sv' => 'se', // Swedish => Sweden 'th' => 'th', // Thai => Thailand
'th' => 'th', // Thai => Thailand 'bo' => 'ti', // Tibetan => Tibet
'bo' => 'ti', // Tibetan => Tibet 'tr' => 'tr', // Turkish => Turkey
'tr' => 'tr', // Turkish => Turkey 'uk' => 'ua', // Ukrainian => Ukraine
'uk' => 'ua', // Ukrainian => Ukraine );
);
}
...@@ -4,200 +4,198 @@ ...@@ -4,200 +4,198 @@
* *
* @link http://piwik.org * @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
*/ */
/* /**
* Language database * Language database
*
* Reference: ISO 639-1 alpha-2
*/ */
if (!isset($GLOBALS['Piwik_LanguageList'])) { return array(
// Reference: ISO 639-1 alpha-2 'aa' => array('Afar'),
$GLOBALS['Piwik_LanguageList'] = array( 'ab' => array('Abkhazian'),
'aa' => array('Afar'), 'ae' => array('Avestan'),
'ab' => array('Abkhazian'), 'af' => array('Afrikaans'),
'ae' => array('Avestan'), 'ak' => array('Akan'),
'af' => array('Afrikaans'), 'am' => array('Amharic'),
'ak' => array('Akan'), 'an' => array('Aragonese'),
'am' => array('Amharic'), 'ar' => array('Arabic'),
'an' => array('Aragonese'), 'as' => array('Assamese'),
'ar' => array('Arabic'), 'av' => array('Avaric'),
'as' => array('Assamese'), 'ay' => array('Aymara'),
'av' => array('Avaric'), 'az' => array('Azerbaijani'),
'ay' => array('Aymara'), 'ba' => array('Bashkir'),
'az' => array('Azerbaijani'), 'be' => array('Belarusian'),
'ba' => array('Bashkir'), 'bg' => array('Bulgarian'),
'be' => array('Belarusian'), 'bh' => array('Bihari'), // 'Bihari languages'
'bg' => array('Bulgarian'), 'bi' => array('Bislama'),
'bh' => array('Bihari'), // 'Bihari languages' 'bm' => array('Bambara'),
'bi' => array('Bislama'), 'bn' => array('Bengali'),
'bm' => array('Bambara'), 'bo' => array('Tibetan'),
'bn' => array('Bengali'), 'br' => array('Breton'),
'bo' => array('Tibetan'), 'bs' => array('Bosnian'),
'br' => array('Breton'), 'ca' => array('Catalan', 'Valencian'),
'bs' => array('Bosnian'), 'ce' => array('Chechen'),
'ca' => array('Catalan', 'Valencian'), 'ch' => array('Chamorro'),
'ce' => array('Chechen'), 'co' => array('Corsican'),
'ch' => array('Chamorro'), 'cr' => array('Cree'),
'co' => array('Corsican'), 'cs' => array('Czech'),
'cr' => array('Cree'), 'cu' => array('Church Slavic', 'Old Slavonic', 'Church Slavonic', 'Old Bulgarian', 'Old Church Slavonic'),
'cs' => array('Czech'), 'cv' => array('Chuvash'),
'cu' => array('Church Slavic', 'Old Slavonic', 'Church Slavonic', 'Old Bulgarian', 'Old Church Slavonic'), 'cy' => array('Welsh'),
'cv' => array('Chuvash'), 'da' => array('Danish'),
'cy' => array('Welsh'), 'de' => array('German'),
'da' => array('Danish'), 'dv' => array('Divehi', 'Dhivehi', 'Maldivian'),
'de' => array('German'), 'dz' => array('Dzongkha'),
'dv' => array('Divehi', 'Dhivehi', 'Maldivian'), 'ee' => array('Ewe'),
'dz' => array('Dzongkha'), 'el' => array('Greek', 'Modern Greek', 'Hellenic'), // Greek, Modern (1453-)
'ee' => array('Ewe'), 'en' => array('English'),
'el' => array('Greek', 'Modern Greek', 'Hellenic'), // Greek, Modern (1453-) 'eo' => array('Esperanto'),
'en' => array('English'), 'es' => array('Spanish', 'Castilian'),
'eo' => array('Esperanto'), 'et' => array('Estonian'),
'es' => array('Spanish', 'Castilian'), 'eu' => array('Basque'),
'et' => array('Estonian'), 'fa' => array('Persian'),
'eu' => array('Basque'), 'ff' => array('Fulah'),
'fa' => array('Persian'), 'fi' => array('Finnish'),
'ff' => array('Fulah'), 'fj' => array('Fijian'),
'fi' => array('Finnish'), 'fo' => array('Faroese'),
'fj' => array('Fijian'), 'fr' => array('French'),
'fo' => array('Faroese'), 'fy' => array('Western Frisian'),
'fr' => array('French'), 'ga' => array('Irish'),
'fy' => array('Western Frisian'), 'gd' => array('Gaelic', 'Scottish Gaelic'),
'ga' => array('Irish'), 'gl' => array('Galician'),
'gd' => array('Gaelic', 'Scottish Gaelic'), 'gn' => array('Guarani'),
'gl' => array('Galician'), 'gu' => array('Gujarati'),
'gn' => array('Guarani'), 'gv' => array('Manx'),
'gu' => array('Gujarati'), 'ha' => array('Hausa'),
'gv' => array('Manx'), 'he' => array('Hebrew'),
'ha' => array('Hausa'), 'hi' => array('Hindi'),
'he' => array('Hebrew'), 'ho' => array('Hiri Motu'),
'hi' => array('Hindi'), 'hr' => array('Croatian'),
'ho' => array('Hiri Motu'), 'ht' => array('Haitian', 'Haitian Creole'),
'hr' => array('Croatian'), 'hu' => array('Hungarian'),
'ht' => array('Haitian', 'Haitian Creole'), 'hy' => array('Armenian'),
'hu' => array('Hungarian'), 'hz' => array('Herero'),
'hy' => array('Armenian'), 'ia' => array('Interlingua'), // 'Interlingua (International Auxiliary Language Association)'
'hz' => array('Herero'), 'id' => array('Indonesian'),
'ia' => array('Interlingua'), // 'Interlingua (International Auxiliary Language Association)' 'ie' => array('Interlingue', 'Occidental'),
'id' => array('Indonesian'), 'ig' => array('Igbo'),
'ie' => array('Interlingue', 'Occidental'), 'ii' => array('Sichuan Yi', 'Nuosu'),
'ig' => array('Igbo'), 'ik' => array('Inupiaq'),
'ii' => array('Sichuan Yi', 'Nuosu'), 'io' => array('Ido'),
'ik' => array('Inupiaq'), 'is' => array('Icelandic'),
'io' => array('Ido'), 'it' => array('Italian'),
'is' => array('Icelandic'), 'iu' => array('Inuktitut'),
'it' => array('Italian'), 'ja' => array('Japanese'),
'iu' => array('Inuktitut'), 'jv' => array('Javanese'),
'ja' => array('Japanese'), 'ka' => array('Georgian'),
'jv' => array('Javanese'), 'kg' => array('Kongo'),
'ka' => array('Georgian'), 'ki' => array('Kikuyu', 'Gikuyu'),
'kg' => array('Kongo'), 'kj' => array('Kuanyama', 'Kwanyama'),
'ki' => array('Kikuyu', 'Gikuyu'), 'kk' => array('Kazakh'),
'kj' => array('Kuanyama', 'Kwanyama'), 'kl' => array('Kalaallisut', 'Greenlandic'),
'kk' => array('Kazakh'), 'km' => array('Central Khmer'),
'kl' => array('Kalaallisut', 'Greenlandic'), 'kn' => array('Kannada'),
'km' => array('Central Khmer'), 'ko' => array('Korean'),
'kn' => array('Kannada'), 'kr' => array('Kanuri'),
'ko' => array('Korean'), 'ks' => array('Kashmiri'),
'kr' => array('Kanuri'), 'ku' => array('Kurdish'),
'ks' => array('Kashmiri'), 'kv' => array('Komi'),
'ku' => array('Kurdish'), 'kw' => array('Cornish'),
'kv' => array('Komi'), 'ky' => array('Kirghiz', 'Kyrgyz'),
'kw' => array('Cornish'), 'la' => array('Latin'),
'ky' => array('Kirghiz', 'Kyrgyz'), 'lb' => array('Luxembourgish', 'Letzeburgesch'),
'la' => array('Latin'), 'lg' => array('Ganda'),
'lb' => array('Luxembourgish', 'Letzeburgesch'), 'li' => array('Limburgan', 'Limburger', 'Limburgish'),
'lg' => array('Ganda'), 'ln' => array('Lingala'),
'li' => array('Limburgan', 'Limburger', 'Limburgish'), 'lo' => array('Lao'),
'ln' => array('Lingala'), 'lt' => array('Lithuanian'),
'lo' => array('Lao'), 'lu' => array('Luba-Katanga'),
'lt' => array('Lithuanian'), 'lv' => array('Latvian'),
'lu' => array('Luba-Katanga'), 'mg' => array('Malagasy'),
'lv' => array('Latvian'), 'mh' => array('Marshallese'),
'mg' => array('Malagasy'), 'mi' => array('Maori'),
'mh' => array('Marshallese'), 'mk' => array('Macedonian'),
'mi' => array('Maori'), 'ml' => array('Malayalam'),
'mk' => array('Macedonian'), 'mn' => array('Mongolian'),
'ml' => array('Malayalam'), // 'mo' => array('Moldavian'), // deprecated
'mn' => array('Mongolian'), 'mr' => array('Marathi'),
// 'mo' => array('Moldavian'), // deprecated 'ms' => array('Malay'),
'mr' => array('Marathi'), 'mt' => array('Maltese'),
'ms' => array('Malay'), 'my' => array('Burmese'),
'mt' => array('Maltese'), 'na' => array('Nauru'),
'my' => array('Burmese'), 'nb' => array('Norwegian Bokmål'),
'na' => array('Nauru'), 'nd' => array('North Ndebele'),
'nb' => array('Norwegian Bokmål'), 'ne' => array('Nepali'),
'nd' => array('North Ndebele'), 'ng' => array('Ndonga'),
'ne' => array('Nepali'), 'nl' => array('Dutch', 'Flemish'),
'ng' => array('Ndonga'), 'nn' => array('Norwegian Nynorsk'),
'nl' => array('Dutch', 'Flemish'), 'no' => array('Norwegian'),
'nn' => array('Norwegian Nynorsk'), 'nr' => array('South Ndebele'),
'no' => array('Norwegian'), 'nv' => array('Navajo', 'Navaho'),
'nr' => array('South Ndebele'), 'ny' => array('Chichewa', 'Chewa', 'Nyanja'),
'nv' => array('Navajo', 'Navaho'), 'oc' => array('Occitan', 'Provençal'), // Occitan (post 1500)
'ny' => array('Chichewa', 'Chewa', 'Nyanja'), 'oj' => array('Ojibwa'),
'oc' => array('Occitan', 'Provençal'), // Occitan (post 1500) 'om' => array('Oromo'),
'oj' => array('Ojibwa'), 'or' => array('Oriya'),
'om' => array('Oromo'), 'os' => array('Ossetian', 'Ossetic'),
'or' => array('Oriya'), 'pa' => array('Panjabi', 'Punjabi'),
'os' => array('Ossetian', 'Ossetic'), 'pi' => array('Pali'),
'pa' => array('Panjabi', 'Punjabi'), 'pl' => array('Polish'),
'pi' => array('Pali'), 'ps' => array('Pushto', 'Pashto'),
'pl' => array('Polish'), 'pt' => array('Portuguese'),
'ps' => array('Pushto', 'Pashto'), 'qu' => array('Quechua'),
'pt' => array('Portuguese'), 'rm' => array('Romansh'),
'qu' => array('Quechua'), 'rn' => array('Rundi'),
'rm' => array('Romansh'), 'ro' => array('Romanian', 'Moldavian', 'Moldovan'),
'rn' => array('Rundi'), 'ru' => array('Russian'),
'ro' => array('Romanian', 'Moldavian', 'Moldovan'), 'rw' => array('Kinyarwanda'),
'ru' => array('Russian'), 'sa' => array('Sanskrit'),
'rw' => array('Kinyarwanda'), 'sc' => array('Sardinian'),
'sa' => array('Sanskrit'), 'sd' => array('Sindhi'),
'sc' => array('Sardinian'), 'se' => array('Northern Sami'),
'sd' => array('Sindhi'), 'sg' => array('Sango'),
'se' => array('Northern Sami'), // 'sh' => array('Serbo-Croatian'), // deprecated
'sg' => array('Sango'), 'si' => array('Sinhala', 'Sinhalese'),
// 'sh' => array('Serbo-Croatian'), // deprecated 'sk' => array('Slovak'),
'si' => array('Sinhala', 'Sinhalese'), 'sl' => array('Slovenian'),
'sk' => array('Slovak'), 'sm' => array('Samoan'),
'sl' => array('Slovenian'), 'sn' => array('Shona'),
'sm' => array('Samoan'), 'so' => array('Somali'),
'sn' => array('Shona'), 'sq' => array('Albanian'),
'so' => array('Somali'), 'sr' => array('Serbian'),
'sq' => array('Albanian'), 'ss' => array('Swati'),
'sr' => array('Serbian'), 'st' => array('Southern Soth'),
'ss' => array('Swati'), 'su' => array('Sundanese'),
'st' => array('Southern Soth'), 'sv' => array('Swedish'),
'su' => array('Sundanese'), 'sw' => array('Swahili'),
'sv' => array('Swedish'), 'ta' => array('Tamil'),
'sw' => array('Swahili'), 'te' => array('Telugu'),
'ta' => array('Tamil'), 'tg' => array('Tajik'),
'te' => array('Telugu'), 'th' => array('Thai'),
'tg' => array('Tajik'), 'ti' => array('Tigrinya'),
'th' => array('Thai'), 'tk' => array('Turkmen'),
'ti' => array('Tigrinya'), 'tl' => array('Tagalog'),
'tk' => array('Turkmen'), 'tn' => array('Tswana'),
'tl' => array('Tagalog'), 'to' => array('Tonga'), // Tonga (Tonga Islands)
'tn' => array('Tswana'), 'tr' => array('Turkish'),
'to' => array('Tonga'), // Tonga (Tonga Islands) 'ts' => array('Tsonga'),
'tr' => array('Turkish'), 'tt' => array('Tatar'),
'ts' => array('Tsonga'), 'tw' => array('Twi'),
'tt' => array('Tatar'), 'ty' => array('Tahitian'),
'tw' => array('Twi'), 'ug' => array('Uighur', 'Uyghur'),
'ty' => array('Tahitian'), 'uk' => array('Ukrainian'),
'ug' => array('Uighur', 'Uyghur'), 'ur' => array('Urdu'),
'uk' => array('Ukrainian'), 'uz' => array('Uzbek'),
'ur' => array('Urdu'), 've' => array('Venda'),
'uz' => array('Uzbek'), 'vi' => array('Vietnamese'),
've' => array('Venda'), 'vo' => array('Volapük'),
'vi' => array('Vietnamese'), 'wa' => array('Walloon'),
'vo' => array('Volapük'), 'wo' => array('Wolof'),
'wa' => array('Walloon'), 'xh' => array('Xhosa'),
'wo' => array('Wolof'), 'yi' => array('Yiddish'),
'xh' => array('Xhosa'), 'yo' => array('Yoruba'),
'yi' => array('Yiddish'), 'za' => array('Zhuang', 'Chuang'),
'yo' => array('Yoruba'), 'zh' => array('Chinese'),
'za' => array('Zhuang', 'Chuang'), 'zu' => array('Zulu'),
'zh' => array('Chinese'), );
'zu' => array('Zulu'),
);
}
<?php
/**
* Piwik - free/libre analytics platform
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
/**
* Continent database.
*
* Primary reference: ISO 3166-1 alpha-2
*/
return array(
'unk', // unknown
'amn', // North America
'amc', // Central America
'ams', // South America
'eur', // Europe
'afr', // Africa
'asi', // Asia
'oce', // Oceania
'ant', // Antarctica
);
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter