As per http://drupal.org/simpletest-tutorial-drupal7#t , I scanned the tests in the block module and removed t()s from assert messages, or changed them to format_string() where appropriate.

Patch follows.

CommentFileSizeAuthor
#9 remove_t_from_block_asserts-1741338-9.patch26.3 KBlazysoundsystem
#7 remove_t_from_block_asserts-1741338-7.patch19.83 KBlazysoundsystem
#1 remove-t-from-Block-asserts-1741338-1.patch32.03 KBlazysoundsystem

Comments

lazysoundsystem’s picture

lazysoundsystem commented
Status: Active » Needs review
StatusFileSize
new remove-t-from-Block-asserts-1741338-1.patch32.03 KB

Here's the patch.

lazysoundsystem’s picture

lazysoundsystem commented

I started this before reading through #500866: [META] remove t() from assert message, where they've been trying to solve this since 2009. Best to wait for confirmation there before putting any more work into this.

lars toomre’s picture

lars toomre commented

#1: remove-t-from-Block-asserts-1741338-1.patch queued for re-testing.

lars toomre’s picture

lars toomre commented
Status: Needs review » Reviewed & tested by the community

I have reviewed all of the t() changes in this patch and they are appropriate. The tests come back green too. Hence, RTBC.

dries’s picture

dries commented
Status: Reviewed & tested by the community » Fixed

Committed to 8.x. Thanks.

xjm’s picture

xjm
she/her
Primary language English
commented
Status: Fixed » Patch (to be ported)
Issue tags: +Needs backport to D7

We're backporting these. :)

lazysoundsystem’s picture

lazysoundsystem commented
Version: 8.x-dev » 7.x-dev
Status: Patch (to be ported) » Needs review
StatusFileSize
new remove_t_from_block_asserts-1741338-7.patch19.83 KB

And here is the backport.

lazysoundsystem’s picture

lazysoundsystem commented
Assigned: Unassigned » lazysoundsystem
Status: Needs review » Needs work

Found some more for 7.x, I'll reroll this patch.

lazysoundsystem’s picture

lazysoundsystem commented
Assigned: lazysoundsystem » Unassigned
Status: Needs work » Needs review
StatusFileSize
new remove_t_from_block_asserts-1741338-9.patch26.3 KB

Okay, this one's better.

dcam’s picture

dcam commented
Status: Needs review » Reviewed & tested by the community

#9 looks good to me. I didn't find any more t()'s around assert messages.

webchick’s picture

webchick
she/they
Primary language English
Location Vancouver 🇨🇦
commented
Assigned: Unassigned » jhodgdon

Tum te tum...

jhodgdon’s picture

jhodgdon
she/her
Primary language English
commented
Assigned: jhodgdon » Unassigned
Status: Reviewed & tested by the community » Fixed

Thanks! Committed to 7.x.

Automatically closed -- issue fixed for 2 weeks with no activity.