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

Merge commit 'origin'

This commit is contained in:
psyc://psyced.org/~lynX 2009-11-04 19:11:04 +01:00
parent 958980e2d6 9df03c38aa
commit 5220470091
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
world/default/en/jabber.textdb
View File

@ -204,10 +204,12 @@ _message_public_reduce
|<message to='[_INTERNAL_target_jabber]' type='groupchat' from='[_INTERNAL_source_jabber]'><body>/me {_TEXT_action_says} {_TEXT_something}.</body></message>
_message_public_question
|<message to='[_INTERNAL_target_jabber]' type='groupchat' from='[_INTERNAL_source_jabber]'><body>/me {_TEXT_action_asks}: [_data]</body></message>
|## <message to='[_INTERNAL_target_jabber]' type='groupchat' from='[_INTERNAL_source_jabber]'><body>/me {_TEXT_action_asks}: [_data]</body></message>
|{_message_public}
_message_public_ask
|<message to='[_INTERNAL_target_jabber]' type='groupchat' from='[_INTERNAL_source_jabber]'><body>/me {_TEXT_action_asks}: [_data]</body></message>
|## <message to='[_INTERNAL_target_jabber]' type='groupchat' from='[_INTERNAL_source_jabber]'><body>/me {_TEXT_action_asks}: [_data]</body></message>
|{_message_public}
_message_public_text_action
|<message to='[_INTERNAL_target_jabber]' type='groupchat' from='[_INTERNAL_source_jabber]'><body>[_data]</body></message>

3
world/net/jabber/mixin_render.c
View File

@ -9,7 +9,8 @@ int msg(string source, string mc, string data,
mapping vars, int showingLog, string target) {
mixed t;
switch (mc){
switch (mc) {
case "_status_description_time":
case "_status_person_away":
case "_status_person_present":
case "_status_person_present_implied":

1
world/net/jabber/user.c
View File

@ -129,6 +129,7 @@ msg(source, mc, data, mapping vars, showingLog) {
mc = "_notice_place_leave";
}
switch (mc) {
case "_status_description_time":
case "_status_person_present":
case "_status_person_present_implied":
case "_status_person_absent":

2
world/net/library/profiles.html
View File

@ -71,7 +71,7 @@
<tr><td>_flag_uniform_verbatim</td><td>verbatimuniform</td><td></td><td></td><td></td><td></td><td></td></tr>
<tr><td>_flag_visibility</td><td>visibility</td><td></td><td></td><td></td><td></td><td></td></tr>
<tr><td>_gender</td><td>sex</td><td>gender</td><td></td><td></td><td></td><td>gender</td></tr>
<tr><td>_identification</td><td>id</td><td>psyc_id</td><td></td><td>PSYCID</td><td></td><td>psycID</td></tr>
<tr><td>_identification</td><td>id</td><td>psyc_id</td><td></td><td></td><td></td><td>psycID</td></tr>
<tr><td>_identification_other</td><td>otherid</td><td></td><td></td><td></td><td></td><td></td></tr>
<tr><td>_identification_scheme_AIM</td><td>aimid</td><td>aim_id</td><td></td><td></td><td></td><td>aimChatID</td></tr>
<tr><td>_identification_scheme_ICQ</td><td>icqid</td><td>icq_id</td><td></td><td></td><td></td><td>icqChatID</td></tr>

2
world/net/library/profiles.i
View File

@ -94,7 +94,6 @@ volatile mapping psyc2jCard = ([
"_affiliation" : "<ORG><ORGNAME>%s</ORGNAME></ORG>",
"_date_birth" : "<BDAY>%s</BDAY>",
"_description_public" : "<DESC>%s</DESC>",
"_identification" : "<PSYCID>%s</PSYCID>",
"_identification_scheme_XMPP" : "<JABBERID>%s</JABBERID>",
"_identification_scheme_mailto" : "<EMAIL><USERID>%s</USERID></EMAIL>",
"_name_family" : "<N><FAMILY>%s</FAMILY></N>",
@ -133,7 +132,6 @@ volatile mapping jCard2psyc = ([
"TEL/NUMBER" : "_contact_telephone",
"BDAY" : "_date_birth",
"DESC" : "_description_public",
"PSYCID" : "_identification",
"JABBERID" : "_identification_scheme_XMPP",
"EMAIL/USERID" : "_identification_scheme_mailto",
"N/FAMILY" : "_name_family",

3
world/net/library/profiles.pl
View File

@ -377,7 +377,8 @@ FOAF icqChatID
PSYC _identification
jProf psyc_id
jCard PSYCID
# I'm afraid adding a PSYCID field will not be well-recepted by some apps
#jCard PSYCID
FOAF psycID
PSYC _identification_other