fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)
fu ([personal profile] fu) wrote in [site community profile] changelog2010-04-21 04:43 pm

[dw-free] Split /misc/adult_content.bml.title for separate use cases

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

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

Change the title in the box to context-specific titles.

Patch by [personal profile] chemicallace.

Files modified:
  • htdocs/misc/adult_concepts.bml
  • htdocs/misc/adult_explicit.bml
  • htdocs/misc/adult_explicit_blocked.bml
--------------------------------------------------------------------------------
diff -r e615d425834a -r 37a877173ae3 htdocs/misc/adult_concepts.bml
--- a/htdocs/misc/adult_concepts.bml	Wed Apr 21 09:29:09 2010 -0700
+++ b/htdocs/misc/adult_concepts.bml	Wed Apr 21 09:48:12 2010 -0700
@@ -61,7 +61,7 @@ body<=
     }
 
     $ret .= "<div class='adult_warning adult_concepts'>";
-    $ret .= "<h1 style='text-align: center;'>$ML{'.title'}</h1>";
+    $ret .= "<h1 style='text-align: center;'>$ML{'.title.NSFW'}</h1>";
     $ret .= "<p>" . BML::ml( '.message.concepts.by' . $markedby, { journal => $journal->ljuser_display, poster => $poster->ljuser_display } ) . "</p>";
     $ret .= DW::Logic::AdultContent->interstitial_reason( $journal, $entry );
     $ret .= "</div>";
diff -r e615d425834a -r 37a877173ae3 htdocs/misc/adult_explicit.bml
--- a/htdocs/misc/adult_explicit.bml	Wed Apr 21 09:29:09 2010 -0700
+++ b/htdocs/misc/adult_explicit.bml	Wed Apr 21 09:48:12 2010 -0700
@@ -63,7 +63,7 @@ body<=
     my $extra_for_no_age = $remote && !$remote->best_guess_age ? BML::ml( '.setage', { aopts => "href='$LJ::SITEROOT/manage/profile/'" } ) : "";
 
     $ret .= "<div class='adult_warning adult_explicit'>";
-    $ret .= "<h1 style='text-align: center;'>$ML{'.title'}</h1>";
+    $ret .= "<h1 style='text-align: center;'>$ML{'.title.18'}</h1>";
     if ( $remote && $remote->best_guess_age ) {
         $ret .= "<p>" . BML::ml( '.message.explicit.18plus.by' . $markedby, { journal => $journal->ljuser_display, poster => $poster->ljuser_display } ) . "</p>";
     } else {
diff -r e615d425834a -r 37a877173ae3 htdocs/misc/adult_explicit_blocked.bml
--- a/htdocs/misc/adult_explicit_blocked.bml	Wed Apr 21 09:29:09 2010 -0700
+++ b/htdocs/misc/adult_explicit_blocked.bml	Wed Apr 21 09:48:12 2010 -0700
@@ -46,7 +46,7 @@ body<=
     }
 
     $ret .= "<div class="adult_warning adult_blocked">";
-    $ret .= "<h1 style='text-align: center;'>$ML{'.title'}</h1>";
+    $ret .= "<h1 style='text-align: center;'>$ML{'.title.18.blocked'}</h1>";
     $ret .= "<p>" . BML::ml( '.message.explicit.blocked.by' . $markedby, { journal => $journal->ljuser_display, poster => $poster->ljuser_display } ) . "</p>";
     $ret .= DW::Logic::AdultContent->interstitial_reason( $journal, $entry );
     $ret .= "</div>";
--------------------------------------------------------------------------------