[dw-free] Make the names of post security levels consistent
[commit: http://hg.dwscoalition.org/dw-free/rev/6f04bc6ef833]
http://bugs.dwscoalition.org/show_bug.cgi?id=2899
Update translation strings for consistency across the site.
Patch by
ninetydegrees.
Files modified:
http://bugs.dwscoalition.org/show_bug.cgi?id=2899
Update translation strings for consistency across the site.
Patch by
![[personal profile]](https://www.dreamwidth.org/img/silk/identity/user.png)
Files modified:
- bin/upgrading/en.dat
- cgi-bin/LJ/Setting/MinSecurity.pm
- htdocs/editprivacy.bml
- htdocs/tools/memadd.bml
-------------------------------------------------------------------------------- diff -r fd48661e6d2e -r 6f04bc6ef833 bin/upgrading/en.dat --- a/bin/upgrading/en.dat Sat Aug 14 17:44:03 2010 +0800 +++ b/bin/upgrading/en.dat Mon Aug 16 20:37:01 2010 -0500 @@ -2810,15 +2810,15 @@ setting.minsecurity.label=Default Entry setting.minsecurity.option=Set all new entries to a minimum security of -setting.minsecurity.option.select.friends=friends - -setting.minsecurity.option.select.members=members - -setting.minsecurity.option.select.admin=administrators - -setting.minsecurity.option.select.private=just me (private) - -setting.minsecurity.option.select.public=everyone (public) +setting.minsecurity.option.select.accesslist=Access List + +setting.minsecurity.option.select.admins=Administrators + +setting.minsecurity.option.select.members2=Members + +setting.minsecurity.option.select.private2=Just Me (Private) + +setting.minsecurity.option.select.public2=Everyone (Public) setting.name.question=What's your name? diff -r fd48661e6d2e -r 6f04bc6ef833 cgi-bin/LJ/Setting/MinSecurity.pm --- a/cgi-bin/LJ/Setting/MinSecurity.pm Sat Aug 14 17:44:03 2010 +0800 +++ b/cgi-bin/LJ/Setting/MinSecurity.pm Mon Aug 16 20:37:01 2010 -0500 @@ -41,11 +41,11 @@ sub option { my $minsecurity = $class->get_arg($args, "minsecurity") || $u->prop("newpost_minsecurity"); my @options = ( - "" => $class->ml('setting.minsecurity.option.select.public'), - friends => $u->is_community ? $class->ml('setting.minsecurity.option.select.members') : $class->ml('setting.minsecurity.option.select.friends'), + "" => $class->ml('setting.minsecurity.option.select.public2'), + friends => $u->is_community ? $class->ml('setting.minsecurity.option.select.members2') : $class->ml('setting.minsecurity.option.select.accesslist'), private => $u->is_community ? - $class->ml( 'setting.minsecurity.option.select.admin' ) : - $class->ml( 'setting.minsecurity.option.select.private' ) + $class->ml( 'setting.minsecurity.option.select.admins' ) : + $class->ml( 'setting.minsecurity.option.select.private2' ) ); diff -r fd48661e6d2e -r 6f04bc6ef833 htdocs/editprivacy.bml --- a/htdocs/editprivacy.bml Sat Aug 14 17:44:03 2010 +0800 +++ b/htdocs/editprivacy.bml Mon Aug 16 20:37:01 2010 -0500 @@ -80,7 +80,7 @@ body<= # map security form values to 0) DB value 1) From string 2) To string my %security = ( 'public' => ['public', BML::ml('label.security.public2'), BML::ml('label.security.public2')], - 'friends' => ['usemask', BML::ml('label.security.friends'), BML::ml('label.security.friends')], + 'friends' => ['usemask', BML::ml('label.security.accesslist'), BML::ml('label.security.accesslist')], 'private' => ['private', BML::ml('label.security.private2'), BML::ml('label.security.private2')]); # Initial view of page diff -r fd48661e6d2e -r 6f04bc6ef833 htdocs/tools/memadd.bml --- a/htdocs/tools/memadd.bml Sat Aug 14 17:44:03 2010 +0800 +++ b/htdocs/tools/memadd.bml Mon Aug 16 20:37:01 2010 -0500 @@ -49,7 +49,7 @@ _c?> my $authextra = $authas ne $remote->{'user'} ? "?authas=$authas" : ''; my %secopts = ( 'public' => $ML{'label.security.public'}, - 'friends' => $ML{'label.security.friends'}, + 'friends' => $ML{'label.security.accesslist'}, 'private' => $ML{'label.security.private'}, ); if ( $memoryu->is_community ) { --------------------------------------------------------------------------------