diff options
| -rw-r--r-- | lang/en.php | 4 | ||||
| -rw-r--r-- | plugins/UserCountry/Controller.php | 2 | ||||
| -rwxr-xr-x | plugins/UserCountry/LocationProvider/GeoIp/Pecl.php | 2 | ||||
| -rwxr-xr-x | plugins/UserCountry/LocationProvider/GeoIp/Php.php | 2 | ||||
| -rwxr-xr-x | plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/lang/en.php b/lang/en.php index 992effebb5..0edb4aa57d 100644 --- a/lang/en.php +++ b/lang/en.php @@ -1487,7 +1487,7 @@ And thank you for using Piwik!', 'UserCountry_DefaultLocationProviderDesc2' => 'This is not very accurate, so %1$swe recommend installing and using %2$sGeoIP%3$s.%4$s', 'UserCountry_HowToInstallGeoIPDatabases' => 'How do I get the GeoIP databases?', 'UserSettings_PluginDescription' => 'Reports various User Settings: Browser, Browser Family, Operating System, Plugins, Resolution, Global Settings.', - 'UserCountry_GeoIpLocationProviderDesc_Php1' => 'This location provider uses a GeoIP database and MaxMind\'s PHP API to accurately determine the location of your visitors.', + 'UserCountry_GeoIpLocationProviderDesc_Php1' => 'This location provider is the most simple to install as it does not require server configuration (ideal for shared hosting!). It uses a GeoIP database and MaxMind\'s PHP API to accurately determine the location of your visitors.', 'UserCountry_GeoIpLocationProviderDesc_Php2' => 'If your website gets a lot of traffic, you may find that this location provider is too slow. In this case, you should install the %1$sPECL extension%2$s or a %3$sserver module%4$s.', 'UserCountry_GeoIpLocationProviderDesc_ServerBased1' => 'This location provider uses the GeoIP module that has been installed in your HTTP server. This provider is fast and accurate, but %1$scan only be used with normal browser tracking.%2$s', 'UserCountry_GeoIpLocationProviderDesc_ServerBased2' => 'If you have to import log files or do something else that requires setting IP addresses, use the %1$sPECL GeoIP implementation (recommended)%2$s or the %3$sPHP GeoIP implementation%4$s.', @@ -1497,7 +1497,7 @@ And thank you for using Piwik!', 'UserCountry_PeclGeoIPNoDBDir' => 'The PECL module is looking for databases in %1$s, but this directory does not exist. Please create it and add the GeoIP databases to it. Alternatively, you can set %2$s to the correct directory in your php.ini file.', 'UserCountry_PeclGeoLiteError' => 'Your GeoIP database in %1$s is named %2$s. Unfortunately, the PECL module will not recognize it with this name. Please rename it to %3$s.', 'UserCountry_GeoIpLocationProviderDesc_Pecl1' => 'This location provider uses a GeoIP database and a PECL module to accurately and efficiently determine the location of your visitors.', - 'UserCountry_GeoIpLocationProviderDesc_Pecl2' => 'There are no limitations with this provider, so it is the one we recommend using.', + 'UserCountry_GeoIpLocationProviderDesc_Pecl2' => 'There are no limitations with this provider, so it is the one we recommend using. ', 'UserCountry_CannotFindGeoIPServerVar' => 'The %s variable is not set. Your server may not be configured correctly.', 'UserCountry_LocationProvider' => 'Location Provider', 'UserCountry_TestIPLocatorFailed' => 'Piwik tried checking the location of a known IP address (%1$s), but your server returned %2$s. If this provider were configured correctly, it would return %3$s.', diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php index 48edf956cd..be24a4ff6d 100644 --- a/plugins/UserCountry/Controller.php +++ b/plugins/UserCountry/Controller.php @@ -52,7 +52,7 @@ class Piwik_UserCountry_Controller extends Piwik_Controller break; } } - +$view->isThereWorkingProvider=FALSE; $this->setBasicVariablesView($view); Piwik_Controller_Admin::setBasicVariablesAdminView($view); $view->menu = Piwik_GetAdminMenu(); diff --git a/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php b/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php index c5c61118af..48fe0c1a50 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php +++ b/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php @@ -240,7 +240,7 @@ class Piwik_UserCountry_LocationProvider_GeoIp_Pecl extends Piwik_UserCountry_Lo 'title' => self::TITLE, 'description' => $desc, 'install_docs' => $installDocs, - 'order' => 2); + 'order' => 3); } /** diff --git a/plugins/UserCountry/LocationProvider/GeoIp/Php.php b/plugins/UserCountry/LocationProvider/GeoIp/Php.php index 07b36a3f63..6ccccb55bc 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp/Php.php +++ b/plugins/UserCountry/LocationProvider/GeoIp/Php.php @@ -240,7 +240,7 @@ class Piwik_UserCountry_LocationProvider_GeoIp_Php extends Piwik_UserCountry_Loc 'title' => self::TITLE, 'description' => $desc, 'install_docs' => $installDocs, - 'order' => 4); + 'order' => 2); } /** diff --git a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php index 0e67a1ce17..40c2226382 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php +++ b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php @@ -207,7 +207,7 @@ class Piwik_UserCountry_LocationProvider_GeoIp_ServerBased extends Piwik_UserCou return array('id' => self::ID, 'title' => $title, 'description' => $desc, - 'order' => 3, + 'order' => 4, 'install_docs' => $installDocs); } } |