web/html/formletters/forgot_accounts.xml | 4 ++--
web/html/formletters/forgot_password.xml | 2 +-
web/modules/rhn/RHN/Postal.pm | 7 ++++++-
3 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 57eabc2f3d86e3345205c442bc002be5bc628908
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 10:49:35 2010 +0100
Do not confuse people by calling Spacewalk logins Red Hat logins.
diff --git a/web/html/formletters/forgot_accounts.xml
b/web/html/formletters/forgot_accounts.xml
index 90d8bbf..175a5da 100644
--- a/web/html/formletters/forgot_accounts.xml
+++ b/web/html/formletters/forgot_accounts.xml
@@ -1,10 +1,10 @@
-<postal-letter subject="Red Hat Login Information">
+<postal-letter subject="&product_name; Login Information">
[ This is an automated email sent to <email-address /> at your request. ]
You have requested a list of all <product-name /> logins associated
with the email address <email-address />.
-Red Hat Login(s):
+Existing login(s):
<account-list />
You may reset the passwords for any of the above Red Hat logins at:
diff --git a/web/html/formletters/forgot_password.xml
b/web/html/formletters/forgot_password.xml
index 42de045..51a22b4 100644
--- a/web/html/formletters/forgot_password.xml
+++ b/web/html/formletters/forgot_password.xml
@@ -1,4 +1,4 @@
-<postal-letter subject="Red Hat Network Password">
+<postal-letter subject="&product_name; Password Reset">
[ This is an automated email sent to <email-address /> at your request. ]
Your <product-name /> password has been reset. To sign in, go to:
diff --git a/web/modules/rhn/RHN/Postal.pm b/web/modules/rhn/RHN/Postal.pm
index 7932e2a..5510bba 100644
--- a/web/modules/rhn/RHN/Postal.pm
+++ b/web/modules/rhn/RHN/Postal.pm
@@ -164,7 +164,12 @@ sub render {
$p->register_tag("postal-letter" =>
sub {
my %params = @_;
- $self->subject($params{subject}) if exists $params{subject};
+ if (exists $params{subject}) {
+ my $subject = $params{subject};
+ my $product_name = PXT::Config->get('product_name');
+ $subject =~ s!&product_name;!$product_name!g;
+ $self->subject($subject);
+ }
return $params{__block__};
}
);
Show replies by thread