From 3950611b47d7926ceacbe366576b1de8cecd12b6 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 2 Nov 2009 18:07:24 -0800 Subject: [PATCH] i18n the event recurrence form. Fixes bug #11194 --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Asset/Event.pm | 169 ++++++++++++------------- lib/WebGUI/i18n/English/Asset_Event.pm | 121 ++++++++++++++++++ 3 files changed, 206 insertions(+), 85 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 40fcedff0..c1d75eb8f 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -35,6 +35,7 @@ - fixed #11188: Incoherence in Navigation edit form - fixed #11189: Controls variable missing in image asset in AssetProxy - fixed #11190: event tmpl_var in help but not available + - fixed #11194: Event Asset Recurrence form is not i18n'ed 7.8.2 - Added scheduled vendor payout workflow activity. (Special thanks to Martin @ Oqapi) diff --git a/lib/WebGUI/Asset/Event.pm b/lib/WebGUI/Asset/Event.pm index 309de8f0e..b309e7ecd 100644 --- a/lib/WebGUI/Asset/Event.pm +++ b/lib/WebGUI/Asset/Event.pm @@ -2209,22 +2209,23 @@ sub www_edit { : $self->isAllDay ; + my $i18n = WebGUI::International->new($session, 'Asset_Event'); $var->{"formTime"} = q| - +
- +
| - . q|Start: |.$var->{"formStartTime"} - . q|
End: |.$var->{"formEndTime"} - . q|
Time Zone: |.$var->{formTimeZone} - . q|
|; + . $i18n->get('start') . q|: | . $var->{"formStartTime"} . q|
| + . $i18n->get('end') . q|: | . $var->{"formEndTime"} . q|
| + . $i18n->get('timezone', 'DateTime'). q|: | . $var->{formTimeZone} . q|| + ; ###### related links my $relatedLinks = $self->getRelatedLinks(); @@ -2241,8 +2242,8 @@ sub www_edit { value => $form->process("rel_group_id_".$_->{eventlinkId}) || $_->{groupIdView} || $self->getParent->get("groupIdView"), defaultValue => $self->getParent->get("groupIdView"), }); - $_->{seq_num_name} = "rel_seq_".$_->{eventlinkId}; - $_->{seq_num_id} = "rel_seq_id_".$_->{eventlinkId}; + $_->{seq_num_name} = "rel_seq_".$_->{eventlinkId}; + $_->{seq_num_id} = "rel_seq_id_".$_->{eventlinkId}; $_->{seq_num_value} = $seqNum++; } $var->{"relatedLinks"} = $relatedLinks; @@ -2265,90 +2266,88 @@ sub www_edit { = q|

-

+

-

+

- Every
+ |. $i18n->get('Every'). q|
-
+
- +
-

-

+

- Every week(s) on
+ |. sprintf($i18n->get('Every N weeks on'), q||). q|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-

-

+

-

Every month(s) on

+

|. sprintf($i18n->get('Every N months on'), q||). q|

- +

week on + + + + + + |. $i18n->get('week on'). q|

-

+

-

Every years(s) on

+

|. sprintf($i18n->get('Every N years on'),q||). q|

@@ -2356,34 +2355,34 @@ sub www_edit {

of + + + + + + + + |. $i18n->get('of'). q|

@@ -2403,18 +2402,18 @@ sub www_edit { $var->{"formRecurEnd"} = q|
-
+
- | + | . WebGUI::Form::date($session,{ name => "recurEndDate", value => $recur{endDate}, defaultValue => $recur{endDate} }) . q|
- + - occurences. + |. $i18n->get('occurences'). q|.
|; @@ -2430,14 +2429,14 @@ sub www_edit { $var->{"formSave"} = WebGUI::Form::submit($session, { name => "save", - value => "save", + value => $i18n->get('62', 'WebGUI'), }); # Cancel button $var->{"formCancel"} = WebGUI::Form::button($session, { name => "cancel", - value => "cancel", + value => $i18n->get('cancel', 'WebGUI'), extras => 'onClick="window.history.go(-1)"', }); diff --git a/lib/WebGUI/i18n/English/Asset_Event.pm b/lib/WebGUI/i18n/English/Asset_Event.pm index c047e42de..0c4e7da64 100644 --- a/lib/WebGUI/i18n/English/Asset_Event.pm +++ b/lib/WebGUI/i18n/English/Asset_Event.pm @@ -700,6 +700,127 @@ be useful, others may not.|, lastUpdated => 1204668000, }, + 'No specific time' => { + message => q{No specific time (all day event)}, + lastUpdated => 1257188155, + }, + + 'Specific start/end time' => { + message => q{Specific start/end time}, + lastUpdated => 1257188155, + }, + + 'day' => { + message => q{day}, + lastUpdated => 1257188155, + }, + + 'Daily' => { + message => q{Daily}, + lastUpdated => 1257188155, + context => q{An event that occurs every day}, + }, + + 'Weekday(s)' => { + message => q{Weekday(s)}, + lastUpdated => 1257188155, + context => q{May occur on one or more weekdays (Monday through Friday)}, + }, + + 'Weekly' => { + message => q{Weekly}, + lastUpdated => 1257188155, + }, + + 'Monthly' => { + message => q{Monthly}, + lastUpdated => 1257188155, + }, + + 'Yearly' => { + message => q{Yearly}, + lastUpdated => 1257188155, + }, + + 'first' => { + message => q{first}, + lastUpdated => 1257188155, + }, + + 'second' => { + message => q{second}, + lastUpdated => 1257188155, + }, + + 'third' => { + message => q{third}, + lastUpdated => 1257188155, + }, + + 'fourth' => { + message => q{fourth}, + lastUpdated => 1257188155, + }, + + 'last' => { + message => q{last}, + lastUpdated => 1257188155, + }, + + 'of' => { + message => 'of', + lastUpdated => 0, + }, + + 'No end' => { + message => 'No end', + lastUpdated => 0, + }, + + 'By date' => { + message => 'By date', + lastUpdated => 0, + }, + + 'After' => { + message => 'After', + lastUpdated => 0, + }, + + 'occurences' => { + message => 'occurences', + lastUpdated => 0, + }, + + 'Every' => { + message => 'Every', + lastUpdated => 0, + }, + + 'Every N weeks on' => { + message => 'Every %s week(s) on', + lastUpdated => 0, + context => '%s is filled with an HTML Form control', + }, + + 'Every N months on' => { + message => 'Every %s month(s) on', + lastUpdated => 0, + context => '%s is filled with an HTML Form control', + }, + + 'Every N years on' => { + message => 'Every %s year(s) on', + lastUpdated => 0, + context => '%s is filled with an HTML Form control', + }, + + 'week on' => { + message => 'week on', + lastUpdated => 0, + context => 'follows a select list with ordinals, first, second, etc. To form the phrase, First week on, Second week on', + }, + }; 1;