Merge pull request nemomobile#19 from mikkoharju/translators

[mlite] Do not install translators from desktop files

Author: mikkoharju

src/mdesktopentry.cpp

@@ -48,7 +48,6 @@ const QString URLKey("Desktop Entry/URL");
 const QString LogicalIdKey("Desktop Entry/X-MeeGo-Logical-Id");
 const QString TranslationCatalogKey("Desktop Entry/X-MeeGo-Translation-Catalog");
 const QString XMaemoServiceKey("Desktop Entry/X-Maemo-Service");
-QMap<QString, QSharedPointer<QTranslator> > MDesktopEntryPrivate::translators;
 
 // The syntax of the locale string in the POSIX environment variables
 // related to locale is:
@@ -94,34 +93,7 @@ MDesktopEntryPrivate::MDesktopEntryPrivate(const QString &fileName) :
 
     //Checks if the file exists and opens it in readonly mode
     if (file.exists() && file.open(QIODevice::ReadOnly)) {
-        if (readDesktopFile(file, desktopEntriesMap)) {
-            // Load the translation catalog if it has been defined for the entry.
-            if (desktopEntriesMap.contains(TranslationCatalogKey)) {
-                // Load the catalog from disk if it's not yet loaded
-                QString catalog = desktopEntriesMap.value(TranslationCatalogKey);
-                QString engineeringEnglishCatalog = catalog + "_eng_en";
-                if (!translators.contains(engineeringEnglishCatalog)) {
-                    QTranslator *translator = new QTranslator;
-                    if (translator->load(engineeringEnglishCatalog, "/usr/share/translations")) {
-                        translators[engineeringEnglishCatalog] = QSharedPointer<QTranslator>(translator);
-                        qApp->installTranslator(translator);
-                    } else {
-                        delete translator;
-                    }
-                }
-
-                if (!translators.contains(catalog)) {
-                    QTranslator *translator = new QTranslator;
-                    if (translator->load(QLocale(), catalog, "-", "/usr/share/translations")) {
-                        translators[catalog] = QSharedPointer<QTranslator>(translator);
-                        qApp->installTranslator(translator);
-                    } else {
-                        qDebug() << "Unable to load catalog" << catalog;
-                        delete translator;
-                    }
-                }
-            }
-        }
+        readDesktopFile(file, desktopEntriesMap);
     } else {
         qDebug() << "Specified Desktop file does not exist" << fileName;
     }
@@ -137,6 +109,18 @@ bool MDesktopEntryPrivate::readDesktopFile(QIODevice &device, QMap<QString, QStr
     return valid;
 }
 
+QTranslator *MDesktopEntryPrivate::loadTranslator() const
+{
+    QTranslator *translator = new QTranslator;
+    QString catalog = desktopEntriesMap.value(TranslationCatalogKey);
+    if (catalog.isNull() || !translator->load(QLocale(), catalog, "-", "/usr/share/translations")) {
+        qDebug() << "Unable to load catalog" << catalog;
+        delete translator;
+        translator = 0;
+    }
+    return translator;
+}
+
 bool MDesktopEntry::readDesktopFile(QIODevice &device, QMap<QString, QString> &desktopEntriesMap)
 {
     bool valid = true;
@@ -335,11 +319,23 @@ QString MDesktopEntry::version() const
 
 QString MDesktopEntry::name() const
 {
+    Q_D(const MDesktopEntry);
+
+    if (!d->translatedName.isNull())
+        return d->translatedName;
+
     QString name = value(NameKey);
 
     if (contains(LogicalIdKey)) {
         QString key = value(LogicalIdKey);
-        QString translation = qtTrId(key.toLatin1().data());
+        QString translation;
+        QScopedPointer<QTranslator> translator(d->loadTranslator());
+        if (translator) {
+            translation = translator->translate(0, key.toLatin1().data(), 0, -1);
+        } else {
+            translation = qtTrId(key.toLatin1().data());
+        }
+
         if (!translation.isEmpty() && translation != key) {
             name = translation;
         }
@@ -360,6 +356,7 @@ QString MDesktopEntry::name() const
         }
     }
 
+    d->translatedName = name;
     return name;
 }
 

