diff options
| author | BlockMen <nmuelll@web.de> | 2014-03-13 14:00:10 +0100 |
|---|---|---|
| committer | BlockMen <nmuelll@web.de> | 2014-03-13 14:00:10 +0100 |
| commit | 03297acbf4efba9a19a7f31950cb6f2bc3c65ec8 (patch) | |
| tree | 9d4b01ea375d069a53e24cd5e10808992b6ce31b /src | |
| parent | 18577f25277f269c8dd8d2bdcaaccbac72d9370d (diff) | |
| download | minetest-03297acbf4efba9a19a7f31950cb6f2bc3c65ec8.tar.gz minetest-03297acbf4efba9a19a7f31950cb6f2bc3c65ec8.tar.bz2 minetest-03297acbf4efba9a19a7f31950cb6f2bc3c65ec8.zip | |
Fix special characters in pause and message menu
Diffstat (limited to 'src')
| -rw-r--r-- | src/game.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/game.cpp b/src/game.cpp index d4d6d5c0e..a3c162457 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -976,7 +976,7 @@ static void show_chat_menu(FormspecFormSource* current_formspec, std::string formspec = "size[11,5.5,true]" "field[3,2.35;6,0.5;f_text;;" + text + "]" - "button_exit[4,3;3,0.5;btn_send;" + std::string(gettext("Proceed")) + "]" + "button_exit[4,3;3,0.5;btn_send;" + wide_to_narrow(wstrgettext("Proceed")) + "]" ; /* Create menu */ @@ -998,7 +998,8 @@ static void show_pause_menu(FormspecFormSource* current_formspec, TextDest* current_textdest, IWritableTextureSource* tsrc, IrrlichtDevice * device) { - const char* control_text = gettext("Default Controls:\n" + + std::string control_text = wide_to_narrow(wstrgettext("Default Controls:\n" "- WASD: move\n" "- Space: jump/climb\n" "- Shift: sneak/go down\n" @@ -1009,7 +1010,7 @@ static void show_pause_menu(FormspecFormSource* current_formspec, "- Mouse right: place/use\n" "- Mouse wheel: select item\n" "- T: chat\n" - ); + )); std::ostringstream os; os<<"Minetest\n"; @@ -1018,11 +1019,11 @@ static void show_pause_menu(FormspecFormSource* current_formspec, std::string formspec = "size[11,5.5,true]" - "button_exit[4,1;3,0.5;btn_continue;" + std::string(gettext("Continue")) + "]" - "button_exit[4,2;3,0.5;btn_sound;" + std::string(gettext("Sound Volume")) + "]" - "button_exit[4,3;3,0.5;btn_exit_menu;" + std::string(gettext("Exit to Menu")) + "]" - "button_exit[4,4;3,0.5;btn_exit_os;" + std::string(gettext("Exit to OS")) + "]" - "textarea[7.5,0.25;3.75,6;;" + std::string(control_text) + ";]" + "button_exit[4,1;3,0.5;btn_continue;" + wide_to_narrow(wstrgettext("Continue")) + "]" + "button_exit[4,2;3,0.5;btn_sound;" + wide_to_narrow(wstrgettext("Sound Volume")) + "]" + "button_exit[4,3;3,0.5;btn_exit_menu;" + wide_to_narrow(wstrgettext("Exit to Menu")) + "]" + "button_exit[4,4;3,0.5;btn_exit_os;" + wide_to_narrow(wstrgettext("Exit to OS")) + "]" + "textarea[7.5,0.25;3.75,6;;" + control_text + ";]" "textarea[0.4,0.25;3.5,6;;" + os.str() + ";]" ; |