psyc-mirrors
/
psyced
mirror of git://git.psyced.org/git/psyced
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

+

This commit is contained in:
psyc://loupsycedyglgamf.onion/~lynX 2016-02-04 21:16:35 +01:00
parent d91e0894c1
commit 0118292714
4 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
world/default/en/irc.textdb
View File

@ -1,9 +1,6 @@
<PSYC:TEXTDB> ## vim:syntax=mail <PSYC:TEXTDB> ## vim:syntax=mail
## Check utf-8: Praise Atatürk! ## Check utf-8: Praise Atatürk!
_status_AREYOUNUTS
|:[_INTERNAL_source_IRC] NOTICE [_INTERNAL_nick_me] :[_data]
_MISC_character_command _MISC_character_command
|+ |+
@ -132,15 +129,11 @@ _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 |##define ERR_CHANISFULL "471"
|#471 [_INTERNAL_nick_me] #[_nick_place] :{_VAR_data} |##define ERR_BADCHANNELKEY "475"
|#475 [_INTERNAL_nick_me] #[_nick_place] :[_data_psyctext]
|## was: Error entering [_nick_place]. |## 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»)
@ -231,9 +224,6 @@ _notice_typing_active
_notice_typing_gone _notice_typing_gone
|:[_INTERNAL_source_IRC] PRIVMSG [_INTERNAL_nick_me] :%TYPING GONE% |:[_INTERNAL_source_IRC] PRIVMSG [_INTERNAL_nick_me] :%TYPING GONE%
_notice_place_AREYOUNUTS
|:{_VAR_server} NOTICE #[_nick_place] :[_data]
_notice_place_enter _notice_place_enter
|## es wird nur diese JOIN datei verwendet.. die anderen können alle in den müll |## es wird nur diese JOIN datei verwendet.. die anderen können alle in den müll
|:[_INTERNAL_source_IRC] JOIN :#[_nick_place] |:[_INTERNAL_source_IRC] JOIN :#[_nick_place]

24
world/default/it/plain.textdb
View File

@ -695,10 +695,10 @@ _failure_invalid_place_membership
|[_nick_place] kann sich an nichts erinnern. Macht aber nichts. |[_nick_place] kann sich an nichts erinnern. Macht aber nichts.
_message_announcement _message_announcement
|[_nick] schreit: [_data] |[_nick] urla: [_data]
_message_private _message_private
|[_nick] sagt Dir: [_data] |[_nick] ti dice: [_data]
_message_public _message_public
|[_nick] {_TEXT_action_says}: [_data] |[_nick] {_TEXT_action_says}: [_data]
@ -743,43 +743,43 @@ _message_public_action_possessive
|[_nick]s [_action_possessive]. |[_nick]s [_action_possessive].
_message_public_action_reduce _message_public_action_reduce
|[_nick] tut was. |[_nick] fa qualcosa.
_message_behaviour_warning _message_behaviour_warning
|*** Warnung: [_data] *** |*** Avvertimento comportamentale: [_data] ***
_message_behaviour_punishment _message_behaviour_punishment
|*** [_data]. Und tschüß. *** |*** [_data]. E ti saluto. ***
_message_behaviour_warning_default _message_behaviour_warning_default
|*** Benimm dich oder du fliegst raus! *** |*** Comportati in modo educato o ti dobbiamo cacciare! ***
_message_behaviour_punishment_default _message_behaviour_punishment_default
| |
_message_private_annotate _message_private_annotate
|Anmerkung von [_nick]: [_data] |Annotazione di [_nick]: [_data]
_message_private_action _message_private_action
|[_nick] [_action]. |[_nick] [_action].
_message_private_ask _message_private_ask
|[_nick] fragt Dich: [_data] |[_nick] ti chiede: [_data]
_message_private_action_reduce _message_private_action_reduce
|[_nick] tut Dir was. |[_nick] ti fa qualcosa.
_notice_login _notice_login
|benvenuto nel mondo PSYC, [_nick]. (http://www.psyc.eu) |benvenuto nel mondo PSYC, [_nick]. (http://www.psyc.eu)
_notice_invitation _notice_invitation
|[_nick] lädt Dich nach [_nick_place] ein. |[_nick] ti invita in [_nick_place].
_notice_link _notice_link
|Verbindung zu [_source] hergestellt. |Creata connessione a [_source].
_notice_link_topic _notice_link_topic
|Verbindung zu [_source] hergestellt. [_topic] |Creata connessione a [_source]. [_topic]
_notice_news_software _notice_news_software
|Dies ist eine neue Version der Server-Software: [_version] |Dies ist eine neue Version der Server-Software: [_version]

4
world/net/library/text.c
View File

@ -45,6 +45,10 @@ varargs string psyctext(string s, mapping m, vastring data,
case "_data": case "_data":
r += p + (data || ""); r += p + (data || "");
break; break;
case "_data_psyctext":
if (data) data = psyctext(data, m, "", source, nick);
r += p + (data || "");
break;
case "_nick": case "_nick":
#if 1 //def USE_THE_NICK #if 1 //def USE_THE_NICK
r += p + (nick || m["_nick"] || "?"); r += p + (nick || m["_nick"] || "?");

10
world/net/text.c
View File

@ -205,7 +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; // mixed ofmt = fmt;
#ifdef NOTEXTCACHE #ifdef NOTEXTCACHE
int dont_cache = 0; int dont_cache = 0;
#endif /* NOTEXTCACHE */ #endif /* NOTEXTCACHE */
@ -330,9 +330,11 @@ 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 // // this didnt work for net/irc where i wanted it
in = before + ofmt + after; // // so i implemented _data_psyctext instead
break; // case "VAR_data":
// 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..];