Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
project
drupal
Commits
e2153365
Commit
e2153365
authored
Dec 09, 2010
by
Dries
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Patch
#991726
by wojtha, meba: missing format_plural() in comments and node module.
parent
7361b458
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
modules/comment/comment.admin.inc
modules/comment/comment.admin.inc
+1
-1
modules/comment/comment.test
modules/comment/comment.test
+1
-1
modules/node/node.admin.inc
modules/node/node.admin.inc
+1
-1
No files found.
modules/comment/comment.admin.inc
View file @
e2153365
...
...
@@ -232,7 +232,7 @@ function comment_multiple_delete_confirm_submit($form, &$form_state) {
cache_clear_all
();
$count
=
count
(
$form_state
[
'values'
][
'comments'
]);
watchdog
(
'content'
,
'Deleted @count comments.'
,
array
(
'@count'
=>
$count
));
drupal_set_message
(
t
(
'Deleted
@count
comment
s
.'
,
array
(
'@count'
=>
$count
)
));
drupal_set_message
(
format_plural
(
$count
,
'Deleted
1
comment.'
,
'Deleted @count comments.'
));
}
$form_state
[
'redirect'
]
=
'admin/content/comment'
;
}
...
...
modules/comment/comment.test
View file @
e2153365
...
...
@@ -226,7 +226,7 @@ class CommentHelperCase extends DrupalWebTestCase {
if
(
$operation
==
'delete'
)
{
$this
->
drupalPost
(
NULL
,
array
(),
t
(
'Delete comments'
));
$this
->
assertRaw
(
t
(
'Deleted
@count
comment
s
.'
,
array
(
'@count'
=>
1
)
),
t
(
'Operation "'
.
$operation
.
'" was performed on comment.'
));
$this
->
assertRaw
(
format_plural
(
1
,
'Deleted
1
comment.'
,
'Deleted @count comments.'
),
t
(
'Operation "'
.
$operation
.
'" was performed on comment.'
));
}
else
{
$this
->
assertText
(
t
(
'The update has been performed.'
),
t
(
'Operation "'
.
$operation
.
'" was performed on comment.'
));
...
...
modules/node/node.admin.inc
View file @
e2153365
...
...
@@ -595,7 +595,7 @@ function node_multiple_delete_confirm_submit($form, &$form_state) {
node_delete_multiple
(
array_keys
(
$form_state
[
'values'
][
'nodes'
]));
$count
=
count
(
$form_state
[
'values'
][
'nodes'
]);
watchdog
(
'content'
,
'Deleted @count posts.'
,
array
(
'@count'
=>
$count
));
drupal_set_message
(
t
(
'Deleted
@count
post
s
.'
,
array
(
'@count'
=>
$count
)
));
drupal_set_message
(
format_plural
(
$count
,
'Deleted
1
post.'
,
'Deleted @count posts.'
));
}
$form_state
[
'redirect'
]
=
'admin/content'
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment