# HG changeset patch # User Luke Schierer # Date 1041949520 0 # Node ID 9e2336d5bdee02ee4ed27756e2411e1da4bbfe91 # Parent 0cff8ec389359945bc4951b83f3559bf787a4be8 [gaim-migrate @ 4465] Nicola's Lichtmaier (niqueco) added _() to irc.c and made a massive switch statement a simple array return committer: Tailor Script diff -r 0cff8ec38935 -r 9e2336d5bdee src/protocols/irc/irc.c --- a/src/protocols/irc/irc.c Tue Jan 07 14:21:43 2003 +0000 +++ b/src/protocols/irc/irc.c Tue Jan 07 14:25:20 2003 +0000 @@ -311,44 +311,14 @@ } } -static char * -int_to_col(int c) -{ - switch(c) { - case 1: - return "#ffffff"; - case 2: - return "#000066"; - case 3: - return "#006600"; - case 4: - return "#ff0000"; - case 5: - return "#660000"; - case 6: - return "#660066"; - case 7: - return "#666600"; - case 8: - return "#cccc00"; - case 9: - return "#33cc33"; - case 10: - return "#00acac"; - case 11: - return "#00ccac"; - case 12: - return "#0000ff"; - case 13: - return "#cc00cc"; - case 14: - return "#666666"; - case 15: - return "#00ccac"; - default: - return "#000000"; - } -} +static const char *irc_colors[] = { + "#000000", "#ffffff", "#000066", "#006600", + "#ff0000", "#660000", "#660066", "#666600", + "#cccc00", "#33cc33", "#00acac", "#00ccac", + "#0000ff", "#cc00cc", "#666666", "#00ccac" +}; + +#define int_to_col(c) (irc_colors[(((c)<0 || (c)> 15)?0:c)]) static GString * encode_html(char *msg) @@ -605,7 +575,7 @@ char buf[IRC_BUF_LEN]; chat->fd = source; g_snprintf (buf, sizeof buf, - "DCC Chat with %s established", + _("DCC Chat with %s established"), chat->nick); write_to_conv (convo, buf, WFLAG_SYSTEM, NULL, time ((time_t) NULL), -1); @@ -780,7 +750,7 @@ char buf[IRC_BUF_LEN]; char *nick = g_strndup(who, strchr(who, '!') - who); - g_snprintf(buf, sizeof(buf), "-:- mode/%s [%c%c %s] by %s", + g_snprintf(buf, sizeof(buf), _("-:- mode/%s [%c%c %s] by %s"), room, sign, mode, strlen(argstr) ? argstr : "", nick); g_free(nick); @@ -2116,7 +2086,7 @@ c = find_conversation(who); } if (c) { - write_to_conv(c, "Requesting DCC CHAT", + write_to_conv(c, _("Requesting DCC CHAT"), WFLAG_SYSTEM, NULL, time(NULL), -1); } @@ -2133,22 +2103,22 @@ return -EINVAL; } if (!g_strcasecmp(word[2], "OPER")) { - write_to_conv(c, "Operator commands:
" - "REHASH RESTART
", + write_to_conv(c, _("Operator commands:
" + "REHASH RESTART
"), WFLAG_NOLOG, NULL, time(NULL), -1); } else if (!g_strcasecmp(word[2], "CTCP")) { - write_to_conv(c, "CTCP commands:
" + write_to_conv(c, _("CTCP commands:
" "CLIENTINFO
" "USERINFO
" "VERSION
" - "PING

", + "PING

"), WFLAG_NOLOG, NULL, time(NULL), -1); } else if (!g_strcasecmp(word[2], "DCC")) { - write_to_conv(c, "DCC commands:
" - "CHAT
", + write_to_conv(c, _("DCC commands:
" + "CHAT
"), WFLAG_NOLOG, NULL, time(NULL), -1); } else { - write_to_conv(c, "Currently supported commands:
" + write_to_conv(c, _("Currently supported commands:
" "WHOIS INVITE NICK LIST
" "JOIN PART TOPIC KICK
" "OP DEOP VOICE DEVOICE
" @@ -2156,7 +2126,7 @@ "MODE VERSION W WHOWAS
" "Type /HELP OPER for operator commands
" "Type /HELP CTCP for CTCP commands
" - "Type /HELP DCC for DCC commands", + "Type /HELP DCC for DCC commands"), WFLAG_NOLOG, NULL, time(NULL), -1); } } else { @@ -2170,7 +2140,7 @@ g_free(what); return -EINVAL; } - write_to_conv(c, "Unknown command", WFLAG_NOLOG, NULL, time(NULL), -1); + write_to_conv(c, _("Unknown command"), WFLAG_NOLOG, NULL, time(NULL), -1); } g_free(what); return 0; @@ -2360,7 +2330,7 @@ chat->inpa = gaim_input_add (chat->fd, GAIM_INPUT_READ, dcc_chat_in, chat); convo = new_conversation (chat->nick); - g_snprintf (buf, sizeof buf, "DCC Chat with %s established", + g_snprintf (buf, sizeof buf, _("DCC Chat with %s established"), chat->nick); write_to_conv (convo, buf, WFLAG_SYSTEM, NULL, time ((time_t) NULL), -1); debug_printf ("Chat with %s established\n", chat->nick);