mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 08:21:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/audioplayer.cpp
	src/system/localize.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: c5df56955b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-07-04 14:06:36 +02:00
parent 0bec415c49 5820d8a8a0
commit f18eb6af70
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/system/localize.h
View File

@@ -70,6 +70,7 @@ class CLocaleManager
const char * getText(const neutrino_locale_t keyName) const;
std::string getString(const neutrino_locale_t keyName) const; //NI
std::string getTextAsString(const neutrino_locale_t keyName) const {return (static_cast<std::string>(getText(keyName)));}
static neutrino_locale_t getMonth (const struct tm * struct_tm_p);
static neutrino_locale_t getMonth (const int mon);