feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmlpreview: fix translation for qml files in subdirectories

Browse Source 
Found path was ignored - so the location was wrong
Keeping the kind of ugly in findValidI18nDirectoryAsUrl(const QString &locale)
for now - to not change too much in that area.

Change-Id: I491df1f928868a8d9afbbb7d25c8102bbe9b51a7
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Tim Jenssen
2020-07-21 11:53:00 +02:00
parent b45b771581
commit b1fc2cdbb4
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp
View File

@@ -76,17 +76,22 @@ void QmlPreviewConnectionManager::createClients()
QUrl QmlPreviewConnectionManager::findValidI18nDirectoryAsUrl(const QString &locale) QUrl QmlPreviewConnectionManager::findValidI18nDirectoryAsUrl(const QString &locale)
{ {
QTC_ASSERT(!m_lastLoadedUrl.isEmpty(), return {};);
const QString shortLocale = locale.left(locale.indexOf("_")); const QString shortLocale = locale.left(locale.indexOf("_"));
QString path = m_lastLoadedUrl.path(); QString path = m_lastLoadedUrl.path();
QString foundPath;
while (!path.isEmpty()) { while (!path.isEmpty()) {
path = path.left(qMax(0, path.lastIndexOf("/"))); path = path.left(qMax(0, path.lastIndexOf("/")));
QUrl url = m_lastLoadedUrl; QUrl url = m_lastLoadedUrl;
auto tryPath = [&](const QString &postfix) { auto tryPath = [&](const QString &postfix) {
url.setPath(path + "/i18n/qml_" + postfix); url.setPath(path + "/i18n/qml_" + postfix);
bool success = false; bool success = false;
m_projectFileFinder.findFile(url, &success); foundPath = m_projectFileFinder.findFile(url, &success).first().toString();
foundPath = foundPath.left(qMax(0, foundPath.lastIndexOf("/i18n")));
return success; return success;
}; };
@@ -101,7 +106,10 @@ QUrl QmlPreviewConnectionManager::findValidI18nDirectoryAsUrl(const QString &loc
} }
QUrl url = m_lastLoadedUrl; QUrl url = m_lastLoadedUrl;
url.setPath(path); if (foundPath.isEmpty())
url.setPath(path);
else
url.setPath(foundPath);
return url; return url;
} }