diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index a0a261d60..d26d0cab8 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1902,7 +1902,6 @@ menu.hint_volume_digits Zifferndarstellung der Lautstärkeanzeige ein- oder auss menu.hint_volume_pos Wählen Sie die Position der Lautstärkeanzeige aus menu.hint_volume_size Wählen Sie die Höhe der Lautstärkeanzeige menu.hint_weather_api_key Geben Sie den OpenWeather API Schlüssel ein. Eine leere Eingabe schaltet die Wetter-Unterstützung aus -menu.hint_weather_country Land auswählen menu.hint_weather_enabled Schaltet die Wetter-Unterstützung (openweathermap.org) ein bzw. aus menu.hint_weather_location Wählen Sie eine Stadt in ihrer Nähe zur Anzeige der Wetterdaten aus menu.hint_webradio_setup Hier konfigurierte WebRadio-Kanäle finden Sie in der Kanalverwaltung. @@ -3037,9 +3036,6 @@ videomenu.zappingmode Umschaltverhalten videomenu.zappingmode_mute Schwarzes Bild videomenu.zappingmode_hold Standbild weather.api_key Wetter API Schlüssel (OpenWeather) -weather.country Länderwahl -weather.country_deutschland Deutschland -weather.country_norway Norwegen weather.enabled Wetter-Unterstützung weather.location Wetter-Standort webchannels.xml.add Hinzufügen diff --git a/data/locale/english.locale b/data/locale/english.locale index ee3825a15..cb6e81a9a 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1902,7 +1902,6 @@ menu.hint_volume_digits Numeric display of the volumebar on/off menu.hint_volume_pos Select volume indicator position menu.hint_volume_size Select volume indicator height menu.hint_weather_api_key Type your OpenWeather API key. An empty input disables Weather support -menu.hint_weather_country Select your country. menu.hint_weather_enabled Enable or disable Weather support (openweathermap.org) menu.hint_weather_location Select your weather location menu.hint_webradio_setup WebRadio channels configured here will be available in the standard channel lists. @@ -3037,9 +3036,6 @@ videomenu.zappingmode Zapping mode videomenu.zappingmode_mute Black screen videomenu.zappingmode_hold Hold screen weather.api_key Weather API key (OpenWeather) -weather.country Country choice -weather.country_deutschland Germany -weather.country_norway Norway weather.enabled Weather support weather.location Weather location webchannels.xml.add Add diff --git a/data/locale/slovak.locale b/data/locale/slovak.locale index 0fefe25e6..28564be55 100644 --- a/data/locale/slovak.locale +++ b/data/locale/slovak.locale @@ -1880,7 +1880,6 @@ menu.hint_volume_digits Číselné zobrazenie ukazateľa hlasitosti Zap/Vyp menu.hint_volume_pos Výber pozície indikátora hlasitosti menu.hint_volume_size Výber výšky indikátora hlasitosti menu.hint_weather_api_key Zadajte svoj kľúč API OpenWeather. Prázdny vstup deaktivuje podporu počasia -menu.hint_weather_country Vyberte svoju krajinu. menu.hint_weather_enabled Povolenie alebo zakázanie podpory počasia (openweathermap.org) menu.hint_weather_location Vyberte svoju lokalitu menu.hint_webradio_setup Kanály WebRadio tu nakonfigurované budú k dispozícii v štandartných zoznamoch kanálov @@ -3002,9 +3001,6 @@ videomenu.zappingmode Režim prepínania videomenu.zappingmode_mute Čierna obraz videomenu.zappingmode_hold Statický obraz weather.api_key Počasie API kľúč (OpenWeather) -weather.country Výber krajiny -weather.country_deutschland Nemecko -weather.country_norway Nórsko weather.enabled Počasie podpora weather.location Lokalita webchannels.xml.add Pridať diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 612a08751..23d5038aa 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1113,7 +1113,6 @@ int CNeutrinoApp::loadSetup(const char *fname) g_settings.weather_enabled = configfile.getInt32("weather_enabled", 1); g_settings.weather_enabled = g_settings.weather_enabled && CApiKey::check_weather_api_key(); - g_settings.weather_country = configfile.getInt32("weather_country", 0); g_settings.weather_location = configfile.getString("weather_location", "52.52,13.40"); g_settings.weather_city = configfile.getString("weather_city", "Berlin"); @@ -1622,7 +1621,10 @@ void CNeutrinoApp::upgradeSetup(const char * fname) { g_settings.bouquetlist_mode = SNeutrinoSettings::CHANNELLIST; } - + if (g_settings.version_pseudo < "20220114220000") + { + configfile.deleteKey("weather_country"); + } g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO; configfile.setString("version_pseudo", g_settings.version_pseudo); @@ -2142,7 +2144,6 @@ void CNeutrinoApp::saveSetup(const char *fname) #endif configfile.setInt32("weather_enabled", g_settings.weather_enabled); - configfile.setInt32("weather_country", g_settings.weather_country); configfile.setString("weather_location", g_settings.weather_location); configfile.setString("weather_city", g_settings.weather_city); diff --git a/src/system/locals.h b/src/system/locals.h index a03aedcf3..385bc2252 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1929,7 +1929,6 @@ typedef enum LOCALE_MENU_HINT_VOLUME_POS, LOCALE_MENU_HINT_VOLUME_SIZE, LOCALE_MENU_HINT_WEATHER_API_KEY, - LOCALE_MENU_HINT_WEATHER_COUNTRY, LOCALE_MENU_HINT_WEATHER_ENABLED, LOCALE_MENU_HINT_WEATHER_LOCATION, LOCALE_MENU_HINT_WEBRADIO_SETUP, @@ -3064,9 +3063,6 @@ typedef enum LOCALE_VIDEOMENU_ZAPPINGMODE_MUTE, LOCALE_VIDEOMENU_ZAPPINGMODE_HOLD, LOCALE_WEATHER_API_KEY, - LOCALE_WEATHER_COUNTRY, - LOCALE_WEATHER_COUNTRY_DEUTSCHLAND, - LOCALE_WEATHER_COUNTRY_NORWAY, LOCALE_WEATHER_ENABLED, LOCALE_WEATHER_LOCATION, LOCALE_WEBCHANNELS_XML_ADD, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 2bc190080..393bb2486 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1929,7 +1929,6 @@ const char * locale_real_names[] = "menu.hint_volume_pos", "menu.hint_volume_size", "menu.hint_weather_api_key", - "menu.hint_weather_country", "menu.hint_weather_enabled", "menu.hint_weather_location", "menu.hint_webradio_setup", @@ -3064,9 +3063,6 @@ const char * locale_real_names[] = "videomenu.zappingmode_mute", "videomenu.zappingmode_hold", "weather.api_key", - "weather.country", - "weather.country_deutschland", - "weather.country_norway", "weather.enabled", "weather.location", "webchannels.xml.add", diff --git a/src/system/settings.h b/src/system/settings.h index 9cefbb829..b5abce084 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -913,7 +913,6 @@ struct SNeutrinoSettings std::string weather_api_key; int weather_enabled; - int weather_country; std::string weather_location; std::string weather_city; diff --git a/version_pseudo.h b/version_pseudo.h index b92c2cb27..6252b8a54 100644 --- a/version_pseudo.h +++ b/version_pseudo.h @@ -1 +1 @@ -#define NEUTRINO_VERSION_PSEUDO "20211209230000" +#define NEUTRINO_VERSION_PSEUDO "20220114220000"