Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #15957 by Goba: reintroduce translateable watchdog types.

4.6.x
Dries Buytaert 2005-01-22 09:38:48 +00:00
parent 42e7e7d519
commit c0814a2072
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/watchdog.module
View File

@ -71,7 +71,7 @@ function watchdog_overview() {
$names['all'] = t('all messages'); $names['all'] = t('all messages');
$queries['all'] = ''; $queries['all'] = '';
foreach (_watchdog_get_message_types() as $type) { foreach (_watchdog_get_message_types() as $type) {
$names[$type] = t('%type messages', array('%type' => $type)); $names[$type] = t('%type messages', array('%type' => t($type)));
$queries[$type] = "WHERE type = '". db_escape_string($type) ."'"; $queries[$type] = "WHERE type = '". db_escape_string($type) ."'";
} }
@ -103,7 +103,7 @@ function watchdog_overview() {
array( array(
// Cells // Cells
$icons[$watchdog->severity], $icons[$watchdog->severity],
$watchdog->type, t($watchdog->type),
format_date($watchdog->timestamp, 'small'), format_date($watchdog->timestamp, 'small'),
truncate_utf8($watchdog->message, 64), truncate_utf8($watchdog->message, 64),
format_name($watchdog), format_name($watchdog),
@ -139,7 +139,7 @@ function watchdog_event($id) {
$result = db_query('SELECT w.*, u.name, u.uid FROM {watchdog} w INNER JOIN {users} u ON w.uid = u.uid WHERE w.wid = %d', $id); $result = db_query('SELECT w.*, u.name, u.uid FROM {watchdog} w INNER JOIN {users} u ON w.uid = u.uid WHERE w.wid = %d', $id);
if ($watchdog = db_fetch_object($result)) { if ($watchdog = db_fetch_object($result)) {
$output .= '<table border="1" cellpadding="2" cellspacing="2">'; $output .= '<table border="1" cellpadding="2" cellspacing="2">';
$output .= ' <tr><th>'. t('Type') ."</th><td>$watchdog->type</td></tr>"; $output .= ' <tr><th>'. t('Type') .'</th><td>' . t($watchdog->type) . '</td></tr>';
$output .= ' <tr><th>'. t('Date') .'</th><td>'. format_date($watchdog->timestamp, 'large') .'</td></tr>'; $output .= ' <tr><th>'. t('Date') .'</th><td>'. format_date($watchdog->timestamp, 'large') .'</td></tr>';
$output .= ' <tr><th>'. t('User') .'</th><td>'. format_name($watchdog) .'</td></tr>'; $output .= ' <tr><th>'. t('User') .'</th><td>'. format_name($watchdog) .'</td></tr>';
$output .= ' <tr><th>'. t('Location') ."</th><td>". l($watchdog->location, $watchdog->location) ."</td></tr>"; $output .= ' <tr><th>'. t('Location') ."</th><td>". l($watchdog->location, $watchdog->location) ."</td></tr>";

6
modules/watchdog/watchdog.module
View File

@ -71,7 +71,7 @@ function watchdog_overview() {
$names['all'] = t('all messages'); $names['all'] = t('all messages');
$queries['all'] = ''; $queries['all'] = '';
foreach (_watchdog_get_message_types() as $type) { foreach (_watchdog_get_message_types() as $type) {
$names[$type] = t('%type messages', array('%type' => $type)); $names[$type] = t('%type messages', array('%type' => t($type)));
$queries[$type] = "WHERE type = '". db_escape_string($type) ."'"; $queries[$type] = "WHERE type = '". db_escape_string($type) ."'";
} }
@ -103,7 +103,7 @@ function watchdog_overview() {
array( array(
// Cells // Cells
$icons[$watchdog->severity], $icons[$watchdog->severity],
$watchdog->type, t($watchdog->type),
format_date($watchdog->timestamp, 'small'), format_date($watchdog->timestamp, 'small'),
truncate_utf8($watchdog->message, 64), truncate_utf8($watchdog->message, 64),
format_name($watchdog), format_name($watchdog),
@ -139,7 +139,7 @@ function watchdog_event($id) {
$result = db_query('SELECT w.*, u.name, u.uid FROM {watchdog} w INNER JOIN {users} u ON w.uid = u.uid WHERE w.wid = %d', $id); $result = db_query('SELECT w.*, u.name, u.uid FROM {watchdog} w INNER JOIN {users} u ON w.uid = u.uid WHERE w.wid = %d', $id);
if ($watchdog = db_fetch_object($result)) { if ($watchdog = db_fetch_object($result)) {
$output .= '<table border="1" cellpadding="2" cellspacing="2">'; $output .= '<table border="1" cellpadding="2" cellspacing="2">';
$output .= ' <tr><th>'. t('Type') ."</th><td>$watchdog->type</td></tr>"; $output .= ' <tr><th>'. t('Type') .'</th><td>' . t($watchdog->type) . '</td></tr>';
$output .= ' <tr><th>'. t('Date') .'</th><td>'. format_date($watchdog->timestamp, 'large') .'</td></tr>'; $output .= ' <tr><th>'. t('Date') .'</th><td>'. format_date($watchdog->timestamp, 'large') .'</td></tr>';
$output .= ' <tr><th>'. t('User') .'</th><td>'. format_name($watchdog) .'</td></tr>'; $output .= ' <tr><th>'. t('User') .'</th><td>'. format_name($watchdog) .'</td></tr>';
$output .= ' <tr><th>'. t('Location') ."</th><td>". l($watchdog->location, $watchdog->location) ."</td></tr>"; $output .= ' <tr><th>'. t('Location') ."</th><td>". l($watchdog->location, $watchdog->location) ."</td></tr>";