Heine

  • home
  • drupal
  • drupal core commits
  • about
Home › Drupal Core Commits

Commit 231204 by webchick

#504428 follow-up by keith.smith: Remove 'now' from all empty admin screen texts. Steve Krug would be proud.

--- modules/aggregator/aggregator.admin.inc     2009/06/28 16:05:57     1.32
+++ modules/aggregator/aggregator.admin.inc     2009/06/29 14:24:56     1.33
@@ -30,7 +30,7 @@
     $rows[] = array(l($feed->title, "aggregator/sources/$feed->fid"), format_plural($feed->items, '1 item', '@count items'), ($feed->checked ? t('@time ago', array('@time' => format_interval(REQUEST_TIME - $feed->checked))) : t('never')), ($feed->checked && $feed->refresh ? t('%time left', array('%time' => format_interval($feed->checked + $feed->refresh - REQUEST_TIME))) : t('never')), l(t('edit'), "admin/content/aggregator/edit/feed/$feed->fid"), l(t('remove items'), "admin/content/aggregator/remove/$feed->fid"), l(t('update items'), "admin/content/aggregator/update/$feed->fid"));
   }
   if (empty($rows)) {
-    $rows[] = array(array('data' => t('No feeds available. <a href="@link">Add feed</a> now.', array('@link' => url('admin/content/aggregator/add/feed'))), 'colspan' => '5', 'class' => 'message'));
+    $rows[] = array(array('data' => t('No feeds available. <a href="@link">Add feed</a>.', array('@link' => url('admin/content/aggregator/add/feed'))), 'colspan' => '5', 'class' => 'message'));
   }
   $output .= theme('table', $header, $rows);
 
@@ -44,7 +44,7 @@
     $rows[] = array(l($category->title, "aggregator/categories/$category->cid"), format_plural($category->items, '1 item', '@count items'), l(t('edit'), "admin/content/aggregator/edit/category/$category->cid"));
   }
   if (empty($rows)) {
-    $rows[] = array(array('data' => t('No categories available. <a href="@link">Add category</a> now.', array('@link' => url('admin/content/aggregator/add/category'))), 'colspan' => '5', 'class' => 'message'));
+    $rows[] = array(array('data' => t('No categories available. <a href="@link">Add category</a>.', array('@link' => url('admin/content/aggregator/add/category'))), 'colspan' => '5', 'class' => 'message'));
   }
   $output .= theme('table', $header, $rows);
 

--- modules/contact/contact.admin.inc   2009/06/28 16:05:57     1.11
+++ modules/contact/contact.admin.inc   2009/06/29 14:24:56     1.12
@@ -30,7 +30,7 @@
 
   // If no categories were found, let the user know.
   if (empty($rows)) {
-    $rows[] = array(array('data' => t('No categories available. <a href="@link">Add category</a> now.', array('@link' => url('admin/build/contact/add'))), 'colspan' => 5));
+    $rows[] = array(array('data' => t('No categories available. <a href="@link">Add category</a>.', array('@link' => url('admin/build/contact/add'))), 'colspan' => 5));
   }
 
   return theme('table', $header, $rows);

--- modules/forum/forum.admin.inc       2009/06/28 16:05:57     1.20
+++ modules/forum/forum.admin.inc       2009/06/29 14:24:56     1.21
@@ -242,7 +242,7 @@
   $form['#theme'] = 'taxonomy_overview_terms';
   $form['#submit'] = array('taxonomy_overview_terms_submit'); // Use the existing taxonomy overview submit handler.
   $form['#validate'] = array('taxonomy_overview_terms_validate');
-  $form['#empty_text'] = t('No containers or forums available. <a href="@container">Add container</a> or <a href="@forum">Add forum</a> now.', array('@container' => url('admin/build/forum/add/container'), '@forum' => url('admin/build/forum/add/forum')));
+  $form['#empty_text'] = t('No containers or forums available. <a href="@container">Add container</a> or <a href="@forum">Add forum</a>.', array('@container' => url('admin/build/forum/add/container'), '@forum' => url('admin/build/forum/add/forum')));
   return $form;
 }
 

--- modules/menu/menu.admin.inc 2009/06/27 23:49:19     1.51
+++ modules/menu/menu.admin.inc 2009/06/29 14:24:56     1.52
@@ -65,7 +65,7 @@
     );
   }
   else {
-    $form['#empty_text'] = t('There are no menu links yet. <a href="@link">Add link</a> now.', array('@link' => url('admin/build/menu-customize/'. $form['#menu']['menu_name'] .'/add')));
+    $form['#empty_text'] = t('There are no menu links yet. <a href="@link">Add link</a>.', array('@link' => url('admin/build/menu-customize/'. $form['#menu']['menu_name'] .'/add')));
   }
   return $form;
 }

