From 1cbf2f63b2455981799cb65ee0832be91064f570 Mon Sep 17 00:00:00 2001
From: Steven Wittens <steven@10.no-reply.drupal.org>
Date: Tue, 26 Oct 2004 17:20:58 +0000
Subject: #12146: Improve locale import/export messages (Stefan)

---
 modules/locale.module        | 7 +++----
 modules/locale/locale.module | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'modules')

diff --git a/modules/locale.module b/modules/locale.module
index a5920ea89..f828f86eb 100644
--- a/modules/locale.module
+++ b/modules/locale.module
@@ -302,7 +302,7 @@ function locale_admin_manage() {
         db_query("DELETE FROM {locales_meta} WHERE locale = '%s'", $edit['langcode']);
         db_query("DELETE FROM {locales_target} WHERE locale = '%s'", $edit['langcode']);
         drupal_set_message(t('%locale language removed.', array('%locale' => '<em>'. t($languages['name'][$edit['langcode']]) .'</em>')));
-        watchdog('locale', t('%locale language removed.', array('%locale' => '<em>'. $edit['langcode'] .'</em>')));
+        watchdog('special', t('%locale language removed.', array('%locale' => '<em>'. $edit['langcode'] .'</em>')));
       }
       break;
   }
@@ -387,9 +387,8 @@ function locale_admin_import() {
 
       // Now import strings into the language
       $file = file_check_upload('file');
-      if ($ret = _locale_import_po($file->filepath, $edit['langcode'], $edit['mode']) == FALSE) {
-        watchdog('error', t('Translation import failed.'));
-        watchdog('locale', t('Translation import failed.'));
+      if ($ret = _locale_import_po($file, $edit['langcode'], $edit['mode']) == FALSE) {
+        watchdog('error', t('Translation import of %filename failed.', array('%filename' => "<em>$file->filename</em>")));
       }
 
       drupal_goto('admin/locale');
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index a5920ea89..f828f86eb 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -302,7 +302,7 @@ function locale_admin_manage() {
         db_query("DELETE FROM {locales_meta} WHERE locale = '%s'", $edit['langcode']);
         db_query("DELETE FROM {locales_target} WHERE locale = '%s'", $edit['langcode']);
         drupal_set_message(t('%locale language removed.', array('%locale' => '<em>'. t($languages['name'][$edit['langcode']]) .'</em>')));
-        watchdog('locale', t('%locale language removed.', array('%locale' => '<em>'. $edit['langcode'] .'</em>')));
+        watchdog('special', t('%locale language removed.', array('%locale' => '<em>'. $edit['langcode'] .'</em>')));
       }
       break;
   }
@@ -387,9 +387,8 @@ function locale_admin_import() {
 
       // Now import strings into the language
       $file = file_check_upload('file');
-      if ($ret = _locale_import_po($file->filepath, $edit['langcode'], $edit['mode']) == FALSE) {
-        watchdog('error', t('Translation import failed.'));
-        watchdog('locale', t('Translation import failed.'));
+      if ($ret = _locale_import_po($file, $edit['langcode'], $edit['mode']) == FALSE) {
+        watchdog('error', t('Translation import of %filename failed.', array('%filename' => "<em>$file->filename</em>")));
       }
 
       drupal_goto('admin/locale');
-- 
cgit v1.2.3