mark: A photo of Mark kneeling on top of the Taal Volcano in the Philippines. It was a long hike. (Default)
Mark Smith ([staff profile] mark) wrote in [site community profile] changelog2009-06-14 06:35 pm

[dw-free] Pass username to the "this account has no memories" message

[commit: http://hg.dwscoalition.org/dw-free/rev/fbde25c78d1b]

http://bugs.dwscoalition.org/show_bug.cgi?id=780

Pass display_name to ML string.

Patch by [staff profile] denise.

Files modified:
  • htdocs/tools/memories.bml
  • htdocs/tools/memories.bml.text
--------------------------------------------------------------------------------
diff -r 212232c35417 -r fbde25c78d1b htdocs/tools/memories.bml
--- a/htdocs/tools/memories.bml	Sun Jun 14 18:32:25 2009 +0000
+++ b/htdocs/tools/memories.bml	Sun Jun 14 18:35:44 2009 +0000
@@ -268,7 +268,7 @@
  $body .= "</form>";
 
  unless (@sortedrows) {
-     $body .= "<?h1 $ML{'.error.noentries.title'} h1?><?p $ML{'.error.noentries.body'} p?>";
+     $body .= "<?h1 $ML{'.error.noentries.title'} h1?><?p " . BML::ml( '.error.noentries.body', { username => $u->display_name } ) . " p?>";
  } else {
      $body .= "<ul>";
      foreach my $row (@sortedrows) {
diff -r 212232c35417 -r fbde25c78d1b htdocs/tools/memories.bml.text
--- a/htdocs/tools/memories.bml.text	Sun Jun 14 18:32:25 2009 +0000
+++ b/htdocs/tools/memories.bml.text	Sun Jun 14 18:35:44 2009 +0000
@@ -31,9 +31,9 @@
 
 .error.noentries.body<<
 This could be because: <ol>
-<li>the user hasn't defined any memorable events,</li>
-<li>the user's memorable events are protected and you don't have access to view them, or</li>
-<li>the user doesn't have any memories that match your filter criteria.</li></ol>
+<li>[[username]] hasn't defined any memorable events,</li>
+<li>[[username]]'s memorable events are protected and you don't have access to view them, or</li>
+<li>[[username]] doesn't have any memories that match your filter criteria.</li></ol>
 .
 
 .error.noentries.title=No memories found.
--------------------------------------------------------------------------------