From 0db24edc49f5197e4f2de81ad6fb86ed3ed1dd3d Mon Sep 17 00:00:00 2001 From: Lars Toomre Date: Sat, 29 Sep 2012 12:40:22 -0400 Subject: [PATCH] Issue 1797510 by Lars Toomre: Remove t() from testasserts in Shortcut module. --- .../Drupal/shortcut/Tests/ShortcutLinksTest.php | 6 +++--- .../lib/Drupal/shortcut/Tests/ShortcutSetsTest.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php b/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php index 9ee094b..54eeab4 100644 --- a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php +++ b/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php @@ -125,15 +125,15 @@ class ShortcutLinksTest extends ShortcutTestBase { variable_set('theme_default', 'seven'); $this->drupalGet('page-that-does-not-exist'); - $this->assertNoRaw('add-shortcut', t('Add to shortcuts link was not shown on a page not found.')); + $this->assertNoRaw('add-shortcut', 'Add to shortcuts link was not shown on a page not found.'); // The user does not have access to this path. $this->drupalGet('admin/modules'); - $this->assertNoRaw('add-shortcut', t('Add to shortcuts link was not shown on a page the user does not have access to.')); + $this->assertNoRaw('add-shortcut', 'Add to shortcuts link was not shown on a page the user does not have access to.'); // Verify that the testing mechanism works by verifying the shortcut // link appears on admin/content/node. $this->drupalGet('admin/content/node'); - $this->assertRaw('add-shortcut', t('Add to shortcuts link was shown on a page the user does have access to.')); + $this->assertRaw('add-shortcut', 'Add to shortcuts link was shown on a page the user does have access to.'); } } diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutSetsTest.php b/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutSetsTest.php index d862dca..9efc6ce 100644 --- a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutSetsTest.php +++ b/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutSetsTest.php @@ -119,7 +119,7 @@ class ShortcutSetsTest extends ShortcutTestBase { $this->drupalPost('admin/config/user-interface/shortcut/' . $set->set_name . '/edit', array('title' => $existing_title), t('Save')); $this->assertRaw(t('The shortcut set %name already exists. Choose another name.', array('%name' => $existing_title))); $set = shortcut_set_load($set->set_name); - $this->assertNotEqual($set->title, $existing_title, t('The shortcut set %title cannot be renamed to %new-title because a shortcut set with that title already exists.', array('%title' => $set->title, '%new-title' => $existing_title))); + $this->assertNotEqual($set->title, $existing_title, format_string('The shortcut set %title cannot be renamed to %new-title because a shortcut set with that title already exists.', array('%title' => $set->title, '%new-title' => $existing_title))); } /** -- 1.7.6.msysgit.0