fix: Change the translation language of the application in dock #1100

Configure name retrieval in three levels

fix-Bug-translation

Author: wjyrich

panels/dock/taskmanager/desktopfileamparser.cpp

@@ -240,17 +240,41 @@ void DesktopFileAMParser::updateActions()
     auto actionNames = m_applicationInterface->actionName();
 
     for (auto action : actions) {
+<<<<<<< HEAD
         auto localeName = actionNames.value(action).value(currentLanguageCode);
+=======
+        auto localeName = getLocaleName(currentLanguageCode, actionNames.value(action));
+>>>>>>> 69273dc (fix: Change the translation language of the application in dock #1100)
         auto fallbackDefaultName = actionNames.value(action).value(DEFAULT_KEY);
         m_actions.append({action, localeName.isEmpty() ? fallbackDefaultName : localeName});
     }
 }
 
+<<<<<<< HEAD
+=======
+QString DesktopFileAMParser::getLocaleName(const QString& currentLanguageCode, const QStringMap& names)
+{
+    auto localeName = names.value(currentLanguageCode);
+    if ( currentLanguageCode.contains('_') && !(names.contains(currentLanguageCode))) {
+    {
+        auto prefix = currentLanguageCode.split('_')[0];
+        if (names.contains(prefix)) {
+            localeName = names.value(prefix);
+        }
+    }
+    return localeName;
+}
+
+>>>>>>> 69273dc (fix: Change the translation language of the application in dock #1100)
 void DesktopFileAMParser::updateLocalName()
 {
     QString currentLanguageCode = QLocale::system().name();
     auto names = m_applicationInterface->name();
+<<<<<<< HEAD
     auto localeName = names.value(currentLanguageCode);
+=======
+    auto localeName = getLocaleName(currentLanguageCode, names);
+>>>>>>> 69273dc (fix: Change the translation language of the application in dock #1100)
     auto fallbackName = names.value(DEFAULT_KEY);
     m_name = localeName.isEmpty() ? fallbackName : localeName;
 }
@@ -264,7 +288,11 @@ void DesktopFileAMParser::updateLocalGenericName()
 {
     QString currentLanguageCode = QLocale::system().name();
     auto genericNames = m_applicationInterface->genericName();
+<<<<<<< HEAD
     auto localeGenericName = genericNames.value(currentLanguageCode);
+=======
+    auto localeGenericName = getLocaleName(currentLanguageCode, genericNames);
+>>>>>>> 69273dc (fix: Change the translation language of the application in dock #1100)
     auto fallBackGenericName = genericNames.value(DEFAULT_KEY);
     m_genericName = localeGenericName.isEmpty() ? fallBackGenericName : localeGenericName;
 }

panels/dock/taskmanager/desktopfileamparser.h

@@ -47,6 +47,10 @@ class DesktopFileAMParser : public DesktopfileAbstractParser
     QString id2dbusPath(const QString& id);
     void connectToAmDBusSignal(const QString& propertyName, const char* slot);
     void launchByAMTool(const QString &action = QString());
+<<<<<<< HEAD
+=======
+    QString getLocaleName(const QString& currentLanguageCode, const QStringMap& names);
+>>>>>>> 69273dc (fix: Change the translation language of the application in dock #1100)
 
 private Q_SLOTS:
     void updateActions();