From f3ce55e9243c73ee92b177c998ed28da4c1b7329 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 21 Feb 2016 10:04:57 +0100 Subject: [PATCH] Added ability to work with static text translation (nw) --- makefile | 2 +- src/emu/language.h | 3 +++ src/emu/ui/ctrlmenu.cpp | 18 +++++++++--------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/makefile b/makefile index fc49bb69692..47c3fef617d 100644 --- a/makefile +++ b/makefile @@ -1379,7 +1379,7 @@ shaders: translation: $(SILENT) echo Generating mame.pot - $(SILENT) find src -iname "*.cpp" | xargs xgettext --from-code=UTF-8 -k_ -o mame.pot + $(SILENT) find src -iname "*.cpp" | xargs xgettext --from-code=UTF-8 -k_ -k__ -o mame.pot $(SILENT) msgmerge -U "language/Afrikaans/strings.po" mame.pot $(SILENT) msgmerge -U "language/Albanian/strings.po" mame.pot $(SILENT) msgmerge -U "language/Arabic/strings.po" mame.pot diff --git a/src/emu/language.h b/src/emu/language.h index a2b57df75c0..ce536531d89 100644 --- a/src/emu/language.h +++ b/src/emu/language.h @@ -21,6 +21,9 @@ //************************************************************************** #define _(param) lang_translate(param) +// Fake one to make possible using it in static text definitions, on those +// lang_translate must be called afterwards +#define __(param) param void load_translation(emu_options &option); const char *lang_translate(const char *word); diff --git a/src/emu/ui/ctrlmenu.cpp b/src/emu/ui/ctrlmenu.cpp index 74b35abd8e3..f954a596f7a 100644 --- a/src/emu/ui/ctrlmenu.cpp +++ b/src/emu/ui/ctrlmenu.cpp @@ -17,14 +17,14 @@ const char *ui_menu_controller_mapping::m_device_status[] = { "none", "keyboard" ui_menu_controller_mapping::ctrl_option ui_menu_controller_mapping::m_options[] = { { 0, nullptr, nullptr }, - { 0, "Lightgun Device Assignment", OPTION_LIGHTGUN_DEVICE }, - { 0, "Trackball Device Assignment", OPTION_TRACKBALL_DEVICE }, - { 0, "Pedal Device Assignment", OPTION_PEDAL_DEVICE }, - { 0, "Adstick Device Assignment", OPTION_ADSTICK_DEVICE }, - { 0, "Paddle Device Assignment", OPTION_PADDLE_DEVICE }, - { 0, "Dial Device Assignment", OPTION_DIAL_DEVICE }, - { 0, "Positional Device Assignment", OPTION_POSITIONAL_DEVICE }, - { 0, "Mouse Device Assignment", OPTION_MOUSE_DEVICE } + { 0, __("Lightgun Device Assignment"), OPTION_LIGHTGUN_DEVICE }, + { 0, __("Trackball Device Assignment"), OPTION_TRACKBALL_DEVICE }, + { 0, __("Pedal Device Assignment"), OPTION_PEDAL_DEVICE }, + { 0, __("Adstick Device Assignment"), OPTION_ADSTICK_DEVICE }, + { 0, __("Paddle Device Assignment"), OPTION_PADDLE_DEVICE }, + { 0, __("Dial Device Assignment"), OPTION_DIAL_DEVICE }, + { 0, __("Positional Device Assignment"), OPTION_POSITIONAL_DEVICE }, + { 0, __("Mouse Device Assignment"), OPTION_MOUSE_DEVICE } }; //------------------------------------------------- @@ -88,7 +88,7 @@ void ui_menu_controller_mapping::populate() for (int d = 1; d < ARRAY_LENGTH(m_options); ++d) { UINT32 arrow_flags = get_arrow_flags(0, ARRAY_LENGTH(m_device_status) - 1, m_options[d].status); - item_append(m_options[d].description, m_device_status[m_options[d].status], arrow_flags, (void *)(FPTR)d); + item_append(_(m_options[d].description), m_device_status[m_options[d].status], arrow_flags, (void *)(FPTR)d); } item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr); customtop = machine().ui().get_line_height() + (3.0f * UI_BOX_TB_BORDER);