Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.tcl 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.tcl 5 Dec 2002 13:10:52 -0000 1.2 @@ -61,4 +61,9 @@ and g.group_id = valid_types.group_id(+) and g.rel_type = valid_types.rel_type(+) order by lower(g.rel_type) +} { + # The role pretty names can be message catalog keys that need + # to be localized before they are displayed + set role_pretty_name [lang::util::localize $role_pretty_name] + set role_pretty_plural [lang::util::localize $role_pretty_plural] } Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl 6 Sep 2002 21:49:59 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl 5 Dec 2002 13:10:52 -0000 1.4 @@ -49,6 +49,11 @@ where rel_types.rel_type = :rel_type } +# The role pretty names can be message catalog keys that need +# to be localized before they are displayed +set role_pretty_name [lang::util::localize $role_pretty_name] +set role_pretty_plural [lang::util::localize $role_pretty_plural] + set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list one?[ad_export_vars group_id] "One Group"] "All $role_pretty_plural"] ad_return_template Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.tcl 6 Sep 2002 21:50:01 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.tcl 5 Dec 2002 13:11:01 -0000 1.5 @@ -32,6 +32,10 @@ and s.rel_type = r.rel_type } +# The role pretty names can be message catalog keys that need +# to be localized before they are displayed +set role_pretty_plural [lang::util::localize $role_pretty_plural] + set context [list [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] [list one?[ad_export_vars {segment_id}] "One segment"] "Elements"] # Expects segment_id, segment_name, group_id, role to be passed in Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl 6 Sep 2002 21:50:01 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl 5 Dec 2002 13:11:01 -0000 1.4 @@ -48,4 +48,8 @@ where t.rel_type = :rel_type } +# The role pretty names can be message catalog keys that need +# to be localized before they are displayed +set role_pretty_plural [lang::util::localize $role_pretty_plural] + ad_return_template Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/index.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/index.tcl 6 Sep 2002 21:50:03 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/index.tcl 5 Dec 2002 13:11:11 -0000 1.3 @@ -28,6 +28,12 @@ where r.role = num1.role(+) and r.role = num2.role(+) order by lower(r.role) +} { + # The role pretty names can be message catalog keys that need + # to be localized before they are displayed + set pretty_name [lang::util::localize $pretty_name] } ad_return_template + + Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.tcl 6 Sep 2002 21:50:03 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.tcl 5 Dec 2002 13:11:11 -0000 1.4 @@ -31,6 +31,11 @@ ad_script_abort } +# The role pretty names can be message catalog keys that need +# to be localized before they are displayed +set role_props(pretty_name) [lang::util::localize $role_props(pretty_name)] +set role_props(pretty_plural) [lang::util::localize $role_props(pretty_plural)] + db_multirow rels select_rel_types_one { select r.rel_type as role, t.pretty_name, r.rel_type, decode(r.role_one,:role,'Side one', 'Side two') as side Index: openacs-4/packages/acs-subsite/www/admin/relations/add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/add.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-subsite/www/admin/relations/add.tcl 18 Sep 2002 14:54:52 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/admin/relations/add.tcl 5 Dec 2002 13:11:21 -0000 1.6 @@ -77,6 +77,10 @@ ) } +# The role pretty names can be message catalog keys that need +# to be localized before they are displayed +set role_pretty_name [lang::util::localize $role_pretty_name] + if {[string equal $ancestor_rel_type membership_rel]} { if {[string equal $join_policy "closed"] && !$create_p} { ad_complain "You do not have permission to add elements to $group_name"