';
diff --git a/mod/register.php b/mod/register.php
index fbc24b1f8..a2f5ddc51 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -93,18 +93,18 @@ function register_post(App $a)
$user['email'], $a->config['sitename'], System::baseUrl(), $user['username'], $result['password']);
if ($res) {
- info(t('Registration successful. Please check your email for further instructions.') . EOL);
+ info(L10n::t('Registration successful. Please check your email for further instructions.') . EOL);
goaway(System::baseUrl());
} else {
notice(
- t('Failed to send email message. Here your accout details:
login: %s
password: %s
You can change your password after login.',
+ L10n::t('Failed to send email message. Here your accout details:
login: %s
password: %s
You can change your password after login.',
$user['email'],
$result['password'])
. EOL
);
}
} else {
- info(t('Registration successful.') . EOL);
+ info(L10n::t('Registration successful.') . EOL);
goaway(System::baseUrl());
}
} elseif ($a->config['register_policy'] == REGISTER_APPROVE) {
@@ -156,7 +156,7 @@ function register_post(App $a)
User::sendRegisterPendingEmail(
$user['email'], $a->config['sitename'], $user['username']);
- info(t('Your registration is pending approval by the site owner.') . EOL);
+ info(L10n::t('Your registration is pending approval by the site owner.') . EOL);
goaway(System::baseUrl());
}
@@ -214,13 +214,13 @@ function register_content(App $a)
$oidlabel = '';
} else {
$oidhtml = '
$oidlabel ';
- $fillwith = t("You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'.");
- $fillext = t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.');
- $oidlabel = t("Your OpenID \x28optional\x29: ");
+ $fillwith = L10n::t("You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'.");
+ $fillext = L10n::t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.');
+ $oidlabel = L10n::t("Your OpenID \x28optional\x29: ");
}
// I set this and got even more fake names than before...
- $realpeople = ''; // t('Members of this network prefer to communicate with real people who use their real names.');
+ $realpeople = ''; // L10n::t('Members of this network prefer to communicate with real people who use their real names.');
if (Config::get('system', 'publish_all')) {
$profile_publish = '
';
@@ -228,11 +228,11 @@ function register_content(App $a)
$publish_tpl = get_markup_template("profile_publish.tpl");
$profile_publish = replace_macros($publish_tpl, [
'$instance' => 'reg',
- '$pubdesc' => t('Include your profile in member directory?'),
+ '$pubdesc' => L10n::t('Include your profile in member directory?'),
'$yes_selected' => ' checked="checked" ',
'$no_selected' => '',
- '$str_yes' => t('Yes'),
- '$str_no' => t('No'),
+ '$str_yes' => L10n::t('Yes'),
+ '$str_no' => L10n::t('No'),
]);
}
@@ -253,34 +253,34 @@ function register_content(App $a)
'$oidhtml' => $oidhtml,
'$invitations' => Config::get('system', 'invitation_only'),
'$permonly' => $a->config['register_policy'] == REGISTER_APPROVE,
- '$permonlybox' => ['permonlybox', t('Note for the admin'), '', t('Leave a message for the admin, why you want to join this node')],
- '$invite_desc' => t('Membership on this site is by invitation only.'),
- '$invite_label' => t('Your invitation ID: '),
+ '$permonlybox' => ['permonlybox', L10n::t('Note for the admin'), '', L10n::t('Leave a message for the admin, why you want to join this node')],
+ '$invite_desc' => L10n::t('Membership on this site is by invitation only.'),
+ '$invite_label' => L10n::t('Your invitation ID: '),
'$invite_id' => $invite_id,
'$realpeople' => $realpeople,
- '$regtitle' => t('Registration'),
+ '$regtitle' => L10n::t('Registration'),
'$registertext' => x($a->config, 'register_text') ? bbcode($a->config['register_text']) : "",
'$fillwith' => $fillwith,
'$fillext' => $fillext,
'$oidlabel' => $oidlabel,
'$openid' => $openid_url,
- '$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith, real or real-looking' . "\x29" . ': '),
- '$addrlabel' => t('Your Email Address: (Initial information will be send there, so this has to be an existing address.)'),
+ '$namelabel' => L10n::t('Your Full Name ' . "\x28" . 'e.g. Joe Smith, real or real-looking' . "\x29" . ': '),
+ '$addrlabel' => L10n::t('Your Email Address: (Initial information will be send there, so this has to be an existing address.)'),
'$passwords' => $passwords,
- '$password1' => ['password1', t('New Password:'), '', t('Leave empty for an auto generated password.')],
- '$password2' => ['confirm', t('Confirm:'), '', ''],
- '$nickdesc' => t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'
nickname@%s \'.', $a->get_hostname()),
- '$nicklabel' => t('Choose a nickname: '),
+ '$password1' => ['password1', L10n::t('New Password:'), '', L10n::t('Leave empty for an auto generated password.')],
+ '$password2' => ['confirm', L10n::t('Confirm:'), '', ''],
+ '$nickdesc' => L10n::t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'
nickname@%s \'.', $a->get_hostname()),
+ '$nicklabel' => L10n::t('Choose a nickname: '),
'$photo' => $photo,
'$publish' => $profile_publish,
- '$regbutt' => t('Register'),
+ '$regbutt' => L10n::t('Register'),
'$username' => $username,
'$email' => $email,
'$nickname' => $nickname,
'$license' => $license,
'$sitename' => $a->get_hostname(),
- '$importh' => t('Import'),
- '$importt' => t('Import your profile to this friendica instance'),
+ '$importh' => L10n::t('Import'),
+ '$importt' => L10n::t('Import your profile to this friendica instance'),
'$form_security_token' => get_form_security_token("register")
]);
return $o;
diff --git a/mod/removeme.php b/mod/removeme.php
index 5912a6e31..ac13da2f1 100644
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -1,6 +1,9 @@
System::baseUrl(),
'$hash' => $hash,
- '$title' => t('Remove My Account'),
- '$desc' => t('This will completely remove your account. Once this has been done it is not recoverable.'),
- '$passwd' => t('Please enter your password for verification:'),
- '$submit' => t('Remove My Account')
+ '$title' => L10n::t('Remove My Account'),
+ '$desc' => L10n::t('This will completely remove your account. Once this has been done it is not recoverable.'),
+ '$passwd' => L10n::t('Please enter your password for verification:'),
+ '$submit' => L10n::t('Remove My Account')
]);
return $o;
diff --git a/mod/search.php b/mod/search.php
index b3018ae8c..57b65df1c 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -33,7 +33,7 @@ function search_saved_searches() {
'id' => $rr['id'],
'term' => $rr['term'],
'encodedterm' => urlencode($rr['term']),
- 'delete' => t('Remove term'),
+ 'delete' => L10n::t('Remove term'),
'selected' => ($search==$rr['term']),
];
}
@@ -42,7 +42,7 @@ function search_saved_searches() {
$tpl = get_markup_template("saved_searches_aside.tpl");
$o .= replace_macros($tpl, [
- '$title' => t('Saved Searches'),
+ '$title' => L10n::t('Saved Searches'),
'$add' => '',
'$searchbox' => '',
'$saved' => $saved,
@@ -100,8 +100,8 @@ function search_content(App $a) {
if (Config::get('system','local_search') && !local_user() && !remote_user()) {
http_status_exit(403,
- ["title" => t("Public access denied."),
- "description" => t("Only logged in users are permitted to perform a search.")]);
+ ["title" => L10n::t("Public access denied."),
+ "description" => L10n::t("Only logged in users are permitted to perform a search.")]);
killme();
//notice(L10n::t('Public access denied.').EOL);
//return;
@@ -125,8 +125,8 @@ function search_content(App $a) {
$resultdata = json_decode($result);
if (($resultdata->time > (time() - $crawl_permit_period)) && ($resultdata->accesses > $free_crawls)) {
http_status_exit(429,
- ["title" => t("Too Many Requests"),
- "description" => t("Only one search per minute is permitted for not logged in users.")]);
+ ["title" => L10n::t("Too Many Requests"),
+ "description" => L10n::t("Only one search per minute is permitted for not logged in users.")]);
killme();
}
Cache::set("remote_search:".$remote, json_encode(["time" => time(), "accesses" => $resultdata->accesses + 1]), CACHE_HOUR);
@@ -151,7 +151,7 @@ function search_content(App $a) {
// contruct a wrapper for the search header
$o .= replace_macros(get_markup_template("content_wrapper.tpl"),[
'name' => "search-header",
- '$title' => t("Search"),
+ '$title' => L10n::t("Search"),
'$title_size' => 3,
'$content' => search($search,'search-box','search',((local_user()) ? true : false), false)
]);
@@ -227,9 +227,9 @@ function search_content(App $a) {
if ($tag)
- $title = sprintf( t('Items tagged with: %s'), $search);
+ $title = sprintf(L10n::t('Items tagged with: %s'), $search);
else
- $title = sprintf( t('Results for: %s'), $search);
+ $title = sprintf(L10n::t('Results for: %s'), $search);
$o .= replace_macros(get_markup_template("section_title.tpl"),[
'$title' => $title
diff --git a/mod/settings.php b/mod/settings.php
index c96e9e18b..2d8d3a605 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -42,13 +42,13 @@ function settings_init(App $a)
// These lines provide the javascript needed by the acl selector
$tpl = get_markup_template('settings/head.tpl');
- $a->page['htmlhead'] .= replace_macros($tpl,[
- '$ispublic' => t('everybody')
+ $a->page['htmlhead'] .= replace_macros($tpl, [
+ '$ispublic' => L10n::t('everybody')
]);
$tabs = [
[
- 'label' => t('Account'),
+ 'label' => L10n::t('Account'),
'url' => 'settings',
'selected' => (($a->argc == 1) && ($a->argv[0] === 'settings')?'active':''),
'accesskey' => 'o',
@@ -57,7 +57,7 @@ function settings_init(App $a)
if (Feature::get()) {
$tabs[] = [
- 'label' => t('Additional features'),
+ 'label' => L10n::t('Additional features'),
'url' => 'settings/features',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'features') ? 'active' : ''),
'accesskey' => 't',
@@ -65,49 +65,49 @@ function settings_init(App $a)
}
$tabs[] = [
- 'label' => t('Display'),
+ 'label' => L10n::t('Display'),
'url' => 'settings/display',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
'accesskey' => 'i',
];
$tabs[] = [
- 'label' => t('Social Networks'),
+ 'label' => L10n::t('Social Networks'),
'url' => 'settings/connectors',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
'accesskey' => 'w',
];
$tabs[] = [
- 'label' => t('Addons'),
+ 'label' => L10n::t('Addons'),
'url' => 'settings/addon',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
'accesskey' => 'l',
];
$tabs[] = [
- 'label' => t('Delegations'),
+ 'label' => L10n::t('Delegations'),
'url' => 'delegate',
'selected' => (($a->argc == 1) && ($a->argv[0] === 'delegate')?'active':''),
'accesskey' => 'd',
];
$tabs[] = [
- 'label' => t('Connected apps'),
+ 'label' => L10n::t('Connected apps'),
'url' => 'settings/oauth',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
'accesskey' => 'b',
];
$tabs[] = [
- 'label' => t('Export personal data'),
+ 'label' => L10n::t('Export personal data'),
'url' => 'uexport',
'selected' => (($a->argc == 1) && ($a->argv[0] === 'uexport')?'active':''),
'accesskey' => 'e',
];
$tabs[] = [
- 'label' => t('Remove account'),
+ 'label' => L10n::t('Remove account'),
'url' => 'removeme',
'selected' => (($a->argc == 1) && ($a->argv[0] === 'removeme')?'active':''),
'accesskey' => 'r',
@@ -116,7 +116,7 @@ function settings_init(App $a)
$tabtpl = get_markup_template("generic_links_widget.tpl");
$a->page['aside'] = replace_macros($tabtpl, [
- '$title' => t('Settings'),
+ '$title' => L10n::t('Settings'),
'$class' => 'settings-widget',
'$items' => $tabs,
]);
@@ -163,7 +163,7 @@ function settings_post(App $a)
if ($name == "" || $key == "" || $secret == "") {
notice(L10n::t("Missing some important data!"));
} else {
- if ($_POST['submit']==t("Update")) {
+ if ($_POST['submit'] == L10n::t("Update")) {
q("UPDATE clients SET
client_id='%s',
pw='%s',
@@ -277,7 +277,7 @@ function settings_post(App $a)
}
}
if (!$failed) {
- info(t('Email settings updated.') . EOL);
+ info(L10n::t('Email settings updated.') . EOL);
}
}
}
@@ -293,7 +293,7 @@ function settings_post(App $a)
PConfig::set(local_user(), 'feature', substr($k, 8), ((intval($v)) ? 1 : 0));
}
}
- info(t('Features updated') . EOL);
+ info(L10n::t('Features updated') . EOL);
return;
}
@@ -365,7 +365,7 @@ function settings_post(App $a)
if (x($_POST,'resend_relocate')) {
Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', local_user());
- info(t("Relocate message has been send to your contacts"));
+ info(L10n::t("Relocate message has been send to your contacts"));
goaway('settings');
}
@@ -395,7 +395,7 @@ function settings_post(App $a)
if (!$err) {
$result = User::updatePassword(local_user(), $newpass);
if (DBM::is_result($result)) {
- info(t('Password changed.') . EOL);
+ info(L10n::t('Password changed.') . EOL);
} else {
notice(L10n::t('Password update failed. Please try again.') . EOL);
}
@@ -487,10 +487,10 @@ function settings_post(App $a)
if ($username != $a->user['username']) {
$name_change = true;
if (strlen($username) > 40) {
- $err .= t(' Please use a shorter name.');
+ $err .= L10n::t(' Please use a shorter name.');
}
if (strlen($username) < 3) {
- $err .= t(' Name too short.');
+ $err .= L10n::t(' Name too short.');
}
}
@@ -498,19 +498,19 @@ function settings_post(App $a)
$email_changed = true;
// check for the correct password
if (!User::authenticate(intval(local_user()), $_POST['mpassword'])) {
- $err .= t('Wrong Password') . EOL;
+ $err .= L10n::t('Wrong Password') . EOL;
$email = $a->user['email'];
}
// check the email is valid
if (!valid_email($email)) {
- $err .= t('Invalid email.');
+ $err .= L10n::t('Invalid email.');
}
// ensure new email is not the admin mail
//if ((x($a->config, 'admin_email')) && (strcasecmp($email, $a->config['admin_email']) == 0)) {
if (x($a->config, 'admin_email')) {
$adminlist = explode(",", str_replace(" ", "", strtolower($a->config['admin_email'])));
if (in_array(strtolower($email), $adminlist)) {
- $err .= t('Cannot change to that email.');
+ $err .= L10n::t('Cannot change to that email.');
$email = $a->user['email'];
}
}
@@ -564,7 +564,7 @@ function settings_post(App $a)
$hidewall = 1;
if (!$str_contact_allow && !$str_group_allow && !$str_contact_deny && !$str_group_deny) {
if ($def_gid) {
- info(t('Private forum has no privacy permissions. Using default privacy group.'). EOL);
+ info(L10n::t('Private forum has no privacy permissions. Using default privacy group.'). EOL);
$str_group_allow = '<' . $def_gid . '>';
} else {
notice(L10n::t('Private forum has no privacy permissions and no default privacy group.') . EOL);
@@ -607,7 +607,7 @@ function settings_post(App $a)
intval(local_user())
);
if (DBM::is_result($r)) {
- info(t('Settings updated.') . EOL);
+ info(L10n::t('Settings updated.') . EOL);
}
// clear session language
@@ -673,14 +673,14 @@ function settings_content(App $a)
$tpl = get_markup_template('settings/oauth_edit.tpl');
$o .= replace_macros($tpl, [
'$form_security_token' => get_form_security_token("settings_oauth"),
- '$title' => t('Add application'),
- '$submit' => t('Save Settings'),
- '$cancel' => t('Cancel'),
- '$name' => ['name', t('Name'), '', ''],
- '$key' => ['key', t('Consumer Key'), '', ''],
- '$secret' => ['secret', t('Consumer Secret'), '', ''],
- '$redirect' => ['redirect', t('Redirect'), '', ''],
- '$icon' => ['icon', t('Icon url'), '', ''],
+ '$title' => L10n::t('Add application'),
+ '$submit' => L10n::t('Save Settings'),
+ '$cancel' => L10n::t('Cancel'),
+ '$name' => ['name', L10n::t('Name'), '', ''],
+ '$key' => ['key', L10n::t('Consumer Key'), '', ''],
+ '$secret' => ['secret', L10n::t('Consumer Secret'), '', ''],
+ '$redirect' => ['redirect', L10n::t('Redirect'), '', ''],
+ '$icon' => ['icon', L10n::t('Icon url'), '', ''],
]);
return $o;
}
@@ -699,14 +699,14 @@ function settings_content(App $a)
$tpl = get_markup_template('settings/oauth_edit.tpl');
$o .= replace_macros($tpl, [
'$form_security_token' => get_form_security_token("settings_oauth"),
- '$title' => t('Add application'),
- '$submit' => t('Update'),
- '$cancel' => t('Cancel'),
- '$name' => ['name', t('Name'), $app['name'] , ''],
- '$key' => ['key', t('Consumer Key'), $app['client_id'], ''],
- '$secret' => ['secret', t('Consumer Secret'), $app['pw'], ''],
- '$redirect' => ['redirect', t('Redirect'), $app['redirect_uri'], ''],
- '$icon' => ['icon', t('Icon url'), $app['icon'], ''],
+ '$title' => L10n::t('Add application'),
+ '$submit' => L10n::t('Update'),
+ '$cancel' => L10n::t('Cancel'),
+ '$name' => ['name', L10n::t('Name'), $app['name'] , ''],
+ '$key' => ['key', L10n::t('Consumer Key'), $app['client_id'], ''],
+ '$secret' => ['secret', L10n::t('Consumer Secret'), $app['pw'], ''],
+ '$redirect' => ['redirect', L10n::t('Redirect'), $app['redirect_uri'], ''],
+ '$icon' => ['icon', L10n::t('Icon url'), $app['icon'], ''],
]);
return $o;
}
@@ -734,13 +734,13 @@ function settings_content(App $a)
$o .= replace_macros($tpl, [
'$form_security_token' => get_form_security_token("settings_oauth"),
'$baseurl' => System::baseUrl(true),
- '$title' => t('Connected Apps'),
- '$add' => t('Add application'),
- '$edit' => t('Edit'),
- '$delete' => t('Delete'),
- '$consumerkey' => t('Client key starts with'),
- '$noname' => t('No name'),
- '$remove' => t('Remove authorization'),
+ '$title' => L10n::t('Connected Apps'),
+ '$add' => L10n::t('Add application'),
+ '$edit' => L10n::t('Edit'),
+ '$delete' => L10n::t('Delete'),
+ '$consumerkey' => L10n::t('Client key starts with'),
+ '$noname' => L10n::t('No name'),
+ '$remove' => L10n::t('Remove authorization'),
'$apps' => $r,
]);
return $o;
@@ -751,7 +751,7 @@ function settings_content(App $a)
$r = q("SELECT * FROM `hook` WHERE `hook` = 'addon_settings' ");
if (!DBM::is_result($r)) {
- $settings_addons = t('No Addon settings configured');
+ $settings_addons = L10n::t('No Addon settings configured');
}
Addon::callHooks('addon_settings', $settings_addons);
@@ -760,7 +760,7 @@ function settings_content(App $a)
$tpl = get_markup_template('settings/addons.tpl');
$o .= replace_macros($tpl, [
'$form_security_token' => get_form_security_token("settings_addon"),
- '$title' => t('Addon Settings'),
+ '$title' => L10n::t('Addon Settings'),
'$settings_addons' => $settings_addons
]);
return $o;
@@ -774,16 +774,16 @@ function settings_content(App $a)
$arr[$fname] = [];
$arr[$fname][0] = $fdata[0];
foreach (array_slice($fdata,1) as $f) {
- $arr[$fname][1][] = ['feature_' .$f[0], $f[1],((intval(Feature::isEnabled(local_user(), $f[0]))) ? "1" : ''), $f[2],[t('Off'), t('On')]];
+ $arr[$fname][1][] = ['feature_' .$f[0], $f[1],((intval(Feature::isEnabled(local_user(), $f[0]))) ? "1" : ''), $f[2],[L10n::t('Off'), L10n::t('On')]];
}
}
$tpl = get_markup_template('settings/features.tpl');
$o .= replace_macros($tpl, [
'$form_security_token' => get_form_security_token("settings_features"),
- '$title' => t('Additional Features'),
+ '$title' => L10n::t('Additional Features'),
'$features' => $arr,
- '$submit' => t('Save Settings'),
+ '$submit' => L10n::t('Save Settings'),
]);
return $o;
}
@@ -803,8 +803,8 @@ function settings_content(App $a)
Addon::callHooks('connector_settings', $settings_connectors);
if (is_site_admin()) {
- $diasp_enabled = t('Built-in support for %s connectivity is %s', t('Diaspora'), ((Config::get('system', 'diaspora_enabled')) ? t('enabled') : t('disabled')));
- $ostat_enabled = t('Built-in support for %s connectivity is %s', t('GNU Social (OStatus)'), ((Config::get('system', 'ostatus_disabled')) ? t('disabled') : t('enabled')));
+ $diasp_enabled = L10n::t('Built-in support for %s connectivity is %s', L10n::t('Diaspora'), ((Config::get('system', 'diaspora_enabled')) ? L10n::t('enabled') : L10n::t('disabled')));
+ $ostat_enabled = L10n::t('Built-in support for %s connectivity is %s', L10n::t('GNU Social (OStatus)'), ((Config::get('system', 'ostatus_disabled')) ? L10n::t('disabled') : L10n::t('enabled')));
} else {
$diasp_enabled = "";
$ostat_enabled = "";
@@ -835,41 +835,41 @@ function settings_content(App $a)
$tpl = get_markup_template('settings/connectors.tpl');
- $mail_disabled_message = (($mail_disabled) ? t('Email access is disabled on this site.') : '');
+ $mail_disabled_message = (($mail_disabled) ? L10n::t('Email access is disabled on this site.') : '');
$o .= replace_macros($tpl, [
'$form_security_token' => get_form_security_token("settings_connectors"),
- '$title' => t('Social Networks'),
+ '$title' => L10n::t('Social Networks'),
'$diasp_enabled' => $diasp_enabled,
'$ostat_enabled' => $ostat_enabled,
- '$general_settings' => t('General Social Media Settings'),
- '$no_intelligent_shortening' => ['no_intelligent_shortening', t('Disable intelligent shortening'), $no_intelligent_shortening, t('Normally the system tries to find the best link to add to shortened posts. If this option is enabled then every shortened post will always point to the original friendica post.')],
- '$ostatus_autofriend' => ['snautofollow', t('Automatically follow any GNU Social (OStatus) followers/mentioners'), $ostatus_autofriend, t('If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user.')],
- '$default_group' => Group::displayGroupSelection(local_user(), $default_group, t("Default group for OStatus contacts")),
- '$legacy_contact' => ['legacy_contact', t('Your legacy GNU Social account'), $legacy_contact, t('If you enter your old GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.')],
+ '$general_settings' => L10n::t('General Social Media Settings'),
+ '$no_intelligent_shortening' => ['no_intelligent_shortening', L10n::t('Disable intelligent shortening'), $no_intelligent_shortening, L10n::t('Normally the system tries to find the best link to add to shortened posts. If this option is enabled then every shortened post will always point to the original friendica post.')],
+ '$ostatus_autofriend' => ['snautofollow', L10n::t('Automatically follow any GNU Social (OStatus) followers/mentioners'), $ostatus_autofriend, L10n::t('If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user.')],
+ '$default_group' => Group::displayGroupSelection(local_user(), $default_group, L10n::t("Default group for OStatus contacts")),
+ '$legacy_contact' => ['legacy_contact', L10n::t('Your legacy GNU Social account'), $legacy_contact, L10n::t('If you enter your old GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.')],
'$repair_ostatus_url' => System::baseUrl() . '/repair_ostatus',
- '$repair_ostatus_text' => t('Repair OStatus subscriptions'),
+ '$repair_ostatus_text' => L10n::t('Repair OStatus subscriptions'),
'$settings_connectors' => $settings_connectors,
- '$h_imap' => t('Email/Mailbox Setup'),
- '$imap_desc' => t("If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."),
- '$imap_lastcheck' => ['imap_lastcheck', t('Last successful email check:'), $mail_chk, ''],
+ '$h_imap' => L10n::t('Email/Mailbox Setup'),
+ '$imap_desc' => L10n::t("If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."),
+ '$imap_lastcheck' => ['imap_lastcheck', L10n::t('Last successful email check:'), $mail_chk, ''],
'$mail_disabled' => $mail_disabled_message,
- '$mail_server' => ['mail_server', t('IMAP server name:'), $mail_server, ''],
- '$mail_port' => ['mail_port', t('IMAP port:'), $mail_port, ''],
- '$mail_ssl' => ['mail_ssl', t('Security:'), strtoupper($mail_ssl), '', ['notls'=>t('None'), 'TLS'=>'TLS', 'SSL'=>'SSL']],
- '$mail_user' => ['mail_user', t('Email login name:'), $mail_user, ''],
- '$mail_pass' => ['mail_pass', t('Email password:'), '', ''],
- '$mail_replyto' => ['mail_replyto', t('Reply-to address:'), $mail_replyto, 'Optional'],
- '$mail_pubmail' => ['mail_pubmail', t('Send public posts to all email contacts:'), $mail_pubmail, ''],
- '$mail_action' => ['mail_action', t('Action after import:'), $mail_action, '', [0=>t('None'), /*1=>t('Delete'),*/ 2=>t('Mark as seen'), 3=>t('Move to folder')]],
- '$mail_movetofolder' => ['mail_movetofolder', t('Move to folder:'), $mail_movetofolder, ''],
- '$submit' => t('Save Settings'),
+ '$mail_server' => ['mail_server', L10n::t('IMAP server name:'), $mail_server, ''],
+ '$mail_port' => ['mail_port', L10n::t('IMAP port:'), $mail_port, ''],
+ '$mail_ssl' => ['mail_ssl', L10n::t('Security:'), strtoupper($mail_ssl), '', ['notls'=>L10n::t('None'), 'TLS'=>'TLS', 'SSL'=>'SSL']],
+ '$mail_user' => ['mail_user', L10n::t('Email login name:'), $mail_user, ''],
+ '$mail_pass' => ['mail_pass', L10n::t('Email password:'), '', ''],
+ '$mail_replyto' => ['mail_replyto', L10n::t('Reply-to address:'), $mail_replyto, 'Optional'],
+ '$mail_pubmail' => ['mail_pubmail', L10n::t('Send public posts to all email contacts:'), $mail_pubmail, ''],
+ '$mail_action' => ['mail_action', L10n::t('Action after import:'), $mail_action, '', [0=>L10n::t('None'), /*1=>L10n::t('Delete'),*/ 2=>L10n::t('Mark as seen'), 3=>L10n::t('Move to folder')]],
+ '$mail_movetofolder' => ['mail_movetofolder', L10n::t('Move to folder:'), $mail_movetofolder, ''],
+ '$submit' => L10n::t('Save Settings'),
]);
Addon::callHooks('display_settings', $o);
@@ -902,7 +902,7 @@ function settings_content(App $a)
$themes = [];
- $mobile_themes = ["---" => t('No special theme for mobile devices')];
+ $mobile_themes = ["---" => L10n::t('No special theme for mobile devices')];
if ($allowed_themes) {
foreach ($allowed_themes as $theme) {
$is_experimental = file_exists('view/theme/' . $theme . '/experimental');
@@ -911,9 +911,9 @@ function settings_content(App $a)
if (!$is_experimental || ($is_experimental && (Config::get('experimentals', 'exp_themes')==1 || is_null(Config::get('experimentals', 'exp_themes'))))) {
$theme_name = ucfirst($theme);
if ($is_unsupported) {
- $theme_name = t("%s - (Unsupported)", $theme_name);
+ $theme_name = L10n::t("%s - (Unsupported)", $theme_name);
} elseif ($is_experimental) {
- $theme_name = t("%s - (Experimental)", $theme_name);
+ $theme_name = L10n::t("%s - (Experimental)", $theme_name);
}
if ($is_mobile) {
$mobile_themes[$theme] = $theme_name;
@@ -940,7 +940,7 @@ function settings_content(App $a)
$nosmile = PConfig::get(local_user(), 'system', 'no_smilies', 0);
$first_day_of_week = PConfig::get(local_user(), 'system', 'first_day_of_week', 0);
- $weekdays = [0 => t("Sunday"), 1 => t("Monday")];
+ $weekdays = [0 => L10n::t("Sunday"), 1 => L10n::t("Monday")];
$noinfo = PConfig::get(local_user(), 'system', 'ignore_info', 0);
$infinite_scroll = PConfig::get(local_user(), 'system', 'infinite_scroll', 0);
@@ -956,37 +956,37 @@ function settings_content(App $a)
$tpl = get_markup_template('settings/display.tpl');
$o = replace_macros($tpl, [
- '$ptitle' => t('Display Settings'),
+ '$ptitle' => L10n::t('Display Settings'),
'$form_security_token' => get_form_security_token("settings_display"),
- '$submit' => t('Save Settings'),
+ '$submit' => L10n::t('Save Settings'),
'$baseurl' => System::baseUrl(true),
'$uid' => local_user(),
- '$theme' => ['theme', t('Display Theme:'), $theme_selected, '', $themes, true],
- '$mobile_theme' => ['mobile_theme', t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, false],
- '$nowarn_insecure' => ['nowarn_insecure', t('Suppress warning of insecure networks'), $nowarn_insecure, t("Should the system suppress the warning that the current group contains members of networks that can't receive non public postings.")],
- '$ajaxint' => ['browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds. Enter -1 to disable it.')],
- '$itemspage_network' => ['itemspage_network', t("Number of items to display per page:"), $itemspage_network, t('Maximum of 100 items')],
- '$itemspage_mobile_network' => ['itemspage_mobile_network', t("Number of items to display per page when viewed from mobile device:"), $itemspage_mobile_network, t('Maximum of 100 items')],
- '$nosmile' => ['nosmile', t("Don't show emoticons"), $nosmile, ''],
- '$calendar_title' => t('Calendar'),
- '$first_day_of_week' => ['first_day_of_week', t('Beginning of week:'), $first_day_of_week, '', $weekdays, false],
- '$noinfo' => ['noinfo', t("Don't show notices"), $noinfo, ''],
- '$infinite_scroll' => ['infinite_scroll', t("Infinite scroll"), $infinite_scroll, ''],
- '$no_auto_update' => ['no_auto_update', t("Automatic updates only at the top of the network page"), $no_auto_update, t('When disabled, the network page is updated all the time, which could be confusing while reading.')],
- '$bandwidth_saver' => ['bandwidth_saver', t('Bandwith Saver Mode'), $bandwidth_saver, t('When enabled, embedded content is not displayed on automatic updates, they only show on page reload.')],
- '$smart_threading' => ['smart_threading', t('Smart Threading'), $smart_threading, t('When enabled, suppress extraneous thread indentation while keeping it where it matters. Only works if threading is available and enabled.')],
+ '$theme' => ['theme', L10n::t('Display Theme:'), $theme_selected, '', $themes, true],
+ '$mobile_theme' => ['mobile_theme', L10n::t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, false],
+ '$nowarn_insecure' => ['nowarn_insecure', L10n::t('Suppress warning of insecure networks'), $nowarn_insecure, L10n::t("Should the system suppress the warning that the current group contains members of networks that can't receive non public postings.")],
+ '$ajaxint' => ['browser_update', L10n::t("Update browser every xx seconds"), $browser_update, L10n::t('Minimum of 10 seconds. Enter -1 to disable it.')],
+ '$itemspage_network' => ['itemspage_network', L10n::t("Number of items to display per page:"), $itemspage_network, L10n::t('Maximum of 100 items')],
+ '$itemspage_mobile_network' => ['itemspage_mobile_network', L10n::t("Number of items to display per page when viewed from mobile device:"), $itemspage_mobile_network, L10n::t('Maximum of 100 items')],
+ '$nosmile' => ['nosmile', L10n::t("Don't show emoticons"), $nosmile, ''],
+ '$calendar_title' => L10n::t('Calendar'),
+ '$first_day_of_week' => ['first_day_of_week', L10n::t('Beginning of week:'), $first_day_of_week, '', $weekdays, false],
+ '$noinfo' => ['noinfo', L10n::t("Don't show notices"), $noinfo, ''],
+ '$infinite_scroll' => ['infinite_scroll', L10n::t("Infinite scroll"), $infinite_scroll, ''],
+ '$no_auto_update' => ['no_auto_update', L10n::t("Automatic updates only at the top of the network page"), $no_auto_update, L10n::t('When disabled, the network page is updated all the time, which could be confusing while reading.')],
+ '$bandwidth_saver' => ['bandwidth_saver', L10n::t('Bandwith Saver Mode'), $bandwidth_saver, L10n::t('When enabled, embedded content is not displayed on automatic updates, they only show on page reload.')],
+ '$smart_threading' => ['smart_threading', L10n::t('Smart Threading'), $smart_threading, L10n::t('When enabled, suppress extraneous thread indentation while keeping it where it matters. Only works if threading is available and enabled.')],
- '$d_tset' => t('General Theme Settings'),
- '$d_ctset' => t('Custom Theme Settings'),
- '$d_cset' => t('Content Settings'),
- 'stitle' => t('Theme settings'),
+ '$d_tset' => L10n::t('General Theme Settings'),
+ '$d_ctset' => L10n::t('Custom Theme Settings'),
+ '$d_cset' => L10n::t('Content Settings'),
+ 'stitle' => L10n::t('Theme settings'),
'$theme_config' => $theme_config,
]);
$tpl = get_markup_template('settings/display_end.tpl');
$a->page['end'] .= replace_macros($tpl, [
- '$theme' => ['theme', t('Display Theme:'), $theme_selected, '', $themes]
+ '$theme' => ['theme', L10n::t('Display Theme:'), $theme_selected, '', $themes]
]);
return $o;
@@ -1043,49 +1043,49 @@ function settings_content(App $a)
$pageset_tpl = get_markup_template('settings/pagetypes.tpl');
$pagetype = replace_macros($pageset_tpl, [
- '$account_types' => t("Account Types"),
- '$user' => t("Personal Page Subtypes"),
- '$community' => t("Community Forum Subtypes"),
+ '$account_types' => L10n::t("Account Types"),
+ '$user' => L10n::t("Personal Page Subtypes"),
+ '$community' => L10n::t("Community Forum Subtypes"),
'$account_type' => $a->user['account-type'],
'$type_person' => ACCOUNT_TYPE_PERSON,
'$type_organisation' => ACCOUNT_TYPE_ORGANISATION,
'$type_news' => ACCOUNT_TYPE_NEWS,
'$type_community' => ACCOUNT_TYPE_COMMUNITY,
- '$account_person' => ['account-type', t('Personal Page'), ACCOUNT_TYPE_PERSON,
- t('Account for a personal profile.'),
+ '$account_person' => ['account-type', L10n::t('Personal Page'), ACCOUNT_TYPE_PERSON,
+ L10n::t('Account for a personal profile.'),
($a->user['account-type'] == ACCOUNT_TYPE_PERSON)],
- '$account_organisation' => ['account-type', t('Organisation Page'), ACCOUNT_TYPE_ORGANISATION,
- t('Account for an organisation that automatically approves contact requests as "Followers".'),
+ '$account_organisation' => ['account-type', L10n::t('Organisation Page'), ACCOUNT_TYPE_ORGANISATION,
+ L10n::t('Account for an organisation that automatically approves contact requests as "Followers".'),
($a->user['account-type'] == ACCOUNT_TYPE_ORGANISATION)],
- '$account_news' => ['account-type', t('News Page'), ACCOUNT_TYPE_NEWS,
- t('Account for a news reflector that automatically approves contact requests as "Followers".'),
+ '$account_news' => ['account-type', L10n::t('News Page'), ACCOUNT_TYPE_NEWS,
+ L10n::t('Account for a news reflector that automatically approves contact requests as "Followers".'),
($a->user['account-type'] == ACCOUNT_TYPE_NEWS)],
- '$account_community' => ['account-type', t('Community Forum'), ACCOUNT_TYPE_COMMUNITY,
- t('Account for community discussions.'),
+ '$account_community' => ['account-type', L10n::t('Community Forum'), ACCOUNT_TYPE_COMMUNITY,
+ L10n::t('Account for community discussions.'),
($a->user['account-type'] == ACCOUNT_TYPE_COMMUNITY)],
- '$page_normal' => ['page-flags', t('Normal Account Page'), PAGE_NORMAL,
- t('Account for a regular personal profile that requires manual approval of "Friends" and "Followers".'),
+ '$page_normal' => ['page-flags', L10n::t('Normal Account Page'), PAGE_NORMAL,
+ L10n::t('Account for a regular personal profile that requires manual approval of "Friends" and "Followers".'),
($a->user['page-flags'] == PAGE_NORMAL)],
- '$page_soapbox' => ['page-flags', t('Soapbox Page'), PAGE_SOAPBOX,
- t('Account for a public profile that automatically approves contact requests as "Followers".'),
+ '$page_soapbox' => ['page-flags', L10n::t('Soapbox Page'), PAGE_SOAPBOX,
+ L10n::t('Account for a public profile that automatically approves contact requests as "Followers".'),
($a->user['page-flags'] == PAGE_SOAPBOX)],
- '$page_community' => ['page-flags', t('Public Forum'), PAGE_COMMUNITY,
- t('Automatically approves all contact requests.'),
+ '$page_community' => ['page-flags', L10n::t('Public Forum'), PAGE_COMMUNITY,
+ L10n::t('Automatically approves all contact requests.'),
($a->user['page-flags'] == PAGE_COMMUNITY)],
- '$page_freelove' => ['page-flags', t('Automatic Friend Page'), PAGE_FREELOVE,
- t('Account for a popular profile that automatically approves contact requests as "Friends".'),
+ '$page_freelove' => ['page-flags', L10n::t('Automatic Friend Page'), PAGE_FREELOVE,
+ L10n::t('Account for a popular profile that automatically approves contact requests as "Friends".'),
($a->user['page-flags'] == PAGE_FREELOVE)],
- '$page_prvgroup' => ['page-flags', t('Private Forum [Experimental]'), PAGE_PRVGROUP,
- t('Requires manual approval of contact requests.'),
+ '$page_prvgroup' => ['page-flags', L10n::t('Private Forum [Experimental]'), PAGE_PRVGROUP,
+ L10n::t('Requires manual approval of contact requests.'),
($a->user['page-flags'] == PAGE_PRVGROUP)],
@@ -1096,7 +1096,7 @@ function settings_content(App $a)
if ($noid) {
$openid_field = false;
} else {
- $openid_field = ['openid_url', t('OpenID:'), $openid, t("\x28Optional\x29 Allow this OpenID to login to this account."), "", "", "url"];
+ $openid_field = ['openid_url', L10n::t('OpenID:'), $openid, L10n::t("\x28Optional\x29 Allow this OpenID to login to this account."), "", "", "url"];
}
$opt_tpl = get_markup_template("field_yesno.tpl");
@@ -1104,64 +1104,64 @@ function settings_content(App $a)
$profile_in_dir = '
';
} else {
$profile_in_dir = replace_macros($opt_tpl, [
- '$field' => ['profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], t("Your profile may be visible in public."), [t('No'), t('Yes')]]
+ '$field' => ['profile_in_directory', L10n::t('Publish your default profile in your local site directory?'), $profile['publish'], L10n::t("Your profile may be visible in public."), [L10n::t('No'), L10n::t('Yes')]]
]);
}
if (strlen(Config::get('system', 'directory'))) {
$profile_in_net_dir = replace_macros($opt_tpl, [
- '$field' => ['profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', [t('No'), t('Yes')]]
+ '$field' => ['profile_in_netdirectory', L10n::t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', [L10n::t('No'), L10n::t('Yes')]]
]);
} else {
$profile_in_net_dir = '';
}
$hide_friends = replace_macros($opt_tpl, [
- '$field' => ['hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', [t('No'), t('Yes')]],
+ '$field' => ['hide-friends', L10n::t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', [L10n::t('No'), L10n::t('Yes')]],
]);
$hide_wall = replace_macros($opt_tpl, [
- '$field' => ['hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), [t('No'), t('Yes')]],
+ '$field' => ['hidewall', L10n::t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], L10n::t("If enabled, posting public messages to Diaspora and other networks isn't possible."), [L10n::t('No'), L10n::t('Yes')]],
]);
$blockwall = replace_macros($opt_tpl, [
- '$field' => ['blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', [t('No'), t('Yes')]],
+ '$field' => ['blockwall', L10n::t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', [L10n::t('No'), L10n::t('Yes')]],
]);
$blocktags = replace_macros($opt_tpl, [
- '$field' => ['blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', [t('No'), t('Yes')]],
+ '$field' => ['blocktags', L10n::t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', [L10n::t('No'), L10n::t('Yes')]],
]);
$suggestme = replace_macros($opt_tpl, [
- '$field' => ['suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', [t('No'), t('Yes')]],
+ '$field' => ['suggestme', L10n::t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', [L10n::t('No'), L10n::t('Yes')]],
]);
$unkmail = replace_macros($opt_tpl, [
- '$field' => ['unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', [t('No'), t('Yes')]],
+ '$field' => ['unkmail', L10n::t('Permit unknown people to send you private mail?'), $unkmail, '', [L10n::t('No'), L10n::t('Yes')]],
]);
if (!$profile['publish'] && !$profile['net-publish']) {
- info(t('Profile is
not published .') . EOL);
+ info(L10n::t('Profile is
not published .') . EOL);
}
$tpl_addr = get_markup_template('settings/nick_set.tpl');
$prof_addr = replace_macros($tpl_addr,[
- '$desc' => t("Your Identity Address is
'%s' or '%s'.", $nickname . '@' . $a->get_hostname() . $a->get_path(), System::baseUrl() . '/profile/' . $nickname),
+ '$desc' => L10n::t("Your Identity Address is
'%s' or '%s'.", $nickname . '@' . $a->get_hostname() . $a->get_path(), System::baseUrl() . '/profile/' . $nickname),
'$basepath' => $a->get_hostname()
]);
$stpl = get_markup_template('settings/settings.tpl');
$expire_arr = [
- 'days' => ['expire', t("Automatically expire posts after this many days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')],
- 'advanced' => t('Advanced expiration settings'),
- 'label' => t('Advanced Expiration'),
- 'items' => ['expire_items', t("Expire posts:"), $expire_items, '', [t('No'), t('Yes')]],
- 'notes' => ['expire_notes', t("Expire personal notes:"), $expire_notes, '', [t('No'), t('Yes')]],
- 'starred' => ['expire_starred', t("Expire starred posts:"), $expire_starred, '', [t('No'), t('Yes')]],
- 'photos' => ['expire_photos', t("Expire photos:"), $expire_photos, '', [t('No'), t('Yes')]],
- 'network_only' => ['expire_network_only', t("Only expire posts by others:"), $expire_network_only, '', [t('No'), t('Yes')]],
+ 'days' => ['expire', L10n::t("Automatically expire posts after this many days:"), $expire, L10n::t('If empty, posts will not expire. Expired posts will be deleted')],
+ 'advanced' => L10n::t('Advanced expiration settings'),
+ 'label' => L10n::t('Advanced Expiration'),
+ 'items' => ['expire_items', L10n::t("Expire posts:"), $expire_items, '', [L10n::t('No'), L10n::t('Yes')]],
+ 'notes' => ['expire_notes', L10n::t("Expire personal notes:"), $expire_notes, '', [L10n::t('No'), L10n::t('Yes')]],
+ 'starred' => ['expire_starred', L10n::t("Expire starred posts:"), $expire_starred, '', [L10n::t('No'), L10n::t('Yes')]],
+ 'photos' => ['expire_photos', L10n::t("Expire photos:"), $expire_photos, '', [L10n::t('No'), L10n::t('Yes')]],
+ 'network_only' => ['expire_network_only', L10n::t("Only expire posts by others:"), $expire_network_only, '', [L10n::t('No'), L10n::t('Yes')]],
];
$group_select = Group::displayGroupSelection(local_user(), $a->user['def_gid']);
@@ -1191,51 +1191,51 @@ function settings_content(App $a)
/// @TODO Fix indending (or so)
$o .= replace_macros($stpl, [
- '$ptitle' => t('Account Settings'),
+ '$ptitle' => L10n::t('Account Settings'),
- '$submit' => t('Save Settings'),
+ '$submit' => L10n::t('Save Settings'),
'$baseurl' => System::baseUrl(true),
'$uid' => local_user(),
'$form_security_token' => get_form_security_token("settings"),
'$nickname_block' => $prof_addr,
- '$h_pass' => t('Password Settings'),
- '$password1'=> ['password', t('New Password:'), '', ''],
- '$password2'=> ['confirm', t('Confirm:'), '', t('Leave password fields blank unless changing')],
- '$password3'=> ['opassword', t('Current Password:'), '', t('Your current password to confirm the changes')],
- '$password4'=> ['mpassword', t('Password:'), '', t('Your current password to confirm the changes')],
+ '$h_pass' => L10n::t('Password Settings'),
+ '$password1'=> ['password', L10n::t('New Password:'), '', ''],
+ '$password2'=> ['confirm', L10n::t('Confirm:'), '', L10n::t('Leave password fields blank unless changing')],
+ '$password3'=> ['opassword', L10n::t('Current Password:'), '', L10n::t('Your current password to confirm the changes')],
+ '$password4'=> ['mpassword', L10n::t('Password:'), '', L10n::t('Your current password to confirm the changes')],
'$oid_enable' => (!Config::get('system', 'no_openid')),
'$openid' => $openid_field,
- '$h_basic' => t('Basic Settings'),
- '$username' => ['username', t('Full Name:'), $username, ''],
- '$email' => ['email', t('Email Address:'), $email, '', '', '', 'email'],
- '$timezone' => ['timezone_select' , t('Your Timezone:'), select_timezone($timezone), ''],
- '$language' => ['language', t('Your Language:'), $language, t('Set the language we use to show you friendica interface and to send you emails'), $lang_choices],
- '$defloc' => ['defloc', t('Default Post Location:'), $defloc, ''],
- '$allowloc' => ['allow_location', t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''],
+ '$h_basic' => L10n::t('Basic Settings'),
+ '$username' => ['username', L10n::t('Full Name:'), $username, ''],
+ '$email' => ['email', L10n::t('Email Address:'), $email, '', '', '', 'email'],
+ '$timezone' => ['timezone_select' , L10n::t('Your Timezone:'), select_timezone($timezone), ''],
+ '$language' => ['language', L10n::t('Your Language:'), $language, L10n::t('Set the language we use to show you friendica interface and to send you emails'), $lang_choices],
+ '$defloc' => ['defloc', L10n::t('Default Post Location:'), $defloc, ''],
+ '$allowloc' => ['allow_location', L10n::t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''],
- '$h_prv' => t('Security and Privacy Settings'),
+ '$h_prv' => L10n::t('Security and Privacy Settings'),
- '$maxreq' => ['maxreq', t('Maximum Friend Requests/Day:'), $maxreq , t("\x28to prevent spam abuse\x29")],
- '$permissions' => t('Default Post Permissions'),
- '$permdesc' => t("\x28click to open/close\x29"),
+ '$maxreq' => ['maxreq', L10n::t('Maximum Friend Requests/Day:'), $maxreq , L10n::t("\x28to prevent spam abuse\x29")],
+ '$permissions' => L10n::t('Default Post Permissions'),
+ '$permdesc' => L10n::t("\x28click to open/close\x29"),
'$visibility' => $profile['net-publish'],
'$aclselect' => populate_acl($a->user),
'$suggestme' => $suggestme,
- '$blockwall'=> $blockwall, // array('blockwall', t('Allow friends to post to your profile page:'), !$blockwall, ''),
- '$blocktags'=> $blocktags, // array('blocktags', t('Allow friends to tag your posts:'), !$blocktags, ''),
+ '$blockwall'=> $blockwall, // array('blockwall', L10n::t('Allow friends to post to your profile page:'), !$blockwall, ''),
+ '$blocktags'=> $blocktags, // array('blocktags', L10n::t('Allow friends to tag your posts:'), !$blocktags, ''),
// ACL permissions box
- '$group_perms' => t('Show to Groups'),
- '$contact_perms' => t('Show to Contacts'),
- '$private' => t('Default Private Post'),
- '$public' => t('Default Public Post'),
+ '$group_perms' => L10n::t('Show to Groups'),
+ '$contact_perms' => L10n::t('Show to Contacts'),
+ '$private' => L10n::t('Default Private Post'),
+ '$public' => L10n::t('Default Public Post'),
'$is_private' => $private_post,
'$return_path' => $query_str,
'$public_link' => $public_post_link,
- '$settings_perms' => t('Default Permissions for New Posts'),
+ '$settings_perms' => L10n::t('Default Permissions for New Posts'),
'$group_select' => $group_select,
@@ -1247,41 +1247,41 @@ function settings_content(App $a)
'$hide_friends' => $hide_friends,
'$hide_wall' => $hide_wall,
'$unkmail' => $unkmail,
- '$cntunkmail' => ['cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail , t("\x28to prevent spam abuse\x29")],
+ '$cntunkmail' => ['cntunkmail', L10n::t('Maximum private messages per day from unknown people:'), $cntunkmail , L10n::t("\x28to prevent spam abuse\x29")],
- '$h_not' => t('Notification Settings'),
- '$activity_options' => t('By default post a status message when:'),
- '$post_newfriend' => ['post_newfriend', t('accepting a friend request'), $post_newfriend, ''],
- '$post_joingroup' => ['post_joingroup', t('joining a forum/community'), $post_joingroup, ''],
- '$post_profilechange' => ['post_profilechange', t('making an
interesting profile change'), $post_profilechange, ''],
- '$lbl_not' => t('Send a notification email when:'),
- '$notify1' => ['notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''],
- '$notify2' => ['notify2', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''],
- '$notify3' => ['notify3', t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, ''],
- '$notify4' => ['notify4', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''],
- '$notify5' => ['notify5', t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''],
- '$notify6' => ['notify6', t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, ''],
- '$notify7' => ['notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''],
- '$notify8' => ['notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''],
+ '$h_not' => L10n::t('Notification Settings'),
+ '$activity_options' => L10n::t('By default post a status message when:'),
+ '$post_newfriend' => ['post_newfriend', L10n::t('accepting a friend request'), $post_newfriend, ''],
+ '$post_joingroup' => ['post_joingroup', L10n::t('joining a forum/community'), $post_joingroup, ''],
+ '$post_profilechange' => ['post_profilechange', L10n::t('making an
interesting profile change'), $post_profilechange, ''],
+ '$lbl_not' => L10n::t('Send a notification email when:'),
+ '$notify1' => ['notify1', L10n::t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''],
+ '$notify2' => ['notify2', L10n::t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''],
+ '$notify3' => ['notify3', L10n::t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, ''],
+ '$notify4' => ['notify4', L10n::t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''],
+ '$notify5' => ['notify5', L10n::t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''],
+ '$notify6' => ['notify6', L10n::t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, ''],
+ '$notify7' => ['notify7', L10n::t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''],
+ '$notify8' => ['notify8', L10n::t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''],
- '$desktop_notifications' => ['desktop_notifications', t('Activate desktop notifications') , false, t('Show desktop popup on new notifications')],
+ '$desktop_notifications' => ['desktop_notifications', L10n::t('Activate desktop notifications') , false, L10n::t('Show desktop popup on new notifications')],
- '$email_textonly' => ['email_textonly', t('Text-only notification emails'),
+ '$email_textonly' => ['email_textonly', L10n::t('Text-only notification emails'),
PConfig::get(local_user(), 'system', 'email_textonly'),
- t('Send text only notification emails, without the html part')],
+ L10n::t('Send text only notification emails, without the html part')],
- '$detailed_notif' => ['detailed_notif', t('Show detailled notifications'),
+ '$detailed_notif' => ['detailed_notif', L10n::t('Show detailled notifications'),
PConfig::get(local_user(), 'system', 'detailed_notif'),
- t('Per default the notificiation are condensed to a single notification per item. When enabled, every notification is displayed.')],
+ L10n::t('Per default the notificiation are condensed to a single notification per item. When enabled, every notification is displayed.')],
- '$h_advn' => t('Advanced Account/Page Type Settings'),
- '$h_descadvn' => t('Change the behaviour of this account for special situations'),
+ '$h_advn' => L10n::t('Advanced Account/Page Type Settings'),
+ '$h_descadvn' => L10n::t('Change the behaviour of this account for special situations'),
'$pagetype' => $pagetype,
- '$relocate' => t('Relocate'),
- '$relocate_text' => t("If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."),
- '$relocate_button' => t("Resend relocate message to contacts"),
+ '$relocate' => L10n::t('Relocate'),
+ '$relocate_text' => L10n::t("If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."),
+ '$relocate_button' => L10n::t("Resend relocate message to contacts"),
]);
diff --git a/mod/subthread.php b/mod/subthread.php
index af7f0b492..9502b7f8d 100644
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -1,13 +1,16 @@
get_hostname(),$owner_uid);
- $post_type = (($item['resource-id']) ? t('photo') : t('status'));
+ $post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
$link = xmlify('
' . "\n") ;
$body = $item['body'];
@@ -105,7 +108,7 @@ function subthread_content(App $a) {
$body
EOT;
- $bodyverb = t('%1$s is following %2$s\'s %3$s');
+ $bodyverb = L10n::t('%1$s is following %2$s\'s %3$s');
if (! isset($bodyverb)) {
return;
diff --git a/mod/suggest.php b/mod/suggest.php
index 9708d160a..5e8dcc5fb 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -33,12 +33,12 @@ function suggest_init(App $a) {
$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
'$method' => 'get',
- '$message' => t('Do you really want to delete this suggestion?'),
+ '$message' => L10n::t('Do you really want to delete this suggestion?'),
'$extra_inputs' => $inputs,
- '$confirm' => t('Yes'),
+ '$confirm' => L10n::t('Yes'),
'$confirm_url' => $query['base'],
'$confirm_name' => 'confirmed',
- '$cancel' => t('Cancel'),
+ '$cancel' => L10n::t('Cancel'),
]);
$a->error = 1; // Set $a->error so the other module functions don't execute
return;
@@ -70,7 +70,7 @@ function suggest_content(App $a) {
$r = GContact::suggestionQuery(local_user());
if (! DBM::is_result($r)) {
- $o .= t('No suggestions available. If this is a new site, please try again in 24 hours.');
+ $o .= L10n::t('No suggestions available. If this is a new site, please try again in 24 hours.');
return $o;
}
@@ -79,9 +79,9 @@ function suggest_content(App $a) {
$connlnk = System::baseUrl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
$ignlnk = System::baseUrl() . '/suggest?ignore=' . $rr['id'];
$photo_menu = [
- 'profile' => [t("View Profile"), Profile::zrl($rr["url"])],
- 'follow' => [t("Connect/Follow"), $connlnk],
- 'hide' => [t('Ignore/Hide'), $ignlnk]
+ 'profile' => [L10n::t("View Profile"), Profile::zrl($rr["url"])],
+ 'follow' => [L10n::t("Connect/Follow"), $connlnk],
+ 'hide' => [L10n::t('Ignore/Hide'), $ignlnk]
];
$contact_details = Contact::getDetailsByURL($rr["url"], local_user(), $rr);
@@ -98,10 +98,10 @@ function suggest_content(App $a) {
'account_type' => Contact::getAccountType($contact_details),
'ignlnk' => $ignlnk,
'ignid' => $rr['id'],
- 'conntxt' => t('Connect'),
+ 'conntxt' => L10n::t('Connect'),
'connlnk' => $connlnk,
'photo_menu' => $photo_menu,
- 'ignore' => t('Ignore/Hide'),
+ 'ignore' => L10n::t('Ignore/Hide'),
'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
'id' => ++$id,
];
@@ -111,7 +111,7 @@ function suggest_content(App $a) {
$tpl = get_markup_template('viewcontact_template.tpl');
$o .= replace_macros($tpl,[
- '$title' => t('Friend Suggestions'),
+ '$title' => L10n::t('Friend Suggestions'),
'$contacts' => $entries,
]);
diff --git a/mod/tagger.php b/mod/tagger.php
index 74cbd658f..942cad2ad 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -1,14 +1,17 @@
get_hostname(),$owner_uid);
$xterm = xmlify($term);
- $post_type = (($item['resource-id']) ? t('photo') : t('status'));
+ $post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
$targettype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
$link = xmlify('
' . t('Select a tag to remove: ') . '';
+ $o .= '
' . L10n::t('Select a tag to remove: ') . '
';
$o .= '
';
return $o;
diff --git a/mod/uexport.php b/mod/uexport.php
index 29ea19c20..c6f76cfce 100644
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -1,7 +1,10 @@
System::baseUrl(),
- '$title' => t('Export personal data'),
+ '$title' => L10n::t('Export personal data'),
'$options' => $options
]);
}
diff --git a/mod/uimport.php b/mod/uimport.php
index 14e56c30c..a1b0e4d14 100644
--- a/mod/uimport.php
+++ b/mod/uimport.php
@@ -9,7 +9,8 @@ use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\UserImport;
-function uimport_post(App $a) {
+function uimport_post(App $a)
+{
switch ($a->config['register_policy']) {
case REGISTER_OPEN:
$blocked = 0;
@@ -66,13 +67,13 @@ function uimport_content(App $a) {
$tpl = get_markup_template("uimport.tpl");
return replace_macros($tpl, [
- '$regbutt' => t('Import'),
+ '$regbutt' => L10n::t('Import'),
'$import' => [
- 'title' => t("Move account"),
- 'intro' => t("You can import an account from another Friendica server."),
- 'instruct' => t("You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."),
- 'warn' => t("This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"),
- 'field' => ['accountfile', t('Account file'), '
', t('To export your account, go to "Settings->Export your personal data" and select "Export account"')],
+ 'title' => L10n::t("Move account"),
+ 'intro' => L10n::t("You can import an account from another Friendica server."),
+ 'instruct' => L10n::t("You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."),
+ 'warn' => L10n::t("This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"),
+ 'field' => ['accountfile', L10n::t('Account file'), '
', L10n::t('To export your account, go to "Settings->Export your personal data" and select "Export account"')],
],
]);
}
diff --git a/mod/unfollow.php b/mod/unfollow.php
index c621b3281..8caf94245 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -38,21 +38,21 @@ function unfollow_post(App $a)
WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
intval($uid)
);
- if (DBM::is_result($r)) {
+ if (DBM::is_result($r)) {
Contact::terminateFriendship($r[0], $contact);
}
}
dba::update('contact', ['rel' => CONTACT_IS_FOLLOWER], ['id' => $contact['id']]);
- info(t('Contact unfollowed').EOL);
+ info(L10n::t('Contact unfollowed').EOL);
goaway(System::baseUrl().'/contacts/'.$contact['id']);
}
goaway($return_url);
// NOTREACHED
}
-function unfollow_content(App $a) {
-
+function unfollow_content(App $a)
+{
if (! local_user()) {
notice(L10n::t('Permission denied.') . EOL);
goaway($_SESSION['return_url']);
@@ -62,7 +62,7 @@ function unfollow_content(App $a) {
$uid = local_user();
$url = notags(trim($_REQUEST['url']));
- $submit = t('Submit Request');
+ $submit = L10n::t('Submit Request');
$condition = ["`uid` = ? AND `rel` = ? AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
local_user(), CONTACT_IS_FRIEND, normalise_link($url),
@@ -97,9 +97,9 @@ function unfollow_content(App $a) {
// Makes the connection request for friendica contacts easier
$_SESSION["fastlane"] = $contact["url"];
- $header = t("Disconnect/Unfollow");
+ $header = L10n::t("Disconnect/Unfollow");
- $o = replace_macros($tpl,[
+ $o = replace_macros($tpl, [
'$header' => htmlentities($header),
'$desc' => "",
'$pls_answer' => "",
@@ -110,16 +110,16 @@ function unfollow_content(App $a) {
'$statusnet' => "",
'$diaspora' => "",
'$diasnote' => "",
- '$your_address' => t('Your Identity Address:'),
+ '$your_address' => L10n::t('Your Identity Address:'),
'$invite_desc' => "",
'$emailnet' => "",
'$submit' => $submit,
- '$cancel' => t('Cancel'),
+ '$cancel' => L10n::t('Cancel'),
'$nickname' => "",
'$name' => $contact["name"],
'$url' => $contact["url"],
'$zrl' => Profile::zrl($contact["url"]),
- '$url_label' => t("Profile URL"),
+ '$url_label' => L10n::t("Profile URL"),
'$myaddr' => $myaddr,
'$request' => $request,
'$keywords' => "",
@@ -129,7 +129,7 @@ function unfollow_content(App $a) {
$a->page['aside'] = "";
Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
- $o .= replace_macros(get_markup_template('section_title.tpl'), ['$title' => t('Status Messages and Posts')]);
+ $o .= replace_macros(get_markup_template('section_title.tpl'), ['$title' => L10n::t('Status Messages and Posts')]);
// Show last public posts
$o .= Contact::getPostsFromUrl($contact["url"]);
diff --git a/mod/videos.php b/mod/videos.php
index 3287e091f..ac7d0f34e 100644
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -72,7 +72,7 @@ function videos_init(App $a) {
if($albums_visible) {
$o .= '';
@@ -134,15 +134,15 @@ function videos_post(App $a) {
$drop_url = $a->query_string;
$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
'$method' => 'post',
- '$message' => t('Do you really want to delete this video?'),
+ '$message' => L10n::t('Do you really want to delete this video?'),
'$extra_inputs' => [
['name'=>'id', 'value'=> $_POST['id']],
['name'=>'delete', 'value'=>'x']
],
- '$confirm' => t('Delete Video'),
+ '$confirm' => L10n::t('Delete Video'),
'$confirm_url' => $drop_url,
'$confirm_name' => 'confirm', // Needed so that confirmation will bring us back into this if statement
- '$cancel' => t('Cancel'),
+ '$cancel' => L10n::t('Cancel'),
]);
$a->error = 1; // Set $a->error so the other module functions don't execute
@@ -391,14 +391,14 @@ function videos_content(App $a) {
$videos[] = [
'id' => $rr['id'],
'link' => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['resource-id'],
- 'title' => t('View Video'),
+ 'title' => L10n::t('View Video'),
'src' => System::baseUrl() . '/attach/' . $rr['id'] . '?attachment=0',
'alt' => $alt_e,
'mime' => $rr['filetype'],
'album' => [
'link' => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
'name' => $name_e,
- 'alt' => t('View Album'),
+ 'alt' => L10n::t('View Album'),
],
];
@@ -407,9 +407,9 @@ function videos_content(App $a) {
$tpl = get_markup_template('videos_recent.tpl');
$o .= replace_macros($tpl, [
- '$title' => t('Recent Videos'),
+ '$title' => L10n::t('Recent Videos'),
'$can_post' => $can_post,
- '$upload' => [t('Upload New Videos'), System::baseUrl().'/videos/'.$a->data['user']['nickname'].'/upload'],
+ '$upload' => [L10n::t('Upload New Videos'), System::baseUrl().'/videos/'.$a->data['user']['nickname'].'/upload'],
'$videos' => $videos,
'$delete_url' => (($can_post)?System::baseUrl().'/videos/'.$a->data['user']['nickname']:False)
]);
diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index c48df2961..3b81171d7 100644
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -11,15 +11,15 @@ use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\Profile;
-function viewcontacts_init(App $a) {
-
- if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
+function viewcontacts_init(App $a)
+{
+ if ((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) {
return;
}
Nav::setSelected('home');
- if($a->argc > 1) {
+ if ($a->argc > 1) {
$nick = $a->argv[1];
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
dbesc($nick)
@@ -37,11 +37,11 @@ function viewcontacts_init(App $a) {
}
}
-
-function viewcontacts_content(App $a) {
+function viewcontacts_content(App $a)
+{
require_once("mod/proxy.php");
- if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
+ if ((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) {
notice(L10n::t('Public access denied.') . EOL);
return;
}
@@ -51,7 +51,7 @@ function viewcontacts_content(App $a) {
// tabs
$o .= Profile::getTabs($a, $is_owner, $a->data['user']['nickname']);
- if(((! count($a->profile)) || ($a->profile['hide-friends']))) {
+ if (((! count($a->profile)) || ($a->profile['hide-friends']))) {
notice(L10n::t('Permission denied.') . EOL);
return $o;
}
@@ -65,8 +65,9 @@ function viewcontacts_content(App $a) {
dbesc(NETWORK_DIASPORA),
dbesc(NETWORK_OSTATUS)
);
- if (DBM::is_result($r))
+ if (DBM::is_result($r)) {
$a->set_pager_total($r[0]['total']);
+ }
$r = q("SELECT * FROM `contact`
WHERE `uid` = %d AND NOT `blocked` AND NOT `pending`
@@ -81,7 +82,7 @@ function viewcontacts_content(App $a) {
intval($a->pager['itemspage'])
);
if (!DBM::is_result($r)) {
- info(t('No contacts.').EOL);
+ info(L10n::t('No contacts.').EOL);
return $o;
}
@@ -99,19 +100,20 @@ function viewcontacts_content(App $a) {
$is_owner = ((local_user() && ($a->profile['profile_uid'] == local_user())) ? true : false);
- if($is_owner && ($rr['network'] === NETWORK_DFRN) && ($rr['rel']))
+ if ($is_owner && ($rr['network'] === NETWORK_DFRN) && ($rr['rel'])) {
$url = 'redir/' . $rr['id'];
- else
+ } else {
$url = Profile::zrl($url);
+ }
$contact_details = Contact::getDetailsByURL($rr['url'], $a->profile['uid'], $rr);
$contacts[] = [
'id' => $rr['id'],
- 'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $contact_details['name'], $rr['url']),
+ 'img_hover' => sprintf(L10n::t('Visit %s\'s profile [%s]'), $contact_details['name'], $rr['url']),
'photo_menu' => Contact::photoMenu($rr),
'thumb' => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
- 'name' => htmlentities(substr($contact_details['name'],0,20)),
+ 'name' => htmlentities(substr($contact_details['name'], 0, 20)),
'username' => htmlentities($contact_details['name']),
'details' => $contact_details['location'],
'tags' => $contact_details['keywords'],
@@ -127,7 +129,7 @@ function viewcontacts_content(App $a) {
$tpl = get_markup_template("viewcontact_template.tpl");
$o .= replace_macros($tpl, [
- '$title' => t('Contacts'),
+ '$title' => L10n::t('Contacts'),
'$contacts' => $contacts,
'$paginate' => paginate($a),
]);
diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 6d7a18fe0..8116bbcf4 100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -21,7 +21,7 @@ function wall_attach_post(App $a) {
);
if (! DBM::is_result($r)) {
if ($r_json) {
- echo json_encode(['error'=>t('Invalid request.')]);
+ echo json_encode(['error'=>L10n::t('Invalid request.')]);
killme();
}
return;
@@ -29,7 +29,7 @@ function wall_attach_post(App $a) {
} else {
if ($r_json) {
- echo json_encode(['error'=>t('Invalid request.')]);
+ echo json_encode(['error'=>L10n::t('Invalid request.')]);
killme();
}
return;
@@ -71,7 +71,7 @@ function wall_attach_post(App $a) {
}
if(! $can_post) {
if ($r_json) {
- echo json_encode(['error'=>t('Permission denied.')]);
+ echo json_encode(['error'=>L10n::t('Permission denied.')]);
killme();
}
notice(L10n::t('Permission denied.') . EOL );
@@ -80,7 +80,7 @@ function wall_attach_post(App $a) {
if(! x($_FILES,'userfile')) {
if ($r_json) {
- echo json_encode(['error'=>t('Invalid request.')]);
+ echo json_encode(['error'=>L10n::t('Invalid request.')]);
}
killme();
}
@@ -98,7 +98,7 @@ function wall_attach_post(App $a) {
*/
if($filesize <=0) {
- $msg = t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(t('Or - did you try to upload an empty file?'));
+ $msg = L10n::t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(L10n::t('Or - did you try to upload an empty file?'));
if ($r_json) {
echo json_encode(['error'=>$msg]);
} else {
@@ -109,7 +109,7 @@ function wall_attach_post(App $a) {
}
if(($maxfilesize) && ($filesize > $maxfilesize)) {
- $msg = sprintf(t('File exceeds size limit of %s'), formatBytes($maxfilesize));
+ $msg = sprintf(L10n::t('File exceeds size limit of %s'), formatBytes($maxfilesize));
if ($r_json) {
echo json_encode(['error'=>$msg]);
} else {
@@ -133,7 +133,7 @@ function wall_attach_post(App $a) {
@unlink($src);
if(! $r) {
- $msg = t('File upload failed.');
+ $msg = L10n::t('File upload failed.');
if ($r_json) {
echo json_encode(['error'=>$msg]);
} else {
@@ -149,7 +149,7 @@ function wall_attach_post(App $a) {
);
if (! DBM::is_result($r)) {
- $msg = t('File upload failed.');
+ $msg = L10n::t('File upload failed.');
if ($r_json) {
echo json_encode(['error'=>$msg]);
} else {
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 7660ba205..17c481888 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -35,7 +35,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
if (! DBM::is_result($r)) {
if ($r_json) {
- echo json_encode(['error'=>t('Invalid request.')]);
+ echo json_encode(['error'=>L10n::t('Invalid request.')]);
killme();
}
return;
@@ -51,7 +51,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
}
} else {
if ($r_json) {
- echo json_encode(['error'=>t('Invalid request.')]);
+ echo json_encode(['error'=>L10n::t('Invalid request.')]);
killme();
}
return;
@@ -100,7 +100,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
if (! $can_post) {
if ($r_json) {
- echo json_encode(['error'=>t('Permission denied.')]);
+ echo json_encode(['error'=>L10n::t('Permission denied.')]);
killme();
}
notice(L10n::t('Permission denied.') . EOL);
@@ -109,7 +109,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
if (! x($_FILES, 'userfile') && ! x($_FILES, 'media')) {
if ($r_json) {
- echo json_encode(['error'=>t('Invalid request.')]);
+ echo json_encode(['error'=>L10n::t('Invalid request.')]);
}
killme();
}
@@ -149,7 +149,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
if ($src=="") {
if ($r_json) {
- echo json_encode(['error'=>t('Invalid request.')]);
+ echo json_encode(['error'=>L10n::t('Invalid request.')]);
killme();
}
notice(L10n::t('Invalid request.').EOL);
@@ -180,7 +180,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
$maximagesize = Config::get('system', 'maximagesize');
if (($maximagesize) && ($filesize > $maximagesize)) {
- $msg = sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize));
+ $msg = sprintf(L10n::t('Image exceeds size limit of %s'), formatBytes($maximagesize));
if ($r_json) {
echo json_encode(['error'=>$msg]);
} else {
@@ -194,7 +194,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
$Image = new Image($imagedata, $filetype);
if (! $Image->isValid()) {
- $msg = t('Unable to process image.');
+ $msg = L10n::t('Unable to process image.');
if ($r_json) {
echo json_encode(['error'=>$msg]);
} else {
@@ -225,7 +225,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
// If we don't have an album name use the Wall Photos album
if (! strlen($album)) {
- $album = t('Wall Photos');
+ $album = L10n::t('Wall Photos');
}
$defperm = '<' . $default_cid . '>';
@@ -233,7 +233,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
$r = Photo::store($Image, $page_owner_uid, $visitor, $hash, $filename, $album, 0, 0, $defperm);
if (! $r) {
- $msg = t('Image upload failed.');
+ $msg = L10n::t('Image upload failed.');
if ($r_json) {
echo json_encode(['error'=>$msg]);
} else {
diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index 9c09ac437..cbebdb779 100644
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -12,7 +12,7 @@ use Friendica\Model\Profile;
function wallmessage_post(App $a) {
$replyto = Profile::getMyURL();
- if(! $replyto) {
+ if (!$replyto) {
notice(L10n::t('Permission denied.') . EOL);
return;
}
@@ -21,7 +21,7 @@ function wallmessage_post(App $a) {
$body = ((x($_REQUEST,'body')) ? escape_tags(trim($_REQUEST['body'])) : '');
$recipient = (($a->argc > 1) ? notags($a->argv[1]) : '');
- if((! $recipient) || (! $body)) {
+ if ((! $recipient) || (! $body)) {
return;
}
@@ -36,7 +36,7 @@ function wallmessage_post(App $a) {
$user = $r[0];
- if(! intval($user['unkmail'])) {
+ if (! intval($user['unkmail'])) {
notice(L10n::t('Permission denied.') . EOL);
return;
}
@@ -45,32 +45,31 @@ function wallmessage_post(App $a) {
intval($user['uid'])
);
- if($r[0]['total'] > $user['cntunkmail']) {
- notice( sprintf( t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])));
+ if ($r[0]['total'] > $user['cntunkmail']) {
+ notice(sprintf(L10n::t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])));
return;
}
$ret = Mail::sendWall($user, $body, $subject, $replyto);
- switch($ret){
+ switch ($ret) {
case -1:
- notice(L10n::t('No recipient selected.') . EOL );
+ notice(L10n::t('No recipient selected.') . EOL);
break;
case -2:
- notice(L10n::t('Unable to check your home location.') . EOL );
+ notice(L10n::t('Unable to check your home location.') . EOL);
break;
case -3:
- notice(L10n::t('Message could not be sent.') . EOL );
+ notice(L10n::t('Message could not be sent.') . EOL);
break;
case -4:
- notice(L10n::t('Message collection failure.') . EOL );
+ notice(L10n::t('Message collection failure.') . EOL);
break;
default:
- info(L10n::t('Message sent.') . EOL );
+ info(L10n::t('Message sent.') . EOL);
}
goaway('profile/'.$user['nickname']);
-
}
@@ -83,7 +82,7 @@ function wallmessage_content(App $a) {
$recipient = (($a->argc > 1) ? $a->argv[1] : '');
- if(! $recipient) {
+ if (!$recipient) {
notice(L10n::t('No recipient.') . EOL);
return;
}
@@ -100,7 +99,7 @@ function wallmessage_content(App $a) {
$user = $r[0];
- if(! intval($user['unkmail'])) {
+ if (!intval($user['unkmail'])) {
notice(L10n::t('Permission denied.') . EOL);
return;
}
@@ -109,8 +108,8 @@ function wallmessage_content(App $a) {
intval($user['uid'])
);
- if($r[0]['total'] > $user['cntunkmail']) {
- notice( sprintf( t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])));
+ if ($r[0]['total'] > $user['cntunkmail']) {
+ notice(sprintf(L10n::t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])));
return;
}
@@ -118,33 +117,33 @@ function wallmessage_content(App $a) {
$a->page['htmlhead'] .= replace_macros($tpl, [
'$baseurl' => System::baseUrl(true),
'$nickname' => $user['nickname'],
- '$linkurl' => t('Please enter a link URL:')
+ '$linkurl' => L10n::t('Please enter a link URL:')
]);
$tpl = get_markup_template('wallmsg-end.tpl');
$a->page['end'] .= replace_macros($tpl, [
'$baseurl' => System::baseUrl(true),
'$nickname' => $user['nickname'],
- '$linkurl' => t('Please enter a link URL:')
+ '$linkurl' => L10n::t('Please enter a link URL:')
]);
$tpl = get_markup_template('wallmessage.tpl');
- $o .= replace_macros($tpl,[
- '$header' => t('Send Private Message'),
- '$subheader' => sprintf( t('If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders.'), $user['username']),
- '$to' => t('To:'),
- '$subject' => t('Subject:'),
+ $o .= replace_macros($tpl, [
+ '$header' => L10n::t('Send Private Message'),
+ '$subheader' => sprintf(L10n::t('If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders.'), $user['username']),
+ '$to' => L10n::t('To:'),
+ '$subject' => L10n::t('Subject:'),
'$recipname' => $user['username'],
'$nickname' => $user['nickname'],
- '$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
- '$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
+ '$subjtxt' => ((x($_REQUEST, 'subject')) ? strip_tags($_REQUEST['subject']) : ''),
+ '$text' => ((x($_REQUEST, 'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
'$readonly' => '',
- '$yourmessage' => t('Your message:'),
+ '$yourmessage' => L10n::t('Your message:'),
'$select' => $select,
'$parent' => '',
- '$upload' => t('Upload photo'),
- '$insert' => t('Insert web link'),
- '$wait' => t('Please wait')
+ '$upload' => L10n::t('Upload photo'),
+ '$insert' => L10n::t('Insert web link'),
+ '$wait' => L10n::t('Please wait')
]);
return $o;
diff --git a/mod/webfinger.php b/mod/webfinger.php
index 85d3b3120..3e205ec03 100644
--- a/mod/webfinger.php
+++ b/mod/webfinger.php
@@ -1,14 +1,21 @@
t("Public access denied."),
- "description" => t("Only logged in users are permitted to perform a probing.")]);
+ http_status_exit(
+ 403,
+ [
+ "title" => L10n::t("Public access denied."),
+ "description" => L10n::t("Only logged in users are permitted to perform a probing.")
+ ]
+ );
killme();
}
@@ -20,11 +27,11 @@ function webfinger_content(App $a) {
$o .= '
';
- if(x($_GET,'addr')) {
+ if (x($_GET, 'addr')) {
$addr = trim($_GET['addr']);
$res = Probe::lrdd($addr);
$o .= '
';
- $o .= str_replace("\n",' ';
}
return $o;