mirror of
https://github.com/friendica/friendica
synced 2024-10-14 00:14:33 +02:00
Move L10n::t() calls to DI::l10n()->t() calls
This commit is contained in:
parent
af88c2daa3
commit
5dfee31108
|
|
@ -39,7 +39,7 @@ They are initialized with an array of data, depending on the tyle of the field.
|
|||
|
||||
All of these take an array holding the values, e.g. for a one line text input field, which is required and should be used to type email addesses use something along the lines of:
|
||||
|
||||
'$adminmail' => array('adminmail', L10n::t('Site administrator email address'), $adminmail, L10n::t('Your account email address must match this in order to use the web admin panel.'), 'required', '', 'email'),
|
||||
'$adminmail' => array('adminmail', DI::l10n()->t('Site administrator email address'), $adminmail, DI::l10n()->t('Your account email address must match this in order to use the web admin panel.'), 'required', '', 'email'),
|
||||
|
||||
To evaluate the input value, you can then use the $_POST array, more precisely the $_POST['adminemail'] variable.
|
||||
|
||||
|
|
|
|||
|
|
@ -108,17 +108,17 @@ The _post functions handle the processing of the send form, in this case they sa
|
|||
To make your own variation appear in the menu, all you need to do is to create a new CSS file in the deriv directoy and include it in the array in the config.php:
|
||||
|
||||
$colorset = array(
|
||||
'default'=>L10n::t('default'),
|
||||
'greenzero'=>L10n::t('greenzero'),
|
||||
'purplezero'=>L10n::t('purplezero'),
|
||||
'easterbunny'=>L10n::t('easterbunny'),
|
||||
'darkzero'=>L10n::t('darkzero'),
|
||||
'comix'=>L10n::t('comix'),
|
||||
'slackr'=>L10n::t('slackr'),
|
||||
'default'=>DI::l10n()->t('default'),
|
||||
'greenzero'=>DI::l10n()->t('greenzero'),
|
||||
'purplezero'=>DI::l10n()->t('purplezero'),
|
||||
'easterbunny'=>DI::l10n()->t('easterbunny'),
|
||||
'darkzero'=>DI::l10n()->t('darkzero'),
|
||||
'comix'=>DI::l10n()->t('comix'),
|
||||
'slackr'=>DI::l10n()->t('slackr'),
|
||||
);
|
||||
|
||||
the 1st part of the line is the name of the CSS file (without the .css) the 2nd part is the common name of the variant.
|
||||
Calling the L10n::t() function with the common name makes the string translateable.
|
||||
Calling the DI::l10n()->t() function with the common name makes the string translateable.
|
||||
The selected 1st part will be saved in the database by the theme_post function.
|
||||
|
||||
function theme_post(App $a){
|
||||
|
|
|
|||
|
|
@ -73,8 +73,8 @@ Then run `bin/console po2php view/lang/<language>/messages.po` to update the rel
|
|||
|
||||
### Basic usage
|
||||
|
||||
- `Friendica\Core\L10n::t('Label')` => `Label`
|
||||
- `Friendica\Core\L10n::t('Label %s', 'test')` => `Label test`
|
||||
- `Friendica\Core\DI::l10n()->t('Label')` => `Label`
|
||||
- `Friendica\Core\DI::l10n()->t('Label %s', 'test')` => `Label test`
|
||||
|
||||
### Plural
|
||||
|
||||
|
|
|
|||
|
|
@ -1106,7 +1106,7 @@ function api_statuses_update($type)
|
|||
|
||||
if ($posts_day > $throttle_day) {
|
||||
Logger::log('Daily posting limit reached for user '.api_user(), Logger::DEBUG);
|
||||
// die(api_error($type, L10n::t("Daily posting limit of %d posts reached. The post was rejected.", $throttle_day));
|
||||
// die(api_error($type, DI::l10n()->t("Daily posting limit of %d posts reached. The post was rejected.", $throttle_day));
|
||||
throw new TooManyRequestsException(L10n::tt("Daily posting limit of %d post reached. The post was rejected.", "Daily posting limit of %d posts reached. The post was rejected.", $throttle_day));
|
||||
}
|
||||
}
|
||||
|
|
@ -1120,7 +1120,7 @@ function api_statuses_update($type)
|
|||
|
||||
if ($posts_week > $throttle_week) {
|
||||
Logger::log('Weekly posting limit reached for user '.api_user(), Logger::DEBUG);
|
||||
// die(api_error($type, L10n::t("Weekly posting limit of %d posts reached. The post was rejected.", $throttle_week)));
|
||||
// die(api_error($type, DI::l10n()->t("Weekly posting limit of %d posts reached. The post was rejected.", $throttle_week)));
|
||||
throw new TooManyRequestsException(L10n::tt("Weekly posting limit of %d post reached. The post was rejected.", "Weekly posting limit of %d posts reached. The post was rejected.", $throttle_week));
|
||||
}
|
||||
}
|
||||
|
|
@ -1134,8 +1134,8 @@ function api_statuses_update($type)
|
|||
|
||||
if ($posts_month > $throttle_month) {
|
||||
Logger::log('Monthly posting limit reached for user '.api_user(), Logger::DEBUG);
|
||||
// die(api_error($type, L10n::t("Monthly posting limit of %d posts reached. The post was rejected.", $throttle_month));
|
||||
throw new TooManyRequestsException(L10n::t("Monthly posting limit of %d post reached. The post was rejected.", "Monthly posting limit of %d posts reached. The post was rejected.", $throttle_month));
|
||||
// die(api_error($type, DI::l10n()->t("Monthly posting limit of %d posts reached. The post was rejected.", $throttle_month));
|
||||
throw new TooManyRequestsException(DI::l10n()->t("Monthly posting limit of %d post reached. The post was rejected.", "Monthly posting limit of %d posts reached. The post was rejected.", $throttle_month));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -4598,7 +4598,7 @@ function api_account_update_profile_image($type)
|
|||
$media = $_FILES['media'];
|
||||
}
|
||||
// save new profile image
|
||||
$data = save_media_to_database("profileimage", $media, $type, L10n::t('Profile Photos'), "", "", "", "", "", $is_default_profile);
|
||||
$data = save_media_to_database("profileimage", $media, $type, DI::l10n()->t('Profile Photos'), "", "", "", "", "", $is_default_profile);
|
||||
|
||||
// get filetype
|
||||
if (is_array($media['type'])) {
|
||||
|
|
|
|||
|
|
@ -160,20 +160,20 @@ function localize_item(&$item)
|
|||
case Activity::POST:
|
||||
switch ($obj['object-type']) {
|
||||
case Activity\ObjectType::EVENT:
|
||||
$post_type = L10n::t('event');
|
||||
$post_type = DI::l10n()->t('event');
|
||||
break;
|
||||
default:
|
||||
$post_type = L10n::t('status');
|
||||
$post_type = DI::l10n()->t('status');
|
||||
}
|
||||
break;
|
||||
default:
|
||||
if ($obj['resource-id']) {
|
||||
$post_type = L10n::t('photo');
|
||||
$post_type = DI::l10n()->t('photo');
|
||||
$m = [];
|
||||
preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
|
||||
$rr['plink'] = $m[1];
|
||||
} else {
|
||||
$post_type = L10n::t('status');
|
||||
$post_type = DI::l10n()->t('status');
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -181,15 +181,15 @@ function localize_item(&$item)
|
|||
|
||||
$bodyverb = '';
|
||||
if ($activity->match($item['verb'], Activity::LIKE)) {
|
||||
$bodyverb = L10n::t('%1$s likes %2$s\'s %3$s');
|
||||
$bodyverb = DI::l10n()->t('%1$s likes %2$s\'s %3$s');
|
||||
} elseif ($activity->match($item['verb'], Activity::DISLIKE)) {
|
||||
$bodyverb = L10n::t('%1$s doesn\'t like %2$s\'s %3$s');
|
||||
$bodyverb = DI::l10n()->t('%1$s doesn\'t like %2$s\'s %3$s');
|
||||
} elseif ($activity->match($item['verb'], Activity::ATTEND)) {
|
||||
$bodyverb = L10n::t('%1$s attends %2$s\'s %3$s');
|
||||
$bodyverb = DI::l10n()->t('%1$s attends %2$s\'s %3$s');
|
||||
} elseif ($activity->match($item['verb'], Activity::ATTENDNO)) {
|
||||
$bodyverb = L10n::t('%1$s doesn\'t attend %2$s\'s %3$s');
|
||||
$bodyverb = DI::l10n()->t('%1$s doesn\'t attend %2$s\'s %3$s');
|
||||
} elseif ($activity->match($item['verb'], Activity::ATTENDMAYBE)) {
|
||||
$bodyverb = L10n::t('%1$s attends maybe %2$s\'s %3$s');
|
||||
$bodyverb = DI::l10n()->t('%1$s attends maybe %2$s\'s %3$s');
|
||||
}
|
||||
|
||||
$item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
|
||||
|
|
@ -224,7 +224,7 @@ function localize_item(&$item)
|
|||
$Bphoto = '[url=' . Contact::magicLink($Blink) . '][img]' . $Bphoto . '[/img][/url]';
|
||||
}
|
||||
|
||||
$item['body'] = L10n::t('%1$s is now friends with %2$s', $A, $B)."\n\n\n".$Bphoto;
|
||||
$item['body'] = DI::l10n()->t('%1$s is now friends with %2$s', $A, $B)."\n\n\n".$Bphoto;
|
||||
|
||||
}
|
||||
if (stristr($item['verb'], Activity::POKE)) {
|
||||
|
|
@ -265,11 +265,11 @@ function localize_item(&$item)
|
|||
* we can't have a translation string with three positions but no distinguishable text
|
||||
* So here is the translate string.
|
||||
*/
|
||||
$txt = L10n::t('%1$s poked %2$s');
|
||||
$txt = DI::l10n()->t('%1$s poked %2$s');
|
||||
|
||||
// now translate the verb
|
||||
$poked_t = trim(sprintf($txt, "", ""));
|
||||
$txt = str_replace($poked_t, L10n::t($verb), $txt);
|
||||
$txt = str_replace($poked_t, DI::l10n()->t($verb), $txt);
|
||||
|
||||
// then do the sprintf on the translation string
|
||||
|
||||
|
|
@ -297,19 +297,19 @@ function localize_item(&$item)
|
|||
case Activity::POST:
|
||||
switch ($obj['object-type']) {
|
||||
case Activity\ObjectType::EVENT:
|
||||
$post_type = L10n::t('event');
|
||||
$post_type = DI::l10n()->t('event');
|
||||
break;
|
||||
default:
|
||||
$post_type = L10n::t('status');
|
||||
$post_type = DI::l10n()->t('status');
|
||||
}
|
||||
break;
|
||||
default:
|
||||
if ($obj['resource-id']) {
|
||||
$post_type = L10n::t('photo');
|
||||
$post_type = DI::l10n()->t('photo');
|
||||
$m=[]; preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
|
||||
$rr['plink'] = $m[1];
|
||||
} else {
|
||||
$post_type = L10n::t('status');
|
||||
$post_type = DI::l10n()->t('status');
|
||||
}
|
||||
// Let's break everthing ... ;-)
|
||||
break;
|
||||
|
|
@ -319,7 +319,7 @@ function localize_item(&$item)
|
|||
$parsedobj = XML::parseString($xmlhead.$item['object']);
|
||||
|
||||
$tag = sprintf('#[url=%s]%s[/url]', $parsedobj->id, $parsedobj->content);
|
||||
$item['body'] = L10n::t('%1$s tagged %2$s\'s %3$s with %4$s', $author, $objauthor, $plink, $tag);
|
||||
$item['body'] = DI::l10n()->t('%1$s tagged %2$s\'s %3$s with %4$s', $author, $objauthor, $plink, $tag);
|
||||
}
|
||||
|
||||
if ($activity->match($item['verb'], Activity::FAVORITE)) {
|
||||
|
|
@ -341,8 +341,8 @@ function localize_item(&$item)
|
|||
$Blink = $target['author-link'];
|
||||
$A = '[url=' . Contact::magicLink($Alink) . ']' . $Aname . '[/url]';
|
||||
$B = '[url=' . Contact::magicLink($Blink) . ']' . $Bname . '[/url]';
|
||||
$P = '[url=' . $target['plink'] . ']' . L10n::t('post/item') . '[/url]';
|
||||
$item['body'] = L10n::t('%1$s marked %2$s\'s %3$s as favorite', $A, $B, $P)."\n";
|
||||
$P = '[url=' . $target['plink'] . ']' . DI::l10n()->t('post/item') . '[/url]';
|
||||
$item['body'] = DI::l10n()->t('%1$s marked %2$s\'s %3$s as favorite', $A, $B, $P)."\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -566,12 +566,12 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
|
|||
$items = $cb['items'];
|
||||
|
||||
$conv_responses = [
|
||||
'like' => ['title' => L10n::t('Likes','title')],
|
||||
'dislike' => ['title' => L10n::t('Dislikes','title')],
|
||||
'attendyes' => ['title' => L10n::t('Attending','title')],
|
||||
'attendno' => ['title' => L10n::t('Not attending','title')],
|
||||
'attendmaybe' => ['title' => L10n::t('Might attend','title')],
|
||||
'announce' => ['title' => L10n::t('Reshares','title')]
|
||||
'like' => ['title' => DI::l10n()->t('Likes','title')],
|
||||
'dislike' => ['title' => DI::l10n()->t('Dislikes','title')],
|
||||
'attendyes' => ['title' => DI::l10n()->t('Attending','title')],
|
||||
'attendno' => ['title' => DI::l10n()->t('Not attending','title')],
|
||||
'attendmaybe' => ['title' => DI::l10n()->t('Might attend','title')],
|
||||
'announce' => ['title' => DI::l10n()->t('Reshares','title')]
|
||||
];
|
||||
|
||||
// array with html for each thread (parent+comments)
|
||||
|
|
@ -651,8 +651,8 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
|
|||
$drop = [
|
||||
'dropping' => $dropping,
|
||||
'pagedrop' => $page_dropping,
|
||||
'select' => L10n::t('Select'),
|
||||
'delete' => L10n::t('Delete'),
|
||||
'select' => DI::l10n()->t('Select'),
|
||||
'delete' => DI::l10n()->t('Delete'),
|
||||
];
|
||||
|
||||
$star = false;
|
||||
|
|
@ -678,7 +678,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
|
|||
'network' => $item['network'],
|
||||
'network_name' => ContactSelector::networkToName($item['author-network'], $item['author-link'], $item['network']),
|
||||
'network_icon' => ContactSelector::networkToIcon($item['network'], $item['author-link']),
|
||||
'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, $item['author-link']),
|
||||
'linktitle' => DI::l10n()->t('View %s\'s profile @ %s', $profile_name, $item['author-link']),
|
||||
'profile_url' => $profile_link,
|
||||
'item_photo_menu' => item_photo_menu($item),
|
||||
'name' => $profile_name,
|
||||
|
|
@ -691,15 +691,15 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
|
|||
'hashtags' => $tags['hashtags'],
|
||||
'mentions' => $tags['mentions'],
|
||||
'implicit_mentions' => $tags['implicit_mentions'],
|
||||
'txt_cats' => L10n::t('Categories:'),
|
||||
'txt_folders' => L10n::t('Filed under:'),
|
||||
'txt_cats' => DI::l10n()->t('Categories:'),
|
||||
'txt_folders' => DI::l10n()->t('Filed under:'),
|
||||
'has_cats' => ((count($categories)) ? 'true' : ''),
|
||||
'has_folders' => ((count($folders)) ? 'true' : ''),
|
||||
'categories' => $categories,
|
||||
'folders' => $folders,
|
||||
'text' => strip_tags($body),
|
||||
'localtime' => DateTimeFormat::local($item['created'], 'r'),
|
||||
'ago' => (($item['app']) ? L10n::t('%s from %s', Temporal::getRelativeDate($item['created']),$item['app']) : Temporal::getRelativeDate($item['created'])),
|
||||
'ago' => (($item['app']) ? DI::l10n()->t('%s from %s', Temporal::getRelativeDate($item['created']),$item['app']) : Temporal::getRelativeDate($item['created'])),
|
||||
'location' => $location,
|
||||
'indent' => '',
|
||||
'owner_name' => $owner_name,
|
||||
|
|
@ -714,9 +714,9 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
|
|||
'like' => '',
|
||||
'dislike' => '',
|
||||
'comment' => '',
|
||||
'conv' => (($preview) ? '' : ['href'=> 'display/'.$item['guid'], 'title'=> L10n::t('View in context')]),
|
||||
'conv' => (($preview) ? '' : ['href'=> 'display/'.$item['guid'], 'title'=> DI::l10n()->t('View in context')]),
|
||||
'previewing' => $previewing,
|
||||
'wait' => L10n::t('Please wait'),
|
||||
'wait' => DI::l10n()->t('Please wait'),
|
||||
'thread_level' => 1,
|
||||
];
|
||||
|
||||
|
|
@ -780,11 +780,11 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
|
|||
'$baseurl' => DI::baseUrl()->get($ssl_state),
|
||||
'$return_path' => DI::args()->getQueryString(),
|
||||
'$live_update' => $live_update_div,
|
||||
'$remove' => L10n::t('remove'),
|
||||
'$remove' => DI::l10n()->t('remove'),
|
||||
'$mode' => $mode,
|
||||
'$user' => $a->user,
|
||||
'$threads' => $threads,
|
||||
'$dropping' => ($page_dropping ? L10n::t('Delete Selected Items') : False),
|
||||
'$dropping' => ($page_dropping ? DI::l10n()->t('Delete Selected Items') : False),
|
||||
]);
|
||||
|
||||
return $o;
|
||||
|
|
@ -945,27 +945,27 @@ function item_photo_menu($item) {
|
|||
|
||||
if (local_user()) {
|
||||
$menu = [
|
||||
L10n::t('Follow Thread') => $sub_link,
|
||||
L10n::t('View Status') => $status_link,
|
||||
L10n::t('View Profile') => $profile_link,
|
||||
L10n::t('View Photos') => $photos_link,
|
||||
L10n::t('Network Posts') => $posts_link,
|
||||
L10n::t('View Contact') => $contact_url,
|
||||
L10n::t('Send PM') => $pm_url,
|
||||
L10n::t('Block') => $block_link,
|
||||
L10n::t('Ignore') => $ignore_link
|
||||
DI::l10n()->t('Follow Thread') => $sub_link,
|
||||
DI::l10n()->t('View Status') => $status_link,
|
||||
DI::l10n()->t('View Profile') => $profile_link,
|
||||
DI::l10n()->t('View Photos') => $photos_link,
|
||||
DI::l10n()->t('Network Posts') => $posts_link,
|
||||
DI::l10n()->t('View Contact') => $contact_url,
|
||||
DI::l10n()->t('Send PM') => $pm_url,
|
||||
DI::l10n()->t('Block') => $block_link,
|
||||
DI::l10n()->t('Ignore') => $ignore_link
|
||||
];
|
||||
|
||||
if ($network == Protocol::DFRN) {
|
||||
$menu[L10n::t("Poke")] = $poke_link;
|
||||
$menu[DI::l10n()->t("Poke")] = $poke_link;
|
||||
}
|
||||
|
||||
if ((($cid == 0) || ($rel == Contact::FOLLOWER)) &&
|
||||
in_array($item['network'], Protocol::FEDERATED)) {
|
||||
$menu[L10n::t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
|
||||
$menu[DI::l10n()->t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
|
||||
}
|
||||
} else {
|
||||
$menu = [L10n::t('View Profile') => $item['author-link']];
|
||||
$menu = [DI::l10n()->t('View Profile') => $item['author-link']];
|
||||
}
|
||||
|
||||
$args = ['item' => $item, 'menu' => $menu];
|
||||
|
|
@ -1088,22 +1088,22 @@ function format_like($cnt, array $arr, $type, $id) {
|
|||
// list which show all likers
|
||||
switch ($type) {
|
||||
case 'like' :
|
||||
$phrase = L10n::t('%s likes this.', $likers);
|
||||
$phrase = DI::l10n()->t('%s likes this.', $likers);
|
||||
break;
|
||||
case 'dislike' :
|
||||
$phrase = L10n::t('%s doesn\'t like this.', $likers);
|
||||
$phrase = DI::l10n()->t('%s doesn\'t like this.', $likers);
|
||||
break;
|
||||
case 'attendyes' :
|
||||
$phrase = L10n::t('%s attends.', $likers);
|
||||
$phrase = DI::l10n()->t('%s attends.', $likers);
|
||||
break;
|
||||
case 'attendno' :
|
||||
$phrase = L10n::t('%s doesn\'t attend.', $likers);
|
||||
$phrase = DI::l10n()->t('%s doesn\'t attend.', $likers);
|
||||
break;
|
||||
case 'attendmaybe' :
|
||||
$phrase = L10n::t('%s attends maybe.', $likers);
|
||||
$phrase = DI::l10n()->t('%s attends maybe.', $likers);
|
||||
break;
|
||||
case 'announce' :
|
||||
$phrase = L10n::t('%s reshared this.', $likers);
|
||||
$phrase = DI::l10n()->t('%s reshared this.', $likers);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -1111,13 +1111,13 @@ function format_like($cnt, array $arr, $type, $id) {
|
|||
if ($cnt > 1) {
|
||||
$total = count($arr);
|
||||
if ($total < MAX_LIKERS) {
|
||||
$last = L10n::t('and') . ' ' . $arr[count($arr)-1];
|
||||
$last = DI::l10n()->t('and') . ' ' . $arr[count($arr)-1];
|
||||
$arr2 = array_slice($arr, 0, -1);
|
||||
$likers = implode(', ', $arr2) . ' ' . $last;
|
||||
} else {
|
||||
$arr = array_slice($arr, 0, MAX_LIKERS - 1);
|
||||
$likers = implode(', ', $arr);
|
||||
$likers .= L10n::t('and %d other people', $total - MAX_LIKERS);
|
||||
$likers .= DI::l10n()->t('and %d other people', $total - MAX_LIKERS);
|
||||
}
|
||||
|
||||
$spanatts = "class=\"fakelink\" onclick=\"openClose('{$type}list-$id');\"";
|
||||
|
|
@ -1125,28 +1125,28 @@ function format_like($cnt, array $arr, $type, $id) {
|
|||
$explikers = '';
|
||||
switch ($type) {
|
||||
case 'like':
|
||||
$phrase = L10n::t('<span %1$s>%2$d people</span> like this', $spanatts, $cnt);
|
||||
$explikers = L10n::t('%s like this.', $likers);
|
||||
$phrase = DI::l10n()->t('<span %1$s>%2$d people</span> like this', $spanatts, $cnt);
|
||||
$explikers = DI::l10n()->t('%s like this.', $likers);
|
||||
break;
|
||||
case 'dislike':
|
||||
$phrase = L10n::t('<span %1$s>%2$d people</span> don\'t like this', $spanatts, $cnt);
|
||||
$explikers = L10n::t('%s don\'t like this.', $likers);
|
||||
$phrase = DI::l10n()->t('<span %1$s>%2$d people</span> don\'t like this', $spanatts, $cnt);
|
||||
$explikers = DI::l10n()->t('%s don\'t like this.', $likers);
|
||||
break;
|
||||
case 'attendyes':
|
||||
$phrase = L10n::t('<span %1$s>%2$d people</span> attend', $spanatts, $cnt);
|
||||
$explikers = L10n::t('%s attend.', $likers);
|
||||
$phrase = DI::l10n()->t('<span %1$s>%2$d people</span> attend', $spanatts, $cnt);
|
||||
$explikers = DI::l10n()->t('%s attend.', $likers);
|
||||
break;
|
||||
case 'attendno':
|
||||
$phrase = L10n::t('<span %1$s>%2$d people</span> don\'t attend', $spanatts, $cnt);
|
||||
$explikers = L10n::t('%s don\'t attend.', $likers);
|
||||
$phrase = DI::l10n()->t('<span %1$s>%2$d people</span> don\'t attend', $spanatts, $cnt);
|
||||
$explikers = DI::l10n()->t('%s don\'t attend.', $likers);
|
||||
break;
|
||||
case 'attendmaybe':
|
||||
$phrase = L10n::t('<span %1$s>%2$d people</span> attend maybe', $spanatts, $cnt);
|
||||
$explikers = L10n::t('%s attend maybe.', $likers);
|
||||
$phrase = DI::l10n()->t('<span %1$s>%2$d people</span> attend maybe', $spanatts, $cnt);
|
||||
$explikers = DI::l10n()->t('%s attend maybe.', $likers);
|
||||
break;
|
||||
case 'announce':
|
||||
$phrase = L10n::t('<span %1$s>%2$d people</span> reshared this', $spanatts, $cnt);
|
||||
$explikers = L10n::t('%s reshared this.', $likers);
|
||||
$phrase = DI::l10n()->t('<span %1$s>%2$d people</span> reshared this', $spanatts, $cnt);
|
||||
$explikers = DI::l10n()->t('%s reshared this.', $likers);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -1175,12 +1175,12 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
|
|||
'$baseurl' => DI::baseUrl()->get(true),
|
||||
'$geotag' => $geotag,
|
||||
'$nickname' => $x['nickname'],
|
||||
'$ispublic' => L10n::t('Visible to <strong>everybody</strong>'),
|
||||
'$linkurl' => L10n::t('Please enter a image/video/audio/webpage URL:'),
|
||||
'$term' => L10n::t('Tag term:'),
|
||||
'$fileas' => L10n::t('Save to Folder:'),
|
||||
'$whereareu' => L10n::t('Where are you right now?'),
|
||||
'$delitems' => L10n::t("Delete item\x28s\x29?")
|
||||
'$ispublic' => DI::l10n()->t('Visible to <strong>everybody</strong>'),
|
||||
'$linkurl' => DI::l10n()->t('Please enter a image/video/audio/webpage URL:'),
|
||||
'$term' => DI::l10n()->t('Tag term:'),
|
||||
'$fileas' => DI::l10n()->t('Save to Folder:'),
|
||||
'$whereareu' => DI::l10n()->t('Where are you right now?'),
|
||||
'$delitems' => DI::l10n()->t("Delete item\x28s\x29?")
|
||||
]);
|
||||
|
||||
$jotplugins = '';
|
||||
|
|
@ -1212,33 +1212,33 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
|
|||
$tpl = Renderer::getMarkupTemplate("jot.tpl");
|
||||
|
||||
$o .= Renderer::replaceMacros($tpl,[
|
||||
'$new_post' => L10n::t('New Post'),
|
||||
'$new_post' => DI::l10n()->t('New Post'),
|
||||
'$return_path' => $query_str,
|
||||
'$action' => 'item',
|
||||
'$share' => ($x['button'] ?? '') ?: L10n::t('Share'),
|
||||
'$upload' => L10n::t('Upload photo'),
|
||||
'$shortupload' => L10n::t('upload photo'),
|
||||
'$attach' => L10n::t('Attach file'),
|
||||
'$shortattach' => L10n::t('attach file'),
|
||||
'$edbold' => L10n::t('Bold'),
|
||||
'$editalic' => L10n::t('Italic'),
|
||||
'$eduline' => L10n::t('Underline'),
|
||||
'$edquote' => L10n::t('Quote'),
|
||||
'$edcode' => L10n::t('Code'),
|
||||
'$edimg' => L10n::t('Image'),
|
||||
'$edurl' => L10n::t('Link'),
|
||||
'$edattach' => L10n::t('Link or Media'),
|
||||
'$setloc' => L10n::t('Set your location'),
|
||||
'$shortsetloc' => L10n::t('set location'),
|
||||
'$noloc' => L10n::t('Clear browser location'),
|
||||
'$shortnoloc' => L10n::t('clear location'),
|
||||
'$share' => ($x['button'] ?? '') ?: DI::l10n()->t('Share'),
|
||||
'$upload' => DI::l10n()->t('Upload photo'),
|
||||
'$shortupload' => DI::l10n()->t('upload photo'),
|
||||
'$attach' => DI::l10n()->t('Attach file'),
|
||||
'$shortattach' => DI::l10n()->t('attach file'),
|
||||
'$edbold' => DI::l10n()->t('Bold'),
|
||||
'$editalic' => DI::l10n()->t('Italic'),
|
||||
'$eduline' => DI::l10n()->t('Underline'),
|
||||
'$edquote' => DI::l10n()->t('Quote'),
|
||||
'$edcode' => DI::l10n()->t('Code'),
|
||||
'$edimg' => DI::l10n()->t('Image'),
|
||||
'$edurl' => DI::l10n()->t('Link'),
|
||||
'$edattach' => DI::l10n()->t('Link or Media'),
|
||||
'$setloc' => DI::l10n()->t('Set your location'),
|
||||
'$shortsetloc' => DI::l10n()->t('set location'),
|
||||
'$noloc' => DI::l10n()->t('Clear browser location'),
|
||||
'$shortnoloc' => DI::l10n()->t('clear location'),
|
||||
'$title' => $x['title'] ?? '',
|
||||
'$placeholdertitle' => L10n::t('Set title'),
|
||||
'$placeholdertitle' => DI::l10n()->t('Set title'),
|
||||
'$category' => $x['category'] ?? '',
|
||||
'$placeholdercategory' => Feature::isEnabled(local_user(), 'categories') ? L10n::t("Categories \x28comma-separated list\x29") : '',
|
||||
'$wait' => L10n::t('Please wait'),
|
||||
'$permset' => L10n::t('Permission settings'),
|
||||
'$shortpermset' => L10n::t('permissions'),
|
||||
'$placeholdercategory' => Feature::isEnabled(local_user(), 'categories') ? DI::l10n()->t("Categories \x28comma-separated list\x29") : '',
|
||||
'$wait' => DI::l10n()->t('Please wait'),
|
||||
'$permset' => DI::l10n()->t('Permission settings'),
|
||||
'$shortpermset' => DI::l10n()->t('permissions'),
|
||||
'$wall' => $notes_cid ? 0 : 1,
|
||||
'$posttype' => $notes_cid ? Item::PT_PERSONAL_NOTE : Item::PT_ARTICLE,
|
||||
'$content' => $x['content'] ?? '',
|
||||
|
|
@ -1247,28 +1247,28 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
|
|||
'$defloc' => $x['default_location'],
|
||||
'$visitor' => $x['visitor'],
|
||||
'$pvisit' => $notes_cid ? 'none' : $x['visitor'],
|
||||
'$public' => L10n::t('Public post'),
|
||||
'$public' => DI::l10n()->t('Public post'),
|
||||
'$lockstate' => $x['lockstate'],
|
||||
'$bang' => $x['bang'],
|
||||
'$profile_uid' => $x['profile_uid'],
|
||||
'$preview' => L10n::t('Preview'),
|
||||
'$preview' => DI::l10n()->t('Preview'),
|
||||
'$jotplugins' => $jotplugins,
|
||||
'$notes_cid' => $notes_cid,
|
||||
'$sourceapp' => L10n::t($a->sourcename),
|
||||
'$cancel' => L10n::t('Cancel'),
|
||||
'$sourceapp' => DI::l10n()->t($a->sourcename),
|
||||
'$cancel' => DI::l10n()->t('Cancel'),
|
||||
'$rand_num' => Crypto::randomDigits(12),
|
||||
|
||||
// ACL permissions box
|
||||
'$acl' => $x['acl'],
|
||||
'$group_perms' => L10n::t('Post to Groups'),
|
||||
'$contact_perms' => L10n::t('Post to Contacts'),
|
||||
'$private' => L10n::t('Private post'),
|
||||
'$group_perms' => DI::l10n()->t('Post to Groups'),
|
||||
'$contact_perms' => DI::l10n()->t('Post to Contacts'),
|
||||
'$private' => DI::l10n()->t('Private post'),
|
||||
'$is_private' => $private_post,
|
||||
'$public_link' => $public_post_link,
|
||||
|
||||
//jot nav tab (used in some themes)
|
||||
'$message' => L10n::t('Message'),
|
||||
'$browser' => L10n::t('Browser'),
|
||||
'$message' => DI::l10n()->t('Message'),
|
||||
'$browser' => DI::l10n()->t('Browser'),
|
||||
]);
|
||||
|
||||
|
||||
|
|
@ -1557,7 +1557,7 @@ function get_responses(array $conv_responses, array $response_verbs, array $item
|
|||
if (count($ret[$v]['list']) > MAX_LIKERS) {
|
||||
$ret[$v]['list_part'] = array_slice($ret[$v]['list'], 0, MAX_LIKERS);
|
||||
array_push($ret[$v]['list_part'], '<a href="#" data-toggle="modal" data-target="#' . $v . 'Modal-'
|
||||
. (($ob) ? $ob->getId() : $item['id']) . '"><b>' . L10n::t('View all') . '</b></a>');
|
||||
. (($ob) ? $ob->getId() : $item['id']) . '"><b>' . DI::l10n()->t('View all') . '</b></a>');
|
||||
} else {
|
||||
$ret[$v]['list_part'] = '';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -347,7 +347,7 @@ function drop_item($id, $return = '')
|
|||
$item = Item::selectFirstForUser(local_user(), $fields, ['id' => $id]);
|
||||
|
||||
if (!DBA::isResult($item)) {
|
||||
notice(L10n::t('Item not found.') . EOL);
|
||||
notice(DI::l10n()->t('Item not found.') . EOL);
|
||||
DI::baseUrl()->redirect('network');
|
||||
}
|
||||
|
||||
|
|
@ -379,12 +379,12 @@ function drop_item($id, $return = '')
|
|||
|
||||
return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
|
||||
'$method' => 'get',
|
||||
'$message' => L10n::t('Do you really want to delete this item?'),
|
||||
'$message' => DI::l10n()->t('Do you really want to delete this item?'),
|
||||
'$extra_inputs' => $inputs,
|
||||
'$confirm' => L10n::t('Yes'),
|
||||
'$confirm' => DI::l10n()->t('Yes'),
|
||||
'$confirm_url' => $query['base'],
|
||||
'$confirm_name' => 'confirmed',
|
||||
'$cancel' => L10n::t('Cancel'),
|
||||
'$cancel' => DI::l10n()->t('Cancel'),
|
||||
]);
|
||||
}
|
||||
// Now check how the user responded to the confirmation query
|
||||
|
|
@ -431,7 +431,7 @@ function drop_item($id, $return = '')
|
|||
}
|
||||
}
|
||||
} else {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
notice(DI::l10n()->t('Permission denied.') . EOL);
|
||||
DI::baseUrl()->redirect('display/' . $item['guid']);
|
||||
//NOTREACHED
|
||||
}
|
||||
|
|
|
|||
18
mod/api.php
18
mod/api.php
|
|
@ -33,12 +33,12 @@ function oauth_get_client(OAuthRequest $request)
|
|||
function api_post(App $a)
|
||||
{
|
||||
if (!local_user()) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
notice(DI::l10n()->t('Permission denied.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
if (count($a->user) && !empty($a->user['uid']) && $a->user['uid'] != local_user()) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
notice(DI::l10n()->t('Permission denied.') . EOL);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -83,8 +83,8 @@ function api_content(App $a)
|
|||
|
||||
$tpl = Renderer::getMarkupTemplate("oauth_authorize_done.tpl");
|
||||
$o = Renderer::replaceMacros($tpl, [
|
||||
'$title' => L10n::t('Authorize application connection'),
|
||||
'$info' => L10n::t('Return to your app and insert this Securty Code:'),
|
||||
'$title' => DI::l10n()->t('Authorize application connection'),
|
||||
'$info' => DI::l10n()->t('Return to your app and insert this Securty Code:'),
|
||||
'$code' => $verifier,
|
||||
]);
|
||||
|
||||
|
|
@ -93,7 +93,7 @@ function api_content(App $a)
|
|||
|
||||
if (!local_user()) {
|
||||
/// @TODO We need login form to redirect to this page
|
||||
notice(L10n::t('Please login to continue.') . EOL);
|
||||
notice(DI::l10n()->t('Please login to continue.') . EOL);
|
||||
return Login::form(DI::args()->getQueryString(), false, $request->get_parameters());
|
||||
}
|
||||
//FKOAuth1::loginUser(4);
|
||||
|
|
@ -105,11 +105,11 @@ function api_content(App $a)
|
|||
|
||||
$tpl = Renderer::getMarkupTemplate('oauth_authorize.tpl');
|
||||
$o = Renderer::replaceMacros($tpl, [
|
||||
'$title' => L10n::t('Authorize application connection'),
|
||||
'$title' => DI::l10n()->t('Authorize application connection'),
|
||||
'$app' => $app,
|
||||
'$authorize' => L10n::t('Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?'),
|
||||
'$yes' => L10n::t('Yes'),
|
||||
'$no' => L10n::t('No'),
|
||||
'$authorize' => DI::l10n()->t('Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?'),
|
||||
'$yes' => DI::l10n()->t('Yes'),
|
||||
'$no' => DI::l10n()->t('No'),
|
||||
]);
|
||||
|
||||
return $o;
|
||||
|
|
|
|||
34
mod/cal.php
34
mod/cal.php
|
|
@ -27,11 +27,11 @@ use Friendica\Util\Temporal;
|
|||
function cal_init(App $a)
|
||||
{
|
||||
if (Config::get('system', 'block_public') && !Session::isAuthenticated()) {
|
||||
throw new \Friendica\Network\HTTPException\ForbiddenException(L10n::t('Access denied.'));
|
||||
throw new \Friendica\Network\HTTPException\ForbiddenException(DI::l10n()->t('Access denied.'));
|
||||
}
|
||||
|
||||
if ($a->argc < 2) {
|
||||
throw new \Friendica\Network\HTTPException\ForbiddenException(L10n::t('Access denied.'));
|
||||
throw new \Friendica\Network\HTTPException\ForbiddenException(DI::l10n()->t('Access denied.'));
|
||||
}
|
||||
|
||||
Nav::setSelected('events');
|
||||
|
|
@ -126,7 +126,7 @@ function cal_content(App $a)
|
|||
$is_owner = local_user() == $a->profile['profile_uid'];
|
||||
|
||||
if ($a->profile['hidewall'] && !$is_owner && !$remote_contact) {
|
||||
notice(L10n::t('Access to this profile has been restricted.') . EOL);
|
||||
notice(DI::l10n()->t('Access to this profile has been restricted.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -257,17 +257,17 @@ function cal_content(App $a)
|
|||
|
||||
$o = Renderer::replaceMacros($tpl, [
|
||||
'$tabs' => $tabs,
|
||||
'$title' => L10n::t('Events'),
|
||||
'$view' => L10n::t('View'),
|
||||
'$previous' => [DI::baseUrl() . "/events/$prevyear/$prevmonth", L10n::t('Previous'), '', ''],
|
||||
'$next' => [DI::baseUrl() . "/events/$nextyear/$nextmonth", L10n::t('Next'), '', ''],
|
||||
'$title' => DI::l10n()->t('Events'),
|
||||
'$view' => DI::l10n()->t('View'),
|
||||
'$previous' => [DI::baseUrl() . "/events/$prevyear/$prevmonth", DI::l10n()->t('Previous'), '', ''],
|
||||
'$next' => [DI::baseUrl() . "/events/$nextyear/$nextmonth", DI::l10n()->t('Next'), '', ''],
|
||||
'$calendar' => Temporal::getCalendarTable($y, $m, $links, ' eventcal'),
|
||||
'$events' => $events,
|
||||
"today" => L10n::t("today"),
|
||||
"month" => L10n::t("month"),
|
||||
"week" => L10n::t("week"),
|
||||
"day" => L10n::t("day"),
|
||||
"list" => L10n::t("list"),
|
||||
"today" => DI::l10n()->t("today"),
|
||||
"month" => DI::l10n()->t("month"),
|
||||
"week" => DI::l10n()->t("week"),
|
||||
"day" => DI::l10n()->t("day"),
|
||||
"list" => DI::l10n()->t("list"),
|
||||
]);
|
||||
|
||||
if (!empty($_GET['id'])) {
|
||||
|
|
@ -280,14 +280,14 @@ function cal_content(App $a)
|
|||
|
||||
if ($mode == 'export') {
|
||||
if (!$owner_uid) {
|
||||
notice(L10n::t('User not found'));
|
||||
notice(DI::l10n()->t('User not found'));
|
||||
return;
|
||||
}
|
||||
|
||||
// Test permissions
|
||||
// Respect the export feature setting for all other /cal pages if it's not the own profile
|
||||
if ((local_user() !== $owner_uid) && !Feature::isEnabled($owner_uid, "export_calendar")) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
notice(DI::l10n()->t('Permission denied.') . EOL);
|
||||
DI::baseUrl()->redirect('cal/' . $nick);
|
||||
}
|
||||
|
||||
|
|
@ -296,9 +296,9 @@ function cal_content(App $a)
|
|||
|
||||
if (!$evexport["success"]) {
|
||||
if ($evexport["content"]) {
|
||||
notice(L10n::t('This calendar format is not supported'));
|
||||
notice(DI::l10n()->t('This calendar format is not supported'));
|
||||
} else {
|
||||
notice(L10n::t('No exportable data found'));
|
||||
notice(DI::l10n()->t('No exportable data found'));
|
||||
}
|
||||
|
||||
// If it the own calendar return to the events page
|
||||
|
|
@ -315,7 +315,7 @@ function cal_content(App $a)
|
|||
// If nothing went wrong we can echo the export content
|
||||
if ($evexport["success"]) {
|
||||
header('Content-type: text/calendar');
|
||||
header('content-disposition: attachment; filename="' . L10n::t('calendar') . '-' . $nick . '.' . $evexport["extension"] . '"');
|
||||
header('content-disposition: attachment; filename="' . DI::l10n()->t('calendar') . '-' . $nick . '.' . $evexport["extension"] . '"');
|
||||
echo $evexport["content"];
|
||||
exit();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ function common_content(App $a)
|
|||
$zcid = 0;
|
||||
|
||||
if (!local_user()) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
notice(DI::l10n()->t('Permission denied.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -88,7 +88,7 @@ function common_content(App $a)
|
|||
}
|
||||
|
||||
if ($total < 1) {
|
||||
notice(L10n::t('No contacts in common.') . EOL);
|
||||
notice(DI::l10n()->t('No contacts in common.') . EOL);
|
||||
return $o;
|
||||
}
|
||||
|
||||
|
|
@ -139,7 +139,7 @@ function common_content(App $a)
|
|||
if ($cmd === 'loc' && $cid && local_user() == $uid) {
|
||||
$tab_str = Module\Contact::getTabsHTML($a, $contact, 5);
|
||||
} else {
|
||||
$title = L10n::t('Common Friends');
|
||||
$title = DI::l10n()->t('Common Friends');
|
||||
}
|
||||
|
||||
$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
|
||||
|
|
|
|||
|
|
@ -23,14 +23,14 @@ function community_content(App $a, $update = 0)
|
|||
$o = '';
|
||||
|
||||
if (Config::get('system', 'block_public') && !Session::isAuthenticated()) {
|
||||
notice(L10n::t('Public access denied.') . EOL);
|
||||
notice(DI::l10n()->t('Public access denied.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
$page_style = Config::get('system', 'community_page_style');
|
||||
|
||||
if ($page_style == CP_NO_INTERNAL_COMMUNITY) {
|
||||
notice(L10n::t('Access denied.') . EOL);
|
||||
notice(DI::l10n()->t('Access denied.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -66,7 +66,7 @@ function community_content(App $a, $update = 0)
|
|||
}
|
||||
|
||||
if (!in_array($content, ['local', 'global'])) {
|
||||
notice(L10n::t('Community option not available.') . EOL);
|
||||
notice(DI::l10n()->t('Community option not available.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -83,7 +83,7 @@ function community_content(App $a, $update = 0)
|
|||
}
|
||||
|
||||
if (!$available) {
|
||||
notice(L10n::t('Not available.') . EOL);
|
||||
notice(DI::l10n()->t('Not available.') . EOL);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -93,10 +93,10 @@ function community_content(App $a, $update = 0)
|
|||
|
||||
if ((local_user() || in_array($page_style, [CP_USERS_AND_GLOBAL, CP_USERS_ON_SERVER])) && empty(Config::get('system', 'singleuser'))) {
|
||||
$tabs[] = [
|
||||
'label' => L10n::t('Local Community'),
|
||||
'label' => DI::l10n()->t('Local Community'),
|
||||
'url' => 'community/local',
|
||||
'sel' => $content == 'local' ? 'active' : '',
|
||||
'title' => L10n::t('Posts from local users on this server'),
|
||||
'title' => DI::l10n()->t('Posts from local users on this server'),
|
||||
'id' => 'community-local-tab',
|
||||
'accesskey' => 'l'
|
||||
];
|
||||
|
|
@ -104,10 +104,10 @@ function community_content(App $a, $update = 0)
|
|||
|
||||
if (local_user() || in_array($page_style, [CP_USERS_AND_GLOBAL, CP_GLOBAL_COMMUNITY])) {
|
||||
$tabs[] = [
|
||||
'label' => L10n::t('Global Community'),
|
||||
'label' => DI::l10n()->t('Global Community'),
|
||||
'url' => 'community/global',
|
||||
'sel' => $content == 'global' ? 'active' : '',
|
||||
'title' => L10n::t('Posts from users of the whole federated network'),
|
||||
'title' => DI::l10n()->t('Posts from users of the whole federated network'),
|
||||
'id' => 'community-global-tab',
|
||||
'accesskey' => 'g'
|
||||
];
|
||||
|
|
@ -153,7 +153,7 @@ function community_content(App $a, $update = 0)
|
|||
$r = community_getitems($pager->getStart(), $pager->getItemsPerPage(), $content, $accounttype);
|
||||
|
||||
if (!DBA::isResult($r)) {
|
||||
info(L10n::t('No results.') . EOL);
|
||||
info(DI::l10n()->t('No results.') . EOL);
|
||||
return $o;
|
||||
}
|
||||
|
||||
|
|
@ -205,7 +205,7 @@ function community_content(App $a, $update = 0)
|
|||
'$content' => $o,
|
||||
'$header' => '',
|
||||
'$show_global_community_hint' => ($content == 'global') && Config::get('system', 'show_global_community_hint'),
|
||||
'$global_community_hint' => L10n::t("This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users.")
|
||||
'$global_community_hint' => DI::l10n()->t("This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users.")
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -77,9 +77,9 @@ function crepair_post(App $a)
|
|||
}
|
||||
|
||||
if ($r) {
|
||||
info(L10n::t('Contact settings applied.') . EOL);
|
||||
info(DI::l10n()->t('Contact settings applied.') . EOL);
|
||||
} else {
|
||||
notice(L10n::t('Contact update failed.') . EOL);
|
||||
notice(DI::l10n()->t('Contact update failed.') . EOL);
|
||||
}
|
||||
|
||||
return;
|
||||
|
|
@ -88,7 +88,7 @@ function crepair_post(App $a)
|
|||
function crepair_content(App $a)
|
||||
{
|
||||
if (!local_user()) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
notice(DI::l10n()->t('Permission denied.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -100,7 +100,7 @@ function crepair_content(App $a)
|
|||
}
|
||||
|
||||
if (!DBA::isResult($contact)) {
|
||||
notice(L10n::t('Contact not found.') . EOL);
|
||||
notice(DI::l10n()->t('Contact not found.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -113,8 +113,8 @@ function crepair_content(App $a)
|
|||
Model\Profile::load($a, "", 0, Model\Contact::getDetailsByURL($contact["url"]));
|
||||
}
|
||||
|
||||
$warning = L10n::t('<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working.');
|
||||
$info = L10n::t('Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.');
|
||||
$warning = DI::l10n()->t('<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working.');
|
||||
$info = DI::l10n()->t('Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.');
|
||||
|
||||
$returnaddr = "contact/$cid";
|
||||
|
||||
|
|
@ -128,9 +128,9 @@ function crepair_content(App $a)
|
|||
}
|
||||
|
||||
if ($contact['network'] == Protocol::FEED) {
|
||||
$remote_self_options = ['0' => L10n::t('No mirroring'), '1' => L10n::t('Mirror as forwarded posting'), '2' => L10n::t('Mirror as my own posting')];
|
||||
$remote_self_options = ['0' => DI::l10n()->t('No mirroring'), '1' => DI::l10n()->t('Mirror as forwarded posting'), '2' => DI::l10n()->t('Mirror as my own posting')];
|
||||
} else {
|
||||
$remote_self_options = ['0' => L10n::t('No mirroring'), '2' => L10n::t('Mirror as my own posting')];
|
||||
$remote_self_options = ['0' => DI::l10n()->t('No mirroring'), '2' => DI::l10n()->t('Mirror as my own posting')];
|
||||
}
|
||||
|
||||
$update_profile = in_array($contact['network'], Protocol::FEDERATED);
|
||||
|
|
@ -143,30 +143,30 @@ function crepair_content(App $a)
|
|||
'$warning' => $warning,
|
||||
'$info' => $info,
|
||||
'$returnaddr' => $returnaddr,
|
||||
'$return' => L10n::t('Return to contact editor'),
|
||||
'$return' => DI::l10n()->t('Return to contact editor'),
|
||||
'$update_profile' => $update_profile,
|
||||
'$udprofilenow' => L10n::t('Refetch contact data'),
|
||||
'$udprofilenow' => DI::l10n()->t('Refetch contact data'),
|
||||
'$contact_id' => $contact['id'],
|
||||
'$lbl_submit' => L10n::t('Submit'),
|
||||
'$label_remote_self' => L10n::t('Remote Self'),
|
||||
'$lbl_submit' => DI::l10n()->t('Submit'),
|
||||
'$label_remote_self' => DI::l10n()->t('Remote Self'),
|
||||
'$allow_remote_self' => $allow_remote_self,
|
||||
'$remote_self' => ['remote_self',
|
||||
L10n::t('Mirror postings from this contact'),
|
||||
DI::l10n()->t('Mirror postings from this contact'),
|
||||
$contact['remote_self'],
|
||||
L10n::t('Mark this contact as remote_self, this will cause friendica to repost new entries from this contact.'),
|
||||
DI::l10n()->t('Mark this contact as remote_self, this will cause friendica to repost new entries from this contact.'),
|
||||
$remote_self_options
|
||||
],
|
||||
|
||||
'$name' => ['name', L10n::t('Name') , $contact['name']],
|
||||
'$nick' => ['nick', L10n::t('Account Nickname'), $contact['nick']],
|
||||
'$attag' => ['attag', L10n::t('@Tagname - overrides Name/Nickname'), $contact['attag']],
|
||||
'$url' => ['url', L10n::t('Account URL'), $contact['url']],
|
||||
'$alias' => ['alias', L10n::t('Account URL Alias'), $contact['alias']],
|
||||
'$request' => ['request', L10n::t('Friend Request URL'), $contact['request']],
|
||||
'confirm' => ['confirm', L10n::t('Friend Confirm URL'), $contact['confirm']],
|
||||
'notify' => ['notify', L10n::t('Notification Endpoint URL'), $contact['notify']],
|
||||
'poll' => ['poll', L10n::t('Poll/Feed URL'), $contact['poll']],
|
||||
'photo' => ['photo', L10n::t('New photo from this URL'), ''],
|
||||
'$name' => ['name', DI::l10n()->t('Name') , $contact['name']],
|
||||
'$nick' => ['nick', DI::l10n()->t('Account Nickname'), $contact['nick']],
|
||||
'$attag' => ['attag', DI::l10n()->t('@Tagname - overrides Name/Nickname'), $contact['attag']],
|
||||
'$url' => ['url', DI::l10n()->t('Account URL'), $contact['url']],
|
||||
'$alias' => ['alias', DI::l10n()->t('Account URL Alias'), $contact['alias']],
|
||||
'$request' => ['request', DI::l10n()->t('Friend Request URL'), $contact['request']],
|
||||
'confirm' => ['confirm', DI::l10n()->t('Friend Confirm URL'), $contact['confirm']],
|
||||
'notify' => ['notify', DI::l10n()->t('Notification Endpoint URL'), $contact['notify']],
|
||||
'poll' => ['poll', DI::l10n()->t('Poll/Feed URL'), $contact['poll']],
|
||||
'photo' => ['photo', DI::l10n()->t('New photo from this URL'), ''],
|
||||
]);
|
||||
|
||||
return $o;
|
||||
|
|
|
|||
|
|
@ -64,13 +64,13 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
if (empty($_POST['source_url'])) {
|
||||
$uid = ($handsfree['uid'] ?? 0) ?: local_user();
|
||||
if (!$uid) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
notice(DI::l10n()->t('Permission denied.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
$user = DBA::selectFirst('user', [], ['uid' => $uid]);
|
||||
if (!DBA::isResult($user)) {
|
||||
notice(L10n::t('Profile not found.') . EOL);
|
||||
notice(DI::l10n()->t('Profile not found.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -125,8 +125,8 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
);
|
||||
if (!DBA::isResult($r)) {
|
||||
Logger::log('Contact not found in DB.');
|
||||
notice(L10n::t('Contact not found.') . EOL);
|
||||
notice(L10n::t('This may occasionally happen if contact was requested by both persons and it has already been approved.') . EOL);
|
||||
notice(DI::l10n()->t('Contact not found.') . EOL);
|
||||
notice(DI::l10n()->t('This may occasionally happen if contact was requested by both persons and it has already been approved.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -227,20 +227,20 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
// We shouldn't proceed, because the xml parser might choke,
|
||||
// and $status is going to be zero, which indicates success.
|
||||
// We can hardly call this a success.
|
||||
notice(L10n::t('Response from remote site was not understood.') . EOL);
|
||||
notice(DI::l10n()->t('Response from remote site was not understood.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
if (strlen($leading_junk) && Config::get('system', 'debugging')) {
|
||||
// This might be more common. Mixed error text and some XML.
|
||||
// If we're configured for debugging, show the text. Proceed in either case.
|
||||
notice(L10n::t('Unexpected response from remote site: ') . EOL . $leading_junk . EOL);
|
||||
notice(DI::l10n()->t('Unexpected response from remote site: ') . EOL . $leading_junk . EOL);
|
||||
}
|
||||
|
||||
if (stristr($res, "<status") === false) {
|
||||
// wrong xml! stop here!
|
||||
Logger::log('Unexpected response posting to ' . $dfrn_confirm);
|
||||
notice(L10n::t('Unexpected response from remote site: ') . EOL . htmlspecialchars($res) . EOL);
|
||||
notice(DI::l10n()->t('Unexpected response from remote site: ') . EOL . htmlspecialchars($res) . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -249,7 +249,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
$message = XML::unescape($xml->message); // human readable text of what may have gone wrong.
|
||||
switch ($status) {
|
||||
case 0:
|
||||
info(L10n::t("Confirmation completed successfully.") . EOL);
|
||||
info(DI::l10n()->t("Confirmation completed successfully.") . EOL);
|
||||
break;
|
||||
case 1:
|
||||
// birthday paradox - generate new dfrn-id and fall through.
|
||||
|
|
@ -261,15 +261,15 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
);
|
||||
|
||||
case 2:
|
||||
notice(L10n::t("Temporary failure. Please wait and try again.") . EOL);
|
||||
notice(DI::l10n()->t("Temporary failure. Please wait and try again.") . EOL);
|
||||
break;
|
||||
case 3:
|
||||
notice(L10n::t("Introduction failed or was revoked.") . EOL);
|
||||
notice(DI::l10n()->t("Introduction failed or was revoked.") . EOL);
|
||||
break;
|
||||
}
|
||||
|
||||
if (strlen($message)) {
|
||||
notice(L10n::t('Remote site reported: ') . $message . EOL);
|
||||
notice(DI::l10n()->t('Remote site reported: ') . $message . EOL);
|
||||
}
|
||||
|
||||
if (($status == 0) && $intro_id) {
|
||||
|
|
@ -374,7 +374,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
// Find our user's account
|
||||
$user = DBA::selectFirst('user', [], ['nickname' => $node]);
|
||||
if (!DBA::isResult($user)) {
|
||||
$message = L10n::t('No user record found for \'%s\' ', $node);
|
||||
$message = DI::l10n()->t('No user record found for \'%s\' ', $node);
|
||||
System::xmlExit(3, $message); // failure
|
||||
// NOTREACHED
|
||||
}
|
||||
|
|
@ -384,7 +384,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
|
||||
|
||||
if (!strstr($my_prvkey, 'PRIVATE KEY')) {
|
||||
$message = L10n::t('Our site encryption key is apparently messed up.');
|
||||
$message = DI::l10n()->t('Our site encryption key is apparently messed up.');
|
||||
System::xmlExit(3, $message);
|
||||
}
|
||||
|
||||
|
|
@ -395,7 +395,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
|
||||
|
||||
if (!strlen($decrypted_source_url)) {
|
||||
$message = L10n::t('Empty site URL was provided or URL could not be decrypted by us.');
|
||||
$message = DI::l10n()->t('Empty site URL was provided or URL could not be decrypted by us.');
|
||||
System::xmlExit(3, $message);
|
||||
// NOTREACHED
|
||||
}
|
||||
|
|
@ -411,7 +411,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
$contact = DBA::selectFirst('contact', [], ['url' => $newurl, 'uid' => $local_uid]);
|
||||
if (!DBA::isResult($contact)) {
|
||||
// this is either a bogus confirmation (?) or we deleted the original introduction.
|
||||
$message = L10n::t('Contact record was not found for you on our site.');
|
||||
$message = DI::l10n()->t('Contact record was not found for you on our site.');
|
||||
System::xmlExit(3, $message);
|
||||
return; // NOTREACHED
|
||||
}
|
||||
|
|
@ -425,7 +425,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
$dfrn_record = $contact['id'];
|
||||
|
||||
if (!$foreign_pubkey) {
|
||||
$message = L10n::t('Site public key not available in contact record for URL %s.', $decrypted_source_url);
|
||||
$message = DI::l10n()->t('Site public key not available in contact record for URL %s.', $decrypted_source_url);
|
||||
System::xmlExit(3, $message);
|
||||
}
|
||||
|
||||
|
|
@ -441,7 +441,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
}
|
||||
|
||||
if (DBA::exists('contact', ['dfrn-id' => $decrypted_dfrn_id])) {
|
||||
$message = L10n::t('The ID provided by your system is a duplicate on our system. It should work if you try again.');
|
||||
$message = DI::l10n()->t('The ID provided by your system is a duplicate on our system. It should work if you try again.');
|
||||
System::xmlExit(1, $message); // Birthday paradox - duplicate dfrn-id
|
||||
// NOTREACHED
|
||||
}
|
||||
|
|
@ -452,7 +452,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
intval($dfrn_record)
|
||||
);
|
||||
if (!DBA::isResult($r)) {
|
||||
$message = L10n::t('Unable to set your contact credentials on our system.');
|
||||
$message = DI::l10n()->t('Unable to set your contact credentials on our system.');
|
||||
System::xmlExit(3, $message);
|
||||
}
|
||||
|
||||
|
|
@ -508,7 +508,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
intval($dfrn_record)
|
||||
);
|
||||
if (!DBA::isResult($r)) { // indicates schema is messed up or total db failure
|
||||
$message = L10n::t('Unable to update your contact profile details on our system');
|
||||
$message = DI::l10n()->t('Unable to update your contact profile details on our system');
|
||||
System::xmlExit(3, $message);
|
||||
}
|
||||
|
||||
|
|
@ -538,7 +538,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
'to_email' => $combined['email'],
|
||||
'uid' => $combined['uid'],
|
||||
'link' => DI::baseUrl() . '/contact/' . $dfrn_record,
|
||||
'source_name' => ((strlen(stripslashes($combined['name']))) ? stripslashes($combined['name']) : L10n::t('[Name Withheld]')),
|
||||
'source_name' => ((strlen(stripslashes($combined['name']))) ? stripslashes($combined['name']) : DI::l10n()->t('[Name Withheld]')),
|
||||
'source_link' => $combined['url'],
|
||||
'source_photo' => $combined['photo'],
|
||||
'verb' => ($mutual ? Activity::FRIEND : Activity::FOLLOW),
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ function dfrn_poll_init(App $a)
|
|||
Session::setVisitorsContacts();
|
||||
|
||||
if (!$quiet) {
|
||||
info(L10n::t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']) . EOL);
|
||||
info(DI::l10n()->t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']) . EOL);
|
||||
}
|
||||
|
||||
// Visitors get 1 day session.
|
||||
|
|
@ -524,7 +524,7 @@ function dfrn_poll_content(App $a)
|
|||
Session::setVisitorsContacts();
|
||||
|
||||
if (!$quiet) {
|
||||
info(L10n::t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']) . EOL);
|
||||
info(DI::l10n()->t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']) . EOL);
|
||||
}
|
||||
|
||||
// Visitors get 1 day session.
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ function dfrn_request_post(App $a)
|
|||
if (DBA::isResult($r)) {
|
||||
if (strlen($r[0]['dfrn-id'])) {
|
||||
// We don't need to be here. It has already happened.
|
||||
notice(L10n::t("This introduction has already been accepted.") . EOL);
|
||||
notice(DI::l10n()->t("This introduction has already been accepted.") . EOL);
|
||||
return;
|
||||
} else {
|
||||
$contact_record = $r[0];
|
||||
|
|
@ -117,14 +117,14 @@ function dfrn_request_post(App $a)
|
|||
$parms = Probe::profile($dfrn_url);
|
||||
|
||||
if (!count($parms)) {
|
||||