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

Merge branch 'cst-next' into nmp-cst-next

Browse Source 
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-08-19 17:40:48 +02:00
parent 3daad4c6d5 59d3c49084
commit 2c4ccf9555
260 changed files with 8682 additions and 4001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/system/helpers.cpp
View File

@@ -46,7 +46,7 @@
#include <linux/hdreg.h>
#include <linux/fs.h>
#include "debug.h"
#include <driver/framebuffer.h>
#include <global.h>
#include <system/helpers.h>
#include <gui/update_ext.h>
using namespace std;
@@ -441,6 +441,28 @@ std::string trim(std::string &str, const std::string &trimChars /*= " \n\r\t"*/)
return result.erase(0, result.find_first_not_of(trimChars));
}
std::string cutString(const std::string str, int msgFont, const int width)
{
Font *msgFont_ = g_Font[msgFont];
std::string ret = str;
ret = trim(ret);
int sw = msgFont_->getRenderWidth(ret);
if (sw <= width)
return ret;
else {
std::string z = "...";
int zw = msgFont_->getRenderWidth(z);
if (width <= 2*zw)
return ret;
do {
ret = ret.substr(0, ret.length()-1);
sw = msgFont_->getRenderWidth(ret);
} while (sw+zw > width);
ret = trim(ret) + z;
}
return ret;
}
std::string strftime(const char *format, const struct tm *tm)
{
char buf[4096];
@@ -490,6 +512,8 @@ std::string& htmlEntityDecode(std::string& text)
};
decode_table dt[] =
{
{"\n", "&#x0a;"},
{"\n", "&#x0d;"},
{" ", "&nbsp;"},
{"&", "&amp;"},
{"<", "&lt;"},
@@ -911,3 +935,36 @@ std::string getJFFS2MountPoint(int mtdPos)
fclose(fd);
return "";
}
std::string Lang2ISO639_1(std::string& lang)
{
std::string ret = "";
if ((lang == "deutsch") || (lang == "bayrisch") || (lang == "ch-baslerdeutsch") || (lang == "ch-berndeutsch"))
ret = "de";
else if (lang == "english")
ret = "en";
else if (lang == "nederlands")
ret = "nl";
else if (lang == "slovak")
ret = "sk";
else if (lang == "bosanski")
ret = "bs";
else if (lang == "czech")
ret = "cs";
else if (lang == "francais")
ret = "fr";
else if (lang == "italiano")
ret = "it";
else if (lang == "polski")
ret = "pl";
else if (lang == "portugues")
ret = "pt";
else if (lang == "russkij")
ret = "ru";
else if (lang == "suomi")
ret = "fi";
else if (lang == "svenska")
ret = "sv";
return ret;
}