summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/scriptengine.cpp
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@theqtcompany.com>2015-06-24 10:15:16 +0200
committerKai Koehne <kai.koehne@theqtcompany.com>2015-06-24 09:22:42 +0000
commit1e589e37a991b29076e9a661f92dfa178421c208 (patch)
treeccdae70edb75b1bc17f0efc61086e16554e3f4eb /src/libs/installer/scriptengine.cpp
parent65a5d4d33c7dcb27ce99ce59535733a28991c544 (diff)
Unify translated error messages
* Enclose file paths in "" * Localize file paths with QDir::toNativeSeparators. * Make sure sentences end with a '.' * Append error details always by ':', e.g. tr("Failed to copy file '%1': %2").(...) * Use 'directory' instead of 'folder' everywhere Change-Id: Ie045f429f72ad5045c96537465c5fb9d2e99d250 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'src/libs/installer/scriptengine.cpp')
-rw-r--r--src/libs/installer/scriptengine.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libs/installer/scriptengine.cpp b/src/libs/installer/scriptengine.cpp
index e3f82194c..eebfdf214 100644
--- a/src/libs/installer/scriptengine.cpp
+++ b/src/libs/installer/scriptengine.cpp
@@ -372,7 +372,7 @@ QJSValue ScriptEngine::loadInContext(const QString &context, const QString &file
{
QFile file(fileName);
if (!file.open(QIODevice::ReadOnly)) {
- throw Error(tr("Could not open the requested script file at %1: %2.")
+ throw Error(tr("Cannot open script file at %1: %2")
.arg(fileName, file.errorString()));
}
@@ -390,9 +390,10 @@ QJSValue ScriptEngine::loadInContext(const QString &context, const QString &file
QJSValue scriptContext = evaluate(scriptContent, fileName);
scriptContext.setProperty(QLatin1String("Uuid"), QUuid::createUuid().toString());
if (scriptContext.isError()) {
- throw Error(tr("Exception while loading the component script '%1'. (%2)").arg(
- QFileInfo(file).absoluteFilePath(), scriptContext.toString().isEmpty() ?
- QString::fromLatin1("Unknown error.") : scriptContext.toString()));
+ throw Error(tr("Exception while loading the component script \"%1\": %2").arg(
+ QDir::toNativeSeparators(QFileInfo(file).absoluteFilePath()),
+ scriptContext.toString().isEmpty() ?
+ tr("Unknown error.") : scriptContext.toString()));
}
return scriptContext;
}