Changed default email subject from hard-coded string to LanguageXX.php

entry.

diff --git a/includes/SpecialEmailuser.php b/includes/SpecialEmailuser.php
index ababac2..4912852 100644 (file)
--- a/includes/SpecialEmailuser.php
+++ b/includes/SpecialEmailuser.php
@@ -57,7 +57,7 @@ class EmailUserForm {
                $wgOut->setPagetitle( wfMsg( "emailpage" ) );
                $wgOut->addWikiText( wfMsg( "emailpagetext" ) );
 
-               if ( ! $wpSubject ) { $wpSubject = "Wikipedia e-mail"; }
+               if ( ! $wpSubject ) { $wpSubject = wfMsg( "defemailsubject" ); }
 
                $emf = wfMsg( "emailfrom" );
                $sender = $wgUser->getName();

diff --git a/languages/Language.php b/languages/Language.php
index 1b3ca3c..1f779af 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1057,6 +1057,7 @@ his or her user preferences, the form below will send a single message.
 The e-mail address you entered in your user preferences will appear
 as the \"From\" address of the mail, so the recipient will be able
 to reply.",
+"defemailsubject"  => "$wgSitename e-mail",                                   
 "noemailtitle" => "No e-mail address",
 "noemailtext"  => "This user has not specified a valid e-mail address,
 or has chosen not to receive e-mail from other users.",