From f1c94b241cb20fb85932868fdeb28670785d63f8 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 24 Nov 2008 22:50:10 +0000 Subject: [PATCH] fix the misspelled word Template in template titles, properties and code for the Account --- docs/changelog/7.x.x.txt | 1 + ...t_inbox_default-inbox-error-template.wgpkg | Bin 0 -> 887 bytes ...ult-invitation-confirmation-template.wgpkg | Bin 0 -> 1047 bytes ...x_default-invite-user-email-template.wgpkg | Bin 0 -> 827 bytes docs/upgrades/upgrade_7.6.4-7.6.5.pl | 21 ++++++++++++++++-- lib/WebGUI/Account/Friends.pm | 6 ++--- lib/WebGUI/Account/Inbox.pm | 14 ++++++------ lib/WebGUI/Account/Profile.pm | 2 +- 8 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 docs/upgrades/packages-7.6.5/root_import_account_inbox_default-inbox-error-template.wgpkg create mode 100644 docs/upgrades/packages-7.6.5/root_import_account_inbox_default-invitation-confirmation-template.wgpkg create mode 100644 docs/upgrades/packages-7.6.5/root_import_account_inbox_default-invite-user-email-template.wgpkg diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 240ab72f9..b9057f05f 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,6 +1,7 @@ 7.6.5 - fixed #8800: Errors in POD of Asset-related mix-in modules (Bernd Kalbfuß-Zimmermann) - fixed: Products imported into the Shelf have bad URLs + - fixed: #9147: Misspellings in Account 7.6.4 - Survey now will show progress and time limit. diff --git a/docs/upgrades/packages-7.6.5/root_import_account_inbox_default-inbox-error-template.wgpkg b/docs/upgrades/packages-7.6.5/root_import_account_inbox_default-inbox-error-template.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..e5aeb516694a8f3956d77ddb2771dd30a8a27748 GIT binary patch literal 887 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 + print "\tFix misspellings in Account settings... " unless $quiet; + # and here's our code + $setting->add("profileViewTemplateId", $setting->get('profileViewTempalteId') ); + $setting->add("profileErrorTemplateId", $setting->get('profileErrorTempalteId') ); + $setting->add("inboxLayoutTemplateId", $setting->get('inboxLayoutTempalteId') ); + $setting->add("friendsLayoutTemplateId", $setting->get('friendsLayoutTempalteId')); + $setting->remove("profileViewTemplateId"); + $setting->remove("profileErrorTemplateId"); + $setting->remove("inboxLayoutTemplateId"); + $setting->remove("friendsLayoutTemplateId"); + print "DONE!\n" unless $quiet; +} # -------------- DO NOT EDIT BELOW THIS LINE -------------------------------- diff --git a/lib/WebGUI/Account/Friends.pm b/lib/WebGUI/Account/Friends.pm index f0d90375d..a56a9f7f1 100644 --- a/lib/WebGUI/Account/Friends.pm +++ b/lib/WebGUI/Account/Friends.pm @@ -96,7 +96,7 @@ sub editSettingsForm { hoverHelp => $i18n->get("friends style template hoverHelp") ); $f->template( - name => "friendsLayoutTempalteId", + name => "friendsLayoutTemplateId", value => $self->getLayoutTemplateId, namespace => "Account/Layout", label => $i18n->get("friends layout template label"), @@ -166,7 +166,7 @@ sub editSettingsFormSave { my $form = $session->form; $setting->set("friendsStyleTemplateId", $form->process("friendsStyleTemplateId","template")); - $setting->set("friendsLayoutTempalteId", $form->process("friendsLayoutTempalteId","template")); + $setting->set("friendsLayoutTemplateId", $form->process("friendsLayoutTemplateId","template")); $setting->set("friendsViewTemplateId", $form->process("friendsViewTemplateId","template")); $setting->set("friendsEditTemplateId",$form->process("friendsEditTemplateId","template")); $setting->set("friendsSendRequestTemplateId",$form->process("friendsSendRequestTemplateId","template")); @@ -226,7 +226,7 @@ This method returns the template ID for the account layout. sub getLayoutTemplateId { my $self = shift; - return $self->session->setting->get("friendsLayoutTempalteId") || "zrNpGbT3odfIkg6nFSUy8Q"; + return $self->session->setting->get("friendsLayoutTemplateId") || "zrNpGbT3odfIkg6nFSUy8Q"; } diff --git a/lib/WebGUI/Account/Inbox.pm b/lib/WebGUI/Account/Inbox.pm index 98d6b799e..6e1f39685 100644 --- a/lib/WebGUI/Account/Inbox.pm +++ b/lib/WebGUI/Account/Inbox.pm @@ -103,7 +103,7 @@ sub editSettingsForm { hoverHelp => $i18n->get("inbox style template hoverHelp") ); $f->template( - name => "inboxLayoutTempalteId", + name => "inboxLayoutTemplateId", value => $self->getLayoutTemplateId, namespace => "Account/Layout", label => $i18n->get("inbox layout template label"), @@ -198,7 +198,7 @@ sub editSettingsForm { ); $f->template( name => "inboxInviteUserMessageTemplateId", - value => $self->getInviteUserMessageTempalteId, + value => $self->getInviteUserMessageTemplateId, namespace => "Account/Inbox/InviteUserMessage", label => $i18n->get("invite user message template label"), hoverHelp => $i18n->get("invite user message template hoverHelp") @@ -237,7 +237,7 @@ sub editSettingsFormSave { #Messages Settings $setting->set("inboxStyleTemplateId", $form->process("inboxStyleTemplateId","template")); - $setting->set("inboxLayoutTempalteId", $form->process("inboxLayoutTempalteId","template")); + $setting->set("inboxLayoutTemplateId", $form->process("inboxLayoutTemplateId","template")); $setting->set("inboxViewTemplateId", $form->process("inboxViewTemplateId","template")); $setting->set("inboxViewMessageTemplateId",$form->process("inboxViewMessageTemplateId","template")); $setting->set("inboxSendMessageTemplateId",$form->process("inboxSendMessageTemplateId","template")); @@ -305,13 +305,13 @@ sub getInvitationConfirmTemplateId { #------------------------------------------------------------------- -=head2 getInviteUserMessageTempalteId ( ) +=head2 getInviteUserMessageTemplateId ( ) This method returns the template ID for the user email message =cut -sub getInviteUserMessageTempalteId { +sub getInviteUserMessageTemplateId { my $self = shift; return $self->session->setting->get("inboxInviteUserMessageTemplateId") || "XgcsoDrbC0duVla7N7JAdw"; } @@ -352,7 +352,7 @@ This method returns the template ID for the account layout. sub getLayoutTemplateId { my $self = shift; - return $self->session->setting->get("inboxLayoutTempalteId") || "gfZOwaTWYjbSoVaQtHBBEw"; + return $self->session->setting->get("inboxLayoutTemplateId") || "gfZOwaTWYjbSoVaQtHBBEw"; } @@ -755,7 +755,7 @@ sub www_inviteUserSave { $session->url->getSiteURL,'op=auth;method=createAccount;code='.$inviteId ); - my $emailBody = $self->processTemplate($var,$self->getInviteUserMessageTempalteId); + my $emailBody = $self->processTemplate($var,$self->getInviteUserMessageTemplateId); ##Create the invitation record. my $hash = { diff --git a/lib/WebGUI/Account/Profile.pm b/lib/WebGUI/Account/Profile.pm index d4f42bbee..c46ffccdd 100644 --- a/lib/WebGUI/Account/Profile.pm +++ b/lib/WebGUI/Account/Profile.pm @@ -207,7 +207,7 @@ sub editSettingsFormSave { $setting->set("profileLayoutTemplateId", $form->process("profileLayoutTemplateId","template")); $setting->set("profileDisplayLayoutTemplateId", $form->process("profileDisplayLayoutTemplateId","template")); $setting->set("profileEditTemplateId", $form->process("profileEditTemplateId","template")); - $setting->set("profileViewTempalteId", $form->process("profileViewTemplateId","template")); + $setting->set("profileViewTemplateId", $form->process("profileViewTemplateId","template")); $setting->set("profileErrorTemplateId",$form->process("profileErrorTemplateId","template")); }