Fix translations not showing in the Sort by and Additional Information submenus

Acked by Frank
REVIEW: 106049
BUGS: 305228
FIXED-IN: 4.9.1
(cherry picked from commit 199fabbaa8d8a12fb49e4c9922c38ec8b033923c)

diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index f8302cfab4408ad4e9f8862e9c5bce2289d21bfb..1bf9e65d4d6a0c1269c2bab92fc2644d29c79f3c 100644 (file)
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -287,7 +287,7 @@ QString KFileItemModel::roleDescription(const QByteArray& role) const
         int count = 0;
         const RoleInfoMap* map = rolesInfoMap(count);
         for (int i = 0; i < count; ++i) {
         int count = 0;
         const RoleInfoMap* map = rolesInfoMap(count);
         for (int i = 0; i < count; ++i) {

-            description.insert(map[i].role, map[i].roleTranslation);
+            description.insert(map[i].role, i18nc(map[i].roleTranslationContext, map[i].roleTranslation));

         }
     }
 
         }
     }
 


@@ -560,8 +560,8 @@ QList<KFileItemModel::RoleInfo> KFileItemModel::rolesInformation()
             if (map[i].roleType != NoRole) {
                 RoleInfo info;
                 info.role = map[i].role;
             if (map[i].roleType != NoRole) {
                 RoleInfo info;
                 info.role = map[i].role;

-                info.translation = map[i].roleTranslation;
-                info.group = map[i].groupTranslation;
+                info.translation = i18nc(map[i].roleTranslationContext, map[i].roleTranslation);
+                info.group = i18nc(map[i].groupTranslationContext, map[i].groupTranslation);

                 info.requiresNepomuk = map[i].requiresNepomuk;
                 info.requiresIndexer = map[i].requiresIndexer;
                 rolesInfo.append(info);
                 info.requiresNepomuk = map[i].requiresNepomuk;
                 info.requiresIndexer = map[i].requiresIndexer;
                 rolesInfo.append(info);