GitHost.io will be shut down on June 1, 2019. At that point this instance will be unreachable and all data will be irrevocably deleted. More details at https://about.gitlab.com/gitlab-hosted/#githost-is-shutting-down-on-june-1st-2019

Commit 87b494f1 authored by Mike Cochrane's avatar Mike Cochrane

Convert _t() to _() for gettext.

darcs-hash:20080708094531-533db-83399a46e6ec4c0fcc6249b0235961f969d1ae73.gz
parent a25f5010
......@@ -31,20 +31,20 @@ class AllAction extends StreamAction {
$user = User::staticGet('nickname', $nickname);
if (!$user) {
$this->client_error(_t('No such user: ') . $nickname);
$this->client_error(sprintf(_('No such user: %s'), $nickname));
return;
}
$profile = $user->getProfile();
if (!$profile) {
common_server_error(_t('User record exists without profile.'));
common_server_error(_('User record exists without profile.'));
return;
}
# Looks like we're good; show the header
common_show_header($profile->nickname . _t(" and friends"),
common_show_header(sprintf(_("%s and friends"), $profile->nickname),
array($this, 'show_header'), $user,
array($this, 'show_top'));
......@@ -58,7 +58,7 @@ class AllAction extends StreamAction {
'href' => common_local_url('allrss', array('nickname' =>
$user->nickname)),
'type' => 'application/rss+xml',
'title' => _t('Feed for friends of ') . $user->nickname));
'title' => sprintf(_('Feed for friends of %s'), $user->nickname)));
}
function show_top($user) {
......
......@@ -32,7 +32,7 @@ class AllrssAction extends Rss10Action {
$this->user = User::staticGet('nickname', $nickname);
if (!$this->user) {
common_user_error(_t('No such nickname.'));
common_user_error(_('No such nickname.'));
return false;
} else {
return true;
......@@ -65,13 +65,13 @@ class AllrssAction extends Rss10Action {
function get_channel() {
$user = $this->user;
$c = array('url' => common_local_url('allrss',
array('nickname' =>
array('nickname' =>
$user->nickname)),
'title' => $user->nickname . _t(' and friends'),
'title' => sprintf(_('%s and friends'), $user->nickname),
'link' => common_local_url('all',
array('nickname' =>
$user->nickname)),
'description' => _t('Feed for friends of ') . $user->nickname);
'description' => sprintf(_('Feed for friends of %s'), $user->nickname));
return $c;
}
......
......@@ -24,7 +24,7 @@ require_once(INSTALLDIR.'/lib/settingsaction.php');
class AvatarAction extends SettingsAction {
function get_instructions() {
return _t('Upload a new "avatar" (user image) here. ' .
return _('Upload a new "avatar" (user image) here. ' .
'You can\'t edit the picture after you upload it, so ' .
'make sure it\'s more or less square. ' .
'It must be under the site license, also. ' .
......@@ -34,7 +34,7 @@ class AvatarAction extends SettingsAction {
function show_form($msg=NULL, $success=false) {
$this->form_header(_t('Avatar'), $msg, $success);
$this->form_header(_('Avatar'), $msg, $success);
$user = common_current_user();
$profile = $user->getProfile();
......@@ -70,7 +70,7 @@ class AvatarAction extends SettingsAction {
common_element('input', array('name' => 'avatarfile',
'type' => 'file',
'id' => 'avatarfile'));
common_submit('submit', _t('Upload'));
common_submit('submit', _('Upload'));
common_element_end('form');
common_show_footer();
}
......@@ -82,14 +82,14 @@ class AvatarAction extends SettingsAction {
break;
case UPLOAD_ERR_INI_SIZE:
case UPLOAD_ERR_FORM_SIZE:
$this->show_form(_t('That file is too big.'));
$this->show_form(_('That file is too big.'));
return;
case UPLOAD_ERR_PARTIAL:
@unlink($_FILES['avatarfile']['tmp_name']);
$this->show_form(_t('Partial upload.'));
$this->show_form(_('Partial upload.'));
return;
default:
$this->show_form(_t('System error uploading file.'));
$this->show_form(_('System error uploading file.'));
return;
}
......@@ -97,7 +97,7 @@ class AvatarAction extends SettingsAction {
if (!$info) {
@unlink($_FILES['avatarfile']['tmp_name']);
$this->show_form(_t('Not an image or corrupt file.'));
$this->show_form(_('Not an image or corrupt file.'));
return;
}
......@@ -107,7 +107,7 @@ class AvatarAction extends SettingsAction {
case IMAGETYPE_PNG:
break;
default:
$this->show_form(_t('Unsupported image file format.'));
$this->show_form(_('Unsupported image file format.'));
return;
}
......@@ -115,9 +115,9 @@ class AvatarAction extends SettingsAction {
$profile = $user->getProfile();
if ($profile->setOriginal($_FILES['avatarfile']['tmp_name'])) {
$this->show_form(_t('Avatar updated.'), true);
$this->show_form(_('Avatar updated.'), true);
} else {
$this->show_form(_t('Failed updating avatar.'));
$this->show_form(_('Failed updating avatar.'));
}
@unlink($_FILES['avatarfile']['tmp_name']);
......
......@@ -30,26 +30,26 @@ class ConfirmaddressAction extends Action {
}
$code = $this->trimmed('code');
if (!$code) {
$this->client_error(_t('No confirmation code.'));
$this->client_error(_('No confirmation code.'));
return;
}
$confirm = Confirm_address::staticGet('code', $code);
if (!$confirm) {
$this->client_error(_t('Confirmation code not found.'));
$this->client_error(_('Confirmation code not found.'));
return;
}
$cur = common_current_user();
if ($cur->id != $confirm->user_id) {
$this->client_error(_t('That confirmation code is not for you!'));
$this->client_error(_('That confirmation code is not for you!'));
return;
}
$type = $confirm->address_type;
if (!in_array($type, array('email', 'jabber', 'sms'))) {
$this->server_error(_t('Unrecognized address type ') . $type);
$this->server_error(sprintf(_('Unrecognized address type %s'), $type));
return;
}
if ($cur->$type == $confirm->address) {
$this->client_error(_t('That address has already been confirmed.'));
$this->client_error(_('That address has already been confirmed.'));
return;
}
......@@ -67,7 +67,7 @@ class ConfirmaddressAction extends Action {
if (!$result) {
common_log_db_error($cur, 'UPDATE', __FILE__);
$this->server_error(_t('Couldn\'t update user.'));
$this->server_error(_('Couldn\'t update user.'));
return;
}
......@@ -75,16 +75,15 @@ class ConfirmaddressAction extends Action {
if (!$result) {
common_log_db_error($confirm, 'DELETE', __FILE__);
$this->server_error(_t('Couldn\'t delete email confirmation.'));
$this->server_error(_('Couldn\'t delete email confirmation.'));
return;
}
$cur->query('COMMIT');
common_show_header(_t('Confirm Address'));
common_show_header(_('Confirm Address'));
common_element('p', NULL,
_t('The address "') . $cur->$type .
_t('" has been confirmed for your account.'));
sprintf(_('The address "%s" has been confirmed for your account.'), $cur->$type));
common_show_footer();
}
}
......@@ -26,12 +26,12 @@ class DocAction extends Action {
$title = $this->trimmed('title');
$filename = INSTALLDIR.'/doc/'.$title;
if (!file_exists($filename)) {
common_user_error(_t('No such document.'));
common_user_error(_('No such document.'));
return;
}
$c = file_get_contents($filename);
$output = common_markup_to_html($c);
common_show_header(_t(ucfirst($title)));
common_show_header(_(ucfirst($title)));
common_raw($output);
common_show_footer();
}
......
......@@ -26,7 +26,7 @@ class FinishaddopenidAction extends Action {
function handle($args) {
parent::handle($args);
if (!common_logged_in()) {
common_user_error(_t('Not logged in.'));
common_user_error(_('Not logged in.'));
} else {
$this->try_login();
}
......@@ -39,11 +39,11 @@ class FinishaddopenidAction extends Action {
$response = $consumer->complete(common_local_url('finishaddopenid'));
if ($response->status == Auth_OpenID_CANCEL) {
$this->message(_t('OpenID authentication cancelled.'));
$this->message(_('OpenID authentication cancelled.'));
return;
} else if ($response->status == Auth_OpenID_FAILURE) {
// Authentication failed; display the error message.
$this->message(_t('OpenID authentication failed: ') . $response->message);
$this->message(sprintf(_('OpenID authentication failed: %s'), $response->message));
} else if ($response->status == Auth_OpenID_SUCCESS) {
$display = $response->getDisplayIdentifier();
......@@ -61,9 +61,9 @@ class FinishaddopenidAction extends Action {
if ($other) {
if ($other->id == $cur->id) {
$this->message(_t('You already have this OpenID!'));
$this->message(_('You already have this OpenID!'));
} else {
$this->message(_t('Someone else already has this OpenID.'));
$this->message(_('Someone else already has this OpenID.'));
}
return;
}
......@@ -75,12 +75,12 @@ class FinishaddopenidAction extends Action {
$result = oid_link_user($cur->id, $canonical, $display);
if (!$result) {
$this->message(_t('Error connecting user.'));
$this->message(_('Error connecting user.'));
return;
}
if ($sreg) {
if (!oid_update_user($cur, $sreg)) {
$this->message(_t('Error updating profile'));
$this->message(_('Error updating profile'));
return;
}
}
......@@ -96,7 +96,7 @@ class FinishaddopenidAction extends Action {
}
function message($msg) {
common_show_header(_t('OpenID Login'));
common_show_header(_('OpenID Login'));
common_element('p', NULL, $msg);
common_show_footer();
}
......
......@@ -26,11 +26,11 @@ class FinishopenidloginAction extends Action {
function handle($args) {
parent::handle($args);
if (common_logged_in()) {
common_user_error(_t('Already logged in.'));
common_user_error(_('Already logged in.'));
} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
if ($this->arg('create')) {
if (!$this->boolean('license')) {
$this->show_form(_t('You can\'t register if you don\'t agree to the license.'),
$this->show_form(_('You can\'t register if you don\'t agree to the license.'),
$this->trimmed('newname'));
return;
}
......@@ -39,7 +39,7 @@ class FinishopenidloginAction extends Action {
$this->connect_user();
} else {
common_debug(print_r($this->args, true), __FILE__);
$this->show_form(_t('Something weird happened.'),
$this->show_form(_('Something weird happened.'),
$this->trimmed('newname'));
}
} else {
......@@ -53,11 +53,11 @@ class FinishopenidloginAction extends Action {
} else {
global $config;
common_element('div', 'instructions',
_t('This is the first time you\'ve logged into ') .
$config['site']['name'] .
_t(' so we must connect your OpenID to a local account. ' .
' You can either create a new account, or connect with ' .
' your existing account, if you have one.'));
sprintf(_('This is the first time you\'ve logged into %s' .
' so we must connect your OpenID to a local account. ' .
' You can either create a new account, or connect with ' .
' your existing account, if you have one.'
), $config['site']['name']));
}
}
......@@ -69,31 +69,31 @@ class FinishopenidloginAction extends Action {
'id' => 'account_connect',
'action' => common_local_url('finishopenidlogin')));
common_element('h2', NULL,
'Create new account');
_('Create new account'));
common_element('p', NULL,
_t('Create a new user with this nickname.'));
common_input('newname', _t('New nickname'),
_('Create a new user with this nickname.'));
common_input('newname', _('New nickname'),
($username) ? $username : '',
_t('1-64 lowercase letters or numbers, no punctuation or spaces'));
_('1-64 lowercase letters or numbers, no punctuation or spaces'));
common_element_start('p');
common_element('input', array('type' => 'checkbox',
'id' => 'license',
'name' => 'license',
'value' => 'true'));
common_text(_t('My text and files are available under '));
common_text(_('My text and files are available under '));
common_element('a', array(href => common_config('license', 'url')),
common_config('license', 'title'));
common_text(_t(' except this private data: password, email address, IM address, phone number.'));
common_text(_(' except this private data: password, email address, IM address, phone number.'));
common_element_end('p');
common_submit('create', _t('Create'));
common_submit('create', _('Create'));
common_element('h2', NULL,
'Connect existing account');
_('Connect existing account'));
common_element('p', NULL,
_t('If you already have an account, login with your username and password '.
_('If you already have an account, login with your username and password '.
'to connect it to your OpenID.'));
common_input('nickname', _t('Existing nickname'));
common_password('password', _t('Password'));
common_submit('connect', _t('Connect'));
common_input('nickname', _('Existing nickname'));
common_password('password', _('Password'));
common_submit('connect', _('Connect'));
common_element_end('form');
common_show_footer();
}
......@@ -105,11 +105,11 @@ class FinishopenidloginAction extends Action {
$response = $consumer->complete(common_local_url('finishopenidlogin'));
if ($response->status == Auth_OpenID_CANCEL) {
$this->message(_t('OpenID authentication cancelled.'));
$this->message(_('OpenID authentication cancelled.'));
return;
} else if ($response->status == Auth_OpenID_FAILURE) {
// Authentication failed; display the error message.
$this->message(_t('OpenID authentication failed: ') . $response->message);
$this->message(sprintf(_('OpenID authentication failed: %s'), $response->message));
} else if ($response->status == Auth_OpenID_SUCCESS) {
// This means the authentication succeeded; extract the
// identity URL and Simple Registration data (if it was
......@@ -142,7 +142,7 @@ class FinishopenidloginAction extends Action {
}
function message($msg) {
common_show_header(_t('OpenID Login'));
common_show_header(_('OpenID Login'));
common_element('p', NULL, $msg);
common_show_footer();
}
......@@ -167,24 +167,24 @@ class FinishopenidloginAction extends Action {
if (!Validate::string($nickname, array('min_length' => 1,
'max_length' => 64,
'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
$this->show_form(_t('Nickname must have only letters and numbers and no spaces.'));
$this->show_form(_('Nickname must have only letters and numbers and no spaces.'));
return;
}
if (!User::allowed_nickname($nickname)) {
$this->show_form(_t('Nickname not allowed.'));
$this->show_form(_('Nickname not allowed.'));
return;
}
if (User::staticGet('nickname', $nickname)) {
$this->show_form(_t('Nickname already in use. Try another one.'));
$this->show_form(_('Nickname already in use. Try another one.'));
return;
}
list($display, $canonical, $sreg) = $this->get_saved_values();
if (!$display || !$canonical) {
common_server_error(_t('Stored OpenID not found.'));
common_server_error(_('Stored OpenID not found.'));
return;
}
......@@ -193,7 +193,7 @@ class FinishopenidloginAction extends Action {
$other = oid_get_user($canonical);
if ($other) {
common_server_error(_t('Creating new account for OpenID that already has a user.'));
common_server_error(_('Creating new account for OpenID that already has a user.'));
return;
}
......@@ -224,7 +224,7 @@ class FinishopenidloginAction extends Action {
$id = $profile->insert();
if (!$id) {
common_server_error(_t('Error saving the profile.'));
common_server_error(_('Error saving the profile.'));
return;
}
......@@ -266,7 +266,7 @@ class FinishopenidloginAction extends Action {
$password = $this->trimmed('password');
if (!common_check_user($nickname, $password)) {
$this->show_form(_t('Invalid username or password.'));
$this->show_form(_('Invalid username or password.'));
return;
}
......@@ -277,14 +277,14 @@ class FinishopenidloginAction extends Action {
list($display, $canonical, $sreg) = $this->get_saved_values();
if (!$display || !$canonical) {
common_server_error(_t('Stored OpenID not found.'));
common_server_error(_('Stored OpenID not found.'));
return;
}
$result = oid_link_user($user->id, $canonical, $display);
if (!$result) {
common_server_error(_t('Error connecting user to OpenID.'));
common_server_error(_('Error connecting user to OpenID.'));
return;
}
......
......@@ -28,14 +28,14 @@ class FinishremotesubscribeAction extends Action {
parent::handle($args);
if (common_logged_in()) {
common_user_error(_t('You can use the local subscription!'));
common_user_error(_('You can use the local subscription!'));
return;
}
$omb = $_SESSION['oauth_authorization_request'];
if (!$omb) {
common_user_error(_t('Not expecting this response!'));
common_user_error(_('Not expecting this response!'));
return;
}
......@@ -48,33 +48,33 @@ class FinishremotesubscribeAction extends Action {
# I think this is the success metric
if ($token != $omb['token']) {
common_user_error(_t('Not authorized.'));
common_user_error(_('Not authorized.'));
return;
}
$version = $req->get_parameter('omb_version');
if ($version != OMB_VERSION_01) {
common_user_error(_t('Unknown version of OMB protocol.'));
common_user_error(_('Unknown version of OMB protocol.'));
return;
}
$nickname = $req->get_parameter('omb_listener_nickname');
if (!$nickname) {
common_user_error(_t('No nickname provided by remote server.'));
common_user_error(_('No nickname provided by remote server.'));
return;
}
$profile_url = $req->get_parameter('omb_listener_profile');
if (!$profile_url) {
common_user_error(_t('No profile URL returned by server.'));
common_user_error(_('No profile URL returned by server.'));
return;
}
if (!Validate::uri($profile_url, array('allowed_schemes' => array('http', 'https')))) {
common_user_error(_t('Invalid profile URL returned by server.'));
common_user_error(_('Invalid profile URL returned by server.'));
return;
}
......@@ -83,7 +83,7 @@ class FinishremotesubscribeAction extends Action {
$user = User::staticGet('nickname', $omb['listenee']);
if (!$user) {
common_user_error(_t('User being listened to doesn\'t exist.'));
common_user_error(_('User being listened to doesn\'t exist.'));
return;
}
......@@ -96,7 +96,7 @@ class FinishremotesubscribeAction extends Action {
list($newtok, $newsecret) = $this->access_token($omb);
if (!$newtok || !$newsecret) {
common_user_error(_t('Couldn\'t convert request tokens to access tokens.'));
common_user_error(_('Couldn\'t convert request tokens to access tokens.'));
return;
}
......@@ -140,7 +140,7 @@ class FinishremotesubscribeAction extends Action {
$profile->created = DB_DataObject_Cast::dateTime(); # current time
$id = $profile->insert();
if (!$id) {
common_server_error(_t('Error inserting new profile'));
common_server_error(_('Error inserting new profile'));
return;
}
$remote->id = $id;
......@@ -148,7 +148,7 @@ class FinishremotesubscribeAction extends Action {
if ($avatar_url) {
if (!$this->add_avatar($profile, $avatar_url)) {
common_server_error(_t('Error inserting avatar'));
common_server_error(_('Error inserting avatar'));
return;
}
}
......@@ -158,13 +158,13 @@ class FinishremotesubscribeAction extends Action {
if ($exists) {
if (!$remote->update($orig_remote)) {
common_server_error(_t('Error updating remote profile'));
common_server_error(_('Error updating remote profile'));
return;
}
} else {
$remote->created = DB_DataObject_Cast::dateTime(); # current time
if (!$remote->insert()) {
common_server_error(_t('Error inserting remote profile'));
common_server_error(_('Error inserting remote profile'));
return;
}
}
......@@ -177,7 +177,7 @@ class FinishremotesubscribeAction extends Action {
$sub->created = DB_DataObject_Cast::dateTime(); # current time
if (!$sub->insert()) {
common_user_error(_t('Couldn\'t insert new subscription.'));
common_user_error(_('Couldn\'t insert new subscription.'));
return;
}
......
......@@ -33,14 +33,14 @@ class FoafAction extends Action {
$user = User::staticGet('nickname', $nickname);
if (!$user) {
common_user_error(_t('No such user'), 404);
common_user_error(_('No such user'), 404);
return;
}
$profile = $user->getProfile();
if (!$profile) {
common_server_error(_t('User has no profile'), 500);
common_server_error(_('User has no profile'), 500);
return;
}
......
......@@ -25,61 +25,61 @@ require_once(INSTALLDIR.'/lib/jabber.php');
class ImsettingsAction extends SettingsAction {
function get_instructions() {
return _t('You can send and receive notices through '.
return _('You can send and receive notices through '.
'Jabber/GTalk [instant messages](%%doc.im%%). Configure '.
'your address and settings below.');
}
function show_form($msg=NULL, $success=false) {
$user = common_current_user();
$this->form_header(_t('IM Settings'), $msg, $success);
$this->form_header(_('IM Settings'), $msg, $success);
common_element_start('form', array('method' => 'post',
'id' => 'imsettings',
'action' =>
common_local_url('imsettings')));
common_element('h2', NULL, _t('Address'));
common_element('h2', NULL, _('Address'));
if ($user->jabber) {
common_element_start('p');
common_element('span', 'address confirmed', $user->jabber);
common_element('span', 'input_instructions',
_t('Current confirmed Jabber/GTalk address.'));
_('Current confirmed Jabber/GTalk address.'));
common_hidden('jabber', $user->jabber);
common_element_end('p');
common_submit('remove', 'Remove');
common_submit('remove', _('Remove'));
} else {
$confirm = $this->get_confirmation();
if ($confirm) {
common_element_start('p');
common_element('span', 'address unconfirmed', $confirm->address);
common_element('span', 'input_instructions',
_t('Awaiting confirmation on this address. Check your ' .
sprintf(_('Awaiting confirmation on this address. Check your ' .
'Jabber/GTalk account for a message with further ' .
'instructions. (Did you add ' . jabber_daemon_address() .
' to your buddy list?)'));
'instructions. (Did you add %s to your buddy list?)',
jabber_daemon_address())));
common_hidden('jabber', $confirm->address);
common_element_end('p');
common_submit('cancel', _t('Cancel'));
common_submit('cancel', _('Cancel'));
} else {
common_input('jabber', _t('IM Address'),
common_input('jabber', _('IM Address'),
($this->arg('jabber')) ? $this->arg('jabber') : NULL,
_t('Jabber or GTalk address, like "UserName@example.org". ' .
'First, make sure to add ' . jabber_daemon_address() .
' to your buddy list in your IM client or on GTalk.'));
common_submit('add', 'Add');
sprintf(_('Jabber or GTalk address, like "UserName@example.org". ' .
'First, make sure to add %s' .
' to your buddy list in your IM client or on GTalk.'), jabber_daemon_address()));
common_submit('add', _('Add'));
}
}
common_element('h2', NULL, _t('Preferences'));
common_element('h2', NULL, _('Preferences'));
common_checkbox('jabbernotify',
_t('Send me notices through Jabber/GTalk.'),
_('Send me notices through Jabber/GTalk.'),
$user->jabbernotify);
common_checkbox('updatefrompresence',
_t('Post a notice when my Jabber/GTalk status changes.'),
_('Post a notice when my Jabber/GTalk status changes.'),
$user->updatefrompresence);
common_submit('save', _t('Save'));
common_submit('save', _('Save'));
common_element_end('form');
common_show_footer();
......@@ -108,7 +108,7 @@ class ImsettingsAction extends SettingsAction {
} else if ($this->arg('remove')) {
$this->remove_address();
} else {
$this->show_form(_t('Unexpected form submission.'));
$this->show_form(_('Unexpected form submission.'));
}
}
......@@ -132,13 +132,13 @@ class ImsettingsAction extends SettingsAction {
if ($result === FALSE) {
common_log_db_error($user, 'UPDATE', __FILE__);
common_server_error(_t('Couldnt update user.'));
common_server_error(_('Couldnt update user.'));
return;
}
$user->query('COMMIT');
$this->show_form(_t('Preferences saved.'), true);
$this->show_form(_('Preferences saved.'), true);
}
function add_address() {
......@@ -150,7 +150,7 @@ class ImsettingsAction extends SettingsAction {
# Some validation
if (!$jabber) {
$this->show_form(_t('No Jabber ID.'));
$this->show_form(_('No Jabber ID.'));
return;
}
......@@ -181,7 +181,7 @@ class ImsettingsAction extends SettingsAction {
if ($result === FALSE) {
common_log_db_error($confirm, 'INSERT', __FILE__);
common_server_error(_t('Couldnt insert confirmation code.'));
common_server_error(_('Couldnt insert confirmation code.'));
return;
}
......@@ -204,11 +204,11 @@ class ImsettingsAction extends SettingsAction {
$jabber = $this->arg('jabber');
$confirm = $this->get_confirmation();
if (!$confirm) {
$this->show_form(_t('No pending confirmation to cancel.'));
$this->show_form(_('No pending confirmation to cancel.'));
return;
}
if ($confirm->address != $jabber) {
$this->show_form(_t('That is the wrong IM address.'));
$this->show_form(_('That is the wrong IM address.'));
return;
}
......@@ -216,11 +216,11 @@ class ImsettingsAction extends SettingsAction {
if (!$result) {
common_log_db_error($confirm, 'DELETE', __FILE__);
$this->server_error(_t('Couldn\'t delete email confirmation.'));
$this->server_error(_('Couldn\'t delete email confirmation.'));
return;
}
$this->show_form(_t('Confirmation cancelled.'), TRUE);
$this->show_form(_('Confirmation cancelled.'), TRUE);
}
function remove_address() {
...