Region and language data files do not use $GLOBALS anymore

6 files changed, 277 insertions, 262 deletions

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