liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Skip language file entries starting with !

Browse Source
This commit is contained in:
heckflosse 2017-10-16 21:54:09 +02:00
parent 90e4e41b85
commit 43ea69447f
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
rtgui/multilangmgr.cc
View File

@ -114,35 +114,37 @@ MultiLangMgr::MultiLangMgr (const Glib::ustring& fname, MultiLangMgr* fallbackMg
bool MultiLangMgr::load (const Glib::ustring& fname, MultiLangMgr* fallbackMgr) bool MultiLangMgr::load (const Glib::ustring& fname, MultiLangMgr* fallbackMgr)
{ {
this->fallbackMgr.reset (fallbackMgr); this->fallbackMgr.reset(fallbackMgr);
std::ifstream file (fname.c_str ()); std::ifstream file(fname.c_str());
if (!file.is_open ()) { if (!file.is_open()) {
return false; return false;
} }
std::map<std::string, Glib::ustring> translations; std::map<std::string, Glib::ustring> translations;
std::string entry, key, value; std::string entry;
while (std::getline (file, entry)) { while (std::getline(file, entry)) {
if (entry.empty () || entry.front () == '#') { if (entry.empty() || entry.front() == '#' || entry.front() == '!') {
continue; continue;
} }
std::istringstream line (entry); std::string key, value;
if (!std::getline (line, key, ';') || !std::getline (line, value)) { std::istringstream line(entry);
if (!std::getline(line, key, ';') || !std::getline(line, value)) {
continue; continue;
} }
static const std::regex newline ("\\\\n"); static const std::regex newline("\\\\n");
value = std::regex_replace (value, newline, "\n"); value = std::regex_replace(value, newline, "\n");
translations.emplace (key, value); translations.emplace(key, value);
} }
this->translations.swap (translations); this->translations.swap(translations);
return true; return true;
} }