diff --git a/lib/WebGUI/Help/Macros.pm b/lib/WebGUI/Help/Macros.pm index 096069a74..042ac1b3e 100644 --- a/lib/WebGUI/Help/Macros.pm +++ b/lib/WebGUI/Help/Macros.pm @@ -30,19 +30,27 @@ our $HELP = { ##Build list of enabled macros, by namespace, by reversing session hash: my %macros = reverse %{ $session->config->get("macros") }; + my $i18n = WebGUI::International->new($session, 'Macros'); + my $yes = $i18n->get(138, 'WebGUI'); + my $no = $i18n->get(139, 'WebGUI'); my $macro_table = join "\n", - map { join '', '', $_, '', - ($macros{$_} ? ('^', $macros{$_}, '();') : ' '), - '' } - @macros; + map { join '', '', $_, + '', + ($macros{$_} ? $yes : $no), + '', + ($macros{$_} ? ('^', $macros{$_}, '();') : ' '), + '' + } @macros; - my $i18n = WebGUI::International->new($session, 'Macros'); $macro_table = join("\n", + $i18n->get('macros list body'), '', '',$macro_table,'
',$i18n->get('macro name'), '', + $i18n->get('macro enabled header'), + '', $i18n->get('macro shortcut'), '
'); }, diff --git a/lib/WebGUI/i18n/English/Macros.pm b/lib/WebGUI/i18n/English/Macros.pm index 1f71bb902..cb2179c67 100644 --- a/lib/WebGUI/i18n/English/Macros.pm +++ b/lib/WebGUI/i18n/English/Macros.pm @@ -9,7 +9,13 @@ our $I18N = { 'macro shortcut' => { message => q|Macro Shortcut|, - lastUpdated => 1112591289 + lastUpdated => 1112591289, + }, + + 'macro enabled header' => { + message => q|Macro Enabled?|, + lastUpdated => 1112591289, + context => q|Table heading in List of Macros help page. Short for "Is this Macro enabled?"|, }, 'macros list title' => { @@ -18,10 +24,11 @@ our $I18N = { }, 'macros list body' => { - message => q|

The set of available Macros is defined in the WebGUI configuration file. These Macros are available for use on your site:

+ message => q|

The set of available Macros is defined in the WebGUI configuration file. The table below shows all macros that are available for use on your site, and which ones have + been enabled on your use. If the macro is enabled, the table will list the shortcut that is used to call it.

|, context => 'Content for dynamically generated macro list', - lastUpdated => 1114134745, + lastUpdated => 1150994876, }, 'macro enabled' => {