[locale] Remove old-style GeoIP configuration

calamares · Sep 7, 2019 · 0ee8427 · 0ee8427
1 parent 5a24e45
commit 0ee8427
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/CHANGES b/CHANGES
@@ -12,6 +12,9 @@ This release contains contributions from (alphabetically by first name):
 
 ## Modules ##
 
+ - *locale* module no longer recognized the legacy GeoIP configuration.
+   This has been deprecated since Calamares 3.2.8.
+
 
 # 3.2.13 (2019-08-30) #
 

diff --git a/src/modules/locale/LocaleViewStep.cpp b/src/modules/locale/LocaleViewStep.cpp
@@ -231,20 +231,4 @@ LocaleViewStep::setConfigurationMap( const QVariantMap& configurationMap )
         m_geoipStyle = CalamaresUtils::getString( geoip, "style" );
         m_geoipSelector = CalamaresUtils::getString( geoip, "selector" );
     }
-    else
-    {
-        // Accommodate deprecated geoip configuration
-        m_geoipUrl = CalamaresUtils::getString( configurationMap, "geoipUrl" );
-        m_geoipStyle = CalamaresUtils::getString( configurationMap, "geoipStyle" );
-        m_geoipSelector = CalamaresUtils::getString( configurationMap, "geoipSelector" );
-
-        if ( !m_geoipUrl.isEmpty() && ( m_geoipStyle.isEmpty() || m_geoipStyle == "legacy" ) )
-        {
-            m_geoipStyle = "json";
-            m_geoipUrl.append( "/json/" );
-        }
-
-        if ( !m_geoipUrl.isEmpty() )
-            cWarning() << "Legacy-style GeoIP configuration is deprecated. Use geoip: map.";
-    }
 }