diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-03-26 22:13:30 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-03-27 11:08:34 (GMT) |
| commit | d3be9fa7c981430c48de0a65938f3a2bd636bfcc (patch) | |
| tree | 36ba96ebbab08a5cd770b9f9d731d37e7be63313 /tools/linguist/shared/translatormessage.cpp | |
| parent | 32798196d81439fa77b34425b95eb47556aebc8d (diff) | |
| download | Qt-d3be9fa7c981430c48de0a65938f3a2bd636bfcc.zip Qt-d3be9fa7c981430c48de0a65938f3a2bd636bfcc.tar.gz Qt-d3be9fa7c981430c48de0a65938f3a2bd636bfcc.tar.bz2 | |
properly deal with messages which appear in multiple encodings
in ts 1.1 and qm files, messages appear in their native encoding. that
means that a message can appear multiple times - once in utf8 and once
in the codecForTr. however, in ts 2.0 files, everything is utf8 and
messages can have a utf8 flag for the later transformation into qm.
unfortunately, there was no flag to mark that the message is needed in
*both* encodings, and the respective case was completely ignored when
reading ts 1.1 and qm files (causing error messages).
Task-number: 249022
AutoTest: 322690
Diffstat (limited to 'tools/linguist/shared/translatormessage.cpp')
| -rw-r--r-- | tools/linguist/shared/translatormessage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/linguist/shared/translatormessage.cpp b/tools/linguist/shared/translatormessage.cpp index ab4301f..afe66fe 100644 --- a/tools/linguist/shared/translatormessage.cpp +++ b/tools/linguist/shared/translatormessage.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE TranslatorMessage::TranslatorMessage() - : m_lineNumber(-1), m_type(Unfinished), m_utf8(false), m_plural(false) + : m_lineNumber(-1), m_type(Unfinished), m_utf8(false), m_nonUtf8(false), m_plural(false) { } @@ -66,7 +66,7 @@ TranslatorMessage::TranslatorMessage(const QString &context, : m_context(context), m_sourcetext(sourceText), m_comment(comment), m_userData(userData), m_translations(translations), m_fileName(fileName), m_lineNumber(lineNumber), - m_type(type), m_utf8(false), m_plural(plural) + m_type(type), m_utf8(false), m_nonUtf8(false), m_plural(plural) { } |