From b4d801bf4d6e664ad729e3e95b212b83cc0c784f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 17 Jul 2009 16:16:31 +0200 Subject: reorganize numerus form count normalization replace implicit normalization of individual messages on file writeout with global normalization which is called by the command line tools. this should a) be faster and b) cover the most critical case: lrelease. --- tools/linguist/shared/translator.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/linguist/shared/translator.h') diff --git a/tools/linguist/shared/translator.h b/tools/linguist/shared/translator.h index 77b515f83e..01778d7899 100644 --- a/tools/linguist/shared/translator.h +++ b/tools/linguist/shared/translator.h @@ -150,8 +150,8 @@ public: static QString guessLanguageCodeFromFileName(const QString &fileName); QList messages() const; QList translatedMessages() const; - static QStringList normalizedTranslations(const TranslatorMessage &m, - QLocale::Language lang, QLocale::Country country); + static QStringList normalizedTranslations(const TranslatorMessage &m, int numPlurals); + void normalizeTranslations(ConversionData &cd); QStringList normalizedTranslations(const TranslatorMessage &m, ConversionData &cd, bool *ok) const; int messageCount() const { return m_messages.size(); } -- cgit v1.2.3 From 1185386dfe9727ed591da442e97084907f0a6735 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 17 Jul 2009 19:41:23 +0200 Subject: 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 --- tools/linguist/shared/translator.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools/linguist/shared/translator.h') diff --git a/tools/linguist/shared/translator.h b/tools/linguist/shared/translator.h index 01778d7899..762a77baf3 100644 --- a/tools/linguist/shared/translator.h +++ b/tools/linguist/shared/translator.h @@ -81,7 +81,8 @@ public: public: QString m_defaultContext; - QByteArray m_codecForSource; // CPP specific + QByteArray m_codecForSource; // CPP, PO & QM specific + QByteArray m_outputCodec; // PO specific QString m_sourceFileName; QString m_targetFileName; QDir m_sourceDir; -- cgit v1.2.3