From 9af43c0762cfa4ed59ccb6fbb08dc2ec5b68e868 Mon Sep 17 00:00:00 2001 From: flowtron Date: Tue, 18 Oct 2011 16:16:37 +0000 Subject: [PATCH] gettext can't handle "\f" - please use the CC constant! git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6669 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 6 +++--- source/src/clients2c.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 3906acd4..8b7f8ade 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -39,9 +39,9 @@ void setbottimeout(int m, int t) default: break; } } - else conoutf(_("\f3Error: \f5valid range for time is 1-60")); + else conoutf(_("%s3Error: %s5valid range for time is 1-60"), CC, CC); } - else conoutf(_("\f3Error: \f5mode needs to be 1 for FFA or 2 for team modes")); + else conoutf(_("%s3Error: %s5mode needs to be 1 for FFA or 2 for team modes"), CC, CC); } COMMAND(setbottimeout, ARG_2INT); @@ -1465,7 +1465,7 @@ void scallvote(char *type, const char *arg1, const char *arg2) if ( !arg2 || strlen(arg2) <= 3 || !multiplayer(false) ) { if(!multiplayer(false)) - conoutf(_("\f3%s is not available in singleplayer."), t == SA_BAN ? "Ban" : "Kick"); + conoutf(_("%s3%s is not available in singleplayer."), CC, t == SA_BAN ? "Ban" : "Kick"); else conoutf(_("%c3invalid reason"), CC); break; } diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp index 143989c3..ec7529e3 100644 --- a/source/src/clients2c.cpp +++ b/source/src/clients2c.cpp @@ -1286,7 +1286,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p) int cn = getint(p); playerent *pl = cn == getclientnum() ? player1 : getclient(cn); int ip = getint(p); - if(m_teammode) conoutf(_("\f0INFO: \f5%s has %d teamkills."), pl->name, pl->tks); + if(m_teammode) conoutf(_("%s0INFO: %s5%s has %d teamkills."), CC, CC, pl->name, pl->tks); if((ip>>24&0xFF) > 0 || player1->clientrole==CR_ADMIN) conoutf("WHOIS %2d: %-16s\t%d.%d.%d.%d", cn, pl ? colorname(pl) : "", ip&0xFF, ip>>8&0xFF, ip>>16&0xFF, ip>>24&0xFF); // full IP else conoutf("WHOIS client %d:\n\f5name\t%s\n\f5IP\t%d.%d.%d.x", cn, pl ? colorname(pl) : "", ip&0xFF, ip>>8&0xFF, ip>>16&0xFF); // censored IP