mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-14 00:43:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

- flashtool: add posibilty to get localized and non-localized type

Browse Source 
Conflicts:
	src/gui/update.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2018-01-06 14:46:09 +01:00
committed by Thilo Graf
parent 8329fe4b31
commit 4c2ce1bac2
7 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/system/flashtool.cpp
View File

@@ -524,28 +524,28 @@ const char *CFlashVersionInfo::getReleaseCycle(void) const
return releaseCycle;
}
const char *CFlashVersionInfo::getType(void) const
const char *CFlashVersionInfo::getType(bool localized) const
{
switch (snapshot)
{
case '0':
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_RELEASE);
return (localized ? g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_RELEASE) : "Release");
case '1':
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_BETA);
return (localized ? g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_BETA) : "Beta");
case '2':
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_INTERNAL);
return (localized ? g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_NIGHTLY) : "Nightly");
case 'L':
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_LOCALE);
return (localized ? g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_LOCALE) : "Locale");
case 'S':
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_SETTINGS);
return (localized ? g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_SETTINGS) : "Settings");
case 'A':
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_ADDON);
return (localized ? g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_ADDON) : "Addon");
case 'U':
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_UPDATE);
return (localized ? g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_UPDATE) : "Update");
case 'T':
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_TEXT);
return (localized ? g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_TEXT) : "Text");
default:
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_UNKNOWN);
return (localized ? g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_UNKNOWN) : "Unknown");
}
}

2
src/system/flashtool.h
View File

@@ -91,7 +91,7 @@ class CFlashVersionInfo
const char *getDate(void) const;
const char *getTime(void) const;
const char *getReleaseCycle(void) const;
const char *getType(void) const;
const char *getType(bool localized = false) const;
int getVersion(void) const;
time_t getDateTime(void) const { return datetime; };
};

2
src/system/locals.h
View File

@@ -715,8 +715,8 @@ typedef enum
LOCALE_FLASHUPDATE_TITLEWRITEFLASH,
LOCALE_FLASHUPDATE_TYPE_ADDON,
LOCALE_FLASHUPDATE_TYPE_BETA,
LOCALE_FLASHUPDATE_TYPE_INTERNAL,
LOCALE_FLASHUPDATE_TYPE_LOCALE,
LOCALE_FLASHUPDATE_TYPE_NIGHTLY,
LOCALE_FLASHUPDATE_TYPE_RELEASE,
LOCALE_FLASHUPDATE_TYPE_SETTINGS,
LOCALE_FLASHUPDATE_TYPE_TEXT,

2
src/system/locals_intern.h
View File

@@ -715,8 +715,8 @@ const char * locale_real_names[] =
"flashupdate.titlewriteflash",
"flashupdate.type_addon",
"flashupdate.type_beta",
"flashupdate.type_internal",
"flashupdate.type_locale",
"flashupdate.type_nightly",
"flashupdate.type_release",
"flashupdate.type_settings",
"flashupdate.type_text",