From af147b4f54249ca93fa63a20ddc10adcb0c344a7 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Mon, 26 Jun 2023 08:54:30 +0200 Subject: [PATCH] fix: Titlebar button localization keys still being inside the windows plugin --- plugins/builtin/romfs/lang/de_DE.json | 2 ++ plugins/builtin/romfs/lang/en_US.json | 2 ++ plugins/builtin/romfs/lang/ko_KR.json | 2 ++ plugins/builtin/romfs/lang/pt_BR.json | 2 ++ plugins/builtin/romfs/lang/zh_CN.json | 2 ++ plugins/builtin/romfs/lang/zh_TW.json | 2 ++ plugins/builtin/source/content/ui_items.cpp | 4 +-- plugins/windows/romfs/lang/base.json | 38 --------------------- plugins/windows/romfs/lang/de_DE.json | 2 -- plugins/windows/romfs/lang/en_US.json | 2 -- plugins/windows/romfs/lang/ko_KR.json | 2 -- plugins/windows/romfs/lang/pt_BR.json | 2 -- plugins/windows/romfs/lang/zh_CN.json | 2 -- plugins/windows/romfs/lang/zh_TW.json | 2 -- 14 files changed, 14 insertions(+), 52 deletions(-) delete mode 100644 plugins/windows/romfs/lang/base.json diff --git a/plugins/builtin/romfs/lang/de_DE.json b/plugins/builtin/romfs/lang/de_DE.json index 230f8fb94..6b9f8d79d 100644 --- a/plugins/builtin/romfs/lang/de_DE.json +++ b/plugins/builtin/romfs/lang/de_DE.json @@ -476,6 +476,8 @@ "hex.builtin.setting.proxy.enable": "Proxy aktivieren", "hex.builtin.setting.proxy.url": "Proxy URL", "hex.builtin.setting.proxy.url.tooltip": "http(s):// oder socks5:// (z.B, http://127.0.0.1:1080)", + "hex.builtin.title_bar_button.debug_build": "Debug build", + "hex.builtin.title_bar_button.feedback": "Feedback hinterlassen", "hex.builtin.tools.ascii_table": "ASCII Tabelle", "hex.builtin.tools.ascii_table.octal": "Oktal anzeigen", "hex.builtin.tools.base_converter": "Basiskonverter", diff --git a/plugins/builtin/romfs/lang/en_US.json b/plugins/builtin/romfs/lang/en_US.json index 30da7922b..6d723e19d 100644 --- a/plugins/builtin/romfs/lang/en_US.json +++ b/plugins/builtin/romfs/lang/en_US.json @@ -484,6 +484,8 @@ "hex.builtin.setting.proxy.enable": "Enable Proxy", "hex.builtin.setting.proxy.url": "Proxy URL", "hex.builtin.setting.proxy.url.tooltip": "http(s):// or socks5:// (e.g., http://127.0.0.1:1080)", + "hex.builtin.title_bar_button.debug_build": "Debug build", + "hex.builtin.title_bar_button.feedback": "Leave Feedback", "hex.builtin.tools.ascii_table": "ASCII table", "hex.builtin.tools.ascii_table.octal": "Show octal", "hex.builtin.tools.base_converter": "Base converter", diff --git a/plugins/builtin/romfs/lang/ko_KR.json b/plugins/builtin/romfs/lang/ko_KR.json index 7ea675424..49fd4ccb2 100644 --- a/plugins/builtin/romfs/lang/ko_KR.json +++ b/plugins/builtin/romfs/lang/ko_KR.json @@ -474,6 +474,8 @@ "hex.builtin.setting.proxy.enable": "Proxy 활성화", "hex.builtin.setting.proxy.url": "Proxy 경로", "hex.builtin.setting.proxy.url.tooltip": "http(s):// 혹은 socks5:// (예., http://127.0.0.1:1080)", + "hex.builtin.title_bar_button.debug_build": "디버그 빌드", + "hex.builtin.title_bar_button.feedback": "피드백 남기기", "hex.builtin.tools.ascii_table": "ASCII 테이블", "hex.builtin.tools.ascii_table.octal": "8진수 표시", "hex.builtin.tools.base_converter": "진수 변환기", diff --git a/plugins/builtin/romfs/lang/pt_BR.json b/plugins/builtin/romfs/lang/pt_BR.json index 7bf387d24..5d3837b71 100644 --- a/plugins/builtin/romfs/lang/pt_BR.json +++ b/plugins/builtin/romfs/lang/pt_BR.json @@ -474,6 +474,8 @@ "hex.builtin.setting.proxy.enable": "", "hex.builtin.setting.proxy.url": "", "hex.builtin.setting.proxy.url.tooltip": "", + "hex.builtin.title_bar_button.debug_build": "Compilação de depuração", + "hex.builtin.title_bar_button.feedback": "Deixar Feedback", "hex.builtin.tools.ascii_table": "ASCII table", "hex.builtin.tools.ascii_table.octal": "Mostrar octal", "hex.builtin.tools.base_converter": "Base converter", diff --git a/plugins/builtin/romfs/lang/zh_CN.json b/plugins/builtin/romfs/lang/zh_CN.json index 25ae59032..0dacdb68e 100644 --- a/plugins/builtin/romfs/lang/zh_CN.json +++ b/plugins/builtin/romfs/lang/zh_CN.json @@ -474,6 +474,8 @@ "hex.builtin.setting.proxy.enable": "启用代理", "hex.builtin.setting.proxy.url": "代理 URL", "hex.builtin.setting.proxy.url.tooltip": "http(s):// 或 socks5://（如 http://127.0.0.1:1080）", + "hex.builtin.title_bar_button.debug_build": "调试构建", + "hex.builtin.title_bar_button.feedback": "反馈", "hex.builtin.tools.ascii_table": "ASCII 表", "hex.builtin.tools.ascii_table.octal": "显示八进制", "hex.builtin.tools.base_converter": "基本进制转换", diff --git a/plugins/builtin/romfs/lang/zh_TW.json b/plugins/builtin/romfs/lang/zh_TW.json index c49fa64a3..dd13d2956 100644 --- a/plugins/builtin/romfs/lang/zh_TW.json +++ b/plugins/builtin/romfs/lang/zh_TW.json @@ -474,6 +474,8 @@ "hex.builtin.setting.proxy.enable": "啟用 Proxy", "hex.builtin.setting.proxy.url": "Proxy 網址", "hex.builtin.setting.proxy.url.tooltip": "http(s):// 或 socks5:// (例如 http:127.0.0.1:1080)", + "hex.builtin.title_bar_button.debug_build": "除錯組建", + "hex.builtin.title_bar_button.feedback": "意見回饋", "hex.builtin.tools.ascii_table": "ASCII 表", "hex.builtin.tools.ascii_table.octal": "Show octal", "hex.builtin.tools.base_converter": "進位轉換工具", diff --git a/plugins/builtin/source/content/ui_items.cpp b/plugins/builtin/source/content/ui_items.cpp index 4441a621f..3abb9e3ce 100644 --- a/plugins/builtin/source/content/ui_items.cpp +++ b/plugins/builtin/source/content/ui_items.cpp @@ -19,7 +19,7 @@ namespace hex::plugin::builtin { void addTitleBarButtons() { #if defined(DEBUG) - ContentRegistry::Interface::addTitleBarButton(ICON_VS_DEBUG, "hex.windows.title_bar_button.debug_build", []{ + ContentRegistry::Interface::addTitleBarButton(ICON_VS_DEBUG, "hex.builtin.title_bar_button.debug_build", []{ if (ImGui::GetIO().KeyCtrl) { // Explicitly trigger a segfault by writing to an invalid memory location // Used for debugging crashes @@ -36,7 +36,7 @@ namespace hex::plugin::builtin { }); #endif - ContentRegistry::Interface::addTitleBarButton(ICON_VS_SMILEY, "hex.windows.title_bar_button.feedback", []{ + ContentRegistry::Interface::addTitleBarButton(ICON_VS_SMILEY, "hex.builtin.title_bar_button.feedback", []{ hex::openWebpage("https://github.com/WerWolv/ImHex/discussions/categories/feedback"); }); diff --git a/plugins/windows/romfs/lang/base.json b/plugins/windows/romfs/lang/base.json deleted file mode 100644 index 4d2b60a23..000000000 --- a/plugins/windows/romfs/lang/base.json +++ /dev/null @@ -1,38 +0,0 @@ -[ - "hex.windows.provider.process_memory", - "hex.windows.provider.process_memory.enumeration_failed", - "hex.windows.provider.process_memory.memory_regions", - "hex.windows.provider.process_memory.name", - "hex.windows.provider.process_memory.process_name", - "hex.windows.provider.process_memory.process_id", - "hex.windows.provider.process_memory.region.commit", - "hex.windows.provider.process_memory.region.reserve", - "hex.windows.provider.process_memory.region.private", - "hex.windows.provider.process_memory.region.mapped", - "hex.windows.provider.process_memory.utils", - "hex.windows.provider.process_memory.utils.inject_dll", - "hex.windows.provider.process_memory.utils.inject_dll.success", - "hex.windows.provider.process_memory.utils.inject_dll.failure", - "hex.builtin.setting.general.context_menu_entry", - "hex.windows.title_bar_button.debug_build", - "hex.windows.title_bar_button.feedback", - "hex.windows.view.tty_console.auto_scroll", - "hex.windows.view.tty_console.baud", - "hex.windows.view.tty_console.clear", - "hex.windows.view.tty_console.config", - "hex.windows.view.tty_console.connect", - "hex.windows.view.tty_console.connect_error", - "hex.windows.view.tty_console.console", - "hex.windows.view.tty_console.cts", - "hex.windows.view.tty_console.disconnect", - "hex.windows.view.tty_console.name", - "hex.windows.view.tty_console.no_available_port", - "hex.windows.view.tty_console.num_bits", - "hex.windows.view.tty_console.parity_bits", - "hex.windows.view.tty_console.port", - "hex.windows.view.tty_console.reload", - "hex.windows.view.tty_console.send_eot", - "hex.windows.view.tty_console.send_etx", - "hex.windows.view.tty_console.send_sub", - "hex.windows.view.tty_console.stop_bits" -] \ No newline at end of file diff --git a/plugins/windows/romfs/lang/de_DE.json b/plugins/windows/romfs/lang/de_DE.json index c9ceafdb9..6d21d9100 100644 --- a/plugins/windows/romfs/lang/de_DE.json +++ b/plugins/windows/romfs/lang/de_DE.json @@ -18,8 +18,6 @@ "hex.windows.provider.process_memory.utils.inject_dll": "", "hex.windows.provider.process_memory.utils.inject_dll.failure": "", "hex.windows.provider.process_memory.utils.inject_dll.success": "", - "hex.windows.title_bar_button.debug_build": "Debug build", - "hex.windows.title_bar_button.feedback": "Feedback hinterlassen", "hex.windows.view.tty_console.auto_scroll": "Auto scroll", "hex.windows.view.tty_console.baud": "Baudrate", "hex.windows.view.tty_console.clear": "Löschen", diff --git a/plugins/windows/romfs/lang/en_US.json b/plugins/windows/romfs/lang/en_US.json index b2cac3be2..4dc73b96e 100644 --- a/plugins/windows/romfs/lang/en_US.json +++ b/plugins/windows/romfs/lang/en_US.json @@ -18,8 +18,6 @@ "hex.windows.provider.process_memory.utils.inject_dll.success": "Successfully injected DLL '{0}'!", "hex.windows.provider.process_memory.utils.inject_dll.failure": "Failed to inject DLL '{0}'!", "hex.builtin.setting.general.context_menu_entry": "Windows context menu entry", - "hex.windows.title_bar_button.debug_build": "Debug build", - "hex.windows.title_bar_button.feedback": "Leave Feedback", "hex.windows.view.tty_console.auto_scroll": "Auto scroll", "hex.windows.view.tty_console.baud": "Baud rate", "hex.windows.view.tty_console.clear": "Clear", diff --git a/plugins/windows/romfs/lang/ko_KR.json b/plugins/windows/romfs/lang/ko_KR.json index c176005c1..2806484d5 100644 --- a/plugins/windows/romfs/lang/ko_KR.json +++ b/plugins/windows/romfs/lang/ko_KR.json @@ -18,8 +18,6 @@ "hex.windows.provider.process_memory.utils.inject_dll": "", "hex.windows.provider.process_memory.utils.inject_dll.failure": "", "hex.windows.provider.process_memory.utils.inject_dll.success": "", - "hex.windows.title_bar_button.debug_build": "디버그 빌드", - "hex.windows.title_bar_button.feedback": "피드백 남기기", "hex.windows.view.tty_console.auto_scroll": "자동 스크롤", "hex.windows.view.tty_console.baud": "Baud rate", "hex.windows.view.tty_console.clear": "지우기", diff --git a/plugins/windows/romfs/lang/pt_BR.json b/plugins/windows/romfs/lang/pt_BR.json index 4c5b61878..97aa2d8bb 100644 --- a/plugins/windows/romfs/lang/pt_BR.json +++ b/plugins/windows/romfs/lang/pt_BR.json @@ -18,8 +18,6 @@ "hex.windows.provider.process_memory.utils.inject_dll": "", "hex.windows.provider.process_memory.utils.inject_dll.failure": "", "hex.windows.provider.process_memory.utils.inject_dll.success": "", - "hex.windows.title_bar_button.debug_build": "Compilação de depuração", - "hex.windows.title_bar_button.feedback": "Deixar Feedback", "hex.windows.view.tty_console.auto_scroll": "Auto rolagem", "hex.windows.view.tty_console.baud": "Baud rate", "hex.windows.view.tty_console.clear": "Limpar", diff --git a/plugins/windows/romfs/lang/zh_CN.json b/plugins/windows/romfs/lang/zh_CN.json index 72656f2dc..4541d3688 100644 --- a/plugins/windows/romfs/lang/zh_CN.json +++ b/plugins/windows/romfs/lang/zh_CN.json @@ -18,8 +18,6 @@ "hex.windows.provider.process_memory.utils.inject_dll": "注入DLL", "hex.windows.provider.process_memory.utils.inject_dll.failure": "无法注入DLL '{0}'！", "hex.windows.provider.process_memory.utils.inject_dll.success": "成功注入DLL '{0}'！", - "hex.windows.title_bar_button.debug_build": "调试构建", - "hex.windows.title_bar_button.feedback": "反馈", "hex.windows.view.tty_console.auto_scroll": "自动滚动", "hex.windows.view.tty_console.baud": "波特率", "hex.windows.view.tty_console.clear": "清除", diff --git a/plugins/windows/romfs/lang/zh_TW.json b/plugins/windows/romfs/lang/zh_TW.json index b673596dd..889fffe53 100644 --- a/plugins/windows/romfs/lang/zh_TW.json +++ b/plugins/windows/romfs/lang/zh_TW.json @@ -18,8 +18,6 @@ "hex.windows.provider.process_memory.utils.inject_dll": "", "hex.windows.provider.process_memory.utils.inject_dll.failure": "", "hex.windows.provider.process_memory.utils.inject_dll.success": "", - "hex.windows.title_bar_button.debug_build": "除錯組建", - "hex.windows.title_bar_button.feedback": "意見回饋", "hex.windows.view.tty_console.auto_scroll": "自動捲動", "hex.windows.view.tty_console.baud": "鮑率", "hex.windows.view.tty_console.clear": "清除",