[livejournal] r18237: LJSUP-7906: Incorrect alert on settings ...

U   trunk/htdocs/manage/settings/index.bml
U   trunk/htdocs/manage/settings/index.bml.text

Modified: trunk/htdocs/manage/settings/index.bml
===================================================================
--- trunk/htdocs/manage/settings/index.bml	2011-02-08 10:59:56 UTC (rev 18236)
+++ trunk/htdocs/manage/settings/index.bml	2011-02-08 11:06:00 UTC (rev 18237)
@@ -307,9 +307,14 @@
     $ret .= $submit_msg;
 
     # Warn them if logged in and not validated
-    if ($given_cat eq 'notifications' && $u && !$u->is_identity && $u->email_raw && $u->email_status ne 'A') {
-        $ret .= "<?warningbar <b>$ML{'label.warning'}</b> $ML{'.error.notvalidated'} warningbar?>";
-        $ret .= "<br />";
+    if ($given_cat eq 'notifications' && $u && !$u->is_identity && $u->email_raw) {
+        if ($u->email_status eq 'N' or $u->email_status eq 'T') {
+            $ret .= "<?warningbar <b>$ML{'label.warning'}</b> $ML{'.error.notvalidated'} warningbar?>";
+            $ret .= "<br />";
+        } elsif ($u->email_status ne 'A') {
+            $ret .= "<?warningbar <b>$ML{'label.warning'}</b> $ML{'.error.validation.cancelled'} warningbar?>";
+            $ret .= "<br />";
+        } # else 'A' - no message needed
     }
 
     $ret .= "<div id='settings_left'>";

Modified: trunk/htdocs/manage/settings/index.bml.text
===================================================================
--- trunk/htdocs/manage/settings/index.bml.text	2011-02-08 10:59:56 UTC (rev 18236)
+++ trunk/htdocs/manage/settings/index.bml.text	2011-02-08 11:06:00 UTC (rev 18237)
@@ -86,6 +86,8 @@
 
 .error.notvalidated=Your account is not validated.
 
+.error.validation.cancelled=Your email address is no longer validated, because we received error messages from the mail server for one week. To receive email notifications again, please validate your address <a href="http://www.livejournal.com/manage/settings/">here</a>.
+
 .finished.save_button=Save Changes
 
 .fn.adultcontentflag|staleness=1