Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@piwik.org>2018-06-07 01:29:46 +0300
committerdiosmosis <diosmosis@users.noreply.github.com>2018-06-07 01:29:46 +0300
commit5076bd6bfdc32b969f122a5ef65c02fb1ab3c5b2 (patch)
treeb2785397e5506f8c305761025ddcd91aa2a6453c /plugins/UserCountry
parentd8c98711edd6eebc16f1be3b87dac798d118b78c (diff)
Use generic device model names if device type is known (#13015)
* Use generic device model names * updates tests * Update screenshots
Diffstat (limited to 'plugins/UserCountry')
-rw-r--r--plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCity_month.xml4
-rw-r--r--plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getRegion_month.xml4
2 files changed, 4 insertions, 4 deletions
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 9f51303233..a61099a113 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
@@ -63,7 +63,7 @@
<logo>plugins/Morpheus/icons/dist/flags/ca.png</logo>
</row>
<row>
- <label>Besan&#xE7;on, Bourgogne-Franche-Comt&#xE9;, France</label>
+ <label>Besançon, Bourgogne-Franche-Comté, France</label>
<nb_visits>3</nb_visits>
<nb_actions>7</nb_actions>
<max_actions>5</max_actions>
@@ -91,7 +91,7 @@
<region>BFC</region>
<country>fr</country>
<country_name>France</country_name>
- <region_name>Bourgogne-Franche-Comt&#xE9;</region_name>
+ <region_name>Bourgogne-Franche-Comté</region_name>
<logo>plugins/Morpheus/icons/dist/flags/fr.png</logo>
</row>
<row>
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 8cf825ec11..3004dbd1fb 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
@@ -58,7 +58,7 @@
<logo>plugins/Morpheus/icons/dist/flags/ca.png</logo>
</row>
<row>
- <label>Bourgogne-Franche-Comt&#xE9;, France</label>
+ <label>Bourgogne-Franche-Comté, France</label>
<nb_visits>3</nb_visits>
<nb_actions>7</nb_actions>
<max_actions>5</max_actions>
@@ -83,7 +83,7 @@
<region>BFC</region>
<country>fr</country>
<country_name>France</country_name>
- <region_name>Bourgogne-Franche-Comt&#xE9;</region_name>
+ <region_name>Bourgogne-Franche-Comté</region_name>
<logo>plugins/Morpheus/icons/dist/flags/fr.png</logo>
</row>
<row>