From 19322c375bd5cc6b8d230cbef561bcf86e744bd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= <gabor@hojtsy.hu>
Date: Mon, 15 Oct 2007 14:52:18 +0000
Subject: Four watchdog() calls which still used t(), identified by myself
 after implementing extraction code for Drupal 6 at #182765

---
 includes/actions.inc | 4 ++--
 includes/file.inc    | 2 +-
 includes/form.inc    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'includes')

diff --git a/includes/actions.inc b/includes/actions.inc
index 2e70c6bda..ae5a05732 100644
--- a/includes/actions.inc
+++ b/includes/actions.inc
@@ -273,7 +273,7 @@ function actions_synchronize($actions_in_code = array(), $delete_orphans = FALSE
       else {
         // This is a new singleton that we don't have an aid for; assign one.
         db_query("INSERT INTO {actions} (aid, type, callback, parameters, description) VALUES ('%s', '%s', '%s', '%s', '%s')", $callback, $array['type'], $callback, '', $array['description']);
-        watchdog('actions', t("Action '%action' added.", array('%action' => filter_xss_admin($array['description']))));
+        watchdog('actions', "Action '%action' added.", array('%action' => filter_xss_admin($array['description'])));
       }
     }
   }
@@ -295,7 +295,7 @@ function actions_synchronize($actions_in_code = array(), $delete_orphans = FALSE
       $results = db_query("SELECT a.aid, a.description FROM {actions} a WHERE callback IN ($placeholders)", $orphaned);
       while ($action = db_fetch_object($results)) {
         actions_delete($action->aid);
-        watchdog('actions', t("Removed orphaned action '%action' from database.", array('%action' => filter_xss_admin($action->description))));
+        watchdog('actions', "Removed orphaned action '%action' from database.", array('%action' => filter_xss_admin($action->description)));
       }
     }
     else {
diff --git a/includes/file.inc b/includes/file.inc
index 485a6452c..9a1b5efeb 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -569,7 +569,7 @@ function file_save_upload($source, $validators = array(), $dest = FALSE, $replac
     $file->filepath = $file->destination;
     if (!move_uploaded_file($_FILES['files']['tmp_name'][$source], $file->filepath)) {
       form_set_error($source, t('File upload error. Could not move uploaded file.'));
-      watchdog('file', t('Upload error. Could not move uploaded file %file to destination %destination.', array('%file' => $file->filename, '%destination', $file->filepath)));
+      watchdog('file', 'Upload error. Could not move uploaded file %file to destination %destination.', array('%file' => $file->filename, '%destination', $file->filepath));
       return 0;
     }
 
diff --git a/includes/form.inc b/includes/form.inc
index 786390ab5..bac9a1d85 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -585,7 +585,7 @@ function _form_validate($elements, &$form_state, $form_id = NULL) {
         }
         elseif (!isset($options[$elements['#value']])) {
           form_error($elements, t('An illegal choice has been detected. Please contact the site administrator.'));
-          watchdog('form', t('Illegal choice %choice in %name element.', array('%choice' => $elements['#value'], '%name' => empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title'])), WATCHDOG_ERROR);
+          watchdog('form', 'Illegal choice %choice in %name element.', array('%choice' => $elements['#value'], '%name' => empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title']), WATCHDOG_ERROR);
         }
       }
     }
-- 
cgit v1.2.3