[Wesnoth-cvs-commits] wesnoth/src help.cpp network.cpp

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    05/06/10 22:34:18

Modified files:
        src            : help.cpp network.cpp 

Log message:
        make translatable all error messages found to be possible to show in a 
dialog (#12605)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/help.cpp.diff?tr1=1.106&tr2=1.107&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/network.cpp.diff?tr1=1.64&tr2=1.65&r1=text&r2=text

Patches:
Index: wesnoth/src/help.cpp
diff -u wesnoth/src/help.cpp:1.106 wesnoth/src/help.cpp:1.107
--- wesnoth/src/help.cpp:1.106  Sat Jun  4 19:16:05 2005
+++ wesnoth/src/help.cpp        Fri Jun 10 22:34:17 2005
@@ -2283,7 +2283,7 @@
                                const topic *t = find_topic(toplevel_, ref);
                                if (t == NULL) {
                                        std::stringstream msg;
-                                       msg << "Reference to unknown topic: '" 
<< ref << "'.";
+                                       msg << _("Reference to unknown topic: 
") << "'" << ref << "'.";
                                        gui::show_dialog(disp_, NULL, "", 
msg.str(), gui::OK_ONLY);
                                        update_cursor();
                                }
@@ -2705,7 +2705,7 @@
        }
        catch (parse_error e) {
                std::stringstream msg;
-               msg << "Parse error when parsing help text: '" << e.message << 
"'";
+               msg << _("Parse error when parsing help text: ") << "'" << 
e.message << "'";
                gui::show_dialog(disp, NULL, "", msg.str(), gui::OK_ONLY);
        }
 }
Index: wesnoth/src/network.cpp
diff -u wesnoth/src/network.cpp:1.64 wesnoth/src/network.cpp:1.65
--- wesnoth/src/network.cpp:1.64        Sat Jun  4 19:16:05 2005
+++ wesnoth/src/network.cpp     Fri Jun 10 22:34:17 2005
@@ -2,6 +2,7 @@
 
 #include "serialization/binary_wml.hpp"
 #include "config.hpp"
+#include "gettext.hpp"
 #include "log.hpp"
 #include "network.hpp"
 #include "network_worker.hpp"
@@ -62,7 +63,7 @@
 {
        const connection_map::iterator i = connections.find(handle);
        if(i == connections.end()) {
-               throw network::error("invalid network handle");
+               throw network::error(_("invalid network handle"));
        }
 
        return i->second;
@@ -95,7 +96,7 @@
        if(sock) {
                for(connection_map::const_iterator i = connections.begin(); i 
!= connections.end(); ++i) {
                        if(i->second.sock == sock) {
-                               throw network::error("Socket error",i->first);
+                               throw network::error(_("Socket 
error"),i->first);
                        }
                }
        }
@@ -413,7 +414,7 @@
                if(res == -1) {
                        SDLNet_TCP_Close(sock);
 
-                       throw network::error("Could not add socket to socket 
set");
+                       throw network::error(_("Could not add socket to socket 
set"));
                }
 
 
@@ -424,7 +425,7 @@
                const int nbytes = SDLNet_TCP_Send(sock,buf,4);
                if(nbytes != 4) {
                        SDLNet_TCP_Close(sock);
-                       throw network::error("Could not send initial 
handshake");
+                       throw network::error(_("Could not send initial 
handshake"));
                }
 
                waiting_sockets.insert(connect);