afuna: Cat under a blanket. Text: "Cats are just little people with Fur and Fangs" (Default)
afuna ([personal profile] afuna) wrote in [site community profile] changelog2009-07-04 12:11 am

[dw-free] clarify why "collapse content" options are greyed-out

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

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

Add message for people whose birthdates are not set.

Patch by [staff profile] denise.

Files modified:
  • bin/upgrading/en.dat
  • cgi-bin/LJ/Setting/ViewingAdultContent.pm
--------------------------------------------------------------------------------
diff -r ea4680710c3a -r 199c406fdb46 bin/upgrading/en.dat
--- a/bin/upgrading/en.dat	Sat Jul 04 00:00:40 2009 +0000
+++ b/bin/upgrading/en.dat	Sat Jul 04 00:10:56 2009 +0000
@@ -2845,6 +2845,8 @@ setting.viewingadultcontent.option.selec
 
 setting.viewingadultcontent.option.select.none=nothing (display all content)
 
+setting.viewingadultcontent.reason=(To change this option, you must <a [[aopts]]>set your birthdate</a> first.)
+
 setting.xpost.btn.add=Add New Account
 
 setting.xpost.label=Crossposting
diff -r ea4680710c3a -r 199c406fdb46 cgi-bin/LJ/Setting/ViewingAdultContent.pm
--- a/cgi-bin/LJ/Setting/ViewingAdultContent.pm	Sat Jul 04 00:00:40 2009 +0000
+++ b/cgi-bin/LJ/Setting/ViewingAdultContent.pm	Sat Jul 04 00:10:56 2009 +0000
@@ -31,12 +31,12 @@ sub option {
         {
             value => "none",
             text => $class->ml('setting.viewingadultcontent.option.select.none'),
-            disabled => $u->is_minor || !$u->best_guess_age ? 1 : 0,
+            disabled => $u->is_minor || ! $u->best_guess_age ? 1 : 0,
         },
         {
             value => "explicit",
             text => $class->ml('setting.viewingadultcontent.option.select.explicit'),
-            disabled => !$u->best_guess_age ? 1 : 0,
+            disabled => ! $u->best_guess_age ? 1 : 0,
         },
         {
             value => "concepts",
@@ -51,6 +51,11 @@ sub option {
         id => "${key}viewingadultcontent",
         selected => $viewingadultcontent,
     }, @options);
+
+    if ( ! $u->best_guess_age ) {
+        $ret .= "<br /><span style='font-size: smaller;'> " . LJ::Lang::ml( 'setting.viewingadultcontent.reason', { aopts => "href='$LJ::SITEROOT/manage/profile'" } ) . "</span>";
+
+    }
 
     my $errdiv = $class->errdiv($errs, "viewingadultcontent");
     $ret .= "<br />$errdiv" if $errdiv;
--------------------------------------------------------------------------------

Post a comment in response:

This account has disabled anonymous posting.
If you don't have an account you can create one now.
HTML doesn't work in the subject.
More info about formatting

If you are unable to use this captcha for any reason, please contact us by email at support@dreamwidth.org