summaryrefslogtreecommitdiff
path: root/src/linguist
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2022-07-11 18:03:18 +0200
committerhjk <hjk@qt.io>2022-07-13 09:40:05 +0200
commita4f7cb3c89ab8de4efcc06be918f4644434016aa (patch)
treeb408355648f15a395ddd0233f93a1866ca22970c /src/linguist
parent6dac7e439ab07e182c8b54890aebd0c18b27a5a1 (diff)
downloadqttools-a4f7cb3c89ab8de4efcc06be918f4644434016aa.tar.gz
lrelease: Show line numbers for duplicated messages
Change-Id: Ife0411782e44e9a51b48f8275215283d85d828cd Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/linguist')
-rw-r--r--src/linguist/shared/translator.cpp3
-rw-r--r--src/linguist/shared/translatormessage.h3
-rw-r--r--src/linguist/shared/ts.cpp1
3 files changed, 7 insertions, 0 deletions
diff --git a/src/linguist/shared/translator.cpp b/src/linguist/shared/translator.cpp
index 3a0df205d..a258dd32c 100644
--- a/src/linguist/shared/translator.cpp
+++ b/src/linguist/shared/translator.cpp
@@ -620,6 +620,9 @@ void Translator::reportDuplicates(const Duplicates &dupes,
<< "\n* Source: " << qPrintable(msg.sourceText()) << std::endl;
if (!msg.comment().isEmpty())
std::cerr << "* Comment: " << qPrintable(msg.comment()) << std::endl;
+ const int tsLine = msg.tsLineNumber();
+ if (tsLine >= 0)
+ std::cerr << "* Line in .ts File: " << msg.tsLineNumber() << std::endl;
}
std::cerr << std::endl;
}
diff --git a/src/linguist/shared/translatormessage.h b/src/linguist/shared/translatormessage.h
index b7eef1ca9..53c739e29 100644
--- a/src/linguist/shared/translatormessage.h
+++ b/src/linguist/shared/translatormessage.h
@@ -73,6 +73,8 @@ public:
void setFileName(const QString &fileName) { m_fileName = fileName; }
int lineNumber() const { return m_lineNumber; }
void setLineNumber(int lineNumber) { m_lineNumber = lineNumber; }
+ int tsLineNumber() const { return m_tsLineNumber; }
+ void setTsLineNumber(int lineNumber) { m_tsLineNumber = lineNumber; }
void clearReferences();
void setReferences(const References &refs);
void addReference(const QString &fileName, int lineNumber);
@@ -126,6 +128,7 @@ private:
QStringList m_translations;
QString m_fileName;
int m_lineNumber;
+ int m_tsLineNumber = -1;
References m_extraRefs;
bool m_warningOnly = false;
diff --git a/src/linguist/shared/ts.cpp b/src/linguist/shared/ts.cpp
index 5ffcc310d..9f213498d 100644
--- a/src/linguist/shared/ts.cpp
+++ b/src/linguist/shared/ts.cpp
@@ -280,6 +280,7 @@ bool TSReader::read(Translator &translator)
msg.setContext(context);
msg.setType(TranslatorMessage::Finished);
msg.setPlural(attributes().value(strnumerus) == stryes);
+ msg.setTsLineNumber(lineNumber());
while (!atEnd()) {
readNext();
if (isEndElement()) {