mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 15:02:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

rename weather-dev-ver => weather-api-version

Browse Source 
Origin commit data
------------------
Commit: d083c61dbb
Author: vanhofen <vanhofen@gmx.de>
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
This commit is contained in:
vanhofen
2024-05-03 22:24:51 +02:00
committed by Thilo Graf
parent 27fadb7864
commit aa95a4338d
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@@ -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@:>@]),

2
data/locale/deutsch.locale
View File

@@ -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

2
data/locale/english.locale
View File

@@ -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

4
src/gui/weather_setup.cpp
View File

@@ -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();

6
src/neutrino.cpp
View File

@@ -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);

2
src/system/locals.h
View File

@@ -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,

2
src/system/locals_intern.h
View File

@@ -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",