diff --git a/src/effects/EffectManager.cpp b/src/effects/EffectManager.cpp index 36e5474d4..d5f5ef9c1 100644 --- a/src/effects/EffectManager.cpp +++ b/src/effects/EffectManager.cpp @@ -300,19 +300,19 @@ wxString EffectManager::GetCommandName(const PluginID & ID) return GetCommandSymbol(ID).Translation(); } -wxString EffectManager::GetEffectFamilyName(const PluginID & ID) +TranslatableString EffectManager::GetEffectFamilyName(const PluginID & ID) { auto effect = GetEffect(ID); if (effect) - return effect->GetFamily().Translation(); + return effect->GetFamily().Msgid(); return {}; } -wxString EffectManager::GetVendorName(const PluginID & ID) +TranslatableString EffectManager::GetVendorName(const PluginID & ID) { auto effect = GetEffect(ID); if (effect) - return effect->GetVendor().Translation(); + return effect->GetVendor().Msgid(); return {}; } diff --git a/src/effects/EffectManager.h b/src/effects/EffectManager.h index 60e0e9ffc..4d2ebe4a3 100644 --- a/src/effects/EffectManager.h +++ b/src/effects/EffectManager.h @@ -93,8 +93,8 @@ public: NotifyingSelectedRegion &selectedRegion, bool shouldPrompt = true); - wxString GetEffectFamilyName(const PluginID & ID); - wxString GetVendorName(const PluginID & ID); + TranslatableString GetEffectFamilyName(const PluginID & ID); + TranslatableString GetVendorName(const PluginID & ID); /** Run a command given the plugin ID */ // Returns true on success. diff --git a/src/menus/PluginMenus.cpp b/src/menus/PluginMenus.cpp index 29f178aa9..47e329af4 100644 --- a/src/menus/PluginMenus.cpp +++ b/src/menus/PluginMenus.cpp @@ -74,8 +74,8 @@ bool CompareEffectsByPublisher( const PluginDescriptor *a, const PluginDescriptor *b) { auto &em = EffectManager::Get(); - auto akey = em.GetVendorName(a->GetID()); - auto bkey = em.GetVendorName(b->GetID()); + auto akey = em.GetVendorName(a->GetID()).Translation(); + auto bkey = em.GetVendorName(b->GetID()).Translation(); if (akey.empty()) { @@ -99,8 +99,8 @@ bool CompareEffectsByPublisherAndName( const PluginDescriptor *a, const PluginDescriptor *b) { auto &em = EffectManager::Get(); - auto akey = em.GetVendorName(a->GetID()); - auto bkey = em.GetVendorName(b->GetID()); + auto akey = em.GetVendorName(a->GetID()).Translation(); + auto bkey = em.GetVendorName(b->GetID()).Translation(); if (a->IsEffectDefault()) { @@ -124,8 +124,8 @@ bool CompareEffectsByTypeAndName( const PluginDescriptor *a, const PluginDescriptor *b) { auto &em = EffectManager::Get(); - auto akey = em.GetEffectFamilyName(a->GetID()); - auto bkey = em.GetEffectFamilyName(b->GetID()); + auto akey = em.GetEffectFamilyName(a->GetID()).Translation(); + auto bkey = em.GetEffectFamilyName(b->GetID()).Translation(); if (akey.empty()) { @@ -157,8 +157,8 @@ bool CompareEffectsByTypeAndName( bool CompareEffectsByType(const PluginDescriptor *a, const PluginDescriptor *b) { auto &em = EffectManager::Get(); - auto akey = em.GetEffectFamilyName(a->GetID()); - auto bkey = em.GetEffectFamilyName(b->GetID()); + auto akey = em.GetEffectFamilyName(a->GetID()).Translation(); + auto bkey = em.GetEffectFamilyName(b->GetID()).Translation(); if (akey.empty()) { @@ -231,7 +231,7 @@ void AddEffectMenuItems( if (groupBy == wxT("groupby:publisher")) { - current = EffectManager::Get().GetVendorName(plug->GetID()); + current = EffectManager::Get().GetVendorName(plug->GetID()).Translation(); if (current.empty()) { current = _("Unknown"); @@ -239,7 +239,7 @@ void AddEffectMenuItems( } else if (groupBy == wxT("groupby:type")) { - current = EffectManager::Get().GetEffectFamilyName(plug->GetID()); + current = EffectManager::Get().GetEffectFamilyName(plug->GetID()).Translation(); if (current.empty()) { current = _("Unknown"); @@ -300,11 +300,11 @@ void AddEffectMenuItems( wxString group; if (groupBy == wxT("sortby:publisher:name")) { - group = EffectManager::Get().GetVendorName(plug->GetID()); + group = EffectManager::Get().GetVendorName(plug->GetID()).Translation(); } else if (groupBy == wxT("sortby:type:name")) { - group = EffectManager::Get().GetEffectFamilyName(plug->GetID()); + group = EffectManager::Get().GetEffectFamilyName(plug->GetID()).Translation(); } if (plug->IsEffectDefault())