- Patch #61893 by timnc: remove message_na().

8 files changed, 9 insertions, 26 deletions

diff --git a/includes/common.inc b/includes/common.inc
index 82368d8dd..47e4308aa 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -534,23 +534,6 @@ function fix_gpc_magic() {
 }
 
 /**
- * @name Messages
- * @{
- * Frequently used messages.
- */
-
-/**
- * Return a string with a "not applicable" message.
- */
-function message_na() {
-  return t('n/a');
-}
-
-/**
- * @} End of "Messages".
- */
-
-/**
  * Initialize the localization system.
  */
 function locale_initialize() {
diff --git a/includes/install.inc b/includes/install.inc
index 08aa55154..be8bc8944 100644
--- a/includes/install.inc
+++ b/includes/install.inc
@@ -276,14 +276,14 @@ function drupal_install_profile($profile) {
   // Get a list of modules required by this profile.
   $function = $profile .'_profile_modules';
   $module_list = $function();
-  
+
   // If anyone has added modules that we automatically install, filter them out.
   $module_list = array_diff($module_list, $bootstrap_list);
 
   // Verify that all required modules exist.
   $bootstrap_modules = drupal_find_modules($bootstrap_list);
   $profile_modules = drupal_find_modules($module_list);
-  
+
   // Install the essential system modules and bootstrap Drupal.
   drupal_install_modules($bootstrap_list);
   drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
diff --git a/includes/locale.inc b/includes/locale.inc
index b8e289f4d..c4ab038a2 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -86,7 +86,7 @@ function theme_locale_admin_manage_screen($form) {
   foreach ($form['name'] as $key => $element) {
     // Do not take form control structures.
     if (is_array($element) && element_child($key)) {
-      $rows[] = array(check_plain($key), form_render($form['name'][$key]), form_render($form['enabled'][$key]), form_render($form['site_default'][$key]), ($key != 'en' ? form_render($form['translation'][$key]) : message_na()), ($key != 'en' ? l(t('delete'), 'admin/locale/language/delete/'. $key) : ''));
+      $rows[] = array(check_plain($key), form_render($form['name'][$key]), form_render($form['enabled'][$key]), form_render($form['site_default'][$key]), ($key != 'en' ? form_render($form['translation'][$key]) : t('n/a')), ($key != 'en' ? l(t('delete'), 'admin/locale/language/delete/'. $key) : ''));
     }
   }
   $header = array(array('data' => t('Code')), array('data' => t('English name')), array('data' => t('Enabled')), array('data' => t('Default')), array('data' => t('Translated')), array('data' => t('Operations')));
diff --git a/modules/blogapi/blogapi.module b/modules/blogapi/blogapi.module
index b674c0edc..e8196d1a0 100644
--- a/modules/blogapi/blogapi.module
+++ b/modules/blogapi/blogapi.module
@@ -215,7 +215,7 @@ function blogapi_blogger_new_post($appkey, $blogid, $username, $password, $conte
   if (user_access('administer nodes') && !isset($edit['date'])) {
     $edit['date'] = format_date(time(), 'custom', 'Y-m-d H:i:s O');
   }
-  
+
   node_invoke_nodeapi($edit, 'blogapi new');
 
   node_validate($edit);
@@ -247,7 +247,7 @@ function blogapi_blogger_edit_post($appkey, $postid, $username, $password, $cont
 
   $node = node_load($postid);
   if (!$node) {
-    return blogapi_error(message_na());
+    return blogapi_error(t('n/a'));
   }
   // Let the teaser be re-generated.
   unset($node->teaser);
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index 498e3dfcc..664e991f1 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -776,7 +776,7 @@ function check_markup($text, $format = FILTER_FORMAT_DEFAULT, $check = TRUE) {
     }
   }
   else {
-    $text = message_na();
+    $text = t('n/a');
   }
 
   return $text;
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 9c4cbf573..d826ae963 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -675,7 +675,7 @@ function _forum_format($topic) {
     return t('%time ago<br />by %author', array('%time' => format_interval(time() - $topic->timestamp), '%author' => theme('username', $topic)));
   }
   else {
-    return message_na();
+    return t('n/a');
   }
 }
 
diff --git a/modules/user/user.module b/modules/user/user.module
index 582bcb29f..85ddd692e 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1441,7 +1441,7 @@ function user_view($uid = 0) {
   // module_invoke_all().
   foreach (module_implements('profile_alter') as $module) {
     $function = $module .'_profile_alter';
-    $function($account, $fields); 
+    $function($account, $fields);
   }
 
   drupal_set_title($account->name);
diff --git a/themes/engines/phptemplate/phptemplate.engine b/themes/engines/phptemplate/phptemplate.engine
index 7dc1254ea..9a7a9b732 100644
--- a/themes/engines/phptemplate/phptemplate.engine
+++ b/themes/engines/phptemplate/phptemplate.engine
@@ -231,7 +231,7 @@ function phptemplate_page($content) {
   if (drupal_is_front_page()) {
     $suggestions[] = 'page-front';
   }
-  
+
   return _phptemplate_callback('page', $variables, $suggestions);
 }