summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2006-11-24 09:01:57 +0000
committerDries Buytaert <dries@buytaert.net>2006-11-24 09:01:57 +0000
commitd721a4f0d974f93d04db19c8d1c107b9d24dd3f5 (patch)
tree33a479695c635ff1d17037e545278ec680f6451b
parenta895b149327ab4c905fc73d87199bc8268c63916 (diff)
downloadbrdo-d721a4f0d974f93d04db19c8d1c107b9d24dd3f5.tar.gz
brdo-d721a4f0d974f93d04db19c8d1c107b9d24dd3f5.tar.bz2
- Patch #98365 by webchick and RobRoy: added missing t() functions.
-rw-r--r--includes/theme.inc2
-rw-r--r--install.php6
-rw-r--r--modules/comment/comment.module4
-rw-r--r--modules/node/node.module2
-rw-r--r--modules/system/system.module2
-rw-r--r--modules/user/user.module2
6 files changed, 9 insertions, 9 deletions
diff --git a/includes/theme.inc b/includes/theme.inc
index 16412c1cf..05b5e4815 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -1028,7 +1028,7 @@ function theme_username($object) {
$output .= ' ('. t('not verified') .')';
}
else {
- $output = variable_get('anonymous', 'Anonymous');
+ $output = variable_get('anonymous', t('Anonymous'));
}
return $output;
diff --git a/install.php b/install.php
index b45ad40c6..3087da778 100644
--- a/install.php
+++ b/install.php
@@ -464,13 +464,13 @@ function install_select_locale_form($locales) {
// Try to use verbose locale name
$name = $locale->name;
if (isset($languages[$name])) {
- $name = $languages[$name][0] . (isset($languages[$name][1]) ? ' (' . $languages[$name][1] . ')' : '');
+ $name = $languages[$name][0] . (isset($languages[$name][1]) ? ' '. st('(@language)', array('@language' => $languages[$name][1])) : '');
}
$form['locale'][$locale->name] = array(
'#type' => 'radio',
'#return_value' => $locale->name,
'#default_value' => ($locale->name == 'en' ? TRUE : FALSE),
- '#title' => $name . ($locale->name == 'en' ? ' (built-in)' : ''),
+ '#title' => $name . ($locale->name == 'en' ? ' '. st('(built-in)') : ''),
'#parents' => array('locale')
);
}
@@ -565,7 +565,7 @@ function install_check_requirements($profile) {
}
}
- drupal_set_title('Incompatible environment');
+ drupal_set_title(st('Incompatible environment'));
print theme('install_page', '');
exit;
}
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 4e504af47..b09160ba5 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1384,7 +1384,7 @@ function comment_form($edit, $title = NULL) {
}
}
else if (variable_get('comment_anonymous', COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MAY_CONTACT) {
- $form['name'] = array('#type' => 'textfield', '#title' => t('Your name'), '#maxlength' => 60, '#size' => 30, '#default_value' => $edit['name'] ? $edit['name'] : variable_get('anonymous', 'Anonymous')
+ $form['name'] = array('#type' => 'textfield', '#title' => t('Your name'), '#maxlength' => 60, '#size' => 30, '#default_value' => $edit['name'] ? $edit['name'] : variable_get('anonymous', t('Anonymous'))
);
$form['mail'] = array('#type' => 'textfield', '#title' => t('E-mail'), '#maxlength' => 64, '#size' => 30, '#default_value' => $edit['mail'], '#description' => t('The content of this field is kept private and will not be shown publicly.')
@@ -1393,7 +1393,7 @@ function comment_form($edit, $title = NULL) {
$form['homepage'] = array('#type' => 'textfield', '#title' => t('Homepage'), '#maxlength' => 255, '#size' => 30, '#default_value' => $edit['homepage']);
}
else if (variable_get('comment_anonymous', COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MUST_CONTACT) {
- $form['name'] = array('#type' => 'textfield', '#title' => t('Your name'), '#maxlength' => 60, '#size' => 30, '#default_value' => $edit['name'] ? $edit['name'] : variable_get('anonymous', 'Anonymous'), '#required' => TRUE);
+ $form['name'] = array('#type' => 'textfield', '#title' => t('Your name'), '#maxlength' => 60, '#size' => 30, '#default_value' => $edit['name'] ? $edit['name'] : variable_get('anonymous', t('Anonymous')), '#required' => TRUE);
$form['mail'] = array('#type' => 'textfield', '#title' => t('E-mail'), '#maxlength' => 64, '#size' => 30, '#default_value' => $edit['mail'],'#description' => t('The content of this field is kept private and will not be shown publicly.'), '#required' => TRUE);
diff --git a/modules/node/node.module b/modules/node/node.module
index 57c8c85c7..3e776427f 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1974,7 +1974,7 @@ function node_form($node, $form_values = NULL) {
'#collapsed' => TRUE,
'#weight' => 20,
);
- $form['author']['name'] = array('#type' => 'textfield', '#title' => t('Authored by'), '#maxlength' => 60, '#autocomplete_path' => 'user/autocomplete', '#default_value' => $node->name ? $node->name : '', '#weight' => -1, '#description' => t('Leave blank for %anonymous.', array('%anonymous' => variable_get('anonymous', 'Anonymous'))));
+ $form['author']['name'] = array('#type' => 'textfield', '#title' => t('Authored by'), '#maxlength' => 60, '#autocomplete_path' => 'user/autocomplete', '#default_value' => $node->name ? $node->name : '', '#weight' => -1, '#description' => t('Leave blank for %anonymous.', array('%anonymous' => variable_get('anonymous', t('Anonymous')))));
$form['author']['date'] = array('#type' => 'textfield', '#title' => t('Authored on'), '#maxlength' => 25, '#description' => t('Format: %time. Leave blank to use the time of form submission.', array('%time' => $node->date)));
if (isset($node->nid)) {
diff --git a/modules/system/system.module b/modules/system/system.module
index e3b4cbdb6..0c0a49b70 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -565,7 +565,7 @@ function system_site_information_settings() {
$form['anonymous'] = array(
'#type' => 'textfield',
'#title' => t('Anonymous user'),
- '#default_value' => variable_get('anonymous', 'Anonymous'),
+ '#default_value' => variable_get('anonymous', t('Anonymous')),
'#description' => t('The name used to indicate anonymous users.')
);
$form['site_frontpage'] = array(
diff --git a/modules/user/user.module b/modules/user/user.module
index cbb24b078..a0decf6c8 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -619,7 +619,7 @@ function theme_user_picture($account) {
}
if (isset($picture)) {
- $alt = t('@user\'s picture', array('@user' => $account->name ? $account->name : variable_get('anonymous', 'Anonymous')));
+ $alt = t("@user's picture", array('@user' => $account->name ? $account->name : variable_get('anonymous', t('Anonymous'))));
$picture = theme('image', $picture, $alt, $alt, '', FALSE);
if (!empty($account->uid) && user_access('access user profiles')) {
$picture = l($picture, "user/$account->uid", array('title' => t('View user profile.')), NULL, NULL, FALSE, TRUE);