Index: openacs-4/packages/jabber/www/add-external-contact-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/add-external-contact-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/jabber/www/add-external-contact-2.tcl 1 Mar 2005 00:01:37 -0000 1.2
+++ openacs-4/packages/jabber/www/add-external-contact-2.tcl 11 Oct 2018 11:17:07 -0000 1.3
@@ -1,6 +1,6 @@
ad_page_contract {
- add new contact to IM-Adressbook
+ add new contact to IM-Addressbook
inserts new rows in jb_friends
@author Luis Mosteiro Fernandez
@creation-date 2002-10-22
Index: openacs-4/packages/jabber/www/edit-user-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/edit-user-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/jabber/www/edit-user-2.tcl 28 Mar 2018 17:00:41 -0000 1.2
+++ openacs-4/packages/jabber/www/edit-user-2.tcl 11 Oct 2018 11:17:07 -0000 1.3
@@ -143,7 +143,7 @@
}
} else {
ns_log debug "edit-user-2 3.2"
- #we have no old_screen_id for this user_id , so check if we have to fully create a a new one, or just inserting the old user_id.
+ #we have no old_screen_id for this user_id, so check if we have to fully create a new one, or just inserting the old user_id.
if { [db_0or1row check_new_screen_exists "SELECT (screen_id) as new_screen_id
FROM jb_screens
WHERE im_screen_name = :user_screen_name
Index: openacs-4/packages/jabber/www/admin/online-users.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/admin/online-users.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/jabber/www/admin/online-users.tcl 1 Mar 2005 00:01:38 -0000 1.2
+++ openacs-4/packages/jabber/www/admin/online-users.tcl 11 Oct 2018 11:17:07 -0000 1.3
@@ -10,7 +10,7 @@
ltext:onevalue
get_users:multirow
online_check_p:onevalue
- statecolour:onevalue
+ statecolor:onevalue
}
@@ -29,22 +29,22 @@
}
-multirow create get_users screen_id status statecolour im_screen_name service resource
+multirow create get_users screen_id status statecolor im_screen_name service resource
db_foreach get_users "select * from jb_screens where status != 'offline'" {
set online_check_p 1
if { $status == "online" } {
- set statecolour "green"
+ set statecolor "green"
} elseif { $status == "away" } {
- set statecolour "mediumslateblue"
+ set statecolor "mediumslateblue"
} elseif { $status == "dnd" } {
- set statecolour "navy"
+ set statecolor "navy"
} else {
- set statecolour "black"
+ set statecolor "black"
}
- multirow append get_users $screen_id $status $statecolour $im_screen_name $service $resourc
+ multirow append get_users $screen_id $status $statecolor $im_screen_name $service $resourc
} if_no_rows {
set online_check_p 0
Index: openacs-4/packages/jabber/www/conference/invite.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/conference/invite.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/jabber/www/conference/invite.tcl 20 Oct 2004 19:36:50 -0000 1.1
+++ openacs-4/packages/jabber/www/conference/invite.tcl 11 Oct 2018 11:17:07 -0000 1.2
@@ -16,8 +16,8 @@
-# we send both version of invites to asure all clients recive the invite
-# This causesconflicts inside the conference module
+# We send both version of invites to asure all clients receive the invite.
+# This causes conflicts inside the conference module
set suc [jb_invite $jid $room_name $room_subject $msg $version ]
#set suc [jb_invite $jid $room_name $room_subject $msg 2 ]
Index: openacs-4/packages/jabber/www/conference/make-group-conference-group.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/conference/make-group-conference-group.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/jabber/www/conference/make-group-conference-group.tcl 4 Apr 2018 18:51:56 -0000 1.2
+++ openacs-4/packages/jabber/www/conference/make-group-conference-group.tcl 11 Oct 2018 11:17:07 -0000 1.3
@@ -44,12 +44,12 @@
if {$type == "start_room"} {
- # Check if the user is registerd with jabber, and if get his/her screen and online status
+ # Check if the user is registered with jabber, and if get his/her screen and online status
if {[db_0or1row get_jabber_user_screen ""]} {
set jid "$im_screen_name@[jb_get_transport_url_from_id [jb_get_transport_id_from_symbol "jabber"]]"
} else {
- # the user is not registerd just redirect him to the jabber/index.tcl
+ # the user is not registered just redirect him to the jabber/index.tcl
ns_returnredirect "jabber/index"
ad_script_abort
Index: openacs-4/packages/messages/tcl/messages-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/messages/tcl/messages-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/messages/tcl/messages-procs.tcl 27 Mar 2018 17:08:50 -0000 1.2
+++ openacs-4/packages/messages/tcl/messages-procs.tcl 11 Oct 2018 11:19:54 -0000 1.3
@@ -240,11 +240,11 @@
append not_folder_ids [messages::get_folder_id -folder_name "sent"] "," \
[messages::get_folder_id -folder_name "trash"]
db_multirow messages get_history_conversation { *SQL* } {
- set day_recive [lc_time_fmt $sent_date "%d %b, %Y" ]
- set ansi_time "$day_recive - $time"
+ set day_receive [lc_time_fmt $sent_date "%d %b, %Y" ]
+ set ansi_time "$day_receive - $time"
set msg_content [template::util::richtext::get_property contents $msg_content]
append conversation "$blockquote_conversation_begin
- El $day_recive, a las $time, [acs_user::get_element -user_id $owner_id -element name] escribio: <br><br>
+ El $day_receive, a las $time, [acs_user::get_element -user_id $owner_id -element name] escribio: <br><br>
$msg_content<br><br>"
incr count_messages
}
@@ -270,7 +270,7 @@
{-len "100"}
-string
} {
- cut middle part of a string in case it is to long copied from xotcl-request-monitor
+ cut middle part of a string in case it is too long copied from xotcl-request-monitor
} {
set string [string trim $string]
if {[string length $string]>$len} {
Index: openacs-4/packages/messages/www/inbox.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/messages/www/inbox.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/messages/www/inbox.tcl 4 Apr 2018 22:05:13 -0000 1.3
+++ openacs-4/packages/messages/www/inbox.tcl 11 Oct 2018 11:19:54 -0000 1.4
@@ -48,7 +48,7 @@
lappend elements contacts \
[list html { align left style "font-size: smaller; width:20%"} \
label [_ messages.from] \
- display_template { <a href="#@messages.msg_id@a${folder_id}a${page_number}" onclick="read_message(@messages.msg_id@,$folder_id,$page_number)"> <if @messages.new_p@>\
+ display_template { <a href="#@messages.msg_id@a${folder_id}a${page_number}" onclick="read_message(@messages.msg_id@,$folder_id,$page_number)"> <if @messages.new_p;literal@ true>\
<span id="new_p.@messages.msg_id@"><span id="new_p_style.@messages.msg_id@" style="font-weight: bold;">@messages.contacts@ \
<if $folder_id ne 1> (@messages.number_conversation@) </if></span>\
</if><else><span id="new_p_style.@messages.msg_id@" style="font-weight:;">@messages.contacts@ (@messages.number_conversation@)</span></else></a>} \
@@ -70,14 +70,14 @@
[list html { align left style "font-size: smaller; width:62%"} \
label [_ messages.subject] \
display_template { <a href="#@messages.msg_id@a${folder_id}a${page_number}" onclick="read_message(@messages.msg_id@,$folder_id,$page_number)">\
- <if @messages.new_p@><span id="new_p_sub.@messages.msg_id@" style="font-weight: bold;">@messages.subject_mail@</span> \
+ <if @messages.new_p;literal@ true><span id="new_p_sub.@messages.msg_id@" style="font-weight: bold;">@messages.subject_mail@</span> \
</if><else><span id="new_p_sub.@messages.msg_id@" style="font-weight:;">@messages.subject_mail@</span></else></a>} \
] \
date \
[list html { align left style "font-size: smaller;width:12%"} \
label [_ messages.date] \
display_template { <a href="#@messages.msg_id@a${folder_id}a${page_number}" onclick="read_message(@messages.msg_id@,$folder_id,$page_number)">\
- <if @messages.new_p@><span id="new_p_date.@messages.msg_id@" style="font-weight: bold;">@messages.date@</span> \
+ <if @messages.new_p;literal@ true><span id="new_p_date.@messages.msg_id@" style="font-weight: bold;">@messages.date@</span> \
</if><else><span id="new_p_date.@messages.msg_id@" style="font-weight:;">@messages.date@</span></else></a>} \
]
Index: openacs-4/packages/messages/www/print-message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/messages/www/print-message.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/messages/www/print-message.tcl 31 Aug 2010 21:30:42 -0000 1.1
+++ openacs-4/packages/messages/www/print-message.tcl 11 Oct 2018 11:19:54 -0000 1.2
@@ -34,7 +34,7 @@
lappend contact_names $contact_name
}
set contact_names [join $contact_names ","]
- set day_recive [lc_time_fmt $sent_date "%d %b, %Y" ]
- set ansi_time "$day_recive - $time"
+ set day_receive [lc_time_fmt $sent_date "%d %b, %Y" ]
+ set ansi_time "$day_receive - $time"
set content [template::util::richtext::get_property content $msg_content]
}
\ No newline at end of file
Index: openacs-4/packages/messages/www/read.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/messages/www/read.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/messages/www/read.tcl 31 Aug 2010 21:30:45 -0000 1.1
+++ openacs-4/packages/messages/www/read.tcl 11 Oct 2018 11:19:54 -0000 1.2
@@ -116,8 +116,8 @@
set contact_names [string range $contact_names 0 [expr [string length $contact_names] - 60]]
set cur_time [clock format [clock seconds] -format "%Y %m %d"]
set sent_time_seconds [clock format [clock scan $sent_date] -format "%Y %m %d"]]
- set day_recive [lc_time_fmt $sent_date "%d %b, %Y" ]
- set ansi_time "$day_recive - $time"
+ set day_receive [lc_time_fmt $sent_date "%d %b, %Y" ]
+ set ansi_time "$day_receive - $time"
set msg_content [template::util::richtext::get_property contents $msg_content]
if { [lindex $cur_time 0] > [lindex $sent_time_seconds 0]} {
set date [lc_time_fmt $sent_date "%D"]
Index: openacs-4/packages/messages/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/messages/www/search.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/messages/www/search.tcl 4 Apr 2018 22:05:13 -0000 1.3
+++ openacs-4/packages/messages/www/search.tcl 11 Oct 2018 11:19:54 -0000 1.4
@@ -65,7 +65,7 @@
lappend elements contacts \
[list html { align left style "font-size: smaller; width:20%"} \
label [_ messages.from] \
- display_template { <a href="#" onclick="read_message(@messages.msg_id@,@messages.folder_id@,$page_number)"> <if @messages.new_p@>\
+ display_template { <a href="#" onclick="read_message(@messages.msg_id@,@messages.folder_id@,$page_number)"> <if @messages.new_p;literal@ true>\
<span id="new_p.@messages.msg_id@"><span id="new_p_style.@messages.msg_id@" style="font-weight: bold;">@messages.contacts@ \
<if @messages.folder_id@ ne 1> (@messages.number_conversation@) </if></span>\
</if><else><span id="new_p_style.@messages.msg_id@" style="font-weight:;">@messages.contacts@ (@messages.number_conversation@)</span></else></a>} \
@@ -85,14 +85,14 @@
[list html { align left style "font-size: smaller; width:65%"} \
label [_ messages.subject] \
display_template { <a href="#" onclick="read_message(@messages.msg_id@,@messages.folder_id@,$page_number)">\
- <if @messages.new_p@><span id="new_p_sub.@messages.msg_id@" style="font-weight: bold;">@messages.subject_mail@</span> \
+ <if @messages.new_p;literal@ true><span id="new_p_sub.@messages.msg_id@" style="font-weight: bold;">@messages.subject_mail@</span> \
</if><else><span id="new_p_sub.@messages.msg_id@" style="font-weight:;">@messages.subject_mail@</span></else></a>} \
] \
date \
[list html { align left style "font-size: smaller;width:10%"} \
label [_ messages.date] \
display_template { <a href="#" onclick="read_message(@messages.msg_id@,@messages.folder_id@,$page_number)">\
- <if @messages.new_p@><span id="new_p_date.@messages.msg_id@" style="font-weight: bold;">@messages.date@</span> \
+ <if @messages.new_p;literal@ true><span id="new_p_date.@messages.msg_id@" style="font-weight: bold;">@messages.date@</span> \
</if><else><span id="new_p_date.@messages.msg_id@" style="font-weight:;">@messages.date@</span></else></a>} \
]