psyc-mirrors/psyced
1
0
Fork 0
mirror of git://git.psyced.org/git/psyced synced 2024-08-15 03:25:10 +00:00
Code Issues 2 Releases Wiki Activity

attempt to make irc error messages more informative

Browse source
This commit is contained in:
psyc://loupsycedyglgamf.onion/~lynX 2016-02-04 07:50:08 +01:00
parent 613715cb17
commit d91e0894c1
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
world/default/en/irc.textdb
View file

@ -132,9 +132,15 @@ _error_status_place_matches
|## |##
|## NOTICE * :Du bist doch schon da! |## NOTICE * :Du bist doch schon da!
_error_place_enter_necessary_invitation
|##define ERR_BADCHANNELKEY "475"
|#475 [_INTERNAL_nick_me] #[_nick_place] :{_error_place_enter_necessary_invitation}
_error_place_enter _error_place_enter
|## 471 is ERR_CHANISFULL |## 471 is ERR_CHANISFULL
|#471 [_INTERNAL_nick_me] #[_nick_place] :Error entering [_nick_place]. |#471 [_INTERNAL_nick_me] #[_nick_place] :{_VAR_data}
|## was: Error entering [_nick_place].
|## would love to put [_data] or {_method} in there, but do they work the way i mean it?
_query_password _query_password
|## Please provide your password. (If your client isn't able to, use /quote pass «your-password» (which does not work in irssi) or use a syntax like /server {_VAR_server} «ircport» «your-password») |## Please provide your password. (If your client isn't able to, use /quote pass «your-password» (which does not work in irssi) or use a syntax like /server {_VAR_server} «ircport» «your-password»)

4
world/net/irc/common.c
View file

@ -158,11 +158,7 @@ render(string mc, string data, mapping vars, mixed source) {
mixed t; mixed t;
P3(("common:render %O %O\n", ME, data)); P3(("common:render %O %O\n", ME, data));
#if 1 // def IRCEXPERIMENTAL
template = T(mc, 0); // enable textdb inheritance template = T(mc, 0); // enable textdb inheritance
#else
template = T(mc, "");
#endif
#ifndef _flag_disable_stamp_time_IRC #ifndef _flag_disable_stamp_time_IRC
t = vars["_time_place"] || vars["_time_log"]; t = vars["_time_place"] || vars["_time_log"];
// this goes thru ->v() // this goes thru ->v()

4
world/net/text.c
View file

@ -205,6 +205,7 @@ summon(layout, lang, scheme) {
lookup(string mc, mixed fmt, object ghost, object curse) { lookup(string mc, mixed fmt, object ghost, object curse) {
string file, in; string file, in;
mixed ofmt = fmt;
#ifdef NOTEXTCACHE #ifdef NOTEXTCACHE
int dont_cache = 0; int dont_cache = 0;
#endif /* NOTEXTCACHE */ #endif /* NOTEXTCACHE */
@ -329,6 +330,9 @@ lookup(string mc, mixed fmt, object ghost, object curse) {
case "VAR_server_uniform": case "VAR_server_uniform":
in = before + SERVER_UNIFORM + after; in = before + SERVER_UNIFORM + after;
break; break;
case "VAR_data": // not sure if this makes sense, --lynX 2016
in = before + ofmt + after;
break;
case "VAR_method": case "VAR_method":
PT(("using %O for %O\n", mc, code)) PT(("using %O for %O\n", mc, code))
code = mc[1..]; code = mc[1..];