Merge pull request #555 from ispyisail/feature/edz-translatable-strings

edz: make EdzArchive error strings translatable (+ German and French)
This commit is contained in:
Laurent Trinques
2026-07-26 14:45:43 +02:00
committed by GitHub
4 changed files with 75 additions and 6 deletions
+33
View File
@@ -15343,4 +15343,37 @@ Maximale Länge: %2px
<translation>Was:</translation>
</message>
</context>
<context>
<name>EdzArchive</name>
<message>
<location filename="../sources/import/edz/edzarchive.cpp" line="41"/>
<source>File not found: %1</source>
<translation>Datei nicht gefunden: %1</translation>
</message>
<message>
<location filename="../sources/import/edz/edzarchive.cpp" line="50"/>
<source>Cannot read %1</source>
<translation>Kann %1 nicht lesen.</translation>
</message>
<message>
<location filename="../sources/import/edz/edzarchive.cpp" line="58"/>
<source>This .edz is a zip-format package, which is not yet supported (only 7-Zip .edz files can be imported).</source>
<translation>Diese .edz-Datei ist ein Paket im ZIP-Format, das noch nicht unterstützt wird (es können nur .edz-Dateien im 7-Zip-Format importiert werden).</translation>
</message>
<message>
<location filename="../sources/import/edz/edzarchive.cpp" line="62"/>
<source>Not a valid .edz package (unrecognised archive format).</source>
<translation>Kein gültiges .edz-Paket (unbekanntes Archivformat).</translation>
</message>
<message>
<location filename="../sources/import/edz/edzarchive.cpp" line="70"/>
<source>Could not create a temporary directory: %1</source>
<translation>Temporäres Verzeichnis konnte nicht erstellt werden: %1</translation>
</message>
<message>
<location filename="../sources/import/edz/edzarchive.cpp" line="80"/>
<source>No *.part.xml found inside the .edz</source>
<translation>Keine *.part.xml in der .edz-Datei gefunden</translation>
</message>
</context>
</TS>
+33
View File
@@ -15181,4 +15181,37 @@ Longueur maximale : %2px
<translation></translation>
</message>
</context>
<context>
<name>EdzArchive</name>
<message>
<location filename="../sources/import/edz/edzarchive.cpp" line="41"/>
<source>File not found: %1</source>
<translation>Fichier introuvable : %1</translation>
</message>
<message>
<location filename="../sources/import/edz/edzarchive.cpp" line="50"/>
<source>Cannot read %1</source>
<translation>Impossible de lire %1</translation>
</message>
<message>
<location filename="../sources/import/edz/edzarchive.cpp" line="58"/>
<source>This .edz is a zip-format package, which is not yet supported (only 7-Zip .edz files can be imported).</source>
<translation>Ce fichier .edz est un paquet au format zip, qui n&apos;est pas encore pris en charge (seuls les fichiers .edz au format 7-Zip peuvent être importés).</translation>
</message>
<message>
<location filename="../sources/import/edz/edzarchive.cpp" line="62"/>
<source>Not a valid .edz package (unrecognised archive format).</source>
<translation>Paquet .edz non valide (format d&apos;archive non reconnu).</translation>
</message>
<message>
<location filename="../sources/import/edz/edzarchive.cpp" line="70"/>
<source>Could not create a temporary directory: %1</source>
<translation>Impossible de créer un répertoire temporaire : %1</translation>
</message>
<message>
<location filename="../sources/import/edz/edzarchive.cpp" line="80"/>
<source>No *.part.xml found inside the .edz</source>
<translation>Aucun fichier *.part.xml trouvé dans le .edz</translation>
</message>
</context>
</TS>
+6 -6
View File
@@ -38,7 +38,7 @@ bool EdzArchive::extract(const QString &edz_path)
const QFileInfo fi(edz_path);
if (!fi.exists() || !fi.isFile()) {
m_error = QStringLiteral("File not found: %1").arg(edz_path);
m_error = tr("File not found: %1").arg(edz_path);
return false;
}
@@ -47,7 +47,7 @@ bool EdzArchive::extract(const QString &edz_path)
// detect that up front and say so clearly rather than failing opaquely.
QFile probe(fi.absoluteFilePath());
if (!probe.open(QIODevice::ReadOnly)) {
m_error = QStringLiteral("Cannot read %1").arg(edz_path);
m_error = tr("Cannot read %1").arg(edz_path);
return false;
}
const QByteArray magic = probe.read(6);
@@ -55,11 +55,11 @@ bool EdzArchive::extract(const QString &edz_path)
static const QByteArray k7z("7z\xBC\xAF\x27\x1C", 6);
if (!magic.startsWith(k7z)) {
if (magic.startsWith(QByteArray("PK\x03\x04", 4))) {
m_error = QStringLiteral(
m_error = tr(
"This .edz is a zip-format package, which is not yet "
"supported (only 7-Zip .edz files can be imported).");
} else {
m_error = QStringLiteral(
m_error = tr(
"Not a valid .edz package (unrecognised archive format).");
}
return false;
@@ -67,7 +67,7 @@ bool EdzArchive::extract(const QString &edz_path)
m_dir.reset(new QTemporaryDir);
if (!m_dir->isValid()) {
m_error = QStringLiteral("Could not create a temporary directory: %1")
m_error = tr("Could not create a temporary directory: %1")
.arg(m_dir->errorString());
return false;
}
@@ -77,7 +77,7 @@ bool EdzArchive::extract(const QString &edz_path)
}
if (partXmlPath().isEmpty()) {
m_error = QStringLiteral("No *.part.xml found inside the .edz");
m_error = tr("No *.part.xml found inside the .edz");
return false;
}
return true;
+3
View File
@@ -18,6 +18,7 @@
#ifndef EDZARCHIVE_H
#define EDZARCHIVE_H
#include <QCoreApplication>
#include <QString>
#include <QScopedPointer>
@@ -38,6 +39,8 @@ class QTemporaryDir;
*/
class EdzArchive
{
Q_DECLARE_TR_FUNCTIONS(EdzArchive)
public:
EdzArchive();
~EdzArchive();