src/mdesktopentry_p.h

@@ -57,9 +57,6 @@ class MDesktopEntryPrivate
     //! A map for storing the desktop entries keys and their corresponding values
     QMap<QString, QString> desktopEntriesMap;
 
-    //! A map for storing translators for translation catalogs
-    static QMap<QString, QSharedPointer<QTranslator> > translators;
-
     /*!
      * Returns the boolean value of a key.
      *
@@ -80,6 +77,15 @@ class MDesktopEntryPrivate
     //! Flag to indicate whether the desktop entry is valid during parsing
     bool valid;
 
+    //! Cached translated name
+    mutable QString translatedName;
+
+    /*!
+     * Loads a QTranslator from X-MeeGo-Translation-Catalog
+     * \return A translator for specified catalog, or null
+     */
+    QTranslator *loadTranslator() const;
+
 protected:
     /*
      * \brief this q_ptr starts the inheritance hierarchy

tests/ut_mdesktopentry.cpp

@@ -371,22 +371,28 @@ void UtMDesktopEntry::localization_data()
             "Name[sr@Latn]=l_vFoo\n",
             "sr_YU@Latn", "l_vFoo");
 
-    Helper::add("logical", "X-MeeGo-Logical-Id=LogicalFoo", QString(), "LogicalFooTranslated");
-    Helper::add("logical_noTranslation", "X-MeeGo-Logical-Id=LogicalFooNoTr", QString(), "Foo");
-}
+    QString entry = QString("X-MeeGo-Logical-Id=LogicalBar\n"
+                            "X-MeeGo-Translation-Catalog=%1/ut_mdesktopentry2.qm")
+            .arg(QCoreApplication::applicationDirPath());
 
-void UtMDesktopEntry::localization()
-{
-    QFETCH(Values, values);
-    QFETCH(QString, lang);
-    QFETCH(QString, expected);
+    Helper::add("logical_fromCatalog", entry, QString(), "LogicalBarTranslated");
+    Helper::add("logical_global", "X-MeeGo-Logical-Id=LogicalFoo", QString(), "LogicalFooTranslated");
+    Helper::add("logical_noTranslation", "X-MeeGo-Logical-Id=LogicalFooNoTr", QString(), "Foo");
+    Helper::add("logical_other", "X-MeeGo-Logical-Id=LogicalBar", QString(), "Foo");
 
     QTranslator *const translator = new QTranslator;
     const bool loadOk = translator->load("ut_mdesktopentry",
             QCoreApplication::instance()->applicationDirPath());
     Q_ASSERT(loadOk);
     qApp->installTranslator(translator);
     Q_ASSERT(qtTrId("LogicalFoo") == "LogicalFooTranslated");
+}
+
+void UtMDesktopEntry::localization()
+{
+    QFETCH(Values, values);
+    QFETCH(QString, lang);
+    QFETCH(QString, expected);
 
     if (!lang.isEmpty()) {
         qputenv("LANG", lang.toLocal8Bit());
@@ -395,6 +401,7 @@ void UtMDesktopEntry::localization()
     MDesktopEntry entry(createDesktopEntry(values));
     QCOMPARE(entry.nameUnlocalized(), QString("Foo"));
     QCOMPARE(entry.name(), expected);
+    QVERIFY2(qtTrId("LogicalBar") != "LogicalBarTranslated", "MDesktopEntry: A translator was installed globally");
 }
 
 QString UtMDesktopEntry::createDesktopEntry(const Values &values)

tests/ut_mdesktopentry.pro

@@ -1,6 +1,6 @@
 include(testapplication.pri)
 
-TRANSLATIONS = ut_mdesktopentry.ts
+TRANSLATIONS = ut_mdesktopentry.ts ut_mdesktopentry2.ts
 
 lrelease.input = TRANSLATIONS
 lrelease.output = ${QMAKE_FILE_BASE}.qm

tests/ut_mdesktopentry2.ts

@@ -0,0 +1,8 @@
+<!DOCTYPE TS>
+<TS>
+  <context>
+    <message id="LogicalBar">
+      <translation>LogicalBarTranslated</translation>
+    </message>
+  </context>
+</TS>