ModdingRX/YimMenu
Archived
1
0
Fork 0
Code Actions Releases Activity

fix: Bool CMD hotkey toggle message showing translation key (#1510)

Browse Source 
* feat(TranslationService): introduced fallback key to joaat version of get_translation
This commit is contained in:
Andreas Maerten 2023-06-23 09:55:26 +02:00 committed by GitHub
parent 5e0efaaed5
commit 8bc6648100
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/bool_command.cpp
View File

@ -1,4 +1,5 @@
#include "bool_command.hpp"
#include "services/translation_service/translation_service.hpp"
namespace big
{
@ -18,14 +19,14 @@ namespace big
m_toggle = false;
if (m_show_notify)
ctx->report_output(std::format("{} has been disabled", m_label));
ctx->report_output(std::format("{} has been disabled", g_translation_service.get_translation(m_label)));
}
else
{
m_toggle = true;
if (m_show_notify)
ctx->report_output(std::format("{} has been enabled", m_label));
ctx->report_output(std::format("{} has been enabled", g_translation_service.get_translation(m_label)));
}
}
else

6
src/services/translation_service/translation_service.cpp
View File

@ -60,16 +60,16 @@ namespace big
std::string_view translation_service::get_translation(const std::string_view translation_key) const
{
return get_translation(rage::joaat(translation_key));
return get_translation(rage::joaat(translation_key), translation_key);
}
std::string_view translation_service::get_translation(const rage::joaat_t translation_key) const
std::string_view translation_service::get_translation(const rage::joaat_t translation_key, const std::string_view fallback) const
{
if (auto it = m_translations.find(translation_key); it != m_translations.end())
return it->second.c_str();
return {0, 0};
return fallback;
}
std::map<std::string, translation_entry>& translation_service::available_translations()

2
src/services/translation_service/translation_service.hpp
View File

@ -23,7 +23,7 @@ namespace big
void init();
std::string_view get_translation(const std::string_view translation_key) const;
std::string_view get_translation(const rage::joaat_t translation_key) const;
std::string_view get_translation(const rage::joaat_t translation_key, const std::string_view fallback = { 0, 0 }) const;
std::map<std::string, translation_entry>& available_translations();
const std::string& current_language_pack();