Index: openacs-4/packages/acs-admin/www/apm/package-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-add.tcl,v diff -u -r1.16.2.1 -r1.16.2.2 --- openacs-4/packages/acs-admin/www/apm/package-add.tcl 13 Jan 2020 16:23:13 -0000 1.16.2.1 +++ openacs-4/packages/acs-admin/www/apm/package-add.tcl 3 Jul 2020 07:43:20 -0000 1.16.2.2 @@ -7,9 +7,9 @@ } set user_id [ad_conn user_id] -set user [acs_user::get -user_id $user_id] -set user_name [dict get $user name] -set email [dict get $user email] +set user_info [acs_user::get -user_id $user_id] +set user_name [dict get $user_info name] +set email [dict get $user_info email] set package_id [db_nextval acs_object_id_seq] set version_id [db_nextval acs_object_id_seq] @@ -45,7 +45,7 @@
In order to contribute this package back to the OpenACS community,
Install/upgrade packages from the local file system (@local_path@). +
Install/upgrade packages from the local filesystem (@local_path@).
Use this if your site has
custom code or your packages are kept in a local code repository.
Help.
Install or -upgrade from the local file system.
+upgrade from the local filesystem.Load a single package an archive stored an a non-standard place on -your local file system or from a URL.
+Load a single package an archive stored a non-standard place on +your local filesystem or from a URL.
Load from URL or Local Path
There are no un-installed applications in your file system meeting the filter criteria.
+There are no un-installed applications in your filesystem meeting the filter criteria.
There are no un-installed applications in the OpenACS repository meeting the filter criteria.
Index: openacs-4/packages/acs-admin/www/install/install.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/install.tcl,v diff -u -r1.13.2.1 -r1.13.2.2 --- openacs-4/packages/acs-admin/www/install/install.tcl 13 Mar 2019 09:00:13 -0000 1.13.2.1 +++ openacs-4/packages/acs-admin/www/install/install.tcl 3 Jul 2020 07:43:20 -0000 1.13.2.2 @@ -1,5 +1,5 @@ ad_page_contract { - Install from local file system + Install from local filesystem } { {package_type ""} {upgrade_p:boolean 0} @@ -35,7 +35,7 @@ } # -# Set page title to reflect install from repository or from file system +# Set page title to reflect install from repository or from filesystem # if { $repository_url ne "" } { Index: openacs-4/packages/acs-admin/www/users/member-state-change.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/member-state-change.tcl,v diff -u -r1.23.2.5 -r1.23.2.6 --- openacs-4/packages/acs-admin/www/users/member-state-change.tcl 5 Mar 2020 14:42:33 -0000 1.23.2.5 +++ openacs-4/packages/acs-admin/www/users/member-state-change.tcl 3 Jul 2020 07:43:20 -0000 1.23.2.6 @@ -35,10 +35,10 @@ return } -set user [acs_user::get -user_id $user_id] -set name [dict get $user name] -set email [dict get $user email] -set rel_id [dict get $user rel_id] +set user_info [acs_user::get -user_id $user_id] +set name [dict get $user_info name] +set email [dict get $user_info email] +set rel_id [dict get $user_info rel_id] # # This page is used for state changes in the member_state, and as well Index: openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl,v diff -u -r1.20.2.3 -r1.20.2.4 --- openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl 8 Jan 2020 17:48:15 -0000 1.20.2.3 +++ openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl 3 Jul 2020 07:43:20 -0000 1.20.2.4 @@ -242,7 +242,7 @@ } if { $table_name eq "" || $column_name eq "" } { - # We have to have both a non-empty table name and column name + # We have to have both a nonempty table name and column name error "We do not have enough information to automatically remove this attribute. Namely, we are missing either the table name or the column name" } Index: openacs-4/packages/acs-subsite/tcl/group-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/group-procs.tcl,v diff -u -r1.60.2.7 -r1.60.2.8 --- openacs-4/packages/acs-subsite/tcl/group-procs.tcl 11 Oct 2019 15:38:32 -0000 1.60.2.7 +++ openacs-4/packages/acs-subsite/tcl/group-procs.tcl 3 Jul 2020 07:43:20 -0000 1.60.2.8 @@ -497,25 +497,25 @@ set message #acs-kernel.member_state_$member_state# } action { - if {$user_name eq ""} { error "user_name must be specified and must be non-empty" } + if {$user_name eq ""} { error "user_name must be specified and must be nonempty" } set message #acs-kernel.member_state_action_$member_state# } account_mail { - if {$site_name eq ""} { error "site_name must be specified and must be non-empty" } + if {$site_name eq ""} { error "site_name must be specified and must be nonempty" } if {[string match "#*#" $site_name]} { # site names can be localized set site_name [lang::util::localize $site_name $locale] } - if {$url eq ""} { error "url must be specified and must be non-empty" } + if {$url eq ""} { error "url must be specified and must be nonempty" } set message #acs-kernel.member_state_account_mail_$member_state# } community_mail { - if {$community_name eq ""} { error "community_name must be specified and must be non-empty" } + if {$community_name eq ""} { error "community_name must be specified and must be nonempty" } if {[string match "#*#" $community_name]} { # community_names can be localized set community_name [lang::util::localize $community_name $locale] } - if {$url eq ""} { error "url must be specified and must be non-empty" } + if {$url eq ""} { error "url must be specified and must be nonempty" } set message #acs-kernel.member_state_community_mail_$member_state# } default { @@ -744,7 +744,7 @@ -object_id_two $user_id \ -rel_type "admin_rel"] - # The party is an admin if the call above returned something non-empty + # The party is an admin if the call above returned something nonempty return [expr {$admin_rel_id ne ""}] } Index: openacs-4/packages/acs-subsite/tcl/package-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/package-procs.tcl,v diff -u -r1.40.2.3 -r1.40.2.4 --- openacs-4/packages/acs-subsite/tcl/package-procs.tcl 19 May 2020 19:15:36 -0000 1.40.2.3 +++ openacs-4/packages/acs-subsite/tcl/package-procs.tcl 3 Jul 2020 07:43:20 -0000 1.40.2.4 @@ -751,7 +751,7 @@ # function. Pieces is just a list of lists where each list contains only # one item - the name of the parameter. We keep track of # parameters we've already added in the array param_array (all keys are - # in upper case) + # in uppercase) set pieces [list] @@ -872,7 +872,7 @@ # function. Pieces is just a list of lists where each list contains only # one item - the name of the parameter. We keep track of # parameters we've already added in the array param_array (all keys are - # in upper case) + # in uppercase) set pieces [list] Index: openacs-4/packages/acs-subsite/tcl/plsql-utility-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/plsql-utility-procs.tcl,v diff -u -r1.9.2.1 -r1.9.2.2 --- openacs-4/packages/acs-subsite/tcl/plsql-utility-procs.tcl 16 May 2019 09:27:52 -0000 1.9.2.1 +++ openacs-4/packages/acs-subsite/tcl/plsql-utility-procs.tcl 3 Jul 2020 07:43:20 -0000 1.9.2.2 @@ -130,8 +130,8 @@ { -include_object_id "f" } stem } { - Returns an object name of max_length characters, in lower - case, beginning with stem but without any unsafe characters. Only + Returns an object name of max_length characters, in lowercase, + beginning with stem but without any unsafe characters. Only allowed characters are numbers, letter, underscore, dash and space, though the returned word will start with a letter. Throws an error if no safe name could be generated. Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v diff -u -r1.68.2.11 -r1.68.2.12 --- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl 3 May 2020 17:00:28 -0000 1.68.2.11 +++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl 3 Jul 2020 07:43:20 -0000 1.68.2.12 @@ -1216,7 +1216,7 @@ If -absolute is supplied then this function will generate absolute URLs. If the site is currently being accessed via a host node mapping then URLs - will omit the corresponding subsite url stub. The host name will be used + will omit the corresponding subsite url stub. The hostname will be used for any appropriate subsite when absolute URLs are generated. @param node_id the subsite's node_id (defaults to nearest subsite node). @@ -1268,7 +1268,7 @@ # # If the provided host is not empty, get it from the host header - # field (when connected) or from the configured host name. + # field (when connected) or from the configured hostname. # if {$force_host eq "any"} { if {[info exists driver_info(vhost)]} { Index: openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl,v diff -u -r1.12 -r1.12.2.1 --- openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl 7 Apr 2018 17:31:59 -0000 1.12 +++ openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl 3 Jul 2020 07:43:20 -0000 1.12.2.1 @@ -37,7 +37,7 @@ } } } -errors { - name_root_ck {Folder or file names cannot contain '/'} + name_root_ck {Folder or filenames cannot contain '/'} name_duplicate_ck {The URL mapping you are creating is already in use. Please delete the other one or change your URL.} node_type_ck {The node type you specified is invalid} } Index: openacs-4/packages/acs-subsite/www/admin/users/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/users/new.tcl,v diff -u -r1.24 -r1.24.2.1 --- openacs-4/packages/acs-subsite/www/admin/users/new.tcl 7 Jun 2018 17:30:17 -0000 1.24 +++ openacs-4/packages/acs-subsite/www/admin/users/new.tcl 3 Jul 2020 07:43:20 -0000 1.24.2.1 @@ -51,7 +51,7 @@ set rel_member_state "" } -# Select out the user name and the user's object type. The validate +# Select out the username and the user's object type. The validate # filter above will catch missing parties acs_object_type::get -object_type $user_type -array object_type @@ -223,8 +223,8 @@ if {[parameter::get -parameter NotifyAdminOfNewRegistrationsP -default 0]} { set creation_user [ad_conn user_id] - set user [acs_user::get -user_id $creation_user] - set creation_name "[dict get $user name] ([dict get $user email])" + set user_info [acs_user::get -user_id $creation_user] + set creation_name "[dict get $user_info name] ([dict get $user_info email])" # we're supposed to notify the administrator when someone new registers Index: openacs-4/packages/acs-subsite/www/pvt/alerts.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/alerts.tcl,v diff -u -r1.9.2.1 -r1.9.2.2 --- openacs-4/packages/acs-subsite/www/pvt/alerts.tcl 16 May 2019 09:54:29 -0000 1.9.2.1 +++ openacs-4/packages/acs-subsite/www/pvt/alerts.tcl 3 Jul 2020 07:43:20 -0000 1.9.2.2 @@ -14,12 +14,12 @@ set user_id [ad_conn user_id] -set user [acs_user::get -user_id $user_id] -set first_names [dict get $user first_names] -set last_name [dict get $user last_name] -set email [dict get $user email] -set url [dict get $user url] -set full_name [dict get $user name] +set user_info [acs_user::get -user_id $user_id] +set first_names [dict get $user_info first_names] +set last_name [dict get $user_info last_name] +set email [dict get $user_info email] +set url [dict get $user_info url] +set full_name [dict get $user_info name] if { [string trim $full_name] eq "" } { set full_name "name unknown" } Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v diff -u -r1.216.2.4 -r1.216.2.5 --- openacs-4/packages/new-portal/tcl/portal-procs.tcl 22 Nov 2019 16:39:23 -0000 1.216.2.4 +++ openacs-4/packages/new-portal/tcl/portal-procs.tcl 3 Jul 2020 07:43:20 -0000 1.216.2.5 @@ -2023,7 +2023,7 @@ ad_proc -private portal::get_layout_region_count { {-layout_id:required} } { - Get the number of regions (a.k.a. columns) this layout supports + Get the number of regions (aka columns) this layout supports } { return [util_memoize "portal::get_layout_region_count_not_cached -layout_id $layout_id"] } Index: openacs-4/packages/new-portal/www/render_styles/all_in_one/render-element.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/render_styles/all_in_one/render-element.tcl,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/new-portal/www/render_styles/all_in_one/render-element.tcl 29 Jun 2018 17:27:19 -0000 1.10 +++ openacs-4/packages/new-portal/www/render_styles/all_in_one/render-element.tcl 3 Jul 2020 07:43:21 -0000 1.10.2.1 @@ -34,7 +34,7 @@ # If the error is in the element's "show" proc, the error will # be shown in the content of the portlet. This is for errors other # than with the "show" proc. - ns_log error "\n\n *** Error in portal/www/render_sytles/all_in_one/render-element.tcl\n Uncaught exception when calling portal::evaluate_element\n with element_id $element_id\n\n ERROR $errorMsg" + ns_log error "\n\n *** Error in portal/www/render_styles/all_in_one/render-element.tcl\n Uncaught exception when calling portal::evaluate_element\n with element_id $element_id\n\n ERROR $errorMsg" return -code error "error during rendering portal element $element_id (render_style all_in_one)" } on ok {element_data} { Index: openacs-4/packages/new-portal/www/render_styles/individual/render-element.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/render_styles/individual/render-element.tcl,v diff -u -r1.16 -r1.16.2.1 --- openacs-4/packages/new-portal/www/render_styles/individual/render-element.tcl 29 Jun 2018 17:27:19 -0000 1.16 +++ openacs-4/packages/new-portal/www/render_styles/individual/render-element.tcl 3 Jul 2020 07:43:21 -0000 1.16.2.1 @@ -53,7 +53,7 @@ # If the error is in the element's "show" proc, the error will # be shown in the content of the portlet. This is for errors other # than with the "show" proc. It hides the entire PE - ns_log error "\n\n *** Error in portal/www/render_sytles_/individual/render-element.tcl\n Uncaught exception when calling portal::evaluate_element \n with element_id $element_id. errmsg: $errorMsg\n\n$::errorInfo" + ns_log error "\n\n *** Error in portal/www/render_styles_/individual/render-element.tcl\n Uncaught exception when calling portal::evaluate_element \n with element_id $element_id. errmsg: $errorMsg\n\n$::errorInfo" return -code error "error during rendering portal element $element_id (render_style individual)" } on ok {element_data} {