atria-soft/etranslate
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update to the URI

Browse Source
This commit is contained in:
Edouard DUPIN 2018-10-02 22:48:53 +02:00
parent af319573a3
commit 83bcc677e2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etranslate/etranslate.cpp
View File

@ -141,7 +141,8 @@ class LocalInstanceTranslation {
if (m_translateLoadad == true) { if (m_translateLoadad == true) {
return; return;
} }
ETRANSLATE_VERBOSE("Load Translation MAJOR='" << m_major << "' LANG='" << m_language << "' default=" << m_languageDefault ); ETRANSLATE_DEBUG("Load Translation MAJOR='" << m_major << "' LANG='" << m_language << "' default=" << m_languageDefault );
ETRANSLATE_DEBUG("list path=" << m_listPath.getKeys() );
// start parse language for Major: // start parse language for Major:
auto itMajor = m_listPath.find(m_major); auto itMajor = m_listPath.find(m_major);
if (itMajor != m_listPath.end()) { if (itMajor != m_listPath.end()) {
@ -165,8 +166,8 @@ class LocalInstanceTranslation {
if (it.first == m_major) { if (it.first == m_major) {
continue; continue;
} }
etk::Uri uri = itMajor->second; etk::Uri uri = it.second;
uri.setPath(itMajor->second.getPath() / m_languageDefault + ".json"); uri.setPath(it.second.getPath() / m_languageDefault + ".json");
if (etk::uri::exist(uri) == false) { if (etk::uri::exist(uri) == false) {
continue; continue;
} }
@ -182,8 +183,8 @@ class LocalInstanceTranslation {
if (it.first == m_major) { if (it.first == m_major) {
continue; continue;
} }
etk::Uri uri = itMajor->second; etk::Uri uri = it.second;
uri.setPath(itMajor->second.getPath() / m_languageDefault + ".json"); uri.setPath(it.second.getPath() / m_languageDefault + ".json");
if (etk::uri::exist(uri) == false) { if (etk::uri::exist(uri) == false) {
continue; continue;
} }
@ -194,6 +195,7 @@ class LocalInstanceTranslation {
m_translate.set(element, val); m_translate.set(element, val);
} }
} }
m_translateLoadad = true;
} }
}; };