normalize numerus forms upon saving ts files

while linguist itself normalized the display, it would write out the
translation units as-is. this may be a problem for 3rd party tools and
manual editing.

the command line tools already do this normalization.

Task-number: QTBUG-35094
Change-Id: Ia309b07f31051c33adddeef519cff6d9b9a30a69
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

diff --git a/src/linguist/linguist/messagemodel.cpp b/src/linguist/linguist/messagemodel.cpp
index ae346ff..d95e2e2 100644 (file)
--- a/src/linguist/linguist/messagemodel.cpp
+++ b/src/linguist/linguist/messagemodel.cpp
@@ -338,10 +338,11 @@ bool DataModel::save(const QString &fileName, QWidget *parent)
                                              : Translator::AbsoluteLocations);
     tor.setExtras(m_extra);
     ConversionData cd;
+    tor.normalizeTranslations(cd);
     bool ok = tor.save(fileName, cd, QLatin1String("auto"));
     if (ok)
         setModified(false);
-    else
+    if (!cd.error().isEmpty())
         QMessageBox::warning(parent, QObject::tr("Qt Linguist"), cd.error());
     return ok;
 }