From aa95a4338d5c0141050141c243ab87e7b4e65aa3 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 3 May 2024 22:24:51 +0200 Subject: [PATCH] rename weather-dev-ver => weather-api-version Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/d083c61dbbb2e1d8350233354540947e283a8ea7 Author: vanhofen Date: 2024-05-03 (Fri, 03 May 2024) Origin message was: ------------------ - rename weather-dev-ver => weather-api-version ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- configure.ac | 10 +++++----- data/locale/deutsch.locale | 2 +- data/locale/english.locale | 2 +- src/gui/weather_setup.cpp | 4 ++-- src/neutrino.cpp | 6 +++--- src/system/locals.h | 2 +- src/system/locals_intern.h | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index 08cdae6eb..2a1878f00 100644 --- a/configure.ac +++ b/configure.ac @@ -203,11 +203,11 @@ AC_ARG_WITH(weather-dev-key, [WEATHER_DEV_KEY=""]) AC_DEFINE_UNQUOTED([WEATHER_DEV_KEY], ["$WEATHER_DEV_KEY"], [API dev key to get data from weather data base, required for additional weather informations]) -AC_ARG_WITH(weather-dev-ver, - AS_HELP_STRING([--with-weather-dev-ver=version], [API version to get data from weather data base, required for additional weather informations]), - [WEATHER_DEV_VER="$withval"], - [WEATHER_DEV_VER=""]) -AC_DEFINE_UNQUOTED([WEATHER_DEV_VER], ["$WEATHER_DEV_VER"], [API version to get data from weather data base, required for additional weather informations]) +AC_ARG_WITH(weather-api-version, + AS_HELP_STRING([--with-weather-api-version=VERSION], [API version to get data from weather data base, required for additional weather informations]), + [WEATHER_API_VERSION="$withval"], + [WEATHER_API_VERSION=""]) +AC_DEFINE_UNQUOTED([WEATHER_API_VERSION], ["$WEATHER_API_VERSION"], [API version to get data from weather data base, required for additional weather informations]) AC_ARG_ENABLE([weather-key-manage], AS_HELP_STRING([--enable-weather-key-manage], [enable manage weather api dev key via gui for additional weather informations @<:@default=yes@:>@]), diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 91dcb87eb..2ee08433e 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -2922,7 +2922,7 @@ videomenu.zappingmode_holdtilllock Standbild bis lock videomenu.zappingmode_mute Schwarzes Bild videomenu.zappingmode_mutetilllock Schwarzes Bild bis lock weather.api_key Wetter API Schlüssel (OpenWeather) -weather.api_ver Wetter API Version +weather.api_version Wetter API Version weather.direction_e O weather.direction_ene ONO weather.direction_ese OSO diff --git a/data/locale/english.locale b/data/locale/english.locale index 782066390..465d3c263 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -2922,7 +2922,7 @@ videomenu.zappingmode_holdtilllock Hold screen until lock videomenu.zappingmode_mute Black screen videomenu.zappingmode_mutetilllock Black screen until lock weather.api_key Weather API key (OpenWeather) -weather.api_ver Weather API version +weather.api_version Weather API version weather.direction_e E weather.direction_ene ENE weather.direction_ese ESE diff --git a/src/gui/weather_setup.cpp b/src/gui/weather_setup.cpp index cc1bb2e68..86c2e8356 100644 --- a/src/gui/weather_setup.cpp +++ b/src/gui/weather_setup.cpp @@ -106,7 +106,7 @@ int CWeatherSetup::showWeatherSetup() ms_oservices->addItem(mf_we); #endif - weather_api = new CMenuOptionChooser(LOCALE_WEATHER_API_VER, &weather_api_version, WEATHER_API_OPTIONS, WEATHER_API_OPTION_COUNT, CApiKey::check_weather_api_key(), this); + weather_api = new CMenuOptionChooser(LOCALE_WEATHER_API_VERSION, &weather_api_version, WEATHER_API_OPTIONS, WEATHER_API_OPTION_COUNT, CApiKey::check_weather_api_key(), this); ms_oservices->addItem(weather_api); CMenuForwarder *mf_wl = new CMenuForwarder(LOCALE_WEATHER_LOCATION, g_settings.weather_enabled, g_settings.weather_city, this, "select_location"); @@ -207,7 +207,7 @@ bool CWeatherSetup::changeNotify(const neutrino_locale_t OptionName, void */*dat weather_api_key_short.clear(); weather_onoff->setActive(CApiKey::check_weather_api_key()); } - else if(ARE_LOCALES_EQUAL(OptionName, LOCALE_WEATHER_API_VER)) + else if(ARE_LOCALES_EQUAL(OptionName, LOCALE_WEATHER_API_VERSION)) { g_settings.weather_api_version = WEATHER_API_OPTIONS[weather_api_version].valname; CWeather::getInstance()->updateApi(); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 13d29594d..042eb77a1 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1113,10 +1113,10 @@ int CNeutrinoApp::loadSetup(const char *fname) // online services g_settings.weather_api_key = WEATHER_DEV_KEY; - g_settings.weather_api_version = WEATHER_DEV_VER; + g_settings.weather_api_version = WEATHER_API_VERSION; #if ENABLE_WEATHER_KEY_MANAGE g_settings.weather_api_key = configfile.getString("weather_api_key", g_settings.weather_api_key.empty() ? "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" : g_settings.weather_api_key); - g_settings.weather_api_version = configfile.getString("weather_api_ver", g_settings.weather_api_version.empty() ? "2.5" : g_settings.weather_api_version); + g_settings.weather_api_version = configfile.getString("weather_api_version", g_settings.weather_api_version.empty() ? "2.5" : g_settings.weather_api_version); #endif g_settings.weather_enabled = configfile.getInt32("weather_enabled", 1); g_settings.weather_enabled = g_settings.weather_enabled && CApiKey::check_weather_api_key(); @@ -2016,7 +2016,7 @@ void CNeutrinoApp::saveSetup(const char *fname) // online services #if ENABLE_WEATHER_KEY_MANAGE configfile.setString("weather_api_key", g_settings.weather_api_key); - configfile.setString( "weather_api_ver", g_settings.weather_api_version); + configfile.setString( "weather_api_version", g_settings.weather_api_version); #endif configfile.setInt32("weather_enabled", g_settings.weather_enabled); diff --git a/src/system/locals.h b/src/system/locals.h index 3576426f8..48561240d 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -2949,7 +2949,7 @@ typedef enum LOCALE_VIDEOMENU_ZAPPINGMODE_MUTE, LOCALE_VIDEOMENU_ZAPPINGMODE_MUTETILLLOCK, LOCALE_WEATHER_API_KEY, - LOCALE_WEATHER_API_VER, + LOCALE_WEATHER_API_VERSION, LOCALE_WEATHER_DIRECTION_E, LOCALE_WEATHER_DIRECTION_ENE, LOCALE_WEATHER_DIRECTION_ESE, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index c893fd549..25b75efdb 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -2949,7 +2949,7 @@ const char * locale_real_names[] = "videomenu.zappingmode_mute", "videomenu.zappingmode_mutetilllock", "weather.api_key", - "weather.api_ver", + "weather.api_version", "weather.direction_e", "weather.direction_ene", "weather.direction_ese",