diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-06-24 10:15:16 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-06-24 09:22:42 +0000 |
| commit | 1e589e37a991b29076e9a661f92dfa178421c208 (patch) | |
| tree | ccdae70edb75b1bc17f0efc61086e16554e3f4eb /src/libs/installer/metadatajob_p.h | |
| parent | 65a5d4d33c7dcb27ce99ce59535733a28991c544 (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/metadatajob_p.h')
| -rw-r--r-- | src/libs/installer/metadatajob_p.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libs/installer/metadatajob_p.h b/src/libs/installer/metadatajob_p.h index 6e9796712..0e2cbf3b6 100644 --- a/src/libs/installer/metadatajob_p.h +++ b/src/libs/installer/metadatajob_p.h @@ -39,6 +39,7 @@ #include "lib7z_facade.h" #include "metadatajob.h" +#include <QDir> #include <QFile> namespace QInstaller{ @@ -86,14 +87,14 @@ public: Lib7z::extractArchive(&archive, m_targetDir); } catch (const Lib7z::SevenZipException& e) { fi.reportException(UnzipArchiveException(MetadataJob::tr("Error while extracting " - "'%1': %2").arg(m_archive, e.message()))); + "archive \"%1\": %2").arg(QDir::toNativeSeparators(m_archive), e.message()))); } catch (...) { fi.reportException(UnzipArchiveException(MetadataJob::tr("Unknown exception " - "caught while extracting %1.").arg(m_archive))); + "caught while extracting archive \"%1\".").arg(QDir::toNativeSeparators(m_archive)))); } } else { - fi.reportException(UnzipArchiveException(MetadataJob::tr("Could not open %1 for " - "reading. Error: %2").arg(m_archive, archive.errorString()))); + fi.reportException(UnzipArchiveException(MetadataJob::tr("Cannot open file \"%1\" for " + "reading: %2").arg(QDir::toNativeSeparators(m_archive), archive.errorString()))); } fi.reportFinished(); |