diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-12-18 14:13:17 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-18 11:31:09 +0000 |
commit | d4079b0797dae46f80d9ada09d43b571749e68dc (patch) | |
tree | 821a11f4e9c39284b714a91f3a9da51227e3a1bd /src/tools/uic/cpp/cppwriteinitialization.cpp | |
parent | 1c8f7082f70af934ddc46b9687a88e02233e1082 (diff) |
uic: Support id-based translations
Use Ids from newly introduced id attribute depending
on the global form setting.
Change-Id: I0a5094d5543c0714c88511fa159b60afc9be3c81
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/tools/uic/cpp/cppwriteinitialization.cpp')
-rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 86908147d8..9ab5fd4eb0 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -2261,7 +2261,7 @@ void WriteInitialization::initializeTableWidget(DomWidget *w) enableSorting(w, varName, tempName); } -QString WriteInitialization::trCall(const QString &str, const QString &commentHint) const +QString WriteInitialization::trCall(const QString &str, const QString &commentHint, const QString &id) const { if (str.isEmpty()) return QLatin1String("QString()"); @@ -2269,8 +2269,9 @@ QString WriteInitialization::trCall(const QString &str, const QString &commentHi QString result; const QString comment = commentHint.isEmpty() ? QString(QLatin1String("nullptr")) : fixString(commentHint, m_dindent); + const bool idBasedTranslations = m_driver->useIdBasedTranslations(); if (m_option.translateFunction.isEmpty()) { - if (m_option.idBased) { + if (idBasedTranslations || m_option.idBased) { result += QLatin1String("qtTrId("); } else { result += QLatin1String("QApplication::translate(\"") @@ -2281,9 +2282,9 @@ QString WriteInitialization::trCall(const QString &str, const QString &commentHi result += m_option.translateFunction + QLatin1Char('('); } - result += fixString(str, m_dindent); + result += fixString(idBasedTranslations ? id : str, m_dindent); - if (!m_option.idBased) { + if (!idBasedTranslations && !m_option.idBased) { result += QLatin1String(", ") + comment; } @@ -2306,11 +2307,13 @@ QString WriteInitialization::trCall(DomString *str, const QString &defaultString { QString value = defaultString; QString comment; + QString id; if (str) { value = toString(str); comment = str->attributeComment(); + id = str->attributeId(); } - return trCall(value, comment); + return trCall(value, comment, id); } QString WriteInitialization::noTrCall(DomString *str, const QString &defaultString) const |