Index: openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl,v diff -u -r1.11.2.9 -r1.11.2.10 --- openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl 26 Aug 2019 12:46:15 -0000 1.11.2.9 +++ openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl 29 Sep 2019 17:32:29 -0000 1.11.2.10 @@ -53,7 +53,7 @@ } { html::nav -class [:navbarClass] -role "navigation" { # - # Render the pull down menues + # Render the pull down menus # html::div -class [:containerClass] { set rightMenuEntries {} Index: openacs-4/packages/xowiki/tcl/menu-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/menu-procs.tcl,v diff -u -r1.19.2.2 -r1.19.2.3 --- openacs-4/packages/xowiki/tcl/menu-procs.tcl 24 Jun 2019 11:27:24 -0000 1.19.2.2 +++ openacs-4/packages/xowiki/tcl/menu-procs.tcl 29 Sep 2019 17:32:29 -0000 1.19.2.3 @@ -151,21 +151,21 @@ } ::xowiki::MenuBar instproc init {} { - set :Menues [list] + set :Menus [list] :destroy_on_cleanup } ::xowiki::MenuBar instproc add_menu {-name {-label ""}} { - if {$name in ${:Menues}} { + if {$name in ${:Menus}} { error "menu $name exists already" } if {[string match {[a-z]*} $name]} { error "names must start with uppercase, provided name '$name'" } - lappend :Menues $name + lappend :Menus $name if {$label eq ""} {set label $name} set :Menu($name) [list label $label] - #:log "menues: ${:Menues}" + #:log "menus: ${:Menus}" } ::xowiki::MenuBar instproc additional_sub_menu {-kind:required -pages:required -owner:required} { @@ -208,7 +208,7 @@ if {![regexp {^([^.]+)[.](.+)$} $name _ menu name]} { error "menu item name '$name' not of the form Menu.Name" } - if {$menu ni ${:Menues}} { + if {$menu ni ${:Menus}} { error "menu $menu does not exist" } if {[string match {[a-z]*} $name]} { @@ -363,7 +363,7 @@ ::xowiki::MenuBar instproc content {} { set result [list id [:id]] - foreach e ${:Menues} { + foreach e ${:Menus} { lappend result $e [list kind MenuButton {*}[set :Menu($e)]] }