Update wording, add space between strings.
Patch by kareila.
diffs (37 lines):
diff -r 9ee5d437d2f0 -r 9db8f0588507 bin/upgrading/en.dat
--- a/bin/upgrading/en.dat Mon Aug 23 11:10:12 2010 +0800
+++ b/bin/upgrading/en.dat Mon Aug 23 11:38:44 2010 +0800
@@ -1801,8 +1801,6 @@ This letter was sent out automatically t
This letter was sent out automatically to help you keep your account secure.
You cannot opt-out of receiving these letters.
.
-esn.someone_must_unscreen=Someone else must unscreen it before you can reply
to it.
-
esn.supofficialpost.html=There is <a href="[[url]]">a new announcement</a> in
[[username]]
esn.supofficialpost.nosubject=[[sitenameshort]] Announcement: New [[username]]
announcement
diff -r 9ee5d437d2f0 -r 9db8f0588507 cgi-bin/LJ/Comment.pm
--- a/cgi-bin/LJ/Comment.pm Mon Aug 23 11:10:12 2010 +0800
+++ b/cgi-bin/LJ/Comment.pm Mon Aug 23 11:38:44 2010 +0800
@@ -1134,7 +1134,6 @@ my @_ml_strings_en = (
'esn.screened',
# 'This comment was screened.',
'esn.you_must_unscreen',
# 'You must respond to it or unscreen it before others can see it.',
- 'esn.someone_must_unscreen',
# 'Someone else must unscreen it before you can reply to it.',
'esn.here_you_can',
# 'From here, you can:',
'esn.view_thread',
# '[[openlink]]View the thread[[closelink]] starting from this comment',
@@ -1480,9 +1479,10 @@ sub _format_mail_both {
$posteru ? $posteru->{user} :
undef);
if ($self->is_screened) {
- $body .= LJ::Lang::get_text($lang, 'esn.screened', undef) .
- LJ::Lang::get_text($lang, $can_unscreen ? 'esn.you_must_unscreen'
: 'esn.someone_must_unscreen', undef) .
- "\n";
+ $body .= LJ::Lang::get_text( $lang, 'esn.screened', undef ) . " ";
+ $body .= LJ::Lang::get_text( $lang, 'esn.you_must_unscreen', undef )
+ if $can_unscreen;
+ $body .= "\n";
}
$body .= LJ::Lang::get_text($lang, 'esn.here_you_can', undef, $vars);
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
