diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2004-10-26 17:20:58 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2004-10-26 17:20:58 +0000 |
| commit | 1cbf2f63b2455981799cb65ee0832be91064f570 (patch) | |
| tree | 206bcd9d77103d81f0594ebe58c5f1c9a88a1efe /modules | |
| parent | c2f174e1f170de2eab523d4b6853ead3916a627e (diff) | |
| download | brdo-1cbf2f63b2455981799cb65ee0832be91064f570.tar.gz brdo-1cbf2f63b2455981799cb65ee0832be91064f570.tar.bz2 | |
#12146: Improve locale import/export messages (Stefan)
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/locale.module | 7 | ||||
| -rw-r--r-- | modules/locale/locale.module | 7 |
2 files changed, 6 insertions, 8 deletions
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'); |