From 8b0a65f00c0e5afb2c177462acd30013afa99b64 Mon Sep 17 00:00:00 2001
From: Kess Vargavind <vargavind@gmail.com>
Date: Fri, 17 Jul 2009 14:31:36 +0200
Subject: Various gettext fixes

  * Merged a few split strings
  * Fixed some spellings and wordings
  * Turned a couple of std::cout and std::cerr into logger messages
---
 src/gui/guildwindow.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'src/gui/guildwindow.cpp')

diff --git a/src/gui/guildwindow.cpp b/src/gui/guildwindow.cpp
index 6dc86e13..1fc1d7fe 100644
--- a/src/gui/guildwindow.cpp
+++ b/src/gui/guildwindow.cpp
@@ -41,6 +41,7 @@
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
+#include "utils/stringutils.h"
 
 #include <algorithm>
 
@@ -110,7 +111,8 @@ void GuildWindow::action(const gcn::ActionEvent &event)
     {
         // Set focus so that guild name to be created can be typed.
         mFocus = true;
-        guildDialog = new TextDialog("Guild Name", "Choose your guild's name", this);
+        guildDialog = new TextDialog(_("Guild Name"),
+                                     _("Choose your guild's name"), this);
         guildDialog->setOKButtonActionId("CREATE_GUILD_OK");
         guildDialog->addActionListener(this);
     }
@@ -118,7 +120,8 @@ void GuildWindow::action(const gcn::ActionEvent &event)
     {
         // TODO - Give feedback on whether the invite succeeded
         mFocus = true;
-        inviteDialog = new TextDialog("Member Invite", "Who would you like to invite?", this);
+        inviteDialog = new TextDialog(_("Member Invite"),
+                                      _("Who would you like to invite?"), this);
         inviteDialog->setOKButtonActionId("INVITE_USER_OK");
         inviteDialog->addActionListener(this);
     }
@@ -128,7 +131,8 @@ void GuildWindow::action(const gcn::ActionEvent &event)
         if (guild)
         {
             Net::ChatServer::Guild::quitGuild(guild);
-            localChatTab->chatLog("Guild " + mGuildTabs->getSelectedTab()->getCaption() + " quit", BY_SERVER);
+            localChatTab->chatLog(strprintf(_("Guild %s quit"),
+                    mGuildTabs->getSelectedTab()->getCaption().c_str()), BY_SERVER);
         }
     }
     else if (eventId == "CREATE_GUILD_OK")
@@ -144,7 +148,8 @@ void GuildWindow::action(const gcn::ActionEvent &event)
 
         // Defocus dialog
         mFocus = false;
-        localChatTab->chatLog("Creating Guild called " + name, BY_SERVER);
+        localChatTab->chatLog(strprintf(_("Creating Guild called %s"),
+                                        name.c_str()), BY_SERVER);
         guildDialog->scheduleDelete();
     }
     else if (eventId == "INVITE_USER_OK")
@@ -157,7 +162,7 @@ void GuildWindow::action(const gcn::ActionEvent &event)
 
         // Defocus dialog
         mFocus = false;
-        localChatTab->chatLog("Invited user " + name, BY_SERVER);
+        localChatTab->chatLog(strprintf(_("Invited user %s"), name.c_str()), BY_SERVER);
         inviteDialog->scheduleDelete();
     }
     else if (eventId == "yes")
@@ -233,10 +238,11 @@ short GuildWindow::getSelectedGuild()
 void GuildWindow::openAcceptDialog(const std::string &inviterName,
                                    const std::string &guildName)
 {
-    std::string msg = inviterName + " has invited you to join the guild " + guildName;
+    std::string msg = strprintf(_("%s has invited you to join the guild %s"),
+                                inviterName.c_str(), guildName.c_str());
     localChatTab->chatLog(msg, BY_SERVER);
 
-    acceptDialog = new ConfirmDialog("Accept Guild Invite", msg, this);
+    acceptDialog = new ConfirmDialog(_("Accept Guild Invite"), msg, this);
     acceptDialog->addActionListener(this);
 
     invitedGuild = guildName;
-- 
cgit v1.2.3-70-g09d2