fix: update module metadata translations at soft restart

saturneric · Sep 28, 2024 · 5953e0e · 5953e0e
1 parent 7bf010a
commit 5953e0e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/modules b/modules
diff --git a/src/ui/UIModuleManager.cpp b/src/ui/UIModuleManager.cpp
@@ -69,18 +69,6 @@ auto UIModuleManager::MountEntry(const QString& id,
   MountedUIEntry m_entry;
   m_entry.id_ = id;
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
-  for (const auto& meta : meta_data.asKeyValueRange()) {
-    meta_data[meta.first] =
-        QApplication::translate("GTrC", meta.second.toUtf8());
-  }
-#else
-  for (auto it = meta_data.keyValueBegin(); it != meta_data.keyValueEnd();
-       ++it) {
-    meta_data[it->first] = QApplication::translate("GTrC", it->second.toUtf8());
-  }
-#endif
-
   m_entry.meta_data_ = std::move(meta_data);
   m_entry.factory_ = factory;
 
@@ -99,6 +87,7 @@ auto MountedUIEntry::GetWidget() const -> QWidget* {
 
 auto MountedUIEntry::GetMetaDataByDefault(
     const QString& key, QString default_value) const -> QString {
+  if (meta_data_translated_.contains(key)) return meta_data_translated_[key];
   if (!meta_data_.contains(key)) return default_value;
   return meta_data_[key];
 }
@@ -162,19 +151,24 @@ void UIModuleManager::TranslateAllModulesParams() {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
   for (auto entry : mounted_entries_.asKeyValueRange()) {
     for (auto& m_entry : entry.second) {
+      m_entry.meta_data_translated_.clear();
       for (auto param : m_entry.meta_data_.asKeyValueRange()) {
-        m_entry.meta_data_[param.first] =
+        m_entry.meta_data_translated_[param.first] =
             QApplication::translate("GTrC", param.second.toUtf8());
+        LOG_D() << "module entry metadata key: " << param.first
+                << "value: " << param.second
+                << "translated: " << m_entry.meta_data_translated_[param.first];
       }
     }
   }
 #else
   for (auto it = mounted_entries_.keyValueBegin();
        it != mounted_entries_.keyValueEnd(); ++it) {
     for (auto& m_entry : it->second) {
+      m_entry.meta_data_translated_.clear();
       for (auto it_p = m_entry.meta_data_.keyValueBegin();
            it_p != m_entry.meta_data_.keyValueEnd(); ++it_p) {
-        m_entry.meta_data_[it_p->first] =
+        m_entry.meta_data_translated_[it_p->first] =
             QApplication::translate("GTrC", it_p->second.toUtf8());
       }
     }

diff --git a/src/ui/UIModuleManager.h b/src/ui/UIModuleManager.h
@@ -40,6 +40,7 @@ namespace GpgFrontend::UI {
 struct MountedUIEntry {
   QString id_;
   QMap<QString, QString> meta_data_;
+  QMap<QString, QString> meta_data_translated_;
   EntryFactory factory_;
 
   MountedUIEntry() = default;
+2 −0		include/GFModuleCommonUtils.hpp
+1 −1		src/m_gpg_info/GnuPGInfoGatheringModule.cpp
+1 −1		src/m_ver_check/VersionCheckingModule.cpp