diff options
15 files changed, 75 insertions, 75 deletions
diff --git a/core/Intl/Data/Resources/countries/tl.json b/core/Intl/Data/Resources/countries/tl.json index 485915925e..5c307a66a1 100644 --- a/core/Intl/Data/Resources/countries/tl.json +++ b/core/Intl/Data/Resources/countries/tl.json @@ -189,7 +189,7 @@ "RE": "Reunion", "RO": "Romanya", "RS": "Serbia", - "RU": "Russian Federation", + "RU": "Russia", "RW": "Rwanda", "SA": "Saudi Arabia", "SB": "Mga isla ni Solomon", diff --git a/plugins/UserLanguage/tests/Fixtures/LanguageFixture.php b/plugins/UserLanguage/tests/Fixtures/LanguageFixture.php index 3e015f776a..b96356d7bd 100644 --- a/plugins/UserLanguage/tests/Fixtures/LanguageFixture.php +++ b/plugins/UserLanguage/tests/Fixtures/LanguageFixture.php @@ -40,7 +40,7 @@ class LanguageFixture extends Fixture private function getBrowserLangs() { return array( 'fr-be', 'ar_QA', 'fr-ch', 'pl', 'pl', 'th_TH', 'zh_SG', 'eu_ES', - 'sr_CS', 'el,fi', 'fr,en-us,en;q=', 'fr-be', 'en,en-us,en;q=', + 'sr_RS', 'el,fi', 'fr,en-us,en;q=', 'fr-be', 'en,en-us,en;q=', 'de,en-us,en;q=', 'cs_CZ', 'pl,en-us,en;q=', 'kpe_LR', 'en,en-us,en;q=', ); diff --git a/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguageCode_day.xml b/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguageCode_day.xml index 704c934193..527ba03c1a 100644 --- a/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguageCode_day.xml +++ b/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguageCode_day.xml @@ -122,7 +122,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Serbian - Serbia Montenegro (sr-cs)</label> + <label>Serbian - Serbia (sr-rs)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> 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 d4b8bc363e..f59700dfc7 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -496,13 +496,13 @@ <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Macedonia, the Former Yugoslav Republic of</country> + <country>Macedonia</country> <countryCode>mk</countryCode> <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> + <location>Stratford-upon-Avon, Miravci, Macedonia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> @@ -624,13 +624,13 @@ <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Macedonia, the Former Yugoslav Republic of</country> + <country>Macedonia</country> <countryCode>mk</countryCode> <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> + <location>Stratford-upon-Avon, Miravci, Macedonia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> @@ -783,13 +783,13 @@ <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Russian Federation</country> + <country>Russia</country> <countryCode>ru</countryCode> <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> - <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> + <location>Hluboká nad Vltavou, Saint Petersburg City, Russia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> @@ -911,13 +911,13 @@ <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Russian Federation</country> + <country>Russia</country> <countryCode>ru</countryCode> <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> - <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> + <location>Hluboká nad Vltavou, Saint Petersburg City, Russia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> @@ -1053,13 +1053,13 @@ <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Russian Federation</country> + <country>Russia</country> <countryCode>ru</countryCode> <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location> + <location>Stratford-upon-Avon, Saint Petersburg City, Russia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> @@ -1181,13 +1181,13 @@ <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Russian Federation</country> + <country>Russia</country> <countryCode>ru</countryCode> <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location> + <location>Stratford-upon-Avon, Saint Petersburg City, Russia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index 2f4c1d0d3d..cf4c86ac6f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -1308,13 +1308,13 @@ <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Russian Federation</country> + <country>Russia</country> <countryCode>ru</countryCode> <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Moscow City</region> <regionCode>48</regionCode> <city>Moscow</city> - <location>Moscow, Moscow City, Russian Federation</location> + <location>Moscow, Moscow City, Russia</location> <latitude>55.751999</latitude> <longitude>37.616001</longitude> <visitLocalTime>04:28:18</visitLocalTime> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml index 190a3632e7..041ce4c922 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml @@ -397,13 +397,13 @@ <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Macedonia, the Former Yugoslav Republic of</country> + <country>Macedonia</country> <countryCode>mk</countryCode> <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> + <location>Stratford-upon-Avon, Miravci, Macedonia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml index 5a539fb4b0..ae5aab8ed8 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml @@ -87,13 +87,13 @@ <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Macedonia, the Former Yugoslav Republic of</country> + <country>Macedonia</country> <countryCode>mk</countryCode> <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> + <location>Stratford-upon-Avon, Miravci, Macedonia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> @@ -251,13 +251,13 @@ <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Russian Federation</country> + <country>Russia</country> <countryCode>ru</countryCode> <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> - <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> + <location>Hluboká nad Vltavou, Saint Petersburg City, Russia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> @@ -381,13 +381,13 @@ <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Russian Federation</country> + <country>Russia</country> <countryCode>ru</countryCode> <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> - <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> + <location>Hluboká nad Vltavou, Saint Petersburg City, Russia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index 0727b6eebe..4b6a7a5bf5 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -509,13 +509,13 @@ <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Macedonia, the Former Yugoslav Republic of</country> + <country>Macedonia</country> <countryCode>mk</countryCode> <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> + <location>Stratford-upon-Avon, Miravci, Macedonia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> @@ -639,13 +639,13 @@ <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Macedonia, the Former Yugoslav Republic of</country> + <country>Macedonia</country> <countryCode>mk</countryCode> <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> + <location>Stratford-upon-Avon, Miravci, Macedonia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> @@ -803,13 +803,13 @@ <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Russian Federation</country> + <country>Russia</country> <countryCode>ru</countryCode> <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> - <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> + <location>Hluboká nad Vltavou, Saint Petersburg City, Russia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> @@ -933,13 +933,13 @@ <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Russian Federation</country> + <country>Russia</country> <countryCode>ru</countryCode> <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> - <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> + <location>Hluboká nad Vltavou, Saint Petersburg City, Russia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml index 7156a17642..e3e0da7816 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml @@ -415,13 +415,13 @@ <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Russian Federation</country> + <country>Russia</country> <countryCode>ru</countryCode> <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> - <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> + <location>Hluboká nad Vltavou, Saint Petersburg City, Russia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> @@ -561,13 +561,13 @@ <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Macedonia, the Former Yugoslav Republic of</country> + <country>Macedonia</country> <countryCode>mk</countryCode> <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> + <location>Stratford-upon-Avon, Miravci, Macedonia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> @@ -691,13 +691,13 @@ <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Macedonia, the Former Yugoslav Republic of</country> + <country>Macedonia</country> <countryCode>mk</countryCode> <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> + <location>Stratford-upon-Avon, Miravci, Macedonia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> @@ -821,13 +821,13 @@ <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Russian Federation</country> + <country>Russia</country> <countryCode>ru</countryCode> <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> - <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> + <location>Hluboká nad Vltavou, Saint Petersburg City, Russia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index 0727b6eebe..4b6a7a5bf5 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -509,13 +509,13 @@ <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Macedonia, the Former Yugoslav Republic of</country> + <country>Macedonia</country> <countryCode>mk</countryCode> <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> + <location>Stratford-upon-Avon, Miravci, Macedonia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> @@ -639,13 +639,13 @@ <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Macedonia, the Former Yugoslav Republic of</country> + <country>Macedonia</country> <countryCode>mk</countryCode> <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> + <location>Stratford-upon-Avon, Miravci, Macedonia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> @@ -803,13 +803,13 @@ <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Russian Federation</country> + <country>Russia</country> <countryCode>ru</countryCode> <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> - <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> + <location>Hluboká nad Vltavou, Saint Petersburg City, Russia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> @@ -933,13 +933,13 @@ <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Russian Federation</country> + <country>Russia</country> <countryCode>ru</countryCode> <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> - <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> + <location>Hluboká nad Vltavou, Saint Petersburg City, Russia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index 9f8ce4e4f1..ed97e10898 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -509,13 +509,13 @@ <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Macedonia, the Former Yugoslav Republic of</country> + <country>Macedonia</country> <countryCode>mk</countryCode> <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> + <location>Stratford-upon-Avon, Miravci, Macedonia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> @@ -639,13 +639,13 @@ <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Macedonia, the Former Yugoslav Republic of</country> + <country>Macedonia</country> <countryCode>mk</countryCode> <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> + <location>Stratford-upon-Avon, Miravci, Macedonia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> @@ -803,13 +803,13 @@ <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Russian Federation</country> + <country>Russia</country> <countryCode>ru</countryCode> <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> - <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> + <location>Hluboká nad Vltavou, Saint Petersburg City, Russia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> @@ -933,13 +933,13 @@ <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Russian Federation</country> + <country>Russia</country> <countryCode>ru</countryCode> <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> - <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> + <location>Hluboká nad Vltavou, Saint Petersburg City, Russia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> @@ -1079,13 +1079,13 @@ <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Russian Federation</country> + <country>Russia</country> <countryCode>ru</countryCode> <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location> + <location>Stratford-upon-Avon, Saint Petersburg City, Russia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> @@ -1209,13 +1209,13 @@ <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> - <country>Russian Federation</country> + <country>Russia</country> <countryCode>ru</countryCode> <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location> + <location>Stratford-upon-Avon, Saint Petersburg City, Russia</location> <latitude /> <longitude /> <visitLocalTime>12:34:06</visitLocalTime> 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 c905bbb316..3a836ebd0d 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml @@ -131,7 +131,7 @@ <logo>plugins/UserCountry/images/flags/fr.png</logo> </row> <row> - <label>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</label> + <label>Hluboká nad Vltavou, Saint Petersburg City, Russia</label> <nb_visits>2</nb_visits> <nb_actions>4</nb_actions> <max_actions>3</max_actions> @@ -157,7 +157,7 @@ <city_name>Hluboká nad Vltavou</city_name> <region>66</region> <country>ru</country> - <country_name>Russian Federation</country_name> + <country_name>Russia</country_name> <region_name>Saint Petersburg City</region_name> <logo>plugins/UserCountry/images/flags/ru.png</logo> </row> @@ -288,7 +288,7 @@ <logo>plugins/UserCountry/images/flags/gb.png</logo> </row> <row> - <label>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</label> + <label>Stratford-upon-Avon, Miravci, Macedonia</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> <max_actions>2</max_actions> @@ -314,12 +314,12 @@ <city_name>Stratford-upon-Avon</city_name> <region>66</region> <country>mk</country> - <country_name>Macedonia, the Former Yugoslav Republic of</country_name> + <country_name>Macedonia</country_name> <region_name>Miravci</region_name> <logo>plugins/UserCountry/images/flags/mk.png</logo> </row> <row> - <label>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</label> + <label>Stratford-upon-Avon, Saint Petersburg City, Russia</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> <max_actions>2</max_actions> @@ -345,7 +345,7 @@ <city_name>Stratford-upon-Avon</city_name> <region>66</region> <country>ru</country> - <country_name>Russian Federation</country_name> + <country_name>Russia</country_name> <region_name>Saint Petersburg City</region_name> <logo>plugins/UserCountry/images/flags/ru.png</logo> </row> 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 50b14e2ae4..235a0e73c5 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml @@ -59,7 +59,7 @@ <logoHeight>11</logoHeight> </row> <row> - <label>Russian Federation</label> + <label>Russia</label> <nb_visits>4</nb_visits> <nb_actions>7</nb_actions> <max_actions>3</max_actions> @@ -204,7 +204,7 @@ <logoHeight>11</logoHeight> </row> <row> - <label>Macedonia, the Former Yugoslav Republic of</label> + <label>Macedonia</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> <max_actions>2</max_actions> 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 5332bb5366..97f6f058e2 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml @@ -90,7 +90,7 @@ <logo>plugins/UserCountry/images/flags/gb.png</logo> </row> <row> - <label>Saint Petersburg City, Russian Federation</label> + <label>Saint Petersburg City, Russia</label> <nb_visits>4</nb_visits> <nb_actions>7</nb_actions> <max_actions>3</max_actions> @@ -115,7 +115,7 @@ <segment>regionCode==66;countryCode==ru</segment> <region>66</region> <country>ru</country> - <country_name>Russian Federation</country_name> + <country_name>Russia</country_name> <region_name>Saint Petersburg City</region_name> <logo>plugins/UserCountry/images/flags/ru.png</logo> </row> @@ -210,7 +210,7 @@ <logo>plugins/UserCountry/images/flags/gb.png</logo> </row> <row> - <label>Miravci, Macedonia, the Former Yugoslav Republic of</label> + <label>Miravci, Macedonia</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> <max_actions>2</max_actions> @@ -235,7 +235,7 @@ <segment>regionCode==66;countryCode==mk</segment> <region>66</region> <country>mk</country> - <country_name>Macedonia, the Former Yugoslav Republic of</country_name> + <country_name>Macedonia</country_name> <region_name>Miravci</region_name> <logo>plugins/UserCountry/images/flags/mk.png</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml index 92c88ab042..022ae3c7fe 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml @@ -30,7 +30,7 @@ <logoHeight>11</logoHeight> </row> <row> - <label>Russian Federation</label> + <label>Russia</label> <nb_visits>4</nb_visits> <nb_actions>7</nb_actions> <max_actions>3</max_actions> @@ -117,7 +117,7 @@ <logoHeight>11</logoHeight> </row> <row> - <label>Macedonia, the Former Yugoslav Republic of</label> + <label>Macedonia</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> <max_actions>2</max_actions> |