1 files changed, 2 insertions, 22 deletions

diff --git a/plugins/UserCountry/UserCountry.php b/plugins/UserCountry/UserCountry.php
index 2d8c0bfce1..b88e5313a9 100644
--- a/plugins/UserCountry/UserCountry.php
+++ b/plugins/UserCountry/UserCountry.php
@@ -8,18 +8,10 @@
  */
 namespace Piwik\Plugins\UserCountry;
 
-use Piwik\ArchiveProcessor;
 use Piwik\Config;
 use Piwik\Container\StaticContainer;
 use Piwik\Intl\Data\Provider\RegionDataProvider;
-use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
-use Piwik\Plugins\UserCountry\LocationProvider;
-use Piwik\Url;
-
-/**
- * @see plugins/UserCountry/GeoIPAutoUpdater.php
- */
-require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/GeoIPAutoUpdater.php';
+use Piwik\Plugins\GeoIp2\LocationProvider\GeoIp2;
 
 /**
  *
@@ -34,7 +26,6 @@ class UserCountry extends \Piwik\Plugin
         return array(
             'AssetManager.getStylesheetFiles'        => 'getStylesheetFiles',
             'AssetManager.getJavaScriptFiles'        => 'getJsFiles',
-            'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys',
             'Tracker.setTrackerCacheGeneral'         => 'setTrackerCacheGeneral',
             'Insights.addReportToOverview'           => 'addReportToInsightsOverview',
         );
@@ -59,8 +50,6 @@ class UserCountry extends \Piwik\Plugin
     {
         $jsFiles[] = "plugins/UserCountry/angularjs/location-provider-selection/location-provider-selection.controller.js";
         $jsFiles[] = "plugins/UserCountry/angularjs/location-provider-selection/location-provider-selection.directive.js";
-        $jsFiles[] = "plugins/UserCountry/angularjs/location-provider-updater/location-provider-updater.controller.js";
-        $jsFiles[] = "plugins/UserCountry/angularjs/location-provider-updater/location-provider-updater.directive.js";
     }
 
     /**
@@ -93,20 +82,11 @@ class UserCountry extends \Piwik\Plugin
     public function isGeoIPWorking()
     {
         $provider = LocationProvider::getCurrentProvider();
-        return $provider instanceof GeoIp
+        return $provider instanceof GeoIp2
         && $provider->isAvailable() === true
         && $provider->isWorking() === true;
     }
 
-    public function getClientSideTranslationKeys(&$translationKeys)
-    {
-        $translationKeys[] = "UserCountry_FatalErrorDuringDownload";
-        $translationKeys[] = "UserCountry_SetupAutomaticUpdatesOfGeoIP";
-        $translationKeys[] = "General_Done";
-        $translationKeys[] = "General_Save";
-        $translationKeys[] = "General_Continue";
-    }
-
     public static function isGeoLocationAdminEnabled()
     {
         return (bool) Config::getInstance()->General['enable_geolocation_admin'];