diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-07-17 17:41:23 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-07-17 17:43:50 (GMT) |
| commit | 1185386dfe9727ed591da442e97084907f0a6735 (patch) | |
| tree | df4a70d8132e4f2d3005160c68130a2c176e5636 /tools/linguist/shared/po.cpp | |
| parent | 74c0b4300b538b24c56abf2be2d5e09b9c59a845 (diff) | |
| download | Qt-1185386dfe9727ed591da442e97084907f0a6735.zip Qt-1185386dfe9727ed591da442e97084907f0a6735.tar.gz Qt-1185386dfe9727ed591da442e97084907f0a6735.tar.bz2 | |
don't rely on system codec when handling PO files
- make -input-codec affect PO files, default to UTF-8
- add -output-codec for PO files, same default
Diffstat (limited to 'tools/linguist/shared/po.cpp')
| -rw-r--r-- | tools/linguist/shared/po.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/linguist/shared/po.cpp b/tools/linguist/shared/po.cpp index a197b25..4850cfd 100644 --- a/tools/linguist/shared/po.cpp +++ b/tools/linguist/shared/po.cpp @@ -359,6 +359,7 @@ bool loadPO(Translator &translator, QIODevice &dev, ConversionData &cd) const QChar quote = QLatin1Char('"'); const QChar newline = QLatin1Char('\n'); QTextStream in(&dev); + in.setCodec(cd.m_codecForSource.isEmpty() ? "UTF-8" : cd.m_codecForSource); bool error = false; // format of a .po file entry: @@ -547,11 +548,11 @@ bool loadPO(Translator &translator, QIODevice &dev, ConversionData &cd) return !error && cd.errors().isEmpty(); } -bool savePO(const Translator &translator, QIODevice &dev, ConversionData &) +bool savePO(const Translator &translator, QIODevice &dev, ConversionData &cd) { bool ok = true; QTextStream out(&dev); - //qDebug() << "OUT CODEC: " << out.codec()->name(); + out.setCodec(cd.m_outputCodec.isEmpty() ? "UTF-8" : cd.m_outputCodec); bool first = true; if (translator.messages().isEmpty() || !translator.messages().first().sourceText().isEmpty()) { |