From 3cb7169cef259efe922912364c3c8479a986619c Mon Sep 17 00:00:00 2001 From: Stefan Giehl Date: Tue, 12 Sep 2017 23:20:38 +0200 Subject: [PATCH] Show Tibet as part of China on map (#11930) * Revert "free tibet!" This reverts commit 4e47c8aba3bf146292f6e9d38aa0151c383e6c33. * Remove unneeded translations * adjust API * fix tests * update screenshots * update tests files * update screenshot * Do not change detected location * update tests * Fix continent detection for old records * submodule update * update screenshots * Cleanup * use group by filters only if needed * make filter work for datatable maps --- core/Common.php | 4 ++ core/Intl/Data/Resources/countries.php | 1 - .../Data/Resources/languages-to-countries.php | 2 +- .../MobileMessaging/CountryCallingCodes.php | 1 - plugins/Morpheus/icons | 2 +- plugins/UserCountry/API.php | 41 ++++++++++++++ .../UserCountry/LocationProvider/GeoIp.php | 22 ++------ plugins/UserCountry/functions.php | 8 +++ plugins/UserCountry/lang/cs.json | 5 -- plugins/UserCountry/lang/da.json | 4 -- plugins/UserCountry/lang/de.json | 4 -- plugins/UserCountry/lang/el.json | 4 -- plugins/UserCountry/lang/en.json | 4 -- plugins/UserCountry/lang/es.json | 4 -- plugins/UserCountry/lang/et.json | 4 -- plugins/UserCountry/lang/fi.json | 1 - plugins/UserCountry/lang/fr.json | 4 -- plugins/UserCountry/lang/gl.json | 1 - plugins/UserCountry/lang/hi.json | 1 - plugins/UserCountry/lang/id.json | 4 -- plugins/UserCountry/lang/it.json | 4 -- plugins/UserCountry/lang/ja.json | 4 -- plugins/UserCountry/lang/ko.json | 4 -- plugins/UserCountry/lang/nl.json | 4 -- plugins/UserCountry/lang/pl.json | 4 -- plugins/UserCountry/lang/pt-br.json | 4 -- plugins/UserCountry/lang/sq.json | 4 -- plugins/UserCountry/lang/sr.json | 4 -- plugins/UserCountry/lang/sv.json | 4 -- plugins/UserCountry/lang/uk.json | 4 -- plugins/UserCountry/lang/zh-cn.json | 4 -- plugins/UserCountry/lang/zh-tw.json | 4 -- ...ithSomeData__UserCountry.getCity_month.xml | 14 ++--- ...SomeData__UserCountry.getCountry_month.xml | 51 ++++------------- ...hSomeData__UserCountry.getRegion_month.xml | 14 ++--- ...st___UserCountry.getCountryCodeMapping.xml | 1 - .../UserCountryMap/javascripts/visitor-map.js | 4 +- plugins/UserCountryMap/svg/AS.svg | 3 +- plugins/UserCountryMap/svg/BGD.svg | 3 +- plugins/UserCountryMap/svg/CHN.svg | 3 +- plugins/UserCountryMap/svg/IND.svg | 3 +- plugins/UserCountryMap/svg/MMR.svg | 3 +- plugins/UserCountryMap/svg/NPL.svg | 3 +- plugins/UserCountryMap/svg/PAK.svg | 3 +- plugins/UserCountryMap/svg/TIB.svg | 1 - plugins/UserCountryMap/svg/world.svg | 2 +- ...ITest__Live.getLastVisitsDetails_range.xml | 24 ++++---- ...Code__API.getSuggestedValuesForSegment.xml | 2 +- ...Code__API.getSuggestedValuesForSegment.xml | 2 +- ...WebsiteTest__UserCountry.getCity_month.xml | 14 ++--- ...siteTest__UserCountry.getCountry_month.xml | 56 +++++++++---------- ...bsiteTest__UserCountry.getRegion_month.xml | 14 ++--- .../DashboardManager_create_new.png | 4 +- .../expected-screenshots/Dashboard_reset.png | 4 +- .../EvolutionGraph_bounce_rate.png | 4 +- .../EvolutionGraph_initial.png | 4 +- .../UIIntegrationTest_dashboard3.png | 4 +- ...UIIntegrationTest_segmented_visitorlog.png | 4 +- ...IIntegrationTest_visitor_profile_popup.png | 4 +- ...rationTest_visitors_locations_provider.png | 4 +- ...IIntegrationTest_visitors_realtime_map.png | 4 +- 61 files changed, 178 insertions(+), 247 deletions(-) delete mode 100644 plugins/UserCountryMap/svg/TIB.svg diff --git a/core/Common.php b/core/Common.php index 1616e565052..f884d9fe2f8 100644 --- a/core/Common.php +++ b/core/Common.php @@ -1026,6 +1026,10 @@ public static function getContinent($country) $countryList = $dataProvider->getCountryList(); + if ($country == 'ti') { + $country = 'cn'; + } + return isset($countryList[$country]) ? $countryList[$country] : 'unk'; } diff --git a/core/Intl/Data/Resources/countries.php b/core/Intl/Data/Resources/countries.php index 90485095252..e000900296c 100644 --- a/core/Intl/Data/Resources/countries.php +++ b/core/Intl/Data/Resources/countries.php @@ -237,7 +237,6 @@ 'tf' => 'ant', 'tg' => 'afr', 'th' => 'asi', - 'ti' => 'asi', // Tibet (no iso 3166 code) 'tj' => 'asi', 'tk' => 'oce', 'tl' => 'asi', diff --git a/core/Intl/Data/Resources/languages-to-countries.php b/core/Intl/Data/Resources/languages-to-countries.php index 91ab0940c5e..5e50cd4ea32 100644 --- a/core/Intl/Data/Resources/languages-to-countries.php +++ b/core/Intl/Data/Resources/languages-to-countries.php @@ -54,7 +54,7 @@ 'sr' => 'rs', // Serbian => Serbia 'sv' => 'se', // Swedish => Sweden 'th' => 'th', // Thai => Thailand - 'bo' => 'ti', // Tibetan => Tibet + 'bo' => 'cn', // Tibetan => China 'tr' => 'tr', // Turkish => Turkey 'uk' => 'ua', // Ukrainian => Ukraine ); diff --git a/plugins/MobileMessaging/CountryCallingCodes.php b/plugins/MobileMessaging/CountryCallingCodes.php index 004e8e57722..0c45202d189 100644 --- a/plugins/MobileMessaging/CountryCallingCodes.php +++ b/plugins/MobileMessaging/CountryCallingCodes.php @@ -234,7 +234,6 @@ class CountryCallingCodes // 'tf' => 'MISSING CODE', 'tg' => '228', 'th' => '66', -// 'ti' => 'MISSING CODE', 'tj' => '992', 'tk' => '690', 'tl' => '670', diff --git a/plugins/Morpheus/icons b/plugins/Morpheus/icons index 0c4e30d95c1..3d383b91347 160000 --- a/plugins/Morpheus/icons +++ b/plugins/Morpheus/icons @@ -1 +1 @@ -Subproject commit 0c4e30d95c1a36bf540df5e5d67a3161053c4909 +Subproject commit 3d383b913471fae94ca30a5f413454c944e16579 diff --git a/plugins/UserCountry/API.php b/plugins/UserCountry/API.php index c4e12b550aa..af644f04e60 100644 --- a/plugins/UserCountry/API.php +++ b/plugins/UserCountry/API.php @@ -32,6 +32,26 @@ public function getCountry($idSite, $period, $date, $segment = false) { $dataTable = $this->getDataTable(Archiver::COUNTRY_RECORD_NAME, $idSite, $period, $date, $segment); + $dataTables = [$dataTable]; + + if ($dataTable instanceof DataTable\Map) { + $dataTables = $dataTable->getDataTables(); + } + + foreach ($dataTables as $dt) { + if ($dt->getRowFromLabel('ti')) { + $dt->filter('GroupBy', array( + 'label', + function ($label) { + if ($label == 'ti') { + return 'cn'; + } + return $label; + } + )); + } + } + // apply filter on the whole datatable in order the inline search to work (searches are done on "beautiful" label) $dataTable->filter('AddSegmentValue'); $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'code')); @@ -75,6 +95,27 @@ public function getRegion($idSite, $period, $date, $segment = false) $separator = Archiver::LOCATION_SEPARATOR; $unk = Visit::UNKNOWN_CODE; + // show visits tracked as Tibet as region of China + $dataTables = [$dataTable]; + + if ($dataTable instanceof DataTable\Map) { + $dataTables = $dataTable->getDataTables(); + } + + foreach ($dataTables as $dt) { + if ($dt->getRowFromLabel('1|ti')) { + $dt->filter('GroupBy', array( + 'label', + function ($label) { + if ($label == '1|ti') { + return 'cn'; + } + return $label; + } + )); + } + } + // split the label and put the elements into the 'region' and 'country' metadata fields $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'region', __NAMESPACE__ . '\getElementFromStringArray', array($separator, 0, $unk))); diff --git a/plugins/UserCountry/LocationProvider/GeoIp.php b/plugins/UserCountry/LocationProvider/GeoIp.php index b37c3df3c85..247ae6035a8 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp.php +++ b/plugins/UserCountry/LocationProvider/GeoIp.php @@ -54,7 +54,6 @@ abstract class GeoIp extends LocationProvider */ public function completeLocationResult(&$location) { - $this->fixupLocation($location); parent::completeLocationResult($location); // set region name if region code is set @@ -68,21 +67,6 @@ public function completeLocationResult(&$location) } } - /** - * Fix up data to work with our SVG maps which include 'Tib' boundaries - */ - protected function fixupLocation(&$location) - { - if (!empty($location[self::REGION_CODE_KEY]) - && $location[self::REGION_CODE_KEY] == '14' - && !empty($location[self::COUNTRY_CODE_KEY]) - && strtoupper($location[self::COUNTRY_CODE_KEY]) == 'CN' - ) { - $location[self::COUNTRY_CODE_KEY] = 'ti'; - $location[self::REGION_CODE_KEY] = '1'; - } - } - /** * Returns true if this provider has been setup correctly, the error message if * otherwise. @@ -155,6 +139,12 @@ public static function getRegionNameFromCodes($countryCode, $regionCode) $countryCode = strtoupper($countryCode); $regionCode = strtoupper($regionCode); + // ensure tibet is shown as region of china + if ($countryCode == 'TI' && $regionCode == '1') { + $regionCode = '14'; + $countryCode = 'CN'; + } + if (isset($regionNames[$countryCode][$regionCode])) { return $regionNames[$countryCode][$regionCode]; } else { diff --git a/plugins/UserCountry/functions.php b/plugins/UserCountry/functions.php index 008e4786a59..afab2570683 100644 --- a/plugins/UserCountry/functions.php +++ b/plugins/UserCountry/functions.php @@ -22,6 +22,10 @@ */ function getFlagFromCode($code) { + if (strtolower($code) == 'ti') { + $code = 'cn'; + } + $pathInPiwik = 'plugins/Morpheus/icons/dist/flags/%s.png'; $pathWithCode = sprintf($pathInPiwik, $code); $absolutePath = PIWIK_INCLUDE_PATH . '/' . $pathWithCode; @@ -57,6 +61,10 @@ function countryTranslate($label) return Piwik::translate('General_Unknown'); } + if (strtolower($label) == 'ti') { + $label = 'cn'; + } + // Try to get name from Intl plugin $key = 'Intl_Country_' . strtoupper($label); $country = Piwik::translate($key); diff --git a/plugins/UserCountry/lang/cs.json b/plugins/UserCountry/lang/cs.json index 6b493e14d03..89e9ce80b1e 100644 --- a/plugins/UserCountry/lang/cs.json +++ b/plugins/UserCountry/lang/cs.json @@ -16,7 +16,6 @@ "country_a2": "Satelitní poskytovatel", "country_cat": "Katalánsky mluvící země", "country_o1": "ostatní země", - "country_ti": "Tibet", "CurrentLocationIntro": "Podle tohoto poskytovatele je vaše aktuální umístění", "DefaultLocationProviderDesc1": "Výchozí poskytovatel umístění odhaduje zemi návštěvníka na základě použitého jazyka.", "DefaultLocationProviderDesc2": "To není příliš přesné, proto doporučujeme %1$sinstalovat a používat %2$sGEOIP%3$s.%4$s", @@ -94,8 +93,4 @@ "UpdaterWasLastRun": "Aktualizátor byl naposledy spuštěn v %s.", "UpdaterWillRunNext": "Další spuštění je naplánováno na %s.", "WidgetLocation": "Umístění návštěvníka" - }, - "Intl": { - "Country_TI": "Tibet" - } } \ No newline at end of file diff --git a/plugins/UserCountry/lang/da.json b/plugins/UserCountry/lang/da.json index a6bffe4c110..0eeed967162 100644 --- a/plugins/UserCountry/lang/da.json +++ b/plugins/UserCountry/lang/da.json @@ -16,7 +16,6 @@ "country_a2": "Satellit udbyder", "country_cat": "Catalansk-talende samfund", "country_o1": "Andet land", - "country_ti": "Tibet", "CurrentLocationIntro": "I følge denne tjeneste er din aktuelle lokation", "DefaultLocationProviderDesc1": "Standardlokationstjenesten gætter en besøgendes land baseret på det sprog de bruger.", "DefaultLocationProviderDesc2": "Dette er ikke særlig nøjagtigt, så %1$svi anbefaler at du installerer og bruger %2$sGeoIP%3$s.%4$s", @@ -94,8 +93,5 @@ "UpdaterWasLastRun": "Opdateringen blev sidst blev kørt den %s.", "UpdaterWillRunNext": "Næste planlagte kørsel %s.", "WidgetLocation": "Besøgendes lokation" - }, - "Intl": { - "Country_TI": "Tibet" } } \ No newline at end of file diff --git a/plugins/UserCountry/lang/de.json b/plugins/UserCountry/lang/de.json index 4baaec45345..61aed3dd6d0 100644 --- a/plugins/UserCountry/lang/de.json +++ b/plugins/UserCountry/lang/de.json @@ -16,7 +16,6 @@ "country_a2": "Satelliten-Anbieter", "country_cat": "Katalanisch sprechende Gemeinden", "country_o1": "Anderes Land", - "country_ti": "Tibet", "CurrentLocationIntro": "Gemäß diesem Provider ist Ihr derzeitiger Standort", "DefaultLocationProviderDesc1": "Die voreingestellte Standorterkennung versucht das Herkunftsland des Besuchers anhand dessen verwendeter Sprache zu erkennen.", "DefaultLocationProviderDesc2": "Dies ist nicht sehr genau, daher %1$swird empfohlen %2$sGeoIP%3$s zu installieren und zu nutzen.%4$s", @@ -94,8 +93,5 @@ "UpdaterWasLastRun": "Die Aktualisierung wurde zuletzt ausgeführt am %s.", "UpdaterWillRunNext": "Nächste Ausführung geplant für %s.", "WidgetLocation": "Besucherstandort" - }, - "Intl": { - "Country_TI": "Tibet" } } \ No newline at end of file diff --git a/plugins/UserCountry/lang/el.json b/plugins/UserCountry/lang/el.json index ae15673e31e..2477f6fd0c7 100644 --- a/plugins/UserCountry/lang/el.json +++ b/plugins/UserCountry/lang/el.json @@ -16,7 +16,6 @@ "country_a2": "Πάροχος δορυφόρου", "country_cat": "Καταλανικόφωνες κοινότητες", "country_o1": "Άλλη Χώρα", - "country_ti": "Θιβέτ", "CurrentLocationIntro": "Σύμφωνα με τον πάροχο, η τρέχουσα τοποθεσία σας είναι", "DefaultLocationProviderDesc1": "Ο προεπιλεγμένος πάροχος θέσης εικάζει τη χώρα του επισκέπτη με βάση τη γλώσσα που χρησιμοποιεί.", "DefaultLocationProviderDesc2": "Αυτό δεν είναι πολύ ακριβές, έτσι %1$sπροτείνουμε την εγκατάσταση και τη χρήση %2$sGeoIP%3$s.%4$s", @@ -94,8 +93,5 @@ "UpdaterWasLastRun": "Το πρόγραμμα ενημέρωσης εκτελέστηκε τελευταία στις %s.", "UpdaterWillRunNext": "Είναι προγραμματισμένο για εκτέλεση στις %s.", "WidgetLocation": "Τοποθεσία Επισκέπτη" - }, - "Intl": { - "Country_TI": "Θιβέτ" } } \ No newline at end of file diff --git a/plugins/UserCountry/lang/en.json b/plugins/UserCountry/lang/en.json index 1b470f2a133..80eafa2349a 100644 --- a/plugins/UserCountry/lang/en.json +++ b/plugins/UserCountry/lang/en.json @@ -16,7 +16,6 @@ "country_a2": "Satellite Provider", "country_cat": "Catalan-speaking communities", "country_o1": "Other Country", - "country_ti": "Tibet", "CurrentLocationIntro": "According to this provider, your current location is", "DefaultLocationProviderDesc1": "The default location provider guesses a visitor's country based on the language they use.", "DefaultLocationProviderDesc2": "This is not very accurate, so %1$swe recommend installing and using %2$sGeoIP%3$s.%4$s", @@ -94,8 +93,5 @@ "UpdaterWasLastRun": "The updater was last run on %s.", "UpdaterWillRunNext": "It is next scheduled to run on %s.", "WidgetLocation": "Visitor Location" - }, - "Intl": { - "Country_TI": "Tibet" } } \ No newline at end of file diff --git a/plugins/UserCountry/lang/es.json b/plugins/UserCountry/lang/es.json index 1d1855be8fd..b292350f34a 100644 --- a/plugins/UserCountry/lang/es.json +++ b/plugins/UserCountry/lang/es.json @@ -16,7 +16,6 @@ "country_a2": "Proveedor Satelital", "country_cat": "Comunidades de habla catalana", "country_o1": "Otro país", - "country_ti": "Tibet", "CurrentLocationIntro": "De acuerdo a este proveedor, su actual ubicación es", "DefaultLocationProviderDesc1": "La ubicación predeterminada del proveedor asume que el país del visitante es por el lenguaje que el mismo utiliza.", "DefaultLocationProviderDesc2": "No es muy preciso, por lo tanto %1$srecomendamos instalar y utilizar %2$sGeoIP%3$s.%4$s", @@ -94,8 +93,5 @@ "UpdaterWasLastRun": "El actualizador se ejecutó por última vez en %s.", "UpdaterWillRunNext": "Está programada la ejecución para el %s.", "WidgetLocation": "Ubicación del visitante" - }, - "Intl": { - "Country_TI": "Tíbet" } } \ No newline at end of file diff --git a/plugins/UserCountry/lang/et.json b/plugins/UserCountry/lang/et.json index cd8592b7f21..362ed4a6355 100644 --- a/plugins/UserCountry/lang/et.json +++ b/plugins/UserCountry/lang/et.json @@ -8,7 +8,6 @@ "country_a2": "Satelliidi pakkuja", "country_cat": "Katalaani kommuunid", "country_o1": "Muu riik", - "country_ti": "Tiibet", "CurrentLocationIntro": "Antud pakkuja andmete alusel on sinu praegune asukoht", "DistinctCountries": "%s eri riigist", "DownloadingDb": "Laen alla %s", @@ -31,8 +30,5 @@ "SubmenuLocations": "Asukohad", "UpdaterWasLastRun": "Uuendaja käivitus viimati %s.", "WidgetLocation": "Külastajate asukohad" - }, - "Intl": { - "Country_TI": "Tiibet" } } \ No newline at end of file diff --git a/plugins/UserCountry/lang/fi.json b/plugins/UserCountry/lang/fi.json index 1cb6e70cb27..98ea0c05186 100644 --- a/plugins/UserCountry/lang/fi.json +++ b/plugins/UserCountry/lang/fi.json @@ -16,7 +16,6 @@ "country_a2": "Satelliittiyhteys", "country_cat": "Katalaania puhuvat alueet", "country_o1": "Muu maa", - "country_ti": "Tiibet", "CurrentLocationIntro": "Tämän toteutuksen mukaan nykyinen sijaintisi on", "DefaultLocationProviderDesc1": "Oletustoteutus arvaa käyttäjien maan kielen perusteella.", "DefaultLocationProviderDesc2": "Tämä ei ole erityisen tarkkaa, joten %1$ssuosittelemme asentamaan ja käyttämään %2$sGeoIp:tä%3$s.%4$s", diff --git a/plugins/UserCountry/lang/fr.json b/plugins/UserCountry/lang/fr.json index 2298c5b26cb..7a2f1c545c3 100644 --- a/plugins/UserCountry/lang/fr.json +++ b/plugins/UserCountry/lang/fr.json @@ -16,7 +16,6 @@ "country_a2": "Fournisseur satellite", "country_cat": "Communautés de langue Catalane", "country_o1": "Autre pays", - "country_ti": "Tibet", "CurrentLocationIntro": "D'après ce fournisseur, votre emplacement actuel est", "DefaultLocationProviderDesc1": "Le fournisseur de localisation par défaut devine le pays d'un visiteur en se basant sur le langage de son navigateur.", "DefaultLocationProviderDesc2": "Ce n'est pas très précis, nous recommandons donc %1$sd'installer et d'utiliser %2$sGeoIP%3$s.%4$s", @@ -94,8 +93,5 @@ "UpdaterWasLastRun": "La dernière mise à jour a été effectuée le %s.", "UpdaterWillRunNext": "Est planifié pour s'exécuter le %s.", "WidgetLocation": "Emplacement du visiteur" - }, - "Intl": { - "Country_TI": "Tibet" } } \ No newline at end of file diff --git a/plugins/UserCountry/lang/gl.json b/plugins/UserCountry/lang/gl.json index ddff4606a2a..6f61031de1d 100644 --- a/plugins/UserCountry/lang/gl.json +++ b/plugins/UserCountry/lang/gl.json @@ -3,7 +3,6 @@ "Continent": "Continente", "Country": "País", "country_o1": "Outro país", - "country_ti": "Tíbet", "DistinctCountries": "%s continentes distintos", "DownloadingDb": "A descargar %s", "DownloadNewDatabasesEvery": "Actualizar as bases de datos cada", diff --git a/plugins/UserCountry/lang/hi.json b/plugins/UserCountry/lang/hi.json index aab14d968cf..bfd8b7fc9a6 100644 --- a/plugins/UserCountry/lang/hi.json +++ b/plugins/UserCountry/lang/hi.json @@ -15,7 +15,6 @@ "country_a2": "सैटेलाइट प्रदाता", "country_cat": "कैटलन भाषी समुदायों", "country_o1": "अन्य देश", - "country_ti": "तिब्बत", "CurrentLocationIntro": "इस प्रदाता के अनुसार, आपका वर्तमान स्थान है", "DefaultLocationProviderDesc1": "एक आगंतुक का देश डिफ़ॉल्ट स्थान प्रदाता के अनुमान का इस्तेमाल वे भाषा के आधार पर करते है.", "DefaultLocationProviderDesc2": "यह बहुत सही नहीं है, तो %1$sहम स्थापित करने और %2$sGeoIP%3$s का उपयोग करना चाहिये.%4$s", diff --git a/plugins/UserCountry/lang/id.json b/plugins/UserCountry/lang/id.json index 4a48d4c1334..dd015b1c103 100644 --- a/plugins/UserCountry/lang/id.json +++ b/plugins/UserCountry/lang/id.json @@ -16,7 +16,6 @@ "country_a2": "Penyedia Satelit", "country_cat": "Masyarakat berbahasa Katalan", "country_o1": "Negara Lain", - "country_ti": "Tibet", "CurrentLocationIntro": "Berdasar penyedia ini, lokasi Anda adalah", "DefaultLocationProviderDesc1": "Lokasi penyedia asali menebak negara pengunjung dari bahasa yang digunakan.", "DefaultLocationProviderDesc2": "Ini sangat tidak teliti, serta %1$skami menyarankan memasang dan menggunakan %2$sGeoIP%3$s.%4$s", @@ -87,8 +86,5 @@ "UpdaterHasNotBeenRun": "Pembaruan belum pernah berjalan.", "UpdaterWasLastRun": "Pembaruan terakhir berjalan dalam %s.", "WidgetLocation": "Lokasi Pengunjung" - }, - "Intl": { - "Country_TI": "Tibet" } } \ No newline at end of file diff --git a/plugins/UserCountry/lang/it.json b/plugins/UserCountry/lang/it.json index 50c957751b0..d0355e339be 100644 --- a/plugins/UserCountry/lang/it.json +++ b/plugins/UserCountry/lang/it.json @@ -16,7 +16,6 @@ "country_a2": "Satellite Provider", "country_cat": "Comunità che parlano catalano", "country_o1": "Altri Paesi", - "country_ti": "Tibet", "CurrentLocationIntro": "In base a questo provider, la tua posizione attuale è", "DefaultLocationProviderDesc1": "L'individuatore di posizione predefinito desume il paese di un visitatore dalla lingua utilizzata.", "DefaultLocationProviderDesc2": "Quasta non è molto accurata, dunque %1$snoi raccomandiamo di installare e utilizzare %2$sGeoIP%3$s.%4$s", @@ -94,8 +93,5 @@ "UpdaterWasLastRun": "Il programma di aggiornamento è stato eseguito per l'ultima volta il %s.", "UpdaterWillRunNext": "È programmato per essere eseguito il %s.", "WidgetLocation": "Posizione Visitatore" - }, - "Intl": { - "Country_TI": "Tibet" } } \ No newline at end of file diff --git a/plugins/UserCountry/lang/ja.json b/plugins/UserCountry/lang/ja.json index 59c12b4aa4d..e2bbbc35734 100644 --- a/plugins/UserCountry/lang/ja.json +++ b/plugins/UserCountry/lang/ja.json @@ -16,7 +16,6 @@ "country_a2": "衛星プロバイダ", "country_cat": "カタロニア語圏のコミュニティ", "country_o1": "その他の国", - "country_ti": "チベット", "CurrentLocationIntro": "このプロバイダーによると、あなたの現在地は", "DefaultLocationProviderDesc1": "デフォルトロケーションプロバイダーでは、ビジターの国は使用言語に基づいて推測されます。", "DefaultLocationProviderDesc2": "精度が低いため、%1$s%2$sGeoIP%3$sのインストールと使用をお勧めします。%4$s", @@ -94,8 +93,5 @@ "UpdaterWasLastRun": "アップデーターは、%s の最後に実行されました。", "UpdaterWillRunNext": "それは次に %s で実行されるようスケジュールされています。", "WidgetLocation": "ビジターの位置" - }, - "Intl": { - "Country_TI": "チベット" } } \ No newline at end of file diff --git a/plugins/UserCountry/lang/ko.json b/plugins/UserCountry/lang/ko.json index 7d4a2150957..9e9fa81ee21 100644 --- a/plugins/UserCountry/lang/ko.json +++ b/plugins/UserCountry/lang/ko.json @@ -16,7 +16,6 @@ "country_a2": "위성 공급자", "country_cat": "카탈로니아 지역의 커뮤니티", "country_o1": "기타 국가", - "country_ti": "티베트", "CurrentLocationIntro": "이 공급자에 따르면, 현재 위치는", "DefaultLocationProviderDesc1": "방문자의 국가에 기반하는 언어에서 추측하는 기본 위치 공급자입니다.", "DefaultLocationProviderDesc2": "이것은 매우 부정확합니다. 그래서 %1$s우리는 %2$sGeoIP%3$s를 설치하여 사용하는 것을 추천합니다.%4$s", @@ -94,8 +93,5 @@ "UpdaterWasLastRun": "%s에 마지막 업데이트 확인", "UpdaterWillRunNext": "%s에 실행이 계획되어 있습니다.", "WidgetLocation": "방문자 위치" - }, - "Intl": { - "Country_TI": "티베트" } } \ No newline at end of file diff --git a/plugins/UserCountry/lang/nl.json b/plugins/UserCountry/lang/nl.json index 64d6746ae80..30a0a1fbd54 100644 --- a/plugins/UserCountry/lang/nl.json +++ b/plugins/UserCountry/lang/nl.json @@ -16,7 +16,6 @@ "country_a2": "Satellite Provider", "country_cat": "Catalaans-sprekende gemeenschappen", "country_o1": "Ander land", - "country_ti": "Tibet", "CurrentLocationIntro": "Volgens deze provider is je huidige locatie", "DefaultLocationProviderDesc1": "De standaard locatie provider gokt een bezoekers land gebaseerd op de taal die ze gebruiken.", "DefaultLocationProviderDesc2": "Dit is niet erg nauwkeurig, %1$swe adviseren %2$sGeoIP%3$s. te installeren en gebruiken.%4$s", @@ -89,8 +88,5 @@ "UpdaterWasLastRun": "De updater is voor het laatst uitgevoerd op %s.", "UpdaterWillRunNext": "De volgende run is gepland om %s", "WidgetLocation": "Bezoekerlocatie" - }, - "Intl": { - "Country_TI": "Tibet" } } \ No newline at end of file diff --git a/plugins/UserCountry/lang/pl.json b/plugins/UserCountry/lang/pl.json index f663cd9dc26..5158f6f2ccc 100644 --- a/plugins/UserCountry/lang/pl.json +++ b/plugins/UserCountry/lang/pl.json @@ -16,7 +16,6 @@ "country_a2": "Dostawca satelitarny", "country_cat": "społeczność mówiąca po Katalońsku", "country_o1": "Nieokreślony kraj pochodzenia", - "country_ti": "Tybet", "CurrentLocationIntro": "Według tego dostawcy, twoją aktualną lokalizacją jest", "DefaultLocationProviderDesc1": "Domyślny dostawca usług geolokacyjnych zgaduje państwo odwiedzającego na podstawie języka używanego w przeglądarce.", "DefaultLocationProviderDesc2": "Ten sposób określania lokalizacji jest bardzo niedokładny, dlatego %1$szalecamy zainstalowanie i korzystanie z %2$sGeoIP%3$s. %4$s", @@ -94,8 +93,5 @@ "UpdaterWasLastRun": "Ostatnia aktualizacja odbyła się %s.", "UpdaterWillRunNext": "Następna aktualizacja zaplanowana na %s.", "WidgetLocation": "Lokalizacja odwiedzającego" - }, - "Intl": { - "Country_TI": "Tybet" } } \ No newline at end of file diff --git a/plugins/UserCountry/lang/pt-br.json b/plugins/UserCountry/lang/pt-br.json index 224ddc906ff..3df8acf2e4d 100644 --- a/plugins/UserCountry/lang/pt-br.json +++ b/plugins/UserCountry/lang/pt-br.json @@ -16,7 +16,6 @@ "country_a2": "Provedor de satélite", "country_cat": "Comunidades Catalães", "country_o1": "Outro país", - "country_ti": "Tibet", "CurrentLocationIntro": "De acordo com este provedor, sua localização é", "DefaultLocationProviderDesc1": "Detecta a localização padrão de um visitante baseando-se no idioma que ele usa", "DefaultLocationProviderDesc2": "Isso não é muito preciso, então %1$s nós recomendamos a instalação e utilização de %2$s GeoIP %3$s.%4$s", @@ -94,8 +93,5 @@ "UpdaterWasLastRun": "O atualizador foi executado pela última vez em %s.", "UpdaterWillRunNext": "A próxima execução está programada para ser executada em %s.", "WidgetLocation": "Localização dos visitantes" - }, - "Intl": { - "Country_TI": "Tibet" } } \ No newline at end of file diff --git a/plugins/UserCountry/lang/sq.json b/plugins/UserCountry/lang/sq.json index 708c0c4fd2f..7663b3fafa6 100644 --- a/plugins/UserCountry/lang/sq.json +++ b/plugins/UserCountry/lang/sq.json @@ -16,7 +16,6 @@ "country_a2": "Furnizues Satelitor", "country_cat": "Bashkësi që flasin Katalançe", "country_o1": "Vend Tjetër", - "country_ti": "Tibet", "CurrentLocationIntro": "Sipas këtij furnizuesi, gjendeni në", "DefaultLocationProviderDesc1": "Furnizuesi parazgjedhje i vendeve e hamendëson vendin e një vizitori bazuar në gjuhën e përdorur prej tyre.", "DefaultLocationProviderDesc2": "Kjo s’është shumë e saktë, ndaj %1$skëshillojmë instalimin dhe përdorimin e %2$sGeoIP%3$s.%4$s", @@ -94,8 +93,5 @@ "UpdaterWasLastRun": "Përditësuesi u xhirua së fundi më %s.", "UpdaterWillRunNext": "Është planifikuar të xhirojë sërish më %s.", "WidgetLocation": "Vend Vizitori" - }, - "Intl": { - "Country_TI": "Tibet" } } \ No newline at end of file diff --git a/plugins/UserCountry/lang/sr.json b/plugins/UserCountry/lang/sr.json index e91c2ca2f1c..2a201e6b541 100644 --- a/plugins/UserCountry/lang/sr.json +++ b/plugins/UserCountry/lang/sr.json @@ -16,7 +16,6 @@ "country_a2": "Satelitski provajder", "country_cat": "Katalonske zajednice", "country_o1": "Ostale zemlje", - "country_ti": "Tibet", "CurrentLocationIntro": "Sudeći po ovom provajderu, vaša trenutna lokacija je", "DefaultLocationProviderDesc1": "Podrazumevani provajder lokacija nagađa zemlju posetioca na osnovu jezika koji oni koriste.", "DefaultLocationProviderDesc2": "Ovo nije veoma precizno tako da %1$spreporučujemo da instalirate %2$sGeoIP%3$s.%4$s", @@ -94,8 +93,5 @@ "UpdaterWasLastRun": "Poslednja provera je izvršena %s.", "UpdaterWillRunNext": "Sledeće izvršenje je zakazano za %s.", "WidgetLocation": "Lokacija posetioca" - }, - "Intl": { - "Country_TI": "Tibet" } } \ No newline at end of file diff --git a/plugins/UserCountry/lang/sv.json b/plugins/UserCountry/lang/sv.json index 505582bbf0b..13654d06094 100644 --- a/plugins/UserCountry/lang/sv.json +++ b/plugins/UserCountry/lang/sv.json @@ -16,7 +16,6 @@ "country_a2": "Satellitleverantör", "country_cat": "Katalanska språkgemenskaperna", "country_o1": "Annat land", - "country_ti": "Tibet", "CurrentLocationIntro": "Enligt denna leverantör är din aktuella plats", "DefaultLocationProviderDesc1": "Som standard gissar sig platstjänsten till besökarens plats baserat på vilket språk som används.", "DefaultLocationProviderDesc2": "Den metoden är inte så exakt, så %1$svi rekommenderar att du installerar och använder %2$sGeoIP%3$s.%4$s", @@ -94,8 +93,5 @@ "UpdaterWasLastRun": "Sensate uppdateringen gjordes den %s.", "UpdaterWillRunNext": "Den är planerar att köras på %s.", "WidgetLocation": "Besökares plats" - }, - "Intl": { - "Country_TI": "Tibet" } } \ No newline at end of file diff --git a/plugins/UserCountry/lang/uk.json b/plugins/UserCountry/lang/uk.json index 87a786de582..7d84597d955 100644 --- a/plugins/UserCountry/lang/uk.json +++ b/plugins/UserCountry/lang/uk.json @@ -16,7 +16,6 @@ "country_a2": "Супутниковий провайдер", "country_cat": "Каталаномовні суспільства", "country_o1": "Інша країна", - "country_ti": "Тибет", "CurrentLocationIntro": "Згідно використовуваного способу відстеження ви знаходитесь тут", "DefaultLocationProviderDesc1": "Цей спосіб відстеження визначає місце розташування на основі мови, яким користуються користувачі в браузері і системі.", "DefaultLocationProviderDesc2": "Це не дуже точне визначення, тому %1$sми рекомендуємо використовувати і встановити плагін %2$sGeoIp%3$s.%4$s", @@ -94,8 +93,5 @@ "UpdaterWasLastRun": "Оновлення останнього запуску в %s.", "UpdaterWillRunNext": "Заплановано наступний запуск на %s.", "WidgetLocation": "Місцезнаходження відвідувача" - }, - "Intl": { - "Country_TI": "Тибет" } } \ No newline at end of file diff --git a/plugins/UserCountry/lang/zh-cn.json b/plugins/UserCountry/lang/zh-cn.json index 92aa3fc4c66..f0e395f1d66 100644 --- a/plugins/UserCountry/lang/zh-cn.json +++ b/plugins/UserCountry/lang/zh-cn.json @@ -16,7 +16,6 @@ "country_a2": "卫星供应商", "country_cat": "加泰罗尼亚语社区", "country_o1": "其它国家", - "country_ti": "中国西藏", "CurrentLocationIntro": "根据提供商信息，您现在的位置是", "DefaultLocationProviderDesc1": "默认的地理位置查询以访客的浏览器猜测国家。", "DefaultLocationProviderDesc2": "这不是很准确，所以 %1$s我们建议安装使用 %2$sGeoIP%3$s.%4$s", @@ -94,8 +93,5 @@ "UpdaterWasLastRun": "更新程序最后运行时间 %s。", "UpdaterWillRunNext": "这是下一个计划在 %s 运行。", "WidgetLocation": "访客位置" - }, - "Intl": { - "Country_TI": "中国西藏" } } \ No newline at end of file diff --git a/plugins/UserCountry/lang/zh-tw.json b/plugins/UserCountry/lang/zh-tw.json index a22da7350d5..57e0c278f6b 100644 --- a/plugins/UserCountry/lang/zh-tw.json +++ b/plugins/UserCountry/lang/zh-tw.json @@ -16,7 +16,6 @@ "country_a2": "衛星網路供應商", "country_cat": "加泰羅尼亞語社區", "country_o1": "其他國家", - "country_ti": "西藏", "CurrentLocationIntro": "根據這個地理位置供應商，你目前的位置是", "DefaultLocationProviderDesc1": "預設的地理位置供應商是透過訪客使用的語言來猜測他的國家。", "DefaultLocationProviderDesc2": "這不是那麼準確，所以%1$s我們推薦安裝並使用 %2$sGeoIP%3$s。%4$s", @@ -94,8 +93,5 @@ "UpdaterWasLastRun": "上次自動更新執行於 %s。", "UpdaterWillRunNext": "下次自動更新將於 %s 執行。", "WidgetLocation": "訪客所在地點" - }, - "Intl": { - "Country_TI": "西藏" } } \ No newline at end of file diff --git a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCity_month.xml b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCity_month.xml index ae227475bd3..1ef9b96f0c5 100644 --- a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCity_month.xml +++ b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCity_month.xml @@ -95,7 +95,7 @@ plugins/Morpheus/icons/dist/flags/fr.png - + 2 5 4 @@ -118,13 +118,13 @@ 0 29.65 91.1 - city==Lhasa;regionCode==1;countryCode==ti + city==Lhasa;regionCode==14;countryCode==cn Lhasa - 1 - ti - Tibet - Unknown - plugins/Morpheus/icons/dist/flags/ti.png + 14 + cn + China + Xizang + plugins/Morpheus/icons/dist/flags/cn.png diff --git a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCountry_month.xml b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCountry_month.xml index 1c8ba290ed2..ade01286fe9 100644 --- a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCountry_month.xml +++ b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCountry_month.xml @@ -2,25 +2,25 @@ - 18 - 50 + 20 + 55 5 - 9 + 10 - 18 - 18 - 90 + 20 + 20 + 100 - 9 - 9 - 45 + 10 + 10 + 50 - 27 - 135 - 9 + 30 + 150 + 10 0 cn plugins/Morpheus/icons/dist/flags/cn.png @@ -135,33 +135,6 @@ countryCode==it 16 - - - 2 - 5 - 4 - 1 - - - 2 - 2 - 10 - - - 1 - 1 - 5 - - - 3 - 15 - 1 - 0 - ti - plugins/Morpheus/icons/dist/flags/ti.png - countryCode==ti - 16 - 2 diff --git a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getRegion_month.xml b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getRegion_month.xml index 49fc389c31b..34fd1a7dfea 100644 --- a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getRegion_month.xml +++ b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getRegion_month.xml @@ -116,7 +116,7 @@ plugins/Morpheus/icons/dist/flags/it.png - + 2 5 4 @@ -137,11 +137,11 @@ 15 1 0 - regionCode==1;countryCode==ti - 1 - ti - Tibet - Unknown - plugins/Morpheus/icons/dist/flags/ti.png + regionCode==14;countryCode==cn + 14 + cn + China + Xizang + plugins/Morpheus/icons/dist/flags/cn.png \ No newline at end of file diff --git a/plugins/UserCountry/tests/System/expected/test___UserCountry.getCountryCodeMapping.xml b/plugins/UserCountry/tests/System/expected/test___UserCountry.getCountryCodeMapping.xml index ee022684bbd..30240aea9de 100644 --- a/plugins/UserCountry/tests/System/expected/test___UserCountry.getCountryCodeMapping.xml +++ b/plugins/UserCountry/tests/System/expected/test___UserCountry.getCountryCodeMapping.xml @@ -219,7 +219,6 @@ French Southern Territories Togo Thailand - Tibet Tajikistan Tokelau Timor-Leste diff --git a/plugins/UserCountryMap/javascripts/visitor-map.js b/plugins/UserCountryMap/javascripts/visitor-map.js index 2a8f2d52b4d..5f7d93c4d65 100644 --- a/plugins/UserCountryMap/javascripts/visitor-map.js +++ b/plugins/UserCountryMap/javascripts/visitor-map.js @@ -1355,10 +1355,10 @@ $.extend(UserCountryMap, { // iso alpha-2 --> iso alpha-3 - ISO2toISO3: {"BD": "BGD", "BE": "BEL", "BF": "BFA", "BG": "BGR", "BA": "BIH", "BB": "BRB", "WF": "WLF", "BL": "BLM", "BM": "BMU", "BN": "BRN", "BO": "BOL", "BH": "BHR", "BI": "BDI", "BJ": "BEN", "BT": "BTN", "JM": "JAM", "BV": "BVT", "BW": "BWA", "WS": "WSM", "BQ": "BES", "BR": "BRA", "BS": "BHS", "JE": "JEY", "BY": "BLR", "BZ": "BLZ", "RU": "RUS", "RW": "RWA", "RS": "SRB", "TL": "TLS", "RE": "REU", "TM": "TKM", "TJ": "TJK", "RO": "ROU", "TK": "TKL", "GW": "GNB", "GU": "GUM", "GT": "GTM", "GS": "SGS", "GR": "GRC", "GQ": "GNQ", "GP": "GLP", "JP": "JPN", "GY": "GUY", "GG": "GGY", "GF": "GUF", "GE": "GEO", "GD": "GRD", "GB": "GBR", "GA": "GAB", "SV": "SLV", "GN": "GIN", "GM": "GMB", "GL": "GRL", "GI": "GIB", "GH": "GHA", "OM": "OMN", "TN": "TUN", "JO": "JOR", "HR": "HRV", "HT": "HTI", "HU": "HUN", "HK": "HKG", "HN": "HND", "HM": "HMD", "VE": "VEN", "PR": "PRI", "PS": "PSE", "PW": "PLW", "PT": "PRT", "SJ": "SJM", "PY": "PRY", "IQ": "IRQ", "PA": "PAN", "PF": "PYF", "PG": "PNG", "PE": "PER", "PK": "PAK", "PH": "PHL", "PN": "PCN", "PL": "POL", "PM": "SPM", "ZM": "ZMB", "EH": "ESH", "EE": "EST", "EG": "EGY", "ZA": "ZAF", "EC": "ECU", "IT": "ITA", "VN": "VNM", "SB": "SLB", "ET": "ETH", "SO": "SOM", "ZW": "ZWE", "SA": "SAU", "ES": "ESP", "ER": "ERI", "ME": "MNE", "MD": "MDA", "MG": "MDG", "MF": "MAF", "MA": "MAR", "MC": "MCO", "UZ": "UZB", "MM": "MMR", "ML": "MLI", "MO": "MAC", "MN": "MNG", "MH": "MHL", "MK": "MKD", "MU": "MUS", "MT": "MLT", "MW": "MWI", "MV": "MDV", "MQ": "MTQ", "MP": "MNP", "MS": "MSR", "MR": "MRT", "IM": "IMN", "UG": "UGA", "TZ": "TZA", "MY": "MYS", "MX": "MEX", "IL": "ISR", "FR": "FRA", "IO": "IOT", "SH": "SHN", "FI": "FIN", "FJ": "FJI", "FK": "FLK", "FM": "FSM", "FO": "FRO", "NI": "NIC", "NL": "NLD", "NO": "NOR", "NA": "NAM", "VU": "VUT", "NC": "NCL", "NE": "NER", "NF": "NFK", "NG": "NGA", "NZ": "NZL", "NP": "NPL", "NR": "NRU", "NU": "NIU", "CK": "COK", "XK": "XKX", "CI": "CIV", "CH": "CHE", "CO": "COL", "CN": "CHN", "CM": "CMR", "CL": "CHL", "CC": "CCK", "CA": "CAN", "CG": "COG", "CF": "CAF", "CD": "COD", "CZ": "CZE", "CY": "CYP", "CX": "CXR", "CS": "SCG", "CR": "CRI", "CW": "CUW", "CV": "CPV", "CU": "CUB", "SZ": "SWZ", "SY": "SYR", "SX": "SXM", "KG": "KGZ", "KE": "KEN", "SS": "SSD", "SR": "SUR", "KI": "KIR", "KH": "KHM", "KN": "KNA", "KM": "COM", "ST": "STP", "SK": "SVK", "KR": "KOR", "SI": "SVN", "KP": "PRK", "KW": "KWT", "SN": "SEN", "SM": "SMR", "SL": "SLE", "SC": "SYC", "KZ": "KAZ", "KY": "CYM", "SG": "SGP", "SE": "SWE", "SD": "SDN", "DO": "DOM", "DM": "DMA", "DJ": "DJI", "DK": "DNK", "VG": "VGB", "DE": "DEU", "YE": "YEM", "DZ": "DZA", "US": "USA", "UY": "URY", "YT": "MYT", "UM": "UMI", "LB": "LBN", "LC": "LCA", "LA": "LAO", "TV": "TUV", "TW": "TWN", "TT": "TTO", "TR": "TUR", "LK": "LKA", "LI": "LIE", "LV": "LVA", "TO": "TON", "LT": "LTU", "LU": "LUX", "LR": "LBR", "LS": "LSO", "TH": "THA", "TF": "ATF", "TG": "TGO", "TD": "TCD", "TC": "TCA", "LY": "LBY", "VA": "VAT", "VC": "VCT", "AE": "ARE", "AD": "AND", "AG": "ATG", "AF": "AFG", "AI": "AIA", "VI": "VIR", "IS": "ISL", "IR": "IRN", "AM": "ARM", "AL": "ALB", "AO": "AGO", "AN": "ANT", "AQ": "ATA", "AS": "ASM", "AR": "ARG", "AU": "AUS", "AT": "AUT", "AW": "ABW", "IN": "IND", "AX": "ALA", "AZ": "AZE", "IE": "IRL", "ID": "IDN", "UA": "UKR", "QA": "QAT", "MZ": "MOZ", "TI": "TIB"}, + ISO2toISO3: {"BD": "BGD", "BE": "BEL", "BF": "BFA", "BG": "BGR", "BA": "BIH", "BB": "BRB", "WF": "WLF", "BL": "BLM", "BM": "BMU", "BN": "BRN", "BO": "BOL", "BH": "BHR", "BI": "BDI", "BJ": "BEN", "BT": "BTN", "JM": "JAM", "BV": "BVT", "BW": "BWA", "WS": "WSM", "BQ": "BES", "BR": "BRA", "BS": "BHS", "JE": "JEY", "BY": "BLR", "BZ": "BLZ", "RU": "RUS", "RW": "RWA", "RS": "SRB", "TL": "TLS", "RE": "REU", "TM": "TKM", "TJ": "TJK", "RO": "ROU", "TK": "TKL", "GW": "GNB", "GU": "GUM", "GT": "GTM", "GS": "SGS", "GR": "GRC", "GQ": "GNQ", "GP": "GLP", "JP": "JPN", "GY": "GUY", "GG": "GGY", "GF": "GUF", "GE": "GEO", "GD": "GRD", "GB": "GBR", "GA": "GAB", "SV": "SLV", "GN": "GIN", "GM": "GMB", "GL": "GRL", "GI": "GIB", "GH": "GHA", "OM": "OMN", "TN": "TUN", "JO": "JOR", "HR": "HRV", "HT": "HTI", "HU": "HUN", "HK": "HKG", "HN": "HND", "HM": "HMD", "VE": "VEN", "PR": "PRI", "PS": "PSE", "PW": "PLW", "PT": "PRT", "SJ": "SJM", "PY": "PRY", "IQ": "IRQ", "PA": "PAN", "PF": "PYF", "PG": "PNG", "PE": "PER", "PK": "PAK", "PH": "PHL", "PN": "PCN", "PL": "POL", "PM": "SPM", "ZM": "ZMB", "EH": "ESH", "EE": "EST", "EG": "EGY", "ZA": "ZAF", "EC": "ECU", "IT": "ITA", "VN": "VNM", "SB": "SLB", "ET": "ETH", "SO": "SOM", "ZW": "ZWE", "SA": "SAU", "ES": "ESP", "ER": "ERI", "ME": "MNE", "MD": "MDA", "MG": "MDG", "MF": "MAF", "MA": "MAR", "MC": "MCO", "UZ": "UZB", "MM": "MMR", "ML": "MLI", "MO": "MAC", "MN": "MNG", "MH": "MHL", "MK": "MKD", "MU": "MUS", "MT": "MLT", "MW": "MWI", "MV": "MDV", "MQ": "MTQ", "MP": "MNP", "MS": "MSR", "MR": "MRT", "IM": "IMN", "UG": "UGA", "TZ": "TZA", "MY": "MYS", "MX": "MEX", "IL": "ISR", "FR": "FRA", "IO": "IOT", "SH": "SHN", "FI": "FIN", "FJ": "FJI", "FK": "FLK", "FM": "FSM", "FO": "FRO", "NI": "NIC", "NL": "NLD", "NO": "NOR", "NA": "NAM", "VU": "VUT", "NC": "NCL", "NE": "NER", "NF": "NFK", "NG": "NGA", "NZ": "NZL", "NP": "NPL", "NR": "NRU", "NU": "NIU", "CK": "COK", "XK": "XKX", "CI": "CIV", "CH": "CHE", "CO": "COL", "CN": "CHN", "CM": "CMR", "CL": "CHL", "CC": "CCK", "CA": "CAN", "CG": "COG", "CF": "CAF", "CD": "COD", "CZ": "CZE", "CY": "CYP", "CX": "CXR", "CS": "SCG", "CR": "CRI", "CW": "CUW", "CV": "CPV", "CU": "CUB", "SZ": "SWZ", "SY": "SYR", "SX": "SXM", "KG": "KGZ", "KE": "KEN", "SS": "SSD", "SR": "SUR", "KI": "KIR", "KH": "KHM", "KN": "KNA", "KM": "COM", "ST": "STP", "SK": "SVK", "KR": "KOR", "SI": "SVN", "KP": "PRK", "KW": "KWT", "SN": "SEN", "SM": "SMR", "SL": "SLE", "SC": "SYC", "KZ": "KAZ", "KY": "CYM", "SG": "SGP", "SE": "SWE", "SD": "SDN", "DO": "DOM", "DM": "DMA", "DJ": "DJI", "DK": "DNK", "VG": "VGB", "DE": "DEU", "YE": "YEM", "DZ": "DZA", "US": "USA", "UY": "URY", "YT": "MYT", "UM": "UMI", "LB": "LBN", "LC": "LCA", "LA": "LAO", "TV": "TUV", "TW": "TWN", "TT": "TTO", "TR": "TUR", "LK": "LKA", "LI": "LIE", "LV": "LVA", "TO": "TON", "LT": "LTU", "LU": "LUX", "LR": "LBR", "LS": "LSO", "TH": "THA", "TF": "ATF", "TG": "TGO", "TD": "TCD", "TC": "TCA", "LY": "LBY", "VA": "VAT", "VC": "VCT", "AE": "ARE", "AD": "AND", "AG": "ATG", "AF": "AFG", "AI": "AIA", "VI": "VIR", "IS": "ISL", "IR": "IRN", "AM": "ARM", "AL": "ALB", "AO": "AGO", "AN": "ANT", "AQ": "ATA", "AS": "ASM", "AR": "ARG", "AU": "AUS", "AT": "AUT", "AW": "ABW", "IN": "IND", "AX": "ALA", "AZ": "AZE", "IE": "IRL", "ID": "IDN", "UA": "UKR", "QA": "QAT", "MZ": "MOZ"}, // iso alpha-3 --> continent code - ISO3toCONT: {"AGO": "AF", "DZA": "AF", "EGY": "AF", "BGD": "AS", "NER": "AF", "LIE": "EU", "NAM": "AF", "BGR": "EU", "BOL": "SA", "GHA": "AF", "CCK": "AS", "PAK": "AS", "CPV": "AF", "JOR": "AS", "LBR": "AF", "LBY": "AF", "MYS": "AS", "DOM": "NA", "PRI": "NA", "SXM": "NA", "PRK": "AS", "PSE": "AS", "TZA": "AF", "BWA": "AF", "KHM": "AS", "UMI": "OC", "NIC": "NA", "TTO": "NA", "ETH": "AF", "PRY": "SA", "HKG": "AS", "SAU": "AS", "LBN": "AS", "SVN": "EU", "BFA": "AF", "CHE": "EU", "MRT": "AF", "HRV": "EU", "CHL": "SA", "CHN": "AS", "KNA": "NA", "SLE": "AF", "JAM": "NA", "SMR": "EU", "GIB": "EU", "DJI": "AF", "GIN": "AF", "FIN": "EU", "URY": "SA", "THA": "AS", "STP": "AF", "SYC": "AF", "NPL": "AS", "CXR": "AS", "LAO": "AS", "YEM": "AS", "BVT": "AN", "ZAF": "AF", "KIR": "OC", "PHL": "AS", "ROU": "EU", "VIR": "NA", "SYR": "AS", "MAC": "AS", "MAF": "NA", "MLT": "EU", "KAZ": "AS", "TCA": "NA", "PYF": "OC", "NIU": "OC", "DMA": "NA", "BEN": "AF", "GUF": "SA", "BEL": "EU", "MSR": "NA", "TGO": "AF", "DEU": "EU", "GUM": "OC", "LKA": "AS", "SSD": "AF", "FLK": "SA", "GBR": "EU", "BES": "NA", "GUY": "SA", "CRI": "NA", "CMR": "AF", "MAR": "AF", "MNP": "OC", "LSO": "AF", "HUN": "EU", "TKM": "AS", "SUR": "SA", "NLD": "EU", "BMU": "NA", "HMD": "AN", "TCD": "AF", "GEO": "AS", "MNE": "EU", "MNG": "AS", "MHL": "OC", "MTQ": "NA", "BLZ": "NA", "NFK": "OC", "MMR": "AS", "AFG": "AS", "BDI": "AF", "VGB": "NA", "BLR": "EU", "BLM": "NA", "GRD": "NA", "TKL": "OC", "GRC": "EU", "RUS": "EU", "GRL": "NA", "SHN": "AF", "AND": "EU", "MOZ": "AF", "TJK": "AS", "XKX": "EU", "HTI": "NA", "MEX": "NA", "ANT": "NA", "ZWE": "AF", "LCA": "NA", "IND": "AS", "LVA": "EU", "BTN": "AS", "VCT": "NA", "VNM": "AS", "NOR": "EU", "CZE": "EU", "ATF": "AN", "ATG": "NA", "FJI": "OC", "IOT": "AS", "HND": "NA", "MUS": "AF", "ATA": "AN", "LUX": "EU", "ISR": "AS", "FSM": "OC", "PER": "SA", "REU": "AF", "IDN": "AS", "VUT": "OC", "MKD": "EU", "COD": "AF", "COG": "AF", "ISL": "EU", "GLP": "NA", "COK": "OC", "COM": "AF", "COL": "SA", "NGA": "AF", "TLS": "OC", "TWN": "AS", "PRT": "EU", "MDA": "EU", "GGY": "EU", "MDG": "AF", "ECU": "SA", "SEN": "AF", "NZL": "OC", "MDV": "AS", "ASM": "OC", "SPM": "NA", "CUW": "NA", "FRA": "EU", "LTU": "EU", "RWA": "AF", "ZMB": "AF", "GMB": "AF", "WLF": "OC", "JEY": "EU", "FRO": "EU", "GTM": "NA", "DNK": "EU", "IMN": "EU", "AUS": "OC", "AUT": "EU", "SJM": "EU", "VEN": "SA", "PLW": "OC", "KEN": "AF", "MYT": "AF", "WSM": "OC", "TUR": "AS", "ALB": "EU", "OMN": "AS", "TUV": "OC", "ALA": "EU", "BRN": "AS", "TUN": "AF", "PCN": "OC", "BRB": "NA", "BRA": "SA", "CIV": "AF", "SRB": "EU", "GNQ": "AF", "USA": "NA", "QAT": "AS", "SWE": "EU", "AZE": "AS", "GNB": "AF", "SWZ": "AF", "TON": "OC", "CAN": "NA", "UKR": "EU", "KOR": "AS", "AIA": "NA", "CAF": "AF", "SVK": "EU", "CYP": "EU", "BIH": "EU", "SGP": "AS", "SGS": "AN", "SOM": "AF", "UZB": "AS", "ERI": "AF", "POL": "EU", "KWT": "AS", "SCG": "EU", "GAB": "AF", "CYM": "NA", "VAT": "EU", "EST": "EU", "MWI": "AF", "ESP": "EU", "IRQ": "AS", "SLV": "NA", "MLI": "AF", "IRL": "EU", "IRN": "AS", "ABW": "NA", "PNG": "OC", "PAN": "NA", "SDN": "AF", "SLB": "OC", "ESH": "AF", "MCO": "EU", "ITA": "EU", "JPN": "AS", "KGZ": "AS", "UGA": "AF", "NCL": "OC", "ARE": "AS", "ARG": "SA", "BHS": "NA", "BHR": "AS", "ARM": "AS", "NRU": "OC", "CUB": "NA", "TIB": "AS"}, + ISO3toCONT: {"AGO": "AF", "DZA": "AF", "EGY": "AF", "BGD": "AS", "NER": "AF", "LIE": "EU", "NAM": "AF", "BGR": "EU", "BOL": "SA", "GHA": "AF", "CCK": "AS", "PAK": "AS", "CPV": "AF", "JOR": "AS", "LBR": "AF", "LBY": "AF", "MYS": "AS", "DOM": "NA", "PRI": "NA", "SXM": "NA", "PRK": "AS", "PSE": "AS", "TZA": "AF", "BWA": "AF", "KHM": "AS", "UMI": "OC", "NIC": "NA", "TTO": "NA", "ETH": "AF", "PRY": "SA", "HKG": "AS", "SAU": "AS", "LBN": "AS", "SVN": "EU", "BFA": "AF", "CHE": "EU", "MRT": "AF", "HRV": "EU", "CHL": "SA", "CHN": "AS", "KNA": "NA", "SLE": "AF", "JAM": "NA", "SMR": "EU", "GIB": "EU", "DJI": "AF", "GIN": "AF", "FIN": "EU", "URY": "SA", "THA": "AS", "STP": "AF", "SYC": "AF", "NPL": "AS", "CXR": "AS", "LAO": "AS", "YEM": "AS", "BVT": "AN", "ZAF": "AF", "KIR": "OC", "PHL": "AS", "ROU": "EU", "VIR": "NA", "SYR": "AS", "MAC": "AS", "MAF": "NA", "MLT": "EU", "KAZ": "AS", "TCA": "NA", "PYF": "OC", "NIU": "OC", "DMA": "NA", "BEN": "AF", "GUF": "SA", "BEL": "EU", "MSR": "NA", "TGO": "AF", "DEU": "EU", "GUM": "OC", "LKA": "AS", "SSD": "AF", "FLK": "SA", "GBR": "EU", "BES": "NA", "GUY": "SA", "CRI": "NA", "CMR": "AF", "MAR": "AF", "MNP": "OC", "LSO": "AF", "HUN": "EU", "TKM": "AS", "SUR": "SA", "NLD": "EU", "BMU": "NA", "HMD": "AN", "TCD": "AF", "GEO": "AS", "MNE": "EU", "MNG": "AS", "MHL": "OC", "MTQ": "NA", "BLZ": "NA", "NFK": "OC", "MMR": "AS", "AFG": "AS", "BDI": "AF", "VGB": "NA", "BLR": "EU", "BLM": "NA", "GRD": "NA", "TKL": "OC", "GRC": "EU", "RUS": "EU", "GRL": "NA", "SHN": "AF", "AND": "EU", "MOZ": "AF", "TJK": "AS", "XKX": "EU", "HTI": "NA", "MEX": "NA", "ANT": "NA", "ZWE": "AF", "LCA": "NA", "IND": "AS", "LVA": "EU", "BTN": "AS", "VCT": "NA", "VNM": "AS", "NOR": "EU", "CZE": "EU", "ATF": "AN", "ATG": "NA", "FJI": "OC", "IOT": "AS", "HND": "NA", "MUS": "AF", "ATA": "AN", "LUX": "EU", "ISR": "AS", "FSM": "OC", "PER": "SA", "REU": "AF", "IDN": "AS", "VUT": "OC", "MKD": "EU", "COD": "AF", "COG": "AF", "ISL": "EU", "GLP": "NA", "COK": "OC", "COM": "AF", "COL": "SA", "NGA": "AF", "TLS": "OC", "TWN": "AS", "PRT": "EU", "MDA": "EU", "GGY": "EU", "MDG": "AF", "ECU": "SA", "SEN": "AF", "NZL": "OC", "MDV": "AS", "ASM": "OC", "SPM": "NA", "CUW": "NA", "FRA": "EU", "LTU": "EU", "RWA": "AF", "ZMB": "AF", "GMB": "AF", "WLF": "OC", "JEY": "EU", "FRO": "EU", "GTM": "NA", "DNK": "EU", "IMN": "EU", "AUS": "OC", "AUT": "EU", "SJM": "EU", "VEN": "SA", "PLW": "OC", "KEN": "AF", "MYT": "AF", "WSM": "OC", "TUR": "AS", "ALB": "EU", "OMN": "AS", "TUV": "OC", "ALA": "EU", "BRN": "AS", "TUN": "AF", "PCN": "OC", "BRB": "NA", "BRA": "SA", "CIV": "AF", "SRB": "EU", "GNQ": "AF", "USA": "NA", "QAT": "AS", "SWE": "EU", "AZE": "AS", "GNB": "AF", "SWZ": "AF", "TON": "OC", "CAN": "NA", "UKR": "EU", "KOR": "AS", "AIA": "NA", "CAF": "AF", "SVK": "EU", "CYP": "EU", "BIH": "EU", "SGP": "AS", "SGS": "AN", "SOM": "AF", "UZB": "AS", "ERI": "AF", "POL": "EU", "KWT": "AS", "SCG": "EU", "GAB": "AF", "CYM": "NA", "VAT": "EU", "EST": "EU", "MWI": "AF", "ESP": "EU", "IRQ": "AS", "SLV": "NA", "MLI": "AF", "IRL": "EU", "IRN": "AS", "ABW": "NA", "PNG": "OC", "PAN": "NA", "SDN": "AF", "SLB": "OC", "ESH": "AF", "MCO": "EU", "ITA": "EU", "JPN": "AS", "KGZ": "AS", "UGA": "AF", "NCL": "OC", "ARE": "AS", "ARG": "SA", "BHS": "NA", "BHR": "AS", "ARM": "AS", "NRU": "OC", "CUB": "NA"}, // special region aggregation for some countries aggregate: { diff --git a/plugins/UserCountryMap/svg/AS.svg b/plugins/UserCountryMap/svg/AS.svg index 0ae36a2fc8d..b425e8daf0f 100644 --- a/plugins/UserCountryMap/svg/AS.svg +++ b/plugins/UserCountryMap/svg/AS.svg @@ -1 +1,2 @@ - + \ No newline at end of file diff --git a/plugins/UserCountryMap/svg/BGD.svg b/plugins/UserCountryMap/svg/BGD.svg index 7f8d9db5674..fa82fa19706 100644 --- a/plugins/UserCountryMap/svg/BGD.svg +++ b/plugins/UserCountryMap/svg/BGD.svg @@ -1 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/plugins/UserCountryMap/svg/CHN.svg b/plugins/UserCountryMap/svg/CHN.svg index 8a926d0579c..e414fbb7c12 100644 --- a/plugins/UserCountryMap/svg/CHN.svg +++ b/plugins/UserCountryMap/svg/CHN.svg @@ -1 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/plugins/UserCountryMap/svg/IND.svg b/plugins/UserCountryMap/svg/IND.svg index 9dc42b04c26..8607b7e698d 100644 --- a/plugins/UserCountryMap/svg/IND.svg +++ b/plugins/UserCountryMap/svg/IND.svg @@ -1 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/plugins/UserCountryMap/svg/MMR.svg b/plugins/UserCountryMap/svg/MMR.svg index cecf0af028e..4cb534677e3 100644 --- a/plugins/UserCountryMap/svg/MMR.svg +++ b/plugins/UserCountryMap/svg/MMR.svg @@ -1 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/plugins/UserCountryMap/svg/NPL.svg b/plugins/UserCountryMap/svg/NPL.svg index 635cea8253a..4ab700ce44c 100644 --- a/plugins/UserCountryMap/svg/NPL.svg +++ b/plugins/UserCountryMap/svg/NPL.svg @@ -1 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/plugins/UserCountryMap/svg/PAK.svg b/plugins/UserCountryMap/svg/PAK.svg index 64fa7b7c5a6..6597de8e1f6 100644 --- a/plugins/UserCountryMap/svg/PAK.svg +++ b/plugins/UserCountryMap/svg/PAK.svg @@ -1 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/plugins/UserCountryMap/svg/TIB.svg b/plugins/UserCountryMap/svg/TIB.svg deleted file mode 100644 index 5428c3a5499..00000000000 --- a/plugins/UserCountryMap/svg/TIB.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/plugins/UserCountryMap/svg/world.svg b/plugins/UserCountryMap/svg/world.svg index 49d78ee43ac..8929e6ac4b8 100644 --- a/plugins/UserCountryMap/svg/world.svg +++ b/plugins/UserCountryMap/svg/world.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 982d316f0c7..27cd9273344 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -2245,13 +2245,13 @@ 1 Asia asi - Tibet - ti - plugins/Morpheus/icons/dist/flags/ti.png - Unknown - 1 + China + cn + plugins/Morpheus/icons/dist/flags/cn.png + Xizang + 14 Lhasa - Lhasa, Unknown, Tibet + Lhasa, Xizang, China 29.650000 91.100000 12:34:06 @@ -2525,13 +2525,13 @@ 0 Asia asi - Tibet - ti - plugins/Morpheus/icons/dist/flags/ti.png - Unknown - 1 + China + cn + plugins/Morpheus/icons/dist/flags/cn.png + Xizang + 14 Lhasa - Lhasa, Unknown, Tibet + Lhasa, Xizang, China 29.650000 91.100000 12:34:06 diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml index 84baa921c6d..57ad4016345 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml @@ -7,7 +7,7 @@ it fr id - ti + cn mk xx \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml index 68a88551099..9e28c098ed1 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml @@ -5,7 +5,7 @@ P3 A6 H9 - 1 + 14 G5 CA \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml index 7df3efc4793..8cc2b0f3865 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml @@ -162,7 +162,7 @@ plugins/Morpheus/icons/dist/flags/ru.png - + 2 5 4 @@ -186,13 +186,13 @@ 0 29.65 91.1 - city==Lhasa;regionCode==1;countryCode==ti + city==Lhasa;regionCode==14;countryCode==cn Lhasa - 1 - ti - Tibet - Unknown - plugins/Morpheus/icons/dist/flags/ti.png + 14 + cn + China + Xizang + plugins/Morpheus/icons/dist/flags/cn.png diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml index 3e1bd4e2cc8..c4558671c16 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml @@ -113,10 +113,10 @@ 16 - + 2 - 6 - 5 + 5 + 4 1621 1 @@ -135,16 +135,16 @@ 15 1 0 - fr - plugins/Morpheus/icons/dist/flags/fr.png - countryCode==fr + cn + plugins/Morpheus/icons/dist/flags/cn.png + countryCode==cn 16 - + 2 - 5 - 4 + 6 + 5 1621 1 @@ -163,16 +163,16 @@ 15 1 0 - id - plugins/Morpheus/icons/dist/flags/id.png - countryCode==id + fr + plugins/Morpheus/icons/dist/flags/fr.png + countryCode==fr 16 - + 2 - 6 - 5 + 5 + 4 1621 1 @@ -191,16 +191,16 @@ 15 1 0 - it - plugins/Morpheus/icons/dist/flags/it.png - countryCode==it + id + plugins/Morpheus/icons/dist/flags/id.png + countryCode==id 16 - + 2 - 5 - 4 + 6 + 5 1621 1 @@ -219,13 +219,13 @@ 15 1 0 - mk - plugins/Morpheus/icons/dist/flags/mk.png - countryCode==mk + it + plugins/Morpheus/icons/dist/flags/it.png + countryCode==it 16 - + 2 5 4 @@ -247,9 +247,9 @@ 15 1 0 - ti - plugins/Morpheus/icons/dist/flags/ti.png - countryCode==ti + mk + plugins/Morpheus/icons/dist/flags/mk.png + countryCode==mk 16 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml index 8e963544ee7..9e358630a18 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml @@ -240,7 +240,7 @@ plugins/Morpheus/icons/dist/flags/mk.png - + 2 5 4 @@ -262,12 +262,12 @@ 15 1 0 - regionCode==1;countryCode==ti - 1 - ti - Tibet - Unknown - plugins/Morpheus/icons/dist/flags/ti.png + regionCode==14;countryCode==cn + 14 + cn + China + Xizang + plugins/Morpheus/icons/dist/flags/cn.png diff --git a/tests/UI/expected-screenshots/DashboardManager_create_new.png b/tests/UI/expected-screenshots/DashboardManager_create_new.png index ae1c1a9ab42..dc4b931886d 100644 --- a/tests/UI/expected-screenshots/DashboardManager_create_new.png +++ b/tests/UI/expected-screenshots/DashboardManager_create_new.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:763a130436a69516580ba5f0c903715d3e4a433fbc8983da1b555bdb0368453f -size 246428 +oid sha256:04dfdef354eb3b75d7342dea0ffe8bf4ce102afbfb330bb4bcfbec547b247df7 +size 246227 diff --git a/tests/UI/expected-screenshots/Dashboard_reset.png b/tests/UI/expected-screenshots/Dashboard_reset.png index 378d5417433..aa6004a698d 100644 --- a/tests/UI/expected-screenshots/Dashboard_reset.png +++ b/tests/UI/expected-screenshots/Dashboard_reset.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3708f066bc45dca4fe1f58454cea6c48abfd32a078ee94dd5b8a674c1bb7bdc9 -size 250604 +oid sha256:dcdeb3f79ef07678939ab5e86c8d18014a185e5d4d5a8c826d80926b996b6f22 +size 250219 diff --git a/tests/UI/expected-screenshots/EvolutionGraph_bounce_rate.png b/tests/UI/expected-screenshots/EvolutionGraph_bounce_rate.png index 7b11d696fe7..897fa2e3ff4 100644 --- a/tests/UI/expected-screenshots/EvolutionGraph_bounce_rate.png +++ b/tests/UI/expected-screenshots/EvolutionGraph_bounce_rate.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a7578d136d0239fd10e9d31dd62a25df82d3e2fba621fcb9c1a91cf79e16de8 -size 105448 +oid sha256:35ffcdb418dfd3d030440202f3489c923fae5373c2e5f36bb0b481c4aad67cc3 +size 105185 diff --git a/tests/UI/expected-screenshots/EvolutionGraph_initial.png b/tests/UI/expected-screenshots/EvolutionGraph_initial.png index 5ac541c5a4c..b24b625694e 100644 --- a/tests/UI/expected-screenshots/EvolutionGraph_initial.png +++ b/tests/UI/expected-screenshots/EvolutionGraph_initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a146aef71baf8d4ec8d40a8e987b3ec63a0cf94ba352dc28ecfdc056ea7320d -size 47068 +oid sha256:c05b765bdfc7ddc231326154c086ccca055a45c84479b629c2510fe293e79452 +size 47271 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png index 798b3cee5e1..89fd23a5b51 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46ca26af9215104bf2dff118462ecf6db5447e0577b368d9d6c0116a14ea8e54 -size 428797 +oid sha256:404dc2c43f0d24df2c9c15adc282b0a0c9b6941b8f88816cf57e1b7b784042e2 +size 428441 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png index 20b7d4c2914..913f994695b 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9e1dbebb762226c741d620cc316c40c8f166da87b321aa0f3ddf2796dc8c1d5 -size 733576 +oid sha256:f676078148169fadf97bf894b4959bab5ad6c44a97d3f506c259a6bcea3bee6a +size 732743 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png index 37b38ffd5a1..9d42ac5a855 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62cd7d868c9c1815abba501c7ed77a91c4ca0c09c45718ec2213c6a91bc79f38 -size 188330 +oid sha256:16c49417d58bbf49a923bb79392a8dd26cdf8044b23b827c9f14db50cc540c00 +size 187866 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png index e14182cff4a..f0c28f68563 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:154e7aa39b4891cf54a1b8639fc856d8c9b966b5bb3f933d7ff499542bee2db4 -size 172904 +oid sha256:25b260968c60860f6046cac461ec97ca2d2e8498f5227d496fb60c8c89295a58 +size 172614 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png index 918743c31f5..14fe8762b80 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d523d13853c0e82e7f6339dff2e2c424ce341dc04ebc8cbf467a629779393fde -size 113163 +oid sha256:708457e09968c0d581da438ec496bbae755e2c8f648b94e250d051828c1dac4a +size 112579