[Wesnoth-cvs-commits] wesnoth/src/editor editor.cpp

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    04/10/30 23:56:50

Modified files:
        src/editor     : editor.cpp 

Log message:
        fixed long-standing strings in editor

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor.cpp.diff?tr1=1.83&tr2=1.84&r1=text&r2=text

Patches:
Index: wesnoth/src/editor/editor.cpp
diff -u wesnoth/src/editor/editor.cpp:1.83 wesnoth/src/editor/editor.cpp:1.84
--- wesnoth/src/editor/editor.cpp:1.83  Wed Oct 27 23:23:02 2004
+++ wesnoth/src/editor/editor.cpp       Sat Oct 30 23:56:50 2004
@@ -1049,7 +1049,7 @@
                i != items.end(); ++i) {
                std::stringstream str;
                // Try to translate it to nicer format.
-               str << translate_string("action_" + *i);
+               str << 
hotkey::command_to_description(hotkey::string_to_command(*i));
                // See if this menu item has an associated hotkey.
                const hotkey::HOTKEY_COMMAND cmd = 
hotkey::string_to_command(*i);
                const std::vector<hotkey::hotkey_item>& hotkeys = 
hotkey::get_hotkeys();
@@ -1130,9 +1130,8 @@
 void map_editor::left_button_func_changed(const LEFT_BUTTON_FUNC func) {
        if (func != l_button_func_) {
                l_button_func_ = func;
-               const std::string string_to_translate = std::string("action_") 
+ get_action_name(func);
                reports::set_report_content(reports::EDIT_LEFT_BUTTON_FUNCTION,
-                                           
translate_string(string_to_translate));
+                                           
hotkey::command_to_description(hotkey::string_to_command(get_action_name(func))));
                gui_.invalidate_game_status();
                l_button_palette_dirty_ = true;
        }