diff --git a/modules/comment.module b/modules/comment.module index 10ebec9476f..89beff80638 100644 --- a/modules/comment.module +++ b/modules/comment.module @@ -955,7 +955,7 @@ function comment_admin_edit($cid) { $form .= form_textfield(t('Subject'), 'subject', $comment->subject, 70, 128); $form .= form_textarea(t('Comment'), 'comment', $comment->comment, 70, 15, ''); $form .= filter_form('format', $comment->format); - $form .= form_radios(t('Status'), 'status', $comment->status, array('published', 'not published')); + $form .= form_radios(t('Status'), 'status', $comment->status, array(t('published'), t('not published'))); $form .= form_hidden('cid', $cid); $form .= form_submit(t('Submit')); print theme('page', form($form)); @@ -1164,7 +1164,7 @@ function comment_vote_settings($mid = 0) { $vote = db_fetch_object(db_query('SELECT vote, weight FROM {moderation_votes} WHERE mid = %d', $mid)); } - $output .= '

'. (isset($mid) ? 'Edit' : 'Add new') .' moderation option

'; + $output .= '

'. (isset($mid) ? t('Edit') : t('Add new')) .' moderation option

'; $form .= form_textfield(t('Vote'), 'vote', $vote->vote, 32, 64, t('The name of this vote. Example: "off topic", "excellent", "sucky".')); $form .= form_textfield(t('Weight'), 'weight', $vote->weight, 32, 64, t('Used to order votes in the comment control box; heavier sink.')); if ($mid) { @@ -1201,7 +1201,7 @@ function comment_threshold_settings($fid = 0) { drupal_set_message(t('The threshold has been added.')); } - $output .= '

Comment threshold overview

'; + $output .= '

'. t('Comment threshold overview') .'

'; // load up and show any thresholds previously defined. $header = array(t('Name'), t('Minimum score'), t('Operations')); @@ -1218,7 +1218,7 @@ function comment_threshold_settings($fid = 0) { $filter = db_fetch_object(db_query('SELECT filter, fid, minimum FROM {moderation_filters} WHERE fid = %d', $fid)); } - $output .= '

'. (isset($fid) ? 'Edit' : 'Add new') .' threshold

'; + $output .= '

'. (isset($fid) ? t('Edit') : t('Add new')) .' threshold

'; $form .= form_textfield(t('Threshold name'), 'filter', $filter->filter, 32, 64, t('The name of this threshold. Example: "good comments", "+1 comments", "everything".')); $form .= form_textfield(t('Minimum score'), 'minimum', $filter->minimum, 32, 64, t('Show all comments whose score is larger or equal to the provided minimal score. Range: -127 +128')); if ($fid) { diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 10ebec9476f..89beff80638 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -955,7 +955,7 @@ function comment_admin_edit($cid) { $form .= form_textfield(t('Subject'), 'subject', $comment->subject, 70, 128); $form .= form_textarea(t('Comment'), 'comment', $comment->comment, 70, 15, ''); $form .= filter_form('format', $comment->format); - $form .= form_radios(t('Status'), 'status', $comment->status, array('published', 'not published')); + $form .= form_radios(t('Status'), 'status', $comment->status, array(t('published'), t('not published'))); $form .= form_hidden('cid', $cid); $form .= form_submit(t('Submit')); print theme('page', form($form)); @@ -1164,7 +1164,7 @@ function comment_vote_settings($mid = 0) { $vote = db_fetch_object(db_query('SELECT vote, weight FROM {moderation_votes} WHERE mid = %d', $mid)); } - $output .= '

'. (isset($mid) ? 'Edit' : 'Add new') .' moderation option

'; + $output .= '

'. (isset($mid) ? t('Edit') : t('Add new')) .' moderation option

'; $form .= form_textfield(t('Vote'), 'vote', $vote->vote, 32, 64, t('The name of this vote. Example: "off topic", "excellent", "sucky".')); $form .= form_textfield(t('Weight'), 'weight', $vote->weight, 32, 64, t('Used to order votes in the comment control box; heavier sink.')); if ($mid) { @@ -1201,7 +1201,7 @@ function comment_threshold_settings($fid = 0) { drupal_set_message(t('The threshold has been added.')); } - $output .= '

Comment threshold overview

'; + $output .= '

'. t('Comment threshold overview') .'

'; // load up and show any thresholds previously defined. $header = array(t('Name'), t('Minimum score'), t('Operations')); @@ -1218,7 +1218,7 @@ function comment_threshold_settings($fid = 0) { $filter = db_fetch_object(db_query('SELECT filter, fid, minimum FROM {moderation_filters} WHERE fid = %d', $fid)); } - $output .= '

'. (isset($fid) ? 'Edit' : 'Add new') .' threshold

'; + $output .= '

'. (isset($fid) ? t('Edit') : t('Add new')) .' threshold

'; $form .= form_textfield(t('Threshold name'), 'filter', $filter->filter, 32, 64, t('The name of this threshold. Example: "good comments", "+1 comments", "everything".')); $form .= form_textfield(t('Minimum score'), 'minimum', $filter->minimum, 32, 64, t('Show all comments whose score is larger or equal to the provided minimal score. Range: -127 +128')); if ($fid) { diff --git a/modules/statistics.module b/modules/statistics.module index eaeba22a609..c7891ecfe5f 100644 --- a/modules/statistics.module +++ b/modules/statistics.module @@ -431,7 +431,7 @@ function statistics_admin_content() { $result = pager_query($sql, 20); // WHERE s.%s <> '0' while ($nid = db_fetch_object($result)) { - $rows[] = array(l($nid->title, 'node/'. $nid->nid, array('title' => t('View this posting.'))), $nid->daycount, $nid->totalcount, format_date($nid->timestamp, 'small'), l('track title', 'admin/logs/hits/page/'. urlencode($nid->title))); + $rows[] = array(l($nid->title, 'node/'. $nid->nid, array('title' => t('View this posting.'))), $nid->daycount, $nid->totalcount, format_date($nid->timestamp, 'small'), l(t('track title'), 'admin/logs/hits/page/'. urlencode($nid->title))); } if ($pager = theme('pager', NULL, 20, 0, tablesort_pager())) { $rows[] = array(array('data' => $pager, 'colspan' => 5)); diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module index eaeba22a609..c7891ecfe5f 100644 --- a/modules/statistics/statistics.module +++ b/modules/statistics/statistics.module @@ -431,7 +431,7 @@ function statistics_admin_content() { $result = pager_query($sql, 20); // WHERE s.%s <> '0' while ($nid = db_fetch_object($result)) { - $rows[] = array(l($nid->title, 'node/'. $nid->nid, array('title' => t('View this posting.'))), $nid->daycount, $nid->totalcount, format_date($nid->timestamp, 'small'), l('track title', 'admin/logs/hits/page/'. urlencode($nid->title))); + $rows[] = array(l($nid->title, 'node/'. $nid->nid, array('title' => t('View this posting.'))), $nid->daycount, $nid->totalcount, format_date($nid->timestamp, 'small'), l(t('track title'), 'admin/logs/hits/page/'. urlencode($nid->title))); } if ($pager = theme('pager', NULL, 20, 0, tablesort_pager())) { $rows[] = array(array('data' => $pager, 'colspan' => 5)); diff --git a/modules/system.module b/modules/system.module index 80d4ddcbc94..b955cdd8925 100644 --- a/modules/system.module +++ b/modules/system.module @@ -194,7 +194,7 @@ function system_view_general() { $period['1000000000'] = t('Never'); $group = form_textfield(t('Default 403 (access denied) page'), 'site_403', variable_get('site_403', ''), 70, 70, t('This page is displayed when the requested document is denied to the current user. If you are not using clean URLs, specify the part after "?q=". If unsure, specify nothing.')); $group .= form_textfield(t('Default 404 (not found) page'), 'site_404', variable_get('site_404', ''), 70, 70, t('This page is displayed when no other content matches the requested document. If you are not using clean URLs, specify the part after "?q=". If unsure, specify nothing.')); - $group .= form_select(t('Error reporting'), 'error_level', variable_get('error_level', 1), array('Write errors to the log', 'Write errors to the log and to the screen'), t('Where Drupal, PHP and SQL errors are logged. On a production server it is recommended that errors are only written to the error log. On a test server it can be helpful to write logs to the screen.')); + $group .= form_select(t('Error reporting'), 'error_level', variable_get('error_level', 1), array(t('Write errors to the log'), t('Write errors to the log and to the screen')), t('Where Drupal, PHP and SQL errors are logged. On a production server it is recommended that errors are only written to the error log. On a test server it can be helpful to write logs to the screen.')); $group .= form_select(t('Discard log entries older than'), 'watchdog_clear', variable_get('watchdog_clear', 604800), $period, t('The time log entries should be kept. Older entries will be automatically discarded. Requires crontab.')); $output .= form_group(t('Error handling'), $group); diff --git a/modules/system/system.module b/modules/system/system.module index 80d4ddcbc94..b955cdd8925 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -194,7 +194,7 @@ function system_view_general() { $period['1000000000'] = t('Never'); $group = form_textfield(t('Default 403 (access denied) page'), 'site_403', variable_get('site_403', ''), 70, 70, t('This page is displayed when the requested document is denied to the current user. If you are not using clean URLs, specify the part after "?q=". If unsure, specify nothing.')); $group .= form_textfield(t('Default 404 (not found) page'), 'site_404', variable_get('site_404', ''), 70, 70, t('This page is displayed when no other content matches the requested document. If you are not using clean URLs, specify the part after "?q=". If unsure, specify nothing.')); - $group .= form_select(t('Error reporting'), 'error_level', variable_get('error_level', 1), array('Write errors to the log', 'Write errors to the log and to the screen'), t('Where Drupal, PHP and SQL errors are logged. On a production server it is recommended that errors are only written to the error log. On a test server it can be helpful to write logs to the screen.')); + $group .= form_select(t('Error reporting'), 'error_level', variable_get('error_level', 1), array(t('Write errors to the log'), t('Write errors to the log and to the screen')), t('Where Drupal, PHP and SQL errors are logged. On a production server it is recommended that errors are only written to the error log. On a test server it can be helpful to write logs to the screen.')); $group .= form_select(t('Discard log entries older than'), 'watchdog_clear', variable_get('watchdog_clear', 604800), $period, t('The time log entries should be kept. Older entries will be automatically discarded. Requires crontab.')); $output .= form_group(t('Error handling'), $group); diff --git a/modules/user.module b/modules/user.module index 2fec399f04f..952659c00d8 100644 --- a/modules/user.module +++ b/modules/user.module @@ -1393,7 +1393,7 @@ function user_admin_perm($edit = array()) { } // Render role/permission overview: - $header = array_merge(array('permission'), $role_names); + $header = array_merge(array(t('permission')), $role_names); foreach (module_list() as $module) { if ($perms = module_invoke($module, 'perm')) { diff --git a/modules/user/user.module b/modules/user/user.module index 2fec399f04f..952659c00d8 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1393,7 +1393,7 @@ function user_admin_perm($edit = array()) { } // Render role/permission overview: - $header = array_merge(array('permission'), $role_names); + $header = array_merge(array(t('permission')), $role_names); foreach (module_list() as $module) { if ($perms = module_invoke($module, 'perm')) {