Imageinfo: add lua API info

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 6b88cea7bf
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-02 (Sun, 02 Oct 2016)
This commit is contained in:
2016-10-02 23:24:54 +02:00
parent 6df22ce699
commit 4dd326ab7e
7 changed files with 16 additions and 6 deletions

View File

@@ -38,9 +38,13 @@
#include <string>
#include <daemonc/remotecontrol.h>
#include <system/flashtool.h>
#include <system/helpers.h>
#include "version.h"
#include <gui/buildinfo.h>
#define LICENSEDIR DATADIR "/neutrino/license/"
#ifdef ENABLE_LUA
#include <gui/lua/lua_api_version.h>
#endif
using namespace std;
@@ -294,6 +298,12 @@ void CImageInfo::InitInfoData()
#endif
image_info_t date = {LOCALE_IMAGEINFO_DATE, builddate};
v_info.push_back(date);
string s_api;
#ifdef ENABLE_LUA
s_api += "LUA " + to_string(LUA_API_VERSION_MAJOR) + "." + to_string(LUA_API_VERSION_MINOR);
#endif
image_info_t api = {LOCALE_IMAGEINFO_API, s_api};
v_info.push_back(api);
if (uname(&uts_info) == 0) {
image_info_t kernel = {LOCALE_IMAGEINFO_KERNEL, uts_info.release};
v_info.push_back(kernel);

View File

@@ -807,6 +807,7 @@ typedef enum
LOCALE_HDD_UMOUNT,
LOCALE_HDD_UMOUNT_WARN,
LOCALE_HDD_UMOUNTED,
LOCALE_IMAGEINFO_API,
LOCALE_IMAGEINFO_CREATOR,
LOCALE_IMAGEINFO_DATE,
LOCALE_IMAGEINFO_DOKUMENTATION,
@@ -816,7 +817,6 @@ typedef enum
LOCALE_IMAGEINFO_IMAGE,
LOCALE_IMAGEINFO_KERNEL,
LOCALE_IMAGEINFO_LICENSE,
LOCALE_IMAGEINFO_LUA,
LOCALE_IMAGEINFO_VCS,
LOCALE_IMAGEINFO_VERSION,
LOCALE_INETRADIO_NAME,

View File

@@ -807,6 +807,7 @@ const char * locale_real_names[] =
"hdd_umount",
"hdd_umount_warn",
"hdd_umounted",
"imageinfo.api",
"imageinfo.creator",
"imageinfo.date",
"imageinfo.dokumentation",
@@ -816,7 +817,6 @@ const char * locale_real_names[] =
"imageinfo.image",
"imageinfo.kernel",
"imageinfo.license",
"imageinfo.lua",
"imageinfo.vcs",
"imageinfo.version",
"inetradio.name",