--- modules/node/content_types.inc      2009/06/28 16:05:57     1.77
+++ modules/node/content_types.inc      2009/06/29 14:24:56     1.78
@@ -35,7 +35,7 @@
   }
 
   if (empty($rows)) {
-    $rows[] = array(array('data' => t('No content types available. <a href="@link">Add content type</a> now.', array('@link' => url('admin/build/types/add'))), 'colspan' => '5', 'class' => 'message'));
+    $rows[] = array(array('data' => t('No content types available. <a href="@link">Add content type</a>.', array('@link' => url('admin/build/types/add'))), 'colspan' => '5', 'class' => 'message'));
   }
 
   return theme('table', $header, $rows);

--- modules/path/path.admin.inc 2009/06/28 16:05:58     1.24
+++ modules/path/path.admin.inc 2009/06/29 14:24:56     1.25
@@ -59,7 +59,7 @@
   }
 
   if (empty($rows)) {
-    $empty_message = $keys ? t('No URL aliases found.') : t('No URL aliases available. <a href="@link">Add alias</a> now.', array('@link' => url('admin/build/path/add'))) ;
+    $empty_message = $keys ? t('No URL aliases found.') : t('No URL aliases available. <a href="@link">Add alias</a>.', array('@link' => url('admin/build/path/add'))) ;
     $rows[] = array(array('data' => $empty_message, 'colspan' => ($multilanguage ? 5 : 4)));
   }
 

--- modules/taxonomy/taxonomy.admin.inc 2009/06/28 16:05:58     1.59
+++ modules/taxonomy/taxonomy.admin.inc 2009/06/29 14:24:57     1.60
@@ -84,7 +84,7 @@
   }
 
   if (empty($rows)) {
-    $rows[] = array(array('data' => t('No vocabularies available. <a href="@link">Add vocabulary</a> now.', array('@link' => url('admin/content/taxonomy/add'))), 'colspan' => '5'));
+    $rows[] = array(array('data' => t('No vocabularies available. <a href="@link">Add vocabulary</a>.', array('@link' => url('admin/content/taxonomy/add'))), 'colspan' => '5'));
   }
 
   $header = array(t('Vocabulary name'), t('Content types'));
@@ -451,7 +451,7 @@
   $form['#page_entries'] = $page_entries;
   $form['#back_peddle'] = $back_peddle;
   $form['#forward_peddle'] = $forward_peddle;
-  $form['#empty_text'] = t('No terms available. <a href="@link">Add term</a> now.', array('@link' => url('admin/build/taxonomy/' . $vocabulary->vid . '/add')));
+  $form['#empty_text'] = t('No terms available. <a href="@link">Add term</a>.', array('@link' => url('admin/build/taxonomy/' . $vocabulary->vid . '/add')));
 
   if (!$vocabulary->tags && $vocabulary->hierarchy < 2 && count($tree) > 1) {
     $form['submit'] = array(

--- modules/trigger/trigger.admin.inc   2009/06/28 16:05:58     1.12
+++ modules/trigger/trigger.admin.inc   2009/06/29 14:24:57     1.13
@@ -174,7 +174,7 @@
   }
   else {
     $form[$op]['none'] = array(
-      '#markup' => t('No actions available for this trigger. <a href="@link">Add action</a> now.', array('@link' => url('admin/settings/actions/manage')))
+      '#markup' => t('No actions available for this trigger. <a href="@link">Add action</a>.', array('@link' => url('admin/settings/actions/manage')))
     );
   }
   return $form;

No votes yet
  • Drupal Core
  • Download patch

Recent posts

  • Upgraded from 6.14 to 6.15, but Drupal still thinks it's 6.14?
  • Google Friendconnect Drupal module not recommended (yet)
  • The OpenID 2.0 Compliance Crusade - Part I
  • Using <embed> for XSS
  • Bugfix woes for Drupal 6
more

Security reviews

  • Afraid custom code makes your site vulnerable?
  • You don't really trust that module you just downloaded from Drupal.org?

Sleep better after a security review.

Tags

Captcha CSRF DOH! Drupal embed Input Format modx OpenID Performance Planet Drupal Security Varnish
more tags
  • home
  • drupal
  • drupal core commits
  • about

Copyright © 2010 by Heine Deelstra. All rights reserved.