diff --git a/doc/smarty3-templates.md b/doc/smarty3-templates.md index 1fadcb221..27e2a0230 100644 --- a/doc/smarty3-templates.md +++ b/doc/smarty3-templates.md @@ -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. diff --git a/doc/themes.md b/doc/themes.md index 577d6a5da..f50ea791d 100644 --- a/doc/themes.md +++ b/doc/themes.md @@ -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){ diff --git a/doc/translations.md b/doc/translations.md index 9ecd8f6d4..c1bd3ce88 100644 --- a/doc/translations.md +++ b/doc/translations.md @@ -73,8 +73,8 @@ Then run `bin/console po2php view/lang//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 diff --git a/include/api.php b/include/api.php index e4464a2c7..ab12d42bf 100644 --- a/include/api.php +++ b/include/api.php @@ -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'])) { diff --git a/include/conversation.php b/include/conversation.php index 990c72e05..d09c918d1 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -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('%2$d people like this', $spanatts, $cnt); - $explikers = L10n::t('%s like this.', $likers); + $phrase = DI::l10n()->t('%2$d people like this', $spanatts, $cnt); + $explikers = DI::l10n()->t('%s like this.', $likers); break; case 'dislike': - $phrase = L10n::t('%2$d people don\'t like this', $spanatts, $cnt); - $explikers = L10n::t('%s don\'t like this.', $likers); + $phrase = DI::l10n()->t('%2$d people don\'t like this', $spanatts, $cnt); + $explikers = DI::l10n()->t('%s don\'t like this.', $likers); break; case 'attendyes': - $phrase = L10n::t('%2$d people attend', $spanatts, $cnt); - $explikers = L10n::t('%s attend.', $likers); + $phrase = DI::l10n()->t('%2$d people attend', $spanatts, $cnt); + $explikers = DI::l10n()->t('%s attend.', $likers); break; case 'attendno': - $phrase = L10n::t('%2$d people don\'t attend', $spanatts, $cnt); - $explikers = L10n::t('%s don\'t attend.', $likers); + $phrase = DI::l10n()->t('%2$d people don\'t attend', $spanatts, $cnt); + $explikers = DI::l10n()->t('%s don\'t attend.', $likers); break; case 'attendmaybe': - $phrase = L10n::t('%2$d people attend maybe', $spanatts, $cnt); - $explikers = L10n::t('%s attend maybe.', $likers); + $phrase = DI::l10n()->t('%2$d people attend maybe', $spanatts, $cnt); + $explikers = DI::l10n()->t('%s attend maybe.', $likers); break; case 'announce': - $phrase = L10n::t('%2$d people reshared this', $spanatts, $cnt); - $explikers = L10n::t('%s reshared this.', $likers); + $phrase = DI::l10n()->t('%2$d people 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 everybody'), - '$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 everybody'), + '$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'], '' . L10n::t('View all') . ''); + . (($ob) ? $ob->getId() : $item['id']) . '">' . DI::l10n()->t('View all') . ''); } else { $ret[$v]['list_part'] = ''; } diff --git a/include/items.php b/include/items.php index 91165344a..a78588e9f 100644 --- a/include/items.php +++ b/include/items.php @@ -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 } diff --git a/mod/api.php b/mod/api.php index 68308d3a6..b0941c558 100644 --- a/mod/api.php +++ b/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; diff --git a/mod/cal.php b/mod/cal.php index 86a762af8..6279bc241 100644 --- a/mod/cal.php +++ b/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(); } diff --git a/mod/common.php b/mod/common.php index 6ad531d07..4a539665a 100644 --- a/mod/common.php +++ b/mod/common.php @@ -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'); diff --git a/mod/community.php b/mod/community.php index 8ed0c14dc..a318148aa 100644 --- a/mod/community.php +++ b/mod/community.php @@ -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.") ]); } diff --git a/mod/crepair.php b/mod/crepair.php index ad90c9f7a..985acce80 100644 --- a/mod/crepair.php +++ b/mod/crepair.php @@ -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('WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working.'); - $info = L10n::t('Please use your browser \'Back\' button now if you are uncertain what to do on this page.'); + $warning = DI::l10n()->t('WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working.'); + $info = DI::l10n()->t('Please use your browser \'Back\' button now 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; diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 489a943cd..a0752f888 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -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, "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), diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index 3e193e2a3..e18874481 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -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. diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index ea570d995..001735ea8 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -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)) { - notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL); + notice(DI::l10n()->t('Profile location is not valid or does not contain profile information.') . EOL); return; } else { if (empty($parms['fn'])) { - notice(L10n::t('Warning: profile location has no identifiable owner name.') . EOL); + notice(DI::l10n()->t('Warning: profile location has no identifiable owner name.') . EOL); } if (empty($parms['photo'])) { - notice(L10n::t('Warning: profile location has no profile photo.') . EOL); + notice(DI::l10n()->t('Warning: profile location has no profile photo.') . EOL); } $invalid = Probe::validDfrn($parms); if ($invalid) { @@ -166,7 +166,7 @@ function dfrn_request_post(App $a) } if ($r) { - info(L10n::t("Introduction complete.") . EOL); + info(DI::l10n()->t("Introduction complete.") . EOL); } $r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `site-pubkey` = '%s' LIMIT 1", @@ -202,7 +202,7 @@ function dfrn_request_post(App $a) } // invalid/bogus request - notice(L10n::t('Unrecoverable protocol error.') . EOL); + notice(DI::l10n()->t('Unrecoverable protocol error.') . EOL); DI::baseUrl()->redirect(); return; // NOTREACHED } @@ -229,7 +229,7 @@ function dfrn_request_post(App $a) * */ if (!(is_array($a->profile) && count($a->profile))) { - notice(L10n::t('Profile unavailable.') . EOL); + notice(DI::l10n()->t('Profile unavailable.') . EOL); return; } @@ -250,9 +250,9 @@ function dfrn_request_post(App $a) intval($uid) ); if (DBA::isResult($r) && count($r) > $maxreq) { - notice(L10n::t('%s has received too many connection requests today.', $a->profile['name']) . EOL); - notice(L10n::t('Spam protection measures have been invoked.') . EOL); - notice(L10n::t('Friends are advised to please try again in 24 hours.') . EOL); + notice(DI::l10n()->t('%s has received too many connection requests today.', $a->profile['name']) . EOL); + notice(DI::l10n()->t('Spam protection measures have been invoked.') . EOL); + notice(DI::l10n()->t('Friends are advised to please try again in 24 hours.') . EOL); return; } } @@ -276,7 +276,7 @@ function dfrn_request_post(App $a) $url = trim($_POST['dfrn_url']); if (!strlen($url)) { - notice(L10n::t("Invalid locator") . EOL); + notice(DI::l10n()->t("Invalid locator") . EOL); return; } @@ -312,10 +312,10 @@ function dfrn_request_post(App $a) if (DBA::isResult($ret)) { if (strlen($ret[0]['issued-id'])) { - notice(L10n::t('You have already introduced yourself here.') . EOL); + notice(DI::l10n()->t('You have already introduced yourself here.') . EOL); return; } elseif ($ret[0]['rel'] == Contact::FRIEND) { - notice(L10n::t('Apparently you are already friends with %s.', $a->profile['name']) . EOL); + notice(DI::l10n()->t('Apparently you are already friends with %s.', $a->profile['name']) . EOL); return; } else { $contact_record = $ret[0]; @@ -335,19 +335,19 @@ function dfrn_request_post(App $a) } else { $url = Network::isUrlValid($url); if (!$url) { - notice(L10n::t('Invalid profile URL.') . EOL); + notice(DI::l10n()->t('Invalid profile URL.') . EOL); DI::baseUrl()->redirect(DI::args()->getCommand()); return; // NOTREACHED } if (!Network::isUrlAllowed($url)) { - notice(L10n::t('Disallowed profile URL.') . EOL); + notice(DI::l10n()->t('Disallowed profile URL.') . EOL); DI::baseUrl()->redirect(DI::args()->getCommand()); return; // NOTREACHED } if (Network::isUrlBlocked($url)) { - notice(L10n::t('Blocked domain') . EOL); + notice(DI::l10n()->t('Blocked domain') . EOL); DI::baseUrl()->redirect(DI::args()->getCommand()); return; // NOTREACHED } @@ -355,14 +355,14 @@ function dfrn_request_post(App $a) $parms = Probe::profile(($hcard) ? $hcard : $url); if (!count($parms)) { - notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL); + notice(DI::l10n()->t('Profile location is not valid or does not contain profile information.') . EOL); DI::baseUrl()->redirect(DI::args()->getCommand()); } else { if (empty($parms['fn'])) { - notice(L10n::t('Warning: profile location has no identifiable owner name.') . EOL); + notice(DI::l10n()->t('Warning: profile location has no identifiable owner name.') . EOL); } if (empty($parms['photo'])) { - notice(L10n::t('Warning: profile location has no profile photo.') . EOL); + notice(DI::l10n()->t('Warning: profile location has no profile photo.') . EOL); } $invalid = Probe::validDfrn($parms); if ($invalid) { @@ -414,7 +414,7 @@ function dfrn_request_post(App $a) } } if ($r === false) { - notice(L10n::t('Failed to update contact record.') . EOL); + notice(DI::l10n()->t('Failed to update contact record.') . EOL); return; } @@ -434,7 +434,7 @@ function dfrn_request_post(App $a) // This notice will only be seen by the requestor if the requestor and requestee are on the same server. if (!$failed) { - info(L10n::t('Your introduction has been sent.') . EOL); + info(DI::l10n()->t('Your introduction has been sent.') . EOL); } // "Homecoming" - send the requestor back to their site to record the introduction. @@ -472,7 +472,7 @@ function dfrn_request_post(App $a) // NOTREACHED // END $network != Protocol::PHANTOM } else { - notice(L10n::t("Remote subscription can't be done for your network. Please subscribe directly on your system.") . EOL); + notice(DI::l10n()->t("Remote subscription can't be done for your network. Please subscribe directly on your system.") . EOL); return; } } return; @@ -488,7 +488,7 @@ function dfrn_request_content(App $a) // to send us to the post section to record the introduction. if (!empty($_GET['dfrn_url'])) { if (!local_user()) { - info(L10n::t("Please login to confirm introduction.") . EOL); + info(DI::l10n()->t("Please login to confirm introduction.") . EOL); /* setup the return URL to come back to this page if they use openid */ return Login::form(); } @@ -496,7 +496,7 @@ function dfrn_request_content(App $a) // Edge case, but can easily happen in the wild. This person is authenticated, // but not as the person who needs to deal with this request. if ($a->user['nickname'] != $a->argv[1]) { - notice(L10n::t("Incorrect identity currently logged in. Please login to this profile.") . EOL); + notice(DI::l10n()->t("Incorrect identity currently logged in. Please login to this profile.") . EOL); return Login::form(); } @@ -510,7 +510,7 @@ function dfrn_request_content(App $a) $_POST["confirm_key"] = $confirm_key; $_POST["localconfirm"] = 1; $_POST["hidden-contact"] = 0; - $_POST["submit"] = L10n::t('Confirm'); + $_POST["submit"] = DI::l10n()->t('Confirm'); dfrn_request_post($a); @@ -521,11 +521,11 @@ function dfrn_request_content(App $a) $o = Renderer::replaceMacros($tpl, [ '$dfrn_url' => $dfrn_url, '$aes_allow' => (($aes_allow) ? '' : "" ), - '$hidethem' => L10n::t('Hide this contact'), + '$hidethem' => DI::l10n()->t('Hide this contact'), '$confirm_key' => $confirm_key, - '$welcome' => L10n::t('Welcome home %s.', $a->user['username']), - '$please' => L10n::t('Please confirm your introduction/connection request to %s.', $dfrn_url), - '$submit' => L10n::t('Confirm'), + '$welcome' => DI::l10n()->t('Welcome home %s.', $a->user['username']), + '$please' => DI::l10n()->t('Please confirm your introduction/connection request to %s.', $dfrn_url), + '$submit' => DI::l10n()->t('Confirm'), '$uid' => $_SESSION['uid'], '$nickname' => $a->user['nickname'], 'dfrn_rawurl' => $_GET['dfrn_url'] @@ -561,7 +561,7 @@ function dfrn_request_content(App $a) 'to_email' => $r[0]['email'], 'uid' => $r[0]['uid'], 'link' => DI::baseUrl() . '/notifications/intros', - 'source_name' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : L10n::t('[Name Withheld]')), + 'source_name' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : DI::l10n()->t('[Name Withheld]')), 'source_link' => $r[0]['url'], 'source_photo' => $r[0]['photo'], 'verb' => Activity::REQ_FRIEND, @@ -598,7 +598,7 @@ function dfrn_request_content(App $a) // Normal web request. Display our user's introduction form. if (Config::get('system', 'block_public') && !Session::isAuthenticated()) { if (!Config::get('system', 'local_block')) { - notice(L10n::t('Public access denied.') . EOL); + notice(DI::l10n()->t('Public access denied.') . EOL); return; } } @@ -633,25 +633,25 @@ function dfrn_request_content(App $a) $tpl = Renderer::getMarkupTemplate('auto_request.tpl'); } - $page_desc = L10n::t("Please enter your 'Identity Address' from one of the following supported communications networks:"); + $page_desc = DI::l10n()->t("Please enter your 'Identity Address' from one of the following supported communications networks:"); - $invite_desc = L10n::t('If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today.', Search::getGlobalDirectory() . '/servers'); + $invite_desc = DI::l10n()->t('If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today.', Search::getGlobalDirectory() . '/servers'); $o = Renderer::replaceMacros($tpl, [ - '$header' => L10n::t('Friend/Connection Request'), - '$desc' => L10n::t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de'), - '$pls_answer' => L10n::t('Please answer the following:'), - '$does_know_you' => ['knowyou', L10n::t('Does %s know you?', $a->profile['name']), false, '', [L10n::t('No'), L10n::t('Yes')]], - '$add_note' => L10n::t('Add a personal note:'), + '$header' => DI::l10n()->t('Friend/Connection Request'), + '$desc' => DI::l10n()->t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de'), + '$pls_answer' => DI::l10n()->t('Please answer the following:'), + '$does_know_you' => ['knowyou', DI::l10n()->t('Does %s know you?', $a->profile['name']), false, '', [DI::l10n()->t('No'), DI::l10n()->t('Yes')]], + '$add_note' => DI::l10n()->t('Add a personal note:'), '$page_desc' => $page_desc, - '$friendica' => L10n::t('Friendica'), - '$statusnet' => L10n::t("GNU Social \x28Pleroma, Mastodon\x29"), - '$diaspora' => L10n::t("Diaspora \x28Socialhome, Hubzilla\x29"), - '$diasnote' => L10n::t(' - please do not use this form. Instead, enter %s into your Diaspora search bar.', $target_addr), - '$your_address' => L10n::t('Your Identity Address:'), + '$friendica' => DI::l10n()->t('Friendica'), + '$statusnet' => DI::l10n()->t("GNU Social \x28Pleroma, Mastodon\x29"), + '$diaspora' => DI::l10n()->t("Diaspora \x28Socialhome, Hubzilla\x29"), + '$diasnote' => DI::l10n()->t(' - please do not use this form. Instead, enter %s into your Diaspora search bar.', $target_addr), + '$your_address' => DI::l10n()->t('Your Identity Address:'), '$invite_desc' => $invite_desc, - '$submit' => L10n::t('Submit Request'), - '$cancel' => L10n::t('Cancel'), + '$submit' => DI::l10n()->t('Submit Request'), + '$cancel' => DI::l10n()->t('Cancel'), '$nickname' => $a->argv[1], '$name' => $a->profile['name'], '$myaddr' => $myaddr diff --git a/mod/display.php b/mod/display.php index 07445ba51..2b4e2c220 100644 --- a/mod/display.php +++ b/mod/display.php @@ -166,7 +166,7 @@ function display_fetchauthor($a, $item) function display_content(App $a, $update = false, $update_uid = 0) { if (Config::get('system','block_public') && !Session::isAuthenticated()) { - throw new HTTPException\ForbiddenException(L10n::t('Public access denied.')); + throw new HTTPException\ForbiddenException(DI::l10n()->t('Public access denied.')); } $o = ''; @@ -223,7 +223,7 @@ function display_content(App $a, $update = false, $update_uid = 0) } if (empty($item)) { - throw new HTTPException\NotFoundException(L10n::t('The requested item doesn\'t exist or has been deleted.')); + throw new HTTPException\NotFoundException(DI::l10n()->t('The requested item doesn\'t exist or has been deleted.')); } // We are displaying an "alternate" link if that post was public. See issue 2864 @@ -268,7 +268,7 @@ function display_content(App $a, $update = false, $update_uid = 0) $is_owner = (local_user() && (in_array($a->profile['profile_uid'], [local_user(), 0])) ? true : false); if (!empty($a->profile['hidewall']) && !$is_owner && !$is_remote_contact) { - throw new HTTPException\ForbiddenException(L10n::t('Access to this profile has been restricted.')); + throw new HTTPException\ForbiddenException(DI::l10n()->t('Access to this profile has been restricted.')); } // We need the editor here to be able to reshare an item. @@ -304,7 +304,7 @@ function display_content(App $a, $update = false, $update_uid = 0) $item = Item::selectFirstForUser($a->profile['profile_uid'], $fields, $condition); if (!DBA::isResult($item)) { - throw new HTTPException\NotFoundException(L10n::t('The requested item doesn\'t exist or has been deleted.')); + throw new HTTPException\NotFoundException(DI::l10n()->t('The requested item doesn\'t exist or has been deleted.')); } $item['uri'] = $item['parent-uri']; @@ -384,7 +384,7 @@ function displayShowFeed($item_id, $conversation) { $xml = DFRN::itemFeed($item_id, $conversation); if ($xml == '') { - throw new HTTPException\InternalServerErrorException(L10n::t('The feed for this item is unavailable.')); + throw new HTTPException\InternalServerErrorException(DI::l10n()->t('The feed for this item is unavailable.')); } header("Content-type: application/atom+xml"); echo $xml; diff --git a/mod/editpost.php b/mod/editpost.php index b6ed78246..94d483172 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -20,14 +20,14 @@ function editpost_content(App $a) $o = ''; if (!local_user()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return; } $post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0); if (!$post_id) { - notice(L10n::t('Item not found') . EOL); + notice(DI::l10n()->t('Item not found') . EOL); return; } @@ -37,19 +37,19 @@ function editpost_content(App $a) $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]); if (!DBA::isResult($item)) { - notice(L10n::t('Item not found') . EOL); + notice(DI::l10n()->t('Item not found') . EOL); return; } $geotag = ''; $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate("section_title.tpl"), [ - '$title' => L10n::t('Edit post') + '$title' => DI::l10n()->t('Edit post') ]); $tpl = Renderer::getMarkupTemplate('jot-header.tpl'); DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [ - '$ispublic' => ' ', // L10n::t('Visible to everybody'), + '$ispublic' => ' ', // DI::l10n()->t('Visible to everybody'), '$geotag' => $geotag, '$nickname' => $a->user['nickname'] ]); @@ -70,23 +70,23 @@ function editpost_content(App $a) '$is_edit' => true, '$return_path' => '/display/' . $item['guid'], '$action' => 'item', - '$share' => L10n::t('Save'), - '$upload' => L10n::t('Upload photo'), - '$shortupload' => L10n::t('upload photo'), - '$attach' => L10n::t('Attach file'), - '$shortattach' => L10n::t('attach file'), - '$weblink' => L10n::t('Insert web link'), - '$shortweblink' => L10n::t('web link'), - '$video' => L10n::t('Insert video link'), - '$shortvideo' => L10n::t('video link'), - '$audio' => L10n::t('Insert audio link'), - '$shortaudio' => L10n::t('audio link'), - '$setloc' => L10n::t('Set your location'), - '$shortsetloc' => L10n::t('set location'), - '$noloc' => L10n::t('Clear browser location'), - '$shortnoloc' => L10n::t('clear location'), - '$wait' => L10n::t('Please wait'), - '$permset' => L10n::t('Permission settings'), + '$share' => DI::l10n()->t('Save'), + '$upload' => DI::l10n()->t('Upload photo'), + '$shortupload' => DI::l10n()->t('upload photo'), + '$attach' => DI::l10n()->t('Attach file'), + '$shortattach' => DI::l10n()->t('attach file'), + '$weblink' => DI::l10n()->t('Insert web link'), + '$shortweblink' => DI::l10n()->t('web link'), + '$video' => DI::l10n()->t('Insert video link'), + '$shortvideo' => DI::l10n()->t('video link'), + '$audio' => DI::l10n()->t('Insert audio link'), + '$shortaudio' => DI::l10n()->t('audio link'), + '$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'), + '$wait' => DI::l10n()->t('Please wait'), + '$permset' => DI::l10n()->t('Permission settings'), '$wall' => $item['wall'], '$posttype' => $item['post-type'], '$content' => undo_post_tagging($item['body']), @@ -94,28 +94,28 @@ function editpost_content(App $a) '$defloc' => $a->user['default-location'], '$visitor' => 'none', '$pvisit' => 'none', - '$emailcc' => L10n::t('CC: email addresses'), - '$public' => L10n::t('Public post'), + '$emailcc' => DI::l10n()->t('CC: email addresses'), + '$public' => DI::l10n()->t('Public post'), '$jotnets' => $jotnets, '$title' => $item['title'], - '$placeholdertitle' => L10n::t('Set title'), + '$placeholdertitle' => DI::l10n()->t('Set title'), '$category' => FileTag::fileToList($item['file'], 'category'), - '$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? L10n::t("Categories \x28comma-separated list\x29") : ''), - '$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'), + '$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? DI::l10n()->t("Categories \x28comma-separated list\x29") : ''), + '$emtitle' => DI::l10n()->t('Example: bob@example.com, mary@example.com'), '$lockstate' => $lockstate, '$acl' => '', // populate_acl((($group) ? $group_acl : $a->user)), '$bang' => ($lockstate === 'lock' ? '!' : ''), '$profile_uid' => $_SESSION['uid'], - '$preview' => L10n::t('Preview'), + '$preview' => DI::l10n()->t('Preview'), '$jotplugins' => $jotplugins, - '$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), //jot nav tab (used in some themes) - '$message' => L10n::t('Message'), - '$browser' => L10n::t('Browser'), - '$shortpermset' => L10n::t('permissions'), + '$message' => DI::l10n()->t('Message'), + '$browser' => DI::l10n()->t('Browser'), + '$shortpermset' => DI::l10n()->t('permissions'), ]); return $o; diff --git a/mod/events.php b/mod/events.php index a3c27a053..f92a01cf6 100644 --- a/mod/events.php +++ b/mod/events.php @@ -117,18 +117,18 @@ function events_post(App $a) $onerror_path = 'events/' . $action . '?' . http_build_query($params, null, null, PHP_QUERY_RFC3986); if (strcmp($finish, $start) < 0 && !$nofinish) { - notice(L10n::t('Event can not end before it has started.') . EOL); + notice(DI::l10n()->t('Event can not end before it has started.') . EOL); if (intval($_REQUEST['preview'])) { - echo L10n::t('Event can not end before it has started.'); + echo DI::l10n()->t('Event can not end before it has started.'); exit(); } DI::baseUrl()->redirect($onerror_path); } if (!$summary || ($start === DBA::NULL_DATETIME)) { - notice(L10n::t('Event title and start time are required.') . EOL); + notice(DI::l10n()->t('Event title and start time are required.') . EOL); if (intval($_REQUEST['preview'])) { - echo L10n::t('Event title and start time are required.'); + echo DI::l10n()->t('Event title and start time are required.'); exit(); } DI::baseUrl()->redirect($onerror_path); @@ -210,7 +210,7 @@ function events_post(App $a) function events_content(App $a) { if (!local_user()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return Login::form(); } @@ -391,20 +391,20 @@ function events_content(App $a) $o = Renderer::replaceMacros($tpl, [ '$tabs' => $tabs, - '$title' => L10n::t('Events'), - '$view' => L10n::t('View'), - '$new_event' => [DI::baseUrl() . '/events/new', L10n::t('Create New Event'), '', ''], - '$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'), + '$new_event' => [DI::baseUrl() . '/events/new', DI::l10n()->t('Create New Event'), '', ''], + '$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'])) { @@ -505,14 +505,14 @@ function events_content(App $a) '$cid' => $cid, '$uri' => $uri, - '$title' => L10n::t('Event details'), - '$desc' => L10n::t('Starting date and Title are required.'), - '$s_text' => L10n::t('Event Starts:') . ' *', + '$title' => DI::l10n()->t('Event details'), + '$desc' => DI::l10n()->t('Starting date and Title are required.'), + '$s_text' => DI::l10n()->t('Event Starts:') . ' *', '$s_dsel' => Temporal::getDateTimeField( new DateTime(), DateTime::createFromFormat('Y', intval($syear) + 5), DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"), - L10n::t('Event Starts:'), + DI::l10n()->t('Event Starts:'), 'start_text', true, true, @@ -520,39 +520,39 @@ function events_content(App $a) '', true ), - '$n_text' => L10n::t('Finish date/time is not known or not relevant'), + '$n_text' => DI::l10n()->t('Finish date/time is not known or not relevant'), '$n_checked' => $n_checked, - '$f_text' => L10n::t('Event Finishes:'), + '$f_text' => DI::l10n()->t('Event Finishes:'), '$f_dsel' => Temporal::getDateTimeField( new DateTime(), DateTime::createFromFormat('Y', intval($fyear) + 5), DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"), - L10n::t('Event Finishes:'), + DI::l10n()->t('Event Finishes:'), 'finish_text', true, true, 'start_text' ), - '$a_text' => L10n::t('Adjust for viewer timezone'), + '$a_text' => DI::l10n()->t('Adjust for viewer timezone'), '$a_checked' => $a_checked, - '$d_text' => L10n::t('Description:'), + '$d_text' => DI::l10n()->t('Description:'), '$d_orig' => $d_orig, - '$l_text' => L10n::t('Location:'), + '$l_text' => DI::l10n()->t('Location:'), '$l_orig' => $l_orig, - '$t_text' => L10n::t('Title:') . ' *', + '$t_text' => DI::l10n()->t('Title:') . ' *', '$t_orig' => $t_orig, - '$summary' => ['summary', L10n::t('Title:'), $t_orig, '', '*'], - '$sh_text' => L10n::t('Share this event'), - '$share' => ['share', L10n::t('Share this event'), $share_checked, '', $share_disabled], + '$summary' => ['summary', DI::l10n()->t('Title:'), $t_orig, '', '*'], + '$sh_text' => DI::l10n()->t('Share this event'), + '$share' => ['share', DI::l10n()->t('Share this event'), $share_checked, '', $share_disabled], '$sh_checked' => $share_checked, - '$nofinish' => ['nofinish', L10n::t('Finish date/time is not known or not relevant'), $n_checked], - '$adjust' => ['adjust', L10n::t('Adjust for viewer timezone'), $a_checked], - '$preview' => L10n::t('Preview'), + '$nofinish' => ['nofinish', DI::l10n()->t('Finish date/time is not known or not relevant'), $n_checked], + '$adjust' => ['adjust', DI::l10n()->t('Adjust for viewer timezone'), $a_checked], + '$preview' => DI::l10n()->t('Preview'), '$acl' => $acl, - '$submit' => L10n::t('Submit'), - '$basic' => L10n::t('Basic'), - '$advanced' => L10n::t('Advanced'), - '$permissions' => L10n::t('Permissions'), + '$submit' => DI::l10n()->t('Submit'), + '$basic' => DI::l10n()->t('Basic'), + '$advanced' => DI::l10n()->t('Advanced'), + '$permissions' => DI::l10n()->t('Permissions'), ]); return $o; @@ -568,9 +568,9 @@ function events_content(App $a) } if (Item::exists(['id' => $ev[0]['itemid']])) { - notice(L10n::t('Failed to remove event') . EOL); + notice(DI::l10n()->t('Failed to remove event') . EOL); } else { - info(L10n::t('Event removed') . EOL); + info(DI::l10n()->t('Event removed') . EOL); } DI::baseUrl()->redirect('events'); diff --git a/mod/fbrowser.php b/mod/fbrowser.php index 2b293a716..79dd1599b 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -40,7 +40,7 @@ function fbrowser_content(App $a) switch ($a->argv[1]) { case "image": - $path = [["", L10n::t("Photos")]]; + $path = [["", DI::l10n()->t("Photos")]]; $albums = false; $sql_extra = ""; $sql_extra2 = " ORDER BY created DESC LIMIT 0, 10"; @@ -49,7 +49,7 @@ function fbrowser_content(App $a) $albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' ", intval(local_user()), DBA::escape('Contact Photos'), - DBA::escape(L10n::t('Contact Photos')) + DBA::escape(DI::l10n()->t('Contact Photos')) ); function _map_folder1($el) @@ -73,7 +73,7 @@ function fbrowser_content(App $a) GROUP BY `resource-id` $sql_extra2", intval(local_user()), DBA::escape('Contact Photos'), - DBA::escape(L10n::t('Contact Photos')) + DBA::escape(DI::l10n()->t('Contact Photos')) ); function _map_files1($rr) @@ -107,9 +107,9 @@ function fbrowser_content(App $a) '$path' => $path, '$folders' => $albums, '$files' => $files, - '$cancel' => L10n::t('Cancel'), + '$cancel' => DI::l10n()->t('Cancel'), '$nickname' => $a->user['nickname'], - '$upload' => L10n::t('Upload') + '$upload' => DI::l10n()->t('Upload') ]); break; @@ -133,12 +133,12 @@ function fbrowser_content(App $a) $tpl = Renderer::getMarkupTemplate($template_file); $o = Renderer::replaceMacros($tpl, [ '$type' => 'file', - '$path' => [ [ "", L10n::t("Files")] ], + '$path' => [ [ "", DI::l10n()->t("Files")] ], '$folders' => false, '$files' => $files, - '$cancel' => L10n::t('Cancel'), + '$cancel' => DI::l10n()->t('Cancel'), '$nickname' => $a->user['nickname'], - '$upload' => L10n::t('Upload') + '$upload' => DI::l10n()->t('Upload') ]); } diff --git a/mod/follow.php b/mod/follow.php index 7363275de..dce6798b3 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -18,7 +18,7 @@ use Friendica\Util\Strings; function follow_post(App $a) { if (!local_user()) { - throw new \Friendica\Network\HTTPException\ForbiddenException(L10n::t('Access denied.')); + throw new \Friendica\Network\HTTPException\ForbiddenException(DI::l10n()->t('Access denied.')); } if (isset($_REQUEST['cancel'])) { @@ -44,7 +44,7 @@ function follow_post(App $a) DI::baseUrl()->redirect('contact/' . $result['cid']); } - info(L10n::t('The contact could not be added.')); + info(DI::l10n()->t('The contact could not be added.')); DI::baseUrl()->redirect($return_path); // NOTREACHED @@ -55,7 +55,7 @@ function follow_content(App $a) $return_path = 'contact'; if (!local_user()) { - notice(L10n::t('Permission denied.')); + notice(DI::l10n()->t('Permission denied.')); DI::baseUrl()->redirect($return_path); // NOTREACHED } @@ -74,7 +74,7 @@ function follow_content(App $a) DI::baseUrl()->redirect($return_path); } - $submit = L10n::t('Submit Request'); + $submit = DI::l10n()->t('Submit Request'); // Don't try to add a pending contact $r = q("SELECT `pending` FROM `contact` WHERE `uid` = %d AND ((`rel` != %d) OR (`network` = '%s')) AND @@ -85,7 +85,7 @@ function follow_content(App $a) if ($r) { if ($r[0]['pending']) { - notice(L10n::t('You already added this contact.')); + notice(DI::l10n()->t('You already added this contact.')); $submit = ''; //$a->internalRedirect($_SESSION['return_path']); // NOTREACHED @@ -97,21 +97,21 @@ function follow_content(App $a) $protocol = Contact::getProtocol($ret['url'], $ret['network']); if (($protocol == Protocol::DIASPORA) && !Config::get('system', 'diaspora_enabled')) { - notice(L10n::t("Diaspora support isn't enabled. Contact can't be added.")); + notice(DI::l10n()->t("Diaspora support isn't enabled. Contact can't be added.")); $submit = ''; //$a->internalRedirect($_SESSION['return_path']); // NOTREACHED } if (($protocol == Protocol::OSTATUS) && Config::get('system', 'ostatus_disabled')) { - notice(L10n::t("OStatus support is disabled. Contact can't be added.")); + notice(DI::l10n()->t("OStatus support is disabled. Contact can't be added.")); $submit = ''; //$a->internalRedirect($_SESSION['return_path']); // NOTREACHED } if ($protocol == Protocol::PHANTOM) { - notice(L10n::t("The network type couldn't be detected. Contact can't be added.")); + notice(DI::l10n()->t("The network type couldn't be detected. Contact can't be added.")); $submit = ''; //$a->internalRedirect($_SESSION['return_path']); // NOTREACHED @@ -132,7 +132,7 @@ function follow_content(App $a) $r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", intval($uid)); if (!$r) { - notice(L10n::t('Permission denied.')); + notice(DI::l10n()->t('Permission denied.')); DI::baseUrl()->redirect($return_path); // NOTREACHED } @@ -158,30 +158,30 @@ function follow_content(App $a) } $o = Renderer::replaceMacros($tpl, [ - '$header' => L10n::t('Connect/Follow'), + '$header' => DI::l10n()->t('Connect/Follow'), '$desc' => '', - '$pls_answer' => L10n::t('Please answer the following:'), - '$does_know_you' => ['knowyou', L10n::t('Does %s know you?', $ret['name']), false, '', [L10n::t('No'), L10n::t('Yes')]], - '$add_note' => L10n::t('Add a personal note:'), + '$pls_answer' => DI::l10n()->t('Please answer the following:'), + '$does_know_you' => ['knowyou', DI::l10n()->t('Does %s know you?', $ret['name']), false, '', [DI::l10n()->t('No'), DI::l10n()->t('Yes')]], + '$add_note' => DI::l10n()->t('Add a personal note:'), '$page_desc' => '', '$friendica' => '', '$statusnet' => '', '$diaspora' => '', '$diasnote' => '', - '$your_address' => L10n::t('Your Identity Address:'), + '$your_address' => DI::l10n()->t('Your Identity Address:'), '$invite_desc' => '', '$emailnet' => '', '$submit' => $submit, - '$cancel' => L10n::t('Cancel'), + '$cancel' => DI::l10n()->t('Cancel'), '$nickname' => '', '$name' => $ret['name'], '$url' => $ret['url'], '$zrl' => Profile::zrl($ret['url']), - '$url_label' => L10n::t('Profile URL'), + '$url_label' => DI::l10n()->t('Profile URL'), '$myaddr' => $myaddr, '$request' => $request, '$keywords' => $r[0]['keywords'], - '$keywords_label'=> L10n::t('Tags:') + '$keywords_label'=> DI::l10n()->t('Tags:') ]); DI::page()['aside'] = ''; @@ -193,7 +193,7 @@ function follow_content(App $a) if ($gcontact_id <> 0) { $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), - ['$title' => L10n::t('Status Messages and Posts')] + ['$title' => DI::l10n()->t('Status Messages and Posts')] ); // Show last public posts diff --git a/mod/fsuggest.php b/mod/fsuggest.php index d41363ad7..f7c1930cc 100644 --- a/mod/fsuggest.php +++ b/mod/fsuggest.php @@ -29,7 +29,7 @@ function fsuggest_post(App $a) // We do query the "uid" as well to ensure that it is our contact if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user()])) { - notice(L10n::t('Contact not found.') . EOL); + notice(DI::l10n()->t('Contact not found.') . EOL); return; } @@ -41,7 +41,7 @@ function fsuggest_post(App $a) // We do query the "uid" as well to ensure that it is our contact $contact = DBA::selectFirst('contact', ['name', 'url', 'request', 'avatar'], ['id' => $suggest_contact_id, 'uid' => local_user()]); if (!DBA::isResult($contact)) { - notice(L10n::t('Suggested contact not found.') . EOL); + notice(DI::l10n()->t('Suggested contact not found.') . EOL); return; } @@ -54,13 +54,13 @@ function fsuggest_post(App $a) Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::SUGGESTION, DBA::lastInsertId()); - info(L10n::t('Friend suggestion sent.') . EOL); + info(DI::l10n()->t('Friend suggestion sent.') . EOL); } function fsuggest_content(App $a) { if (! local_user()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return; } @@ -72,13 +72,13 @@ function fsuggest_content(App $a) $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user()]); if (! DBA::isResult($contact)) { - notice(L10n::t('Contact not found.') . EOL); + notice(DI::l10n()->t('Contact not found.') . EOL); return; } - $o = '

' . L10n::t('Suggest Friends') . '

'; + $o = '

' . DI::l10n()->t('Suggest Friends') . '

'; - $o .= '
' . L10n::t('Suggest a friend for %s', $contact['name']) . '
'; + $o .= '
' . DI::l10n()->t('Suggest a friend for %s', $contact['name']) . '
'; $o .= '
'; @@ -89,7 +89,7 @@ function fsuggest_content(App $a) ); - $o .= '
'; + $o .= '
'; $o .= '
'; return $o; diff --git a/mod/item.php b/mod/item.php index 90d8f3ead..a639886ad 100644 --- a/mod/item.php +++ b/mod/item.php @@ -123,7 +123,7 @@ function item_post(App $a) { } if (!DBA::isResult($toplevel_item)) { - notice(L10n::t('Unable to locate original post.') . EOL); + notice(DI::l10n()->t('Unable to locate original post.') . EOL); if (!empty($_REQUEST['return'])) { DI::baseUrl()->redirect($return_path); } @@ -170,7 +170,7 @@ function item_post(App $a) { // Now check that valid personal details have been provided if (!Security::canWriteToUserWall($profile_uid) && !$allow_comment) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); if (!empty($_REQUEST['return'])) { DI::baseUrl()->redirect($return_path); @@ -325,7 +325,7 @@ function item_post(App $a) { if ($preview) { exit(); } - info(L10n::t('Empty post discarded.') . EOL); + info(DI::l10n()->t('Empty post discarded.') . EOL); if (!empty($_REQUEST['return'])) { DI::baseUrl()->redirect($return_path); } @@ -797,14 +797,14 @@ function item_post(App $a) { if (!strlen($addr)) { continue; } - $disclaimer = '
' . L10n::t('This message was sent to you by %s, a member of the Friendica social network.', $a->user['username']) + $disclaimer = '
' . DI::l10n()->t('This message was sent to you by %s, a member of the Friendica social network.', $a->user['username']) . '
'; - $disclaimer .= L10n::t('You may visit them online at %s', DI::baseUrl() . '/profile/' . $a->user['nickname']) . EOL; - $disclaimer .= L10n::t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL; + $disclaimer .= DI::l10n()->t('You may visit them online at %s', DI::baseUrl() . '/profile/' . $a->user['nickname']) . EOL; + $disclaimer .= DI::l10n()->t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL; if (!$datarray['title']=='') { $subject = Email::encodeHeader($datarray['title'], 'UTF-8'); } else { - $subject = Email::encodeHeader('[Friendica]' . ' ' . L10n::t('%s posted an update.', $a->user['username']), 'UTF-8'); + $subject = Email::encodeHeader('[Friendica]' . ' ' . DI::l10n()->t('%s posted an update.', $a->user['username']), 'UTF-8'); } $link = '' . $a->user['username'] . '

'; $html = Item::prepareBody($datarray); diff --git a/mod/lockview.php b/mod/lockview.php index fc9fed306..aeee5a762 100644 --- a/mod/lockview.php +++ b/mod/lockview.php @@ -45,7 +45,7 @@ function lockview_content(App $a) Hook::callAll('lockview_content', $item); if ($item['uid'] != local_user()) { - echo L10n::t('Remote privacy information not available.') . '
'; + echo DI::l10n()->t('Remote privacy information not available.') . '
'; exit(); } @@ -56,7 +56,7 @@ function lockview_content(App $a) && empty($item['deny_cid']) && empty($item['deny_gid'])) { - echo L10n::t('Remote privacy information not available.') . '
'; + echo DI::l10n()->t('Remote privacy information not available.') . '
'; exit(); } @@ -67,19 +67,19 @@ function lockview_content(App $a) $deny_users = $aclFormatter->expand($item['deny_cid']); $deny_groups = $aclFormatter->expand($item['deny_gid']); - $o = L10n::t('Visible to:') . '
'; + $o = DI::l10n()->t('Visible to:') . '
'; $l = []; if (count($allowed_groups)) { $key = array_search(Group::FOLLOWERS, $allowed_groups); if ($key !== false) { - $l[] = '' . L10n::t('Followers') . ''; + $l[] = '' . DI::l10n()->t('Followers') . ''; unset($allowed_groups[$key]); } $key = array_search(Group::MUTUALS, $allowed_groups); if ($key !== false) { - $l[] = '' . L10n::t('Mutuals') . ''; + $l[] = '' . DI::l10n()->t('Mutuals') . ''; unset($allowed_groups[$key]); } @@ -108,13 +108,13 @@ function lockview_content(App $a) if (count($deny_groups)) { $key = array_search(Group::FOLLOWERS, $deny_groups); if ($key !== false) { - $l[] = '' . L10n::t('Followers') . ''; + $l[] = '' . DI::l10n()->t('Followers') . ''; unset($deny_groups[$key]); } $key = array_search(Group::MUTUALS, $deny_groups); if ($key !== false) { - $l[] = '' . L10n::t('Mutuals') . ''; + $l[] = '' . DI::l10n()->t('Mutuals') . ''; unset($deny_groups[$key]); } diff --git a/mod/lostpass.php b/mod/lostpass.php index 81bcad79c..cf6801d70 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -24,7 +24,7 @@ function lostpass_post(App $a) $condition = ['(`email` = ? OR `nickname` = ?) AND `verified` = 1 AND `blocked` = 0', $loginame, $loginame]; $user = DBA::selectFirst('user', ['uid', 'username', 'nickname', 'email', 'language'], $condition); if (!DBA::isResult($user)) { - notice(L10n::t('No valid account found.') . EOL); + notice(DI::l10n()->t('No valid account found.') . EOL); DI::baseUrl()->redirect(); } @@ -36,13 +36,13 @@ function lostpass_post(App $a) ]; $result = DBA::update('user', $fields, ['uid' => $user['uid']]); if ($result) { - info(L10n::t('Password reset request issued. Check your email.') . EOL); + info(DI::l10n()->t('Password reset request issued. Check your email.') . EOL); } $sitename = Config::get('config', 'sitename'); $resetlink = DI::baseUrl() . '/lostpass/' . $pwdreset_token; - $preamble = Strings::deindent(L10n::t(' + $preamble = Strings::deindent(DI::l10n()->t(' Dear %1$s, A request was recently received at "%2$s" to reset your account password. In order to confirm this request, please select the verification link @@ -53,7 +53,7 @@ function lostpass_post(App $a) Your password will not be changed unless we can verify that you issued this request.', $user['username'], $sitename)); - $body = Strings::deindent(L10n::t(' + $body = Strings::deindent(DI::l10n()->t(' Follow this link soon to verify your identity: %1$s @@ -72,7 +72,7 @@ function lostpass_post(App $a) 'to_name' => $user['username'], 'to_email' => $user['email'], 'uid' => $user['uid'], - 'subject' => L10n::t('Password reset requested at %s', $sitename), + 'subject' => DI::l10n()->t('Password reset requested at %s', $sitename), 'preamble' => $preamble, 'body' => $body ]); @@ -87,7 +87,7 @@ function lostpass_content(App $a) $user = DBA::selectFirst('user', ['uid', 'username', 'nickname', 'email', 'pwdreset_time', 'language'], ['pwdreset' => $pwdreset_token]); if (!DBA::isResult($user)) { - notice(L10n::t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed.")); + notice(DI::l10n()->t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed.")); return lostpass_form(); } @@ -100,7 +100,7 @@ function lostpass_content(App $a) ]; DBA::update('user', $fields, ['uid' => $user['uid']]); - notice(L10n::t('Request has expired, please make a new one.')); + notice(DI::l10n()->t('Request has expired, please make a new one.')); return lostpass_form(); } @@ -115,10 +115,10 @@ function lostpass_form() { $tpl = Renderer::getMarkupTemplate('lostpass.tpl'); $o = Renderer::replaceMacros($tpl, [ - '$title' => L10n::t('Forgot your Password?'), - '$desc' => L10n::t('Enter your email address and submit to have your password reset. Then check your email for further instructions.'), - '$name' => L10n::t('Nickname or Email: '), - '$submit' => L10n::t('Reset') + '$title' => DI::l10n()->t('Forgot your Password?'), + '$desc' => DI::l10n()->t('Enter your email address and submit to have your password reset. Then check your email for further instructions.'), + '$name' => DI::l10n()->t('Nickname or Email: '), + '$submit' => DI::l10n()->t('Reset') ]); return $o; @@ -133,25 +133,25 @@ function lostpass_generate_password($user) if (DBA::isResult($result)) { $tpl = Renderer::getMarkupTemplate('pwdreset.tpl'); $o .= Renderer::replaceMacros($tpl, [ - '$lbl1' => L10n::t('Password Reset'), - '$lbl2' => L10n::t('Your password has been reset as requested.'), - '$lbl3' => L10n::t('Your new password is'), - '$lbl4' => L10n::t('Save or copy your new password - and then'), - '$lbl5' => '' . L10n::t('click here to login') . '.', - '$lbl6' => L10n::t('Your password may be changed from the Settings page after successful login.'), + '$lbl1' => DI::l10n()->t('Password Reset'), + '$lbl2' => DI::l10n()->t('Your password has been reset as requested.'), + '$lbl3' => DI::l10n()->t('Your new password is'), + '$lbl4' => DI::l10n()->t('Save or copy your new password - and then'), + '$lbl5' => '' . DI::l10n()->t('click here to login') . '.', + '$lbl6' => DI::l10n()->t('Your password may be changed from the Settings page after successful login.'), '$newpass' => $new_password, ]); info("Your password has been reset." . EOL); $sitename = Config::get('config', 'sitename'); - $preamble = Strings::deindent(L10n::t(' + $preamble = Strings::deindent(DI::l10n()->t(' Dear %1$s, Your password has been changed as requested. Please retain this information for your records ' . "\x28" . 'or change your password immediately to something that you will remember' . "\x29" . '. ', $user['username'])); - $body = Strings::deindent(L10n::t(' + $body = Strings::deindent(DI::l10n()->t(' Your login details are as follows: Site Location: %1$s @@ -167,7 +167,7 @@ function lostpass_generate_password($user) 'to_name' => $user['username'], 'to_email' => $user['email'], 'uid' => $user['uid'], - 'subject' => L10n::t('Your password has been changed at %s', $sitename), + 'subject' => DI::l10n()->t('Your password has been changed at %s', $sitename), 'preamble' => $preamble, 'body' => $body ]); diff --git a/mod/match.php b/mod/match.php index 0bfe8fd30..c187546b3 100644 --- a/mod/match.php +++ b/mod/match.php @@ -46,7 +46,7 @@ function match_content(App $a) return ''; } if (!$profile['pub_keywords'] && (!$profile['prv_keywords'])) { - notice(L10n::t('No keywords to match. Please add keywords to your default profile.') . EOL); + notice(DI::l10n()->t('No keywords to match. Please add keywords to your default profile.') . EOL); return ''; } @@ -84,8 +84,8 @@ function match_content(App $a) $connlnk = DI::baseUrl() . '/follow/?url=' . $profile->url; $photo_menu = [ - 'profile' => [L10n::t("View Profile"), Contact::magicLink($profile->url)], - 'follow' => [L10n::t("Connect/Follow"), $connlnk] + 'profile' => [DI::l10n()->t("View Profile"), Contact::magicLink($profile->url)], + 'follow' => [DI::l10n()->t("Connect/Follow"), $connlnk] ]; $contact_details = Contact::getDetailsByURL($profile->url, 0); @@ -99,7 +99,7 @@ function match_content(App $a) 'about' => $contact_details['about'] ?? '', 'account_type' => Contact::getAccountType($contact_details), 'thumb' => ProxyUtils::proxifyUrl($profile->photo, false, ProxyUtils::SIZE_THUMB), - 'conntxt' => L10n::t('Connect'), + 'conntxt' => DI::l10n()->t('Connect'), 'connlnk' => $connlnk, 'img_hover' => $profile->tags, 'photo_menu' => $photo_menu, @@ -112,12 +112,12 @@ function match_content(App $a) 'class' => 'pager', 'first' => [ 'url' => 'match', - 'text' => L10n::t('first'), + 'text' => DI::l10n()->t('first'), 'class' => 'previous' . ($start == 0 ? 'disabled' : '') ], 'next' => [ 'url' => 'match?start=' . $i, - 'text' => L10n::t('next'), + 'text' => DI::l10n()->t('next'), 'class' => 'next' . ($i >= $msearch->total ? ' disabled' : '') ] ]; @@ -127,12 +127,12 @@ function match_content(App $a) } if (empty($entries)) { - info(L10n::t('No matches') . EOL); + info(DI::l10n()->t('No matches') . EOL); } $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl'); $o = Renderer::replaceMacros($tpl, [ - '$title' => L10n::t('Profile Match'), + '$title' => DI::l10n()->t('Profile Match'), '$contacts' => $entries, '$paginate' => $paginate ]); diff --git a/mod/message.php b/mod/message.php index 3d378f515..06203b839 100644 --- a/mod/message.php +++ b/mod/message.php @@ -29,7 +29,7 @@ function message_init(App $a) } $new = [ - 'label' => L10n::t('New Message'), + 'label' => DI::l10n()->t('New Message'), 'url' => 'message/new', 'sel' => $a->argc > 1 && $a->argv[1] == 'new', 'accesskey' => 'm', @@ -52,7 +52,7 @@ function message_init(App $a) function message_post(App $a) { if (!local_user()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return; } @@ -66,20 +66,20 @@ function message_post(App $a) switch ($ret) { case -1: - notice(L10n::t('No recipient selected.') . EOL); + notice(DI::l10n()->t('No recipient selected.') . EOL); $norecip = true; break; case -2: - notice(L10n::t('Unable to locate contact information.') . EOL); + notice(DI::l10n()->t('Unable to locate contact information.') . EOL); break; case -3: - notice(L10n::t('Message could not be sent.') . EOL); + notice(DI::l10n()->t('Message could not be sent.') . EOL); break; case -4: - notice(L10n::t('Message collection failure.') . EOL); + notice(DI::l10n()->t('Message collection failure.') . EOL); break; default: - info(L10n::t('Message sent.') . EOL); + info(DI::l10n()->t('Message sent.') . EOL); } // fake it to go back to the input form if no recipient listed @@ -97,7 +97,7 @@ function message_content(App $a) Nav::setSelected('messages'); if (!local_user()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return Login::form(); } @@ -106,20 +106,20 @@ function message_content(App $a) $tpl = Renderer::getMarkupTemplate('mail_head.tpl'); if ($a->argc > 1 && $a->argv[1] == 'new') { $button = [ - 'label' => L10n::t('Discard'), + 'label' => DI::l10n()->t('Discard'), 'url' => '/message', 'sel' => 'close', ]; } else { $button = [ - 'label' => L10n::t('New Message'), + 'label' => DI::l10n()->t('New Message'), 'url' => '/message/new', 'sel' => 'new', 'accesskey' => 'm', ]; } $header = Renderer::replaceMacros($tpl, [ - '$messages' => L10n::t('Messages'), + '$messages' => DI::l10n()->t('Messages'), '$button' => $button, ]); @@ -144,12 +144,12 @@ function message_content(App $a) //DI::page()['aside'] = ''; return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [ '$method' => 'get', - '$message' => L10n::t('Do you really want to delete this message?'), + '$message' => DI::l10n()->t('Do you really want to delete this message?'), '$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'), ]); } @@ -162,17 +162,17 @@ function message_content(App $a) if ($cmd === 'drop') { $message = DBA::selectFirst('mail', ['convid'], ['id' => $a->argv[2], 'uid' => local_user()]); if(!DBA::isResult($message)){ - info(L10n::t('Conversation not found.') . EOL); + info(DI::l10n()->t('Conversation not found.') . EOL); DI::baseUrl()->redirect('message'); } if (DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) { - info(L10n::t('Message deleted.') . EOL); + info(DI::l10n()->t('Message deleted.') . EOL); } $conversation = DBA::selectFirst('mail', ['id'], ['convid' => $message['convid'], 'uid' => local_user()]); if(!DBA::isResult($conversation)){ - info(L10n::t('Conversation removed.') . EOL); + info(DI::l10n()->t('Conversation removed.') . EOL); DI::baseUrl()->redirect('message'); } @@ -186,7 +186,7 @@ function message_content(App $a) $parent = $r[0]['parent-uri']; if (DBA::delete('mail', ['parent-uri' => $parent, 'uid' => local_user()])) { - info(L10n::t('Conversation removed.') . EOL); + info(DI::l10n()->t('Conversation removed.') . EOL); } } DI::baseUrl()->redirect('message'); @@ -200,7 +200,7 @@ function message_content(App $a) DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [ '$baseurl' => DI::baseUrl()->get(true), '$nickname' => $a->user['nickname'], - '$linkurl' => L10n::t('Please enter a link URL:') + '$linkurl' => DI::l10n()->t('Please enter a link URL:') ]); $preselect = isset($a->argv[2]) ? [$a->argv[2]] : []; @@ -242,22 +242,22 @@ function message_content(App $a) $tpl = Renderer::getMarkupTemplate('prv_message.tpl'); $o .= Renderer::replaceMacros($tpl, [ - '$header' => L10n::t('Send Private Message'), - '$to' => L10n::t('To:'), + '$header' => DI::l10n()->t('Send Private Message'), + '$to' => DI::l10n()->t('To:'), '$showinputs' => 'true', '$prefill' => $prefill, '$preid' => $preid, - '$subject' => L10n::t('Subject:'), + '$subject' => DI::l10n()->t('Subject:'), '$subjtxt' => $_REQUEST['subject'] ?? '', '$text' => $_REQUEST['body'] ?? '', '$readonly' => '', - '$yourmessage'=> L10n::t('Your message:'), + '$yourmessage'=> DI::l10n()->t('Your message:'), '$select' => $select, '$parent' => '', - '$upload' => L10n::t('Upload photo'), - '$insert' => L10n::t('Insert web link'), - '$wait' => L10n::t('Please wait'), - '$submit' => L10n::t('Submit') + '$upload' => DI::l10n()->t('Upload photo'), + '$insert' => DI::l10n()->t('Insert web link'), + '$wait' => DI::l10n()->t('Please wait'), + '$submit' => DI::l10n()->t('Submit') ]); return $o; } @@ -285,7 +285,7 @@ function message_content(App $a) $r = get_messages(local_user(), $pager->getStart(), $pager->getItemsPerPage()); if (!DBA::isResult($r)) { - info(L10n::t('No messages.') . EOL); + info(DI::l10n()->t('No messages.') . EOL); return $o; } @@ -348,7 +348,7 @@ function message_content(App $a) } if (!DBA::isResult($messages)) { - notice(L10n::t('Message not available.') . EOL); + notice(DI::l10n()->t('Message not available.') . EOL); return $o; } @@ -356,7 +356,7 @@ function message_content(App $a) DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [ '$baseurl' => DI::baseUrl()->get(true), '$nickname' => $a->user['nickname'], - '$linkurl' => L10n::t('Please enter a link URL:') + '$linkurl' => DI::l10n()->t('Please enter a link URL:') ]); $mails = []; @@ -402,9 +402,9 @@ function message_content(App $a) 'from_photo' => ProxyUtils::proxifyUrl($from_photo, false, ProxyUtils::SIZE_THUMB), 'subject' => $subject_e, 'body' => $body_e, - 'delete' => L10n::t('Delete message'), + 'delete' => DI::l10n()->t('Delete message'), 'to_name' => $to_name_e, - 'date' => DateTimeFormat::local($message['created'], L10n::t('D, d M Y - g:i A')), + 'date' => DateTimeFormat::local($message['created'], DI::l10n()->t('D, d M Y - g:i A')), 'ago' => Temporal::getRelativeDate($message['created']), ]; @@ -419,26 +419,26 @@ function message_content(App $a) '$thread_id' => $a->argv[1], '$thread_subject' => $message['title'], '$thread_seen' => $seen, - '$delete' => L10n::t('Delete conversation'), + '$delete' => DI::l10n()->t('Delete conversation'), '$canreply' => (($unknown) ? false : '1'), - '$unknown_text' => L10n::t("No secure communications available. You may be able to respond from the sender's profile page."), + '$unknown_text' => DI::l10n()->t("No secure communications available. You may be able to respond from the sender's profile page."), '$mails' => $mails, // reply - '$header' => L10n::t('Send Reply'), - '$to' => L10n::t('To:'), + '$header' => DI::l10n()->t('Send Reply'), + '$to' => DI::l10n()->t('To:'), '$showinputs' => '', - '$subject' => L10n::t('Subject:'), + '$subject' => DI::l10n()->t('Subject:'), '$subjtxt' => $message['title'], '$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ', - '$yourmessage' => L10n::t('Your message:'), + '$yourmessage' => DI::l10n()->t('Your message:'), '$text' => '', '$select' => $select, '$parent' => $parent, - '$upload' => L10n::t('Upload photo'), - '$insert' => L10n::t('Insert web link'), - '$submit' => L10n::t('Submit'), - '$wait' => L10n::t('Please wait') + '$upload' => DI::l10n()->t('Upload photo'), + '$insert' => DI::l10n()->t('Insert web link'), + '$submit' => DI::l10n()->t('Submit'), + '$wait' => DI::l10n()->t('Please wait') ]); return $o; @@ -508,11 +508,11 @@ function render_messages(array $msg, $t) foreach ($msg as $rr) { if ($rr['unknown']) { - $participants = L10n::t("Unknown sender - %s", $rr['from-name']); + $participants = DI::l10n()->t("Unknown sender - %s", $rr['from-name']); } elseif (Strings::compareLink($rr['from-url'], $myprofile)) { - $participants = L10n::t("You and %s", $rr['name']); + $participants = DI::l10n()->t("You and %s", $rr['name']); } else { - $participants = L10n::t("%s and You", $rr['from-name']); + $participants = DI::l10n()->t("%s and You", $rr['from-name']); } $body_e = $rr['body']; @@ -533,10 +533,10 @@ function render_messages(array $msg, $t) '$sparkle' => ' sparkle', '$from_photo' => ProxyUtils::proxifyUrl($from_photo, false, ProxyUtils::SIZE_THUMB), '$subject' => $rr['title'], - '$delete' => L10n::t('Delete conversation'), + '$delete' => DI::l10n()->t('Delete conversation'), '$body' => $body_e, '$to_name' => $to_name_e, - '$date' => DateTimeFormat::local($rr['mailcreated'], L10n::t('D, d M Y - g:i A')), + '$date' => DateTimeFormat::local($rr['mailcreated'], DI::l10n()->t('D, d M Y - g:i A')), '$ago' => Temporal::getRelativeDate($rr['mailcreated']), '$seen' => $rr['mailseen'], '$count' => L10n::tt('%d message', '%d messages', $rr['count']), diff --git a/mod/network.php b/mod/network.php index 271231c53..11650367b 100644 --- a/mod/network.php +++ b/mod/network.php @@ -34,7 +34,7 @@ use Friendica\Util\Strings; function network_init(App $a) { if (!local_user()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return; } @@ -494,7 +494,7 @@ function networkThreadedView(App $a, $update, $parent) notice(L10n::tt("Warning: This group contains %s member from a network that doesn't allow non public messages.", "Warning: This group contains %s members from a network that doesn't allow non public messages.", $t) . EOL); - notice(L10n::t("Messages in this group won't be send to these receivers.").EOL); + notice(DI::l10n()->t("Messages in this group won't be send to these receivers.").EOL); } Nav::setSelected('network'); @@ -561,7 +561,7 @@ function networkThreadedView(App $a, $update, $parent) if ($update) { exit(); } - notice(L10n::t('No such group') . EOL); + notice(DI::l10n()->t('No such group') . EOL); DI::baseUrl()->redirect('network/0'); // NOTREACHED } @@ -582,11 +582,11 @@ function networkThreadedView(App $a, $update, $parent) $sql_extra3 .= " OR (`thread`.`contact-id` = '$contact_str_self' AND `temp1`.`allow_gid` LIKE '" . Strings::protectSprintf('%<' . intval($gid) . '>%') . "' AND `temp1`.`private`))"; } else { $sql_extra3 .= " AND false "; - info(L10n::t('Group is empty')); + info(DI::l10n()->t('Group is empty')); } $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), [ - '$title' => L10n::t('Group: %s', $group['name']) + '$title' => DI::l10n()->t('Group: %s', $group['name']) ]) . $o; } elseif ($cid) { $fields = ['id', 'name', 'network', 'writable', 'nurl', @@ -612,10 +612,10 @@ function networkThreadedView(App $a, $update, $parent) ]) . $o; if ($contact['network'] === Protocol::OSTATUS && $contact['writable'] && !DI::pConfig()->get(local_user(),'system','nowarn_insecure')) { - notice(L10n::t('Private messages to this person are at risk of public disclosure.') . EOL); + notice(DI::l10n()->t('Private messages to this person are at risk of public disclosure.') . EOL); } } else { - notice(L10n::t('Invalid contact.') . EOL); + notice(DI::l10n()->t('Invalid contact.') . EOL); DI::baseUrl()->redirect('network'); // NOTREACHED } @@ -899,38 +899,38 @@ function network_tabs(App $a) // tabs $tabs = [ [ - 'label' => L10n::t('Latest Activity'), + 'label' => DI::l10n()->t('Latest Activity'), 'url' => $cmd . '?' . http_build_query(array_merge($def_param, ['order' => 'activity'])), 'sel' => $all_active, - 'title' => L10n::t('Sort by latest activity'), + 'title' => DI::l10n()->t('Sort by latest activity'), 'id' => 'activity-order-tab', 'accesskey' => 'e', ], [ - 'label' => L10n::t('Latest Posts'), + 'label' => DI::l10n()->t('Latest Posts'), 'url' => $cmd . '?' . http_build_query(array_merge($def_param, ['order' => 'post'])), 'sel' => $post_active, - 'title' => L10n::t('Sort by post received date'), + 'title' => DI::l10n()->t('Sort by post received date'), 'id' => 'post-order-tab', 'accesskey' => 't', ], ]; $tabs[] = [ - 'label' => L10n::t('Personal'), + 'label' => DI::l10n()->t('Personal'), 'url' => $cmd . '?' . http_build_query(array_merge($def_param, ['conv' => true])), 'sel' => $conv_active, - 'title' => L10n::t('Posts that mention or involve you'), + 'title' => DI::l10n()->t('Posts that mention or involve you'), 'id' => 'personal-tab', 'accesskey' => 'r', ]; if (Feature::isEnabled(local_user(), 'new_tab')) { $tabs[] = [ - 'label' => L10n::t('New'), + 'label' => DI::l10n()->t('New'), 'url' => $cmd . '?' . http_build_query(array_merge($def_param, ['new' => true])), 'sel' => $new_active, - 'title' => L10n::t('Activity Stream - by date'), + 'title' => DI::l10n()->t('Activity Stream - by date'), 'id' => 'activitiy-by-date-tab', 'accesskey' => 'w', ]; @@ -938,20 +938,20 @@ function network_tabs(App $a) if (Feature::isEnabled(local_user(), 'link_tab')) { $tabs[] = [ - 'label' => L10n::t('Shared Links'), + 'label' => DI::l10n()->t('Shared Links'), 'url' => $cmd . '?' . http_build_query(array_merge($def_param, ['bmark' => true])), 'sel' => $bookmarked_active, - 'title' => L10n::t('Interesting Links'), + 'title' => DI::l10n()->t('Interesting Links'), 'id' => 'shared-links-tab', 'accesskey' => 'b', ]; } $tabs[] = [ - 'label' => L10n::t('Starred'), + 'label' => DI::l10n()->t('Starred'), 'url' => $cmd . '?' . http_build_query(array_merge($def_param, ['star' => true])), 'sel' => $starred_active, - 'title' => L10n::t('Favourite Posts'), + 'title' => DI::l10n()->t('Favourite Posts'), 'id' => 'starred-posts-tab', 'accesskey' => 'm', ]; diff --git a/mod/notes.php b/mod/notes.php index 4a19ab5ca..223e03023 100644 --- a/mod/notes.php +++ b/mod/notes.php @@ -25,14 +25,14 @@ function notes_init(App $a) function notes_content(App $a, $update = false) { if (!local_user()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return; } $o = Profile::getTabs($a, 'notes', true); if (!$update) { - $o .= '

' . L10n::t('Personal Notes') . '

'; + $o .= '

' . DI::l10n()->t('Personal Notes') . '

'; $x = [ 'is_owner' => true, @@ -44,7 +44,7 @@ function notes_content(App $a, $update = false) 'bang' => '', 'visitor' => 'block', 'profile_uid' => local_user(), - 'button' => L10n::t('Save'), + 'button' => DI::l10n()->t('Save'), 'acl_data' => '', ]; diff --git a/mod/notifications.php b/mod/notifications.php index e306f0c8a..634a6d74a 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -34,10 +34,10 @@ function notifications_post(App $a) $intro = DI::intro()->selectFirst(['id' => $request_id, 'uid' => local_user()]); switch ($_POST['submit']) { - case L10n::t('Discard'): + case DI::l10n()->t('Discard'): $intro->discard(); break; - case L10n::t('Ignore'): + case DI::l10n()->t('Ignore'): $intro->ignore(); break; } @@ -49,7 +49,7 @@ function notifications_post(App $a) function notifications_content(App $a) { if (!local_user()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return Login::form(); } @@ -72,7 +72,7 @@ function notifications_content(App $a) $perpage = 20; $startrec = ($page * $perpage) - $perpage; - $notif_header = L10n::t('Notifications'); + $notif_header = DI::l10n()->t('Notifications'); $all = false; @@ -91,22 +91,22 @@ function notifications_content(App $a) // Get the network notifications } elseif (($a->argc > 1) && ($a->argv[1] == 'network')) { - $notif_header = L10n::t('Network Notifications'); + $notif_header = DI::l10n()->t('Network Notifications'); $notifs = $nm->getNetworkList($show, $startrec, $perpage); // Get the system notifications } elseif (($a->argc > 1) && ($a->argv[1] == 'system')) { - $notif_header = L10n::t('System Notifications'); + $notif_header = DI::l10n()->t('System Notifications'); $notifs = $nm->getSystemList($show, $startrec, $perpage); // Get the personal notifications } elseif (($a->argc > 1) && ($a->argv[1] == 'personal')) { - $notif_header = L10n::t('Personal Notifications'); + $notif_header = DI::l10n()->t('Personal Notifications'); $notifs = $nm->getPersonalList($show, $startrec, $perpage); // Get the home notifications } elseif (($a->argc > 1) && ($a->argv[1] == 'home')) { - $notif_header = L10n::t('Home Notifications'); + $notif_header = DI::l10n()->t('Home Notifications'); $notifs = $nm->getHomeList($show, $startrec, $perpage); // fallback - redirect to main page } else { @@ -129,7 +129,7 @@ function notifications_content(App $a) $notif_show_lnk = [ 'href' => ($show ? 'notifications/' . $notifs['ident'] : 'notifications/' . $notifs['ident'] . '?show=all' ), - 'text' => ($show ? L10n::t('Show unread') : L10n::t('Show all')), + 'text' => ($show ? DI::l10n()->t('Show unread') : DI::l10n()->t('Show all')), ]; // Process the data for template creation @@ -140,7 +140,7 @@ function notifications_content(App $a) // The link to switch between ignored and normal connection requests $notif_show_lnk = [ 'href' => (!$all ? 'notifications/intros/all' : 'notifications/intros' ), - 'text' => (!$all ? L10n::t('Show Ignored Requests') : L10n::t('Hide Ignored Requests')) + 'text' => (!$all ? DI::l10n()->t('Show Ignored Requests') : DI::l10n()->t('Hide Ignored Requests')) ]; // Loop through all introduction notifications.This creates an array with the output html for each @@ -153,10 +153,10 @@ function notifications_content(App $a) case 'friend_suggestion': $notif_content[] = Renderer::replaceMacros($sugg, [ '$type' => $notif['label'], - '$str_notifytype' => L10n::t('Notification type:'), + '$str_notifytype' => DI::l10n()->t('Notification type:'), '$notify_type'=> $notif['notify_type'], '$intro_id' => $notif['intro_id'], - '$lbl_madeby' => L10n::t('Suggested by:'), + '$lbl_madeby' => DI::l10n()->t('Suggested by:'), '$madeby' => $notif['madeby'], '$madeby_url' => $notif['madeby_url'], '$madeby_zrl' => $notif['madeby_zrl'], @@ -166,15 +166,15 @@ function notifications_content(App $a) '$fullname' => $notif['name'], '$url' => $notif['url'], '$zrl' => $notif['zrl'], - '$lbl_url' => L10n::t('Profile URL'), + '$lbl_url' => DI::l10n()->t('Profile URL'), '$addr' => $notif['addr'], - '$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($notif['hidden'] == 1), ''], + '$hidden' => ['hidden', DI::l10n()->t('Hide this contact from others'), ($notif['hidden'] == 1), ''], '$knowyou' => $notif['knowyou'], - '$approve' => L10n::t('Approve'), + '$approve' => DI::l10n()->t('Approve'), '$note' => $notif['note'], '$request' => $notif['request'], - '$ignore' => L10n::t('Ignore'), - '$discard' => L10n::t('Discard'), + '$ignore' => DI::l10n()->t('Ignore'), + '$discard' => DI::l10n()->t('Discard'), ]); break; @@ -190,15 +190,15 @@ function notifications_content(App $a) $helptext3 = ''; if ($notif['network'] === Protocol::DFRN) { - $lbl_knowyou = L10n::t('Claims to be known to you: '); - $knowyou = (($notif['knowyou']) ? L10n::t('yes') : L10n::t('no')); - $helptext = L10n::t('Shall your connection be bidirectional or not?'); - $helptext2 = L10n::t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $notif['name'], $notif['name']); - $helptext3 = L10n::t('Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $notif['name']); + $lbl_knowyou = DI::l10n()->t('Claims to be known to you: '); + $knowyou = (($notif['knowyou']) ? DI::l10n()->t('yes') : DI::l10n()->t('no')); + $helptext = DI::l10n()->t('Shall your connection be bidirectional or not?'); + $helptext2 = DI::l10n()->t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $notif['name'], $notif['name']); + $helptext3 = DI::l10n()->t('Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $notif['name']); } elseif ($notif['network'] === Protocol::DIASPORA) { - $helptext = L10n::t('Shall your connection be bidirectional or not?'); - $helptext2 = L10n::t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $notif['name'], $notif['name']); - $helptext3 = L10n::t('Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $notif['name']); + $helptext = DI::l10n()->t('Shall your connection be bidirectional or not?'); + $helptext2 = DI::l10n()->t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $notif['name'], $notif['name']); + $helptext3 = DI::l10n()->t('Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $notif['name']); } $dfrn_tpl = Renderer::getMarkupTemplate('netfriend.tpl'); @@ -209,8 +209,8 @@ function notifications_content(App $a) '$approve_as1' => $helptext, '$approve_as2' => $helptext2, '$approve_as3' => $helptext3, - '$as_friend' => L10n::t('Friend'), - '$as_fan' => (($notif['network'] == Protocol::DIASPORA) ? L10n::t('Sharer') : L10n::t('Subscriber')) + '$as_friend' => DI::l10n()->t('Friend'), + '$as_fan' => (($notif['network'] == Protocol::DIASPORA) ? DI::l10n()->t('Sharer') : DI::l10n()->t('Subscriber')) ]); $contact = DBA::selectFirst('contact', ['network', 'protocol'], ['id' => $notif['contact_id']]); @@ -230,7 +230,7 @@ function notifications_content(App $a) $header .= ' (' . ContactSelector::networkToName($notif['network'], $notif['url']) . ')'; if ($notif['network'] != Protocol::DIASPORA) { - $discard = L10n::t('Discard'); + $discard = DI::l10n()->t('Discard'); } else { $discard = ''; } @@ -238,7 +238,7 @@ function notifications_content(App $a) $notif_content[] = Renderer::replaceMacros($tpl, [ '$type' => $notif['label'], '$header' => $header, - '$str_notifytype' => L10n::t('Notification type:'), + '$str_notifytype' => DI::l10n()->t('Notification type:'), '$notify_type' => $notif['notify_type'], '$dfrn_text' => $dfrn_text, '$dfrn_id' => $notif['dfrn_id'], @@ -248,25 +248,25 @@ function notifications_content(App $a) '$photo' => $notif['photo'], '$fullname' => $notif['name'], '$location' => $notif['location'], - '$lbl_location'=> L10n::t('Location:'), + '$lbl_location'=> DI::l10n()->t('Location:'), '$about' => $notif['about'], - '$lbl_about' => L10n::t('About:'), + '$lbl_about' => DI::l10n()->t('About:'), '$keywords' => $notif['keywords'], - '$lbl_keywords'=> L10n::t('Tags:'), + '$lbl_keywords'=> DI::l10n()->t('Tags:'), '$gender' => $notif['gender'], - '$lbl_gender' => L10n::t('Gender:'), - '$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($notif['hidden'] == 1), ''], + '$lbl_gender' => DI::l10n()->t('Gender:'), + '$hidden' => ['hidden', DI::l10n()->t('Hide this contact from others'), ($notif['hidden'] == 1), ''], '$url' => $notif['url'], '$zrl' => $notif['zrl'], - '$lbl_url' => L10n::t('Profile URL'), + '$lbl_url' => DI::l10n()->t('Profile URL'), '$addr' => $notif['addr'], '$lbl_knowyou' => $lbl_knowyou, - '$lbl_network' => L10n::t('Network:'), + '$lbl_network' => DI::l10n()->t('Network:'), '$network' => ContactSelector::networkToName($notif['network'], $notif['url']), '$knowyou' => $knowyou, - '$approve' => L10n::t('Approve'), + '$approve' => DI::l10n()->t('Approve'), '$note' => $notif['note'], - '$ignore' => L10n::t('Ignore'), + '$ignore' => DI::l10n()->t('Ignore'), '$discard' => $discard, '$action' => $action, ]); @@ -275,7 +275,7 @@ function notifications_content(App $a) } if (count($notifs['notifications']) == 0) { - info(L10n::t('No introductions.') . EOL); + info(DI::l10n()->t('No introductions.') . EOL); } // Normal notifications (no introductions) @@ -309,7 +309,7 @@ function notifications_content(App $a) ]); } } else { - $notif_nocontent = L10n::t('No more %s notifications.', $notifs['ident']); + $notif_nocontent = DI::l10n()->t('No more %s notifications.', $notifs['ident']); } $o .= Renderer::replaceMacros($notif_tpl, [ diff --git a/mod/oexchange.php b/mod/oexchange.php index 10d48338a..d1b5523a4 100644 --- a/mod/oexchange.php +++ b/mod/oexchange.php @@ -29,7 +29,7 @@ function oexchange_content(App $a) { } if (($a->argc > 1) && $a->argv[1] === 'done') { - info(L10n::t('Post successful.') . EOL); + info(DI::l10n()->t('Post successful.') . EOL); return; } diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php index f6d826e85..a6c7d9da4 100644 --- a/mod/ostatus_subscribe.php +++ b/mod/ostatus_subscribe.php @@ -14,12 +14,12 @@ use Friendica\Util\Network; function ostatus_subscribe_content(App $a) { if (!local_user()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); DI::baseUrl()->redirect('ostatus_subscribe'); // NOTREACHED } - $o = '

' . L10n::t('Subscribing to OStatus contacts') . '

'; + $o = '

' . DI::l10n()->t('Subscribing to OStatus contacts') . '

'; $uid = local_user(); @@ -29,14 +29,14 @@ function ostatus_subscribe_content(App $a) if ($_REQUEST['url'] == '') { DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact'); - return $o . L10n::t('No contact provided.'); + return $o . DI::l10n()->t('No contact provided.'); } $contact = Probe::uri($_REQUEST['url']); if (!$contact) { DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact'); - return $o . L10n::t('Couldn\'t fetch information for contact.'); + return $o . DI::l10n()->t('Couldn\'t fetch information for contact.'); } $api = $contact['baseurl'] . '/api/'; @@ -46,7 +46,7 @@ function ostatus_subscribe_content(App $a) if (!$curlResult->isSuccess()) { DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact'); - return $o . L10n::t('Couldn\'t fetch friends for contact.'); + return $o . DI::l10n()->t('Couldn\'t fetch friends for contact.'); } DI::pConfig()->set($uid, 'ostatus', 'legacy_friends', $curlResult->getBody()); @@ -64,7 +64,7 @@ function ostatus_subscribe_content(App $a) DI::page()['htmlhead'] = ''; DI::pConfig()->delete($uid, 'ostatus', 'legacy_friends'); DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact'); - $o .= L10n::t('Done'); + $o .= DI::l10n()->t('Done'); return $o; } @@ -78,17 +78,17 @@ function ostatus_subscribe_content(App $a) if ($probed['network'] == Protocol::OSTATUS) { $result = Contact::createFromProbe($uid, $url, true, Protocol::OSTATUS); if ($result['success']) { - $o .= ' - ' . L10n::t('success'); + $o .= ' - ' . DI::l10n()->t('success'); } else { - $o .= ' - ' . L10n::t('failed'); + $o .= ' - ' . DI::l10n()->t('failed'); } } else { - $o .= ' - ' . L10n::t('ignored'); + $o .= ' - ' . DI::l10n()->t('ignored'); } $o .= '

'; - $o .= '

' . L10n::t('Keep this window open until done.') . '

'; + $o .= '

' . DI::l10n()->t('Keep this window open until done.') . '

'; DI::page()['htmlhead'] = ''; diff --git a/mod/photos.php b/mod/photos.php index 37c974048..db30c7d94 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -86,7 +86,7 @@ function photos_init(App $a) { $ret['albums'] = []; foreach ($albums as $k => $album) { //hide profile photos to others - if (!$is_owner && !Session::getRemoteContactID($a->profile_uid) && ($album['album'] == L10n::t('Profile Photos'))) + if (!$is_owner && !Session::getRemoteContactID($a->profile_uid) && ($album['album'] == DI::l10n()->t('Profile Photos'))) continue; $entry = [ 'text' => $album['album'], @@ -108,10 +108,10 @@ function photos_init(App $a) { if ($ret['success']) { $photo_albums_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('photo_albums.tpl'), [ '$nick' => $a->data['user']['nickname'], - '$title' => L10n::t('Photo Albums'), - '$recent' => L10n::t('Recent Photos'), + '$title' => DI::l10n()->t('Photo Albums'), + '$recent' => DI::l10n()->t('Recent Photos'), '$albums' => $ret['albums'], - '$upload' => [L10n::t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload'], + '$upload' => [DI::l10n()->t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload'], '$can_post' => $can_post ]); } @@ -129,7 +129,7 @@ function photos_init(App $a) { $tpl = Renderer::getMarkupTemplate("photos_head.tpl"); DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl,[ - '$ispublic' => L10n::t('everybody') + '$ispublic' => DI::l10n()->t('everybody') ]); } @@ -159,14 +159,14 @@ function photos_post(App $a) } if (!$can_post) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); exit(); } $owner_record = User::getOwnerDataById($page_owner_uid); if (!$owner_record) { - notice(L10n::t('Contact information unavailable') . EOL); + notice(DI::l10n()->t('Contact information unavailable') . EOL); Logger::log('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid); exit(); } @@ -177,7 +177,7 @@ function photos_post(App $a) } $album = hex2bin($a->argv[3]); - if ($album === L10n::t('Profile Photos') || $album === 'Contact Photos' || $album === L10n::t('Contact Photos')) { + if ($album === DI::l10n()->t('Profile Photos') || $album === 'Contact Photos' || $album === DI::l10n()->t('Contact Photos')) { DI::baseUrl()->redirect($_SESSION['photo_return']); return; // NOTREACHED } @@ -188,7 +188,7 @@ function photos_post(App $a) ); if (!DBA::isResult($r)) { - notice(L10n::t('Album not found.') . EOL); + notice(DI::l10n()->t('Album not found.') . EOL); DI::baseUrl()->redirect($_SESSION['photo_return']); return; // NOTREACHED } @@ -246,9 +246,9 @@ function photos_post(App $a) // Update the photo albums cache Photo::clearAlbumCache($page_owner_uid); - notice(L10n::t('Album successfully deleted')); + notice(DI::l10n()->t('Album successfully deleted')); } else { - notice(L10n::t('Album was empty.')); + notice(DI::l10n()->t('Album was empty.')); } } @@ -573,7 +573,7 @@ function photos_post(App $a) $arr['tag'] = $tagged[4]; $arr['inform'] = $tagged[2]; $arr['origin'] = 1; - $arr['body'] = L10n::t('%1$s was tagged in %2$s by %3$s', '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . DI::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . ']' . L10n::t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ; + $arr['body'] = DI::l10n()->t('%1$s was tagged in %2$s by %3$s', '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . DI::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . ']' . DI::l10n()->t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ; $arr['body'] .= "\n\n" . '[url=' . DI::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . ']' . '[img]' . DI::baseUrl() . "/photo/" . $photo['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ; $arr['object'] = '' . Activity\ObjectType::PERSON . '' . $tagged[0] . '' . $tagged[1] . '/' . $tagged[0] . ''; @@ -623,7 +623,7 @@ function photos_post(App $a) $r = Photo::selectToArray([], ['`album` = ? AND `uid` = ? AND `created` > UTC_TIMESTAMP() - INTERVAL 3 HOUR', $album, $page_owner_uid]); - if (!DBA::isResult($r) || ($album == L10n::t('Profile Photos'))) { + if (!DBA::isResult($r) || ($album == DI::l10n()->t('Profile Photos'))) { $visible = 1; } else { $visible = 0; @@ -668,21 +668,21 @@ function photos_post(App $a) if ($error !== UPLOAD_ERR_OK) { switch ($error) { case UPLOAD_ERR_INI_SIZE: - notice(L10n::t('Image exceeds size limit of %s', ini_get('upload_max_filesize')) . EOL); + notice(DI::l10n()->t('Image exceeds size limit of %s', ini_get('upload_max_filesize')) . EOL); break; case UPLOAD_ERR_FORM_SIZE: - notice(L10n::t('Image exceeds size limit of %s', Strings::formatBytes($_REQUEST['MAX_FILE_SIZE'] ?? 0)) . EOL); + notice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($_REQUEST['MAX_FILE_SIZE'] ?? 0)) . EOL); break; case UPLOAD_ERR_PARTIAL: - notice(L10n::t('Image upload didn\'t complete, please try again') . EOL); + notice(DI::l10n()->t('Image upload didn\'t complete, please try again') . EOL); break; case UPLOAD_ERR_NO_FILE: - notice(L10n::t('Image file is missing') . EOL); + notice(DI::l10n()->t('Image file is missing') . EOL); break; case UPLOAD_ERR_NO_TMP_DIR: case UPLOAD_ERR_CANT_WRITE: case UPLOAD_ERR_EXTENSION: - notice(L10n::t('Server can\'t accept new file upload at this time, please contact your administrator') . EOL); + notice(DI::l10n()->t('Server can\'t accept new file upload at this time, please contact your administrator') . EOL); break; } @unlink($src); @@ -700,7 +700,7 @@ function photos_post(App $a) $maximagesize = Config::get('system', 'maximagesize'); if ($maximagesize && ($filesize > $maximagesize)) { - notice(L10n::t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)) . EOL); + notice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)) . EOL); @unlink($src); $foo = 0; Hook::callAll('photo_post_end', $foo); @@ -708,7 +708,7 @@ function photos_post(App $a) } if (!$filesize) { - notice(L10n::t('Image file is empty.') . EOL); + notice(DI::l10n()->t('Image file is empty.') . EOL); @unlink($src); $foo = 0; Hook::callAll('photo_post_end', $foo); @@ -723,7 +723,7 @@ function photos_post(App $a) if (!$image->isValid()) { Logger::log('mod/photos.php: photos_post(): unable to process image' , Logger::DEBUG); - notice(L10n::t('Unable to process image.') . EOL); + notice(DI::l10n()->t('Unable to process image.') . EOL); @unlink($src); $foo = 0; Hook::callAll('photo_post_end',$foo); @@ -752,7 +752,7 @@ function photos_post(App $a) if (!$r) { Logger::log('mod/photos.php: photos_post(): image store failed', Logger::DEBUG); - notice(L10n::t('Image upload failed.') . EOL); + notice(DI::l10n()->t('Image upload failed.') . EOL); return; } @@ -835,12 +835,12 @@ function photos_content(App $a) // photos/name/image/xxxxx/drop if (Config::get('system', 'block_public') && !Session::isAuthenticated()) { - notice(L10n::t('Public access denied.') . EOL); + notice(DI::l10n()->t('Public access denied.') . EOL); return; } if (empty($a->data['user'])) { - notice(L10n::t('No photos selected') . EOL); + notice(DI::l10n()->t('No photos selected') . EOL); return; } @@ -906,7 +906,7 @@ function photos_content(App $a) } if ($a->data['user']['hidewall'] && (local_user() != $owner_uid) && !$remote_contact) { - notice(L10n::t('Access to this item is restricted.') . EOL); + notice(DI::l10n()->t('Access to this item is restricted.') . EOL); return; } @@ -921,7 +921,7 @@ function photos_content(App $a) // Display upload form if ($datatype === 'upload') { if (!$can_post) { - notice(L10n::t('Permission denied.')); + notice(DI::l10n()->t('Permission denied.')); return; } @@ -932,7 +932,7 @@ function photos_content(App $a) $albumselect .= ''; if (!empty($a->data['albums'])) { foreach ($a->data['albums'] as $album) { - if (($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === L10n::t('Contact Photos'))) { + if (($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === DI::l10n()->t('Contact Photos'))) { continue; } $selected = (($selname === $album['album']) ? ' selected="selected" ' : ''); @@ -950,7 +950,7 @@ function photos_content(App $a) $default_upload_box = Renderer::replaceMacros(Renderer::getMarkupTemplate('photos_default_uploader_box.tpl'), []); $default_upload_submit = Renderer::replaceMacros(Renderer::getMarkupTemplate('photos_default_uploader_submit.tpl'), [ - '$submit' => L10n::t('Submit'), + '$submit' => DI::l10n()->t('Submit'), ]); $usage_message = ''; @@ -960,15 +960,15 @@ function photos_content(App $a) $aclselect_e = ($visitor ? '' : ACL::getFullSelectorHTML(DI::page(), $a->user)); $o .= Renderer::replaceMacros($tpl,[ - '$pagename' => L10n::t('Upload Photos'), + '$pagename' => DI::l10n()->t('Upload Photos'), '$sessid' => session_id(), '$usage' => $usage_message, '$nickname' => $a->data['user']['nickname'], - '$newalbum' => L10n::t('New album name: '), - '$existalbumtext' => L10n::t('or select existing album:'), - '$nosharetext' => L10n::t('Do not show a status post for this upload'), + '$newalbum' => DI::l10n()->t('New album name: '), + '$existalbumtext' => DI::l10n()->t('or select existing album:'), + '$nosharetext' => DI::l10n()->t('Do not show a status post for this upload'), '$albumselect' => $albumselect, - '$permissions' => L10n::t('Permissions'), + '$permissions' => DI::l10n()->t('Permissions'), '$aclselect' => $aclselect_e, '$lockstate' => is_array($a->user) && (strlen($a->user['allow_cid']) @@ -982,8 +982,8 @@ function photos_content(App $a) '$uploadurl' => $ret['post_url'], // ACL permissions box - '$group_perms' => L10n::t('Show to Groups'), - '$contact_perms' => L10n::t('Show to Contacts'), + '$group_perms' => DI::l10n()->t('Show to Groups'), + '$contact_perms' => DI::l10n()->t('Show to Contacts'), '$return_path' => DI::args()->getQueryString(), ]); @@ -1034,44 +1034,44 @@ function photos_content(App $a) return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [ '$method' => 'post', - '$message' => L10n::t('Do you really want to delete this photo album and all its photos?'), + '$message' => DI::l10n()->t('Do you really want to delete this photo album and all its photos?'), '$extra_inputs' => [], - '$confirm' => L10n::t('Delete Album'), + '$confirm' => DI::l10n()->t('Delete Album'), '$confirm_url' => $drop_url, '$confirm_name' => 'dropalbum', - '$cancel' => L10n::t('Cancel'), + '$cancel' => DI::l10n()->t('Cancel'), ]); } // edit album name if ($cmd === 'edit') { - if (($album !== L10n::t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== L10n::t('Contact Photos'))) { + if (($album !== DI::l10n()->t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== DI::l10n()->t('Contact Photos'))) { if ($can_post) { $edit_tpl = Renderer::getMarkupTemplate('album_edit.tpl'); $album_e = $album; $o .= Renderer::replaceMacros($edit_tpl,[ - '$nametext' => L10n::t('New album name: '), + '$nametext' => DI::l10n()->t('New album name: '), '$nickname' => $a->data['user']['nickname'], '$album' => $album_e, '$hexalbum' => bin2hex($album), - '$submit' => L10n::t('Submit'), - '$dropsubmit' => L10n::t('Delete Album') + '$submit' => DI::l10n()->t('Submit'), + '$dropsubmit' => DI::l10n()->t('Delete Album') ]); } } } else { - if (($album !== L10n::t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== L10n::t('Contact Photos')) && $can_post) { - $edit = [L10n::t('Edit Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit']; - $drop = [L10n::t('Drop Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/drop']; + if (($album !== DI::l10n()->t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== DI::l10n()->t('Contact Photos')) && $can_post) { + $edit = [DI::l10n()->t('Edit Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit']; + $drop = [DI::l10n()->t('Drop Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/drop']; } } if ($order_field === 'posted') { - $order = [L10n::t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album), 'oldest']; + $order = [DI::l10n()->t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album), 'oldest']; } else { - $order = [L10n::t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?order=posted', 'newest']; + $order = [DI::l10n()->t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?order=posted', 'newest']; } $photos = []; @@ -1092,7 +1092,7 @@ function photos_content(App $a) 'twist' => ' ' . ($twist ? 'rotleft' : 'rotright') . rand(2,4), 'link' => 'photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'] . ($order_field === 'posted' ? '?order=posted' : ''), - 'title' => L10n::t('View Photo'), + 'title' => DI::l10n()->t('View Photo'), 'src' => 'photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.' .$ext, 'alt' => $imgalt_e, 'desc'=> $desc_e, @@ -1107,7 +1107,7 @@ function photos_content(App $a) '$photos' => $photos, '$album' => $album, '$can_post' => $can_post, - '$upload' => [L10n::t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)], + '$upload' => [DI::l10n()->t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)], '$order' => $order, '$edit' => $edit, '$drop' => $drop, @@ -1129,9 +1129,9 @@ function photos_content(App $a) if (!DBA::isResult($ph)) { if (DBA::exists('photo', ['resource-id' => $datum, 'uid' => $owner_uid])) { - notice(L10n::t('Permission denied. Access to this item may be restricted.')); + notice(DI::l10n()->t('Permission denied. Access to this item may be restricted.')); } else { - notice(L10n::t('Photo not available') . EOL); + notice(DI::l10n()->t('Photo not available') . EOL); } return; } @@ -1141,12 +1141,12 @@ function photos_content(App $a) return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [ '$method' => 'post', - '$message' => L10n::t('Do you really want to delete this photo?'), + '$message' => DI::l10n()->t('Do you really want to delete this photo?'), '$extra_inputs' => [], - '$confirm' => L10n::t('Delete Photo'), + '$confirm' => DI::l10n()->t('Delete Photo'), '$confirm_url' => $drop_url, '$confirm_name' => 'delete', - '$cancel' => L10n::t('Cancel'), + '$cancel' => DI::l10n()->t('Cancel'), ]); } @@ -1234,24 +1234,24 @@ function photos_content(App $a) if ($can_post && ($ph[0]['uid'] == $owner_uid)) { $tools = []; if ($cmd === 'edit') { - $tools['view'] = ['photos/' . $a->data['user']['nickname'] . '/image/' . $datum, L10n::t('View photo')]; + $tools['view'] = ['photos/' . $a->data['user']['nickname'] . '/image/' . $datum, DI::l10n()->t('View photo')]; } else { - $tools['edit'] = ['photos/' . $a->data['user']['nickname'] . '/image/' . $datum . '/edit', L10n::t('Edit photo')]; - $tools['delete'] = ['photos/' . $a->data['user']['nickname'] . '/image/' . $datum . '/drop', L10n::t('Delete photo')]; - $tools['profile'] = ['profile_photo/use/'.$ph[0]['resource-id'], L10n::t('Use as profile photo')]; + $tools['edit'] = ['photos/' . $a->data['user']['nickname'] . '/image/' . $datum . '/edit', DI::l10n()->t('Edit photo')]; + $tools['delete'] = ['photos/' . $a->data['user']['nickname'] . '/image/' . $datum . '/drop', DI::l10n()->t('Delete photo')]; + $tools['profile'] = ['profile_photo/use/'.$ph[0]['resource-id'], DI::l10n()->t('Use as profile photo')]; } if ( $ph[0]['uid'] == local_user() && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid']) || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) ) { - $tools['lock'] = L10n::t('Private Photo'); + $tools['lock'] = DI::l10n()->t('Private Photo'); } } $photo = [ 'href' => 'photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.' . $phototypes[$hires['type']], - 'title'=> L10n::t('View Full Size'), + 'title'=> DI::l10n()->t('View Full Size'), 'src' => 'photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.' . $phototypes[$lores['type']] . '?_u=' . DateTimeFormat::utcNow('ymdhis'), 'height' => $hires['height'], 'width' => $hires['width'], @@ -1311,10 +1311,10 @@ function photos_content(App $a) 'removeurl' => '/tagrm/' . $link_item['id'] . '/' . bin2hex($tag) ]; } - $tags = ['title' => L10n::t('Tags: '), 'tags' => $tag_arr]; + $tags = ['title' => DI::l10n()->t('Tags: '), 'tags' => $tag_arr]; if ($cmd === 'edit') { $tags['removeanyurl'] = 'tagrm/' . $link_item['id']; - $tags['removetitle'] = L10n::t('[Select tags to remove]'); + $tags['removetitle'] = DI::l10n()->t('[Select tags to remove]'); } } @@ -1329,25 +1329,25 @@ function photos_content(App $a) $edit = Renderer::replaceMacros($edit_tpl, [ '$id' => $ph[0]['id'], - '$album' => ['albname', L10n::t('New album name'), $album_e,''], - '$caption' => ['desc', L10n::t('Caption'), $caption_e, ''], - '$tags' => ['newtag', L10n::t('Add a Tag'), "", L10n::t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping')], - '$rotate_none' => ['rotate', L10n::t('Do not rotate'),0,'', true], - '$rotate_cw' => ['rotate', L10n::t("Rotate CW \x28right\x29"),1,''], - '$rotate_ccw' => ['rotate', L10n::t("Rotate CCW \x28left\x29"),2,''], + '$album' => ['albname', DI::l10n()->t('New album name'), $album_e,''], + '$caption' => ['desc', DI::l10n()->t('Caption'), $caption_e, ''], + '$tags' => ['newtag', DI::l10n()->t('Add a Tag'), "", DI::l10n()->t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping')], + '$rotate_none' => ['rotate', DI::l10n()->t('Do not rotate'),0,'', true], + '$rotate_cw' => ['rotate', DI::l10n()->t("Rotate CW \x28right\x29"),1,''], + '$rotate_ccw' => ['rotate', DI::l10n()->t("Rotate CCW \x28left\x29"),2,''], '$nickname' => $a->data['user']['nickname'], '$resource_id' => $ph[0]['resource-id'], - '$permissions' => L10n::t('Permissions'), + '$permissions' => DI::l10n()->t('Permissions'), '$aclselect' => $aclselect_e, '$item_id' => $link_item['id'] ?? 0, - '$submit' => L10n::t('Submit'), - '$delete' => L10n::t('Delete Photo'), + '$submit' => DI::l10n()->t('Submit'), + '$delete' => DI::l10n()->t('Delete Photo'), // ACL permissions box - '$group_perms' => L10n::t('Show to Groups'), - '$contact_perms' => L10n::t('Show to Contacts'), + '$group_perms' => DI::l10n()->t('Show to Groups'), + '$contact_perms' => DI::l10n()->t('Show to Contacts'), '$return_path' => DI::args()->getQueryString(), ]); } @@ -1368,9 +1368,9 @@ function photos_content(App $a) $like_tpl = Renderer::getMarkupTemplate('like_noshare.tpl'); $likebuttons = Renderer::replaceMacros($like_tpl, [ '$id' => $link_item['id'], - '$likethis' => L10n::t("I like this \x28toggle\x29"), - '$nolike' => L10n::t("I don't like this \x28toggle\x29"), - '$wait' => L10n::t('Please wait'), + '$likethis' => DI::l10n()->t("I like this \x28toggle\x29"), + '$nolike' => DI::l10n()->t("I don't like this \x28toggle\x29"), + '$wait' => DI::l10n()->t('Please wait'), '$return_path' => DI::args()->getQueryString(), ]); } @@ -1384,12 +1384,12 @@ function photos_content(App $a) '$parent' => $link_item['id'], '$profile_uid' => $owner_uid, '$mylink' => $contact['url'], - '$mytitle' => L10n::t('This is you'), + '$mytitle' => DI::l10n()->t('This is you'), '$myphoto' => $contact['thumb'], - '$comment' => L10n::t('Comment'), - '$submit' => L10n::t('Submit'), - '$preview' => L10n::t('Preview'), - '$sourceapp' => L10n::t($a->sourcename), + '$comment' => DI::l10n()->t('Comment'), + '$submit' => DI::l10n()->t('Submit'), + '$preview' => DI::l10n()->t('Preview'), + '$sourceapp' => DI::l10n()->t($a->sourcename), '$ww' => '', '$rand_num' => Crypto::randomDigits(12) ]); @@ -1397,8 +1397,8 @@ function photos_content(App $a) } $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')] + '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')] ]; // display comments @@ -1423,12 +1423,12 @@ function photos_content(App $a) '$parent' => $link_item['id'], '$profile_uid' => $owner_uid, '$mylink' => $contact['url'], - '$mytitle' => L10n::t('This is you'), + '$mytitle' => DI::l10n()->t('This is you'), '$myphoto' => $contact['thumb'], - '$comment' => L10n::t('Comment'), - '$submit' => L10n::t('Submit'), - '$preview' => L10n::t('Preview'), - '$sourceapp' => L10n::t($a->sourcename), + '$comment' => DI::l10n()->t('Comment'), + '$submit' => DI::l10n()->t('Submit'), + '$preview' => DI::l10n()->t('Preview'), + '$sourceapp' => DI::l10n()->t($a->sourcename), '$ww' => '', '$rand_num' => Crypto::randomDigits(12) ]); @@ -1458,8 +1458,8 @@ function photos_content(App $a) $drop = [ 'dropping' => $dropping, 'pagedrop' => false, - 'select' => L10n::t('Select'), - 'delete' => L10n::t('Delete'), + 'select' => DI::l10n()->t('Select'), + 'delete' => DI::l10n()->t('Delete'), ]; $title_e = $item['title']; @@ -1487,12 +1487,12 @@ function photos_content(App $a) '$parent' => $item['parent'], '$profile_uid' => $owner_uid, '$mylink' => $contact['url'], - '$mytitle' => L10n::t('This is you'), + '$mytitle' => DI::l10n()->t('This is you'), '$myphoto' => $contact['thumb'], - '$comment' => L10n::t('Comment'), - '$submit' => L10n::t('Submit'), - '$preview' => L10n::t('Preview'), - '$sourceapp' => L10n::t($a->sourcename), + '$comment' => DI::l10n()->t('Comment'), + '$submit' => DI::l10n()->t('Submit'), + '$preview' => DI::l10n()->t('Preview'), + '$sourceapp' => DI::l10n()->t($a->sourcename), '$ww' => '', '$rand_num' => Crypto::randomDigits(12) ]); @@ -1518,7 +1518,7 @@ function photos_content(App $a) '$tags' => $tags, '$edit' => $edit, '$map' => $map, - '$map_text' => L10n::t('Map'), + '$map_text' => DI::l10n()->t('Map'), '$likebuttons' => $likebuttons, '$like' => $like, '$dislike' => $dislike, @@ -1543,7 +1543,7 @@ function photos_content(App $a) $sql_extra GROUP BY `resource-id`", intval($a->data['user']['uid']), DBA::escape('Contact Photos'), - DBA::escape(L10n::t('Contact Photos')) + DBA::escape(DI::l10n()->t('Contact Photos')) ); if (DBA::isResult($r)) { $total = count($r); @@ -1558,7 +1558,7 @@ function photos_content(App $a) $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d", intval($a->data['user']['uid']), DBA::escape('Contact Photos'), - DBA::escape(L10n::t('Contact Photos')), + DBA::escape(DI::l10n()->t('Contact Photos')), $pager->getStart(), $pager->getItemsPerPage() ); @@ -1569,7 +1569,7 @@ function photos_content(App $a) $twist = false; foreach ($r as $rr) { //hide profile photos to others - if (!$is_owner && !Session::getRemoteContactID($owner_uid) && ($rr['album'] == L10n::t('Profile Photos'))) { + if (!$is_owner && !Session::getRemoteContactID($owner_uid) && ($rr['album'] == DI::l10n()->t('Profile Photos'))) { continue; } @@ -1583,13 +1583,13 @@ function photos_content(App $a) 'id' => $rr['id'], 'twist' => ' ' . ($twist ? 'rotleft' : 'rotright') . rand(2,4), 'link' => 'photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'], - 'title' => L10n::t('View Photo'), + 'title' => DI::l10n()->t('View Photo'), 'src' => 'photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.' . $ext, 'alt' => $alt_e, 'album' => [ 'link' => 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']), 'name' => $name_e, - 'alt' => L10n::t('View Album'), + 'alt' => DI::l10n()->t('View Album'), ], ]; @@ -1598,9 +1598,9 @@ function photos_content(App $a) $tpl = Renderer::getMarkupTemplate('photos_recent.tpl'); $o .= Renderer::replaceMacros($tpl, [ - '$title' => L10n::t('Recent Photos'), + '$title' => DI::l10n()->t('Recent Photos'), '$can_post' => $can_post, - '$upload' => [L10n::t('Upload New Photos'), 'photos/'.$a->data['user']['nickname'].'/upload'], + '$upload' => [DI::l10n()->t('Upload New Photos'), 'photos/'.$a->data['user']['nickname'].'/upload'], '$photos' => $photos, '$paginate' => $pager->renderFull($total), ]); diff --git a/mod/ping.php b/mod/ping.php index 8aa65b7e1..57b55a0f9 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -268,7 +268,7 @@ function ping_init(App $a) 'photo' => $intro['photo'], 'date' => $intro['datetime'], 'seen' => false, - 'message' => L10n::t('{0} wants to be your friend'), + 'message' => DI::l10n()->t('{0} wants to be your friend'), ]; $notifs[] = $notif; } @@ -284,7 +284,7 @@ function ping_init(App $a) 'photo' => $reg['micro'], 'date' => $reg['created'], 'seen' => false, - 'message' => L10n::t('{0} requested registration'), + 'message' => DI::l10n()->t('{0} requested registration'), ]; $notifs[] = $notif; } diff --git a/mod/poke.php b/mod/poke.php index 900aa8e75..ea968f7bd 100644 --- a/mod/poke.php +++ b/mod/poke.php @@ -122,7 +122,7 @@ function poke_init(App $a) $arr['object-type'] = Activity\ObjectType::PERSON; $arr['origin'] = 1; - $arr['body'] = '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' . ' ' . L10n::t($verbs[$verb][0]) . ' ' . '[url=' . $target['url'] . ']' . $target['name'] . '[/url]'; + $arr['body'] = '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' . ' ' . DI::l10n()->t($verbs[$verb][0]) . ' ' . '[url=' . $target['url'] . ']' . $target['name'] . '[/url]'; $arr['object'] = '' . Activity\ObjectType::PERSON . '' . $target['name'] . '' . $target['url'] . ''; $arr['object'] .= '' . XML::escape('' . "\n"); @@ -140,7 +140,7 @@ function poke_init(App $a) function poke_content(App $a) { if (!local_user()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return; } @@ -176,14 +176,14 @@ function poke_content(App $a) $tpl = Renderer::getMarkupTemplate('poke_content.tpl'); $o = Renderer::replaceMacros($tpl,[ - '$title' => L10n::t('Poke/Prod'), - '$desc' => L10n::t('poke, prod or do other things to somebody'), - '$clabel' => L10n::t('Recipient'), - '$choice' => L10n::t('Choose what you wish to do to recipient'), + '$title' => DI::l10n()->t('Poke/Prod'), + '$desc' => DI::l10n()->t('poke, prod or do other things to somebody'), + '$clabel' => DI::l10n()->t('Recipient'), + '$choice' => DI::l10n()->t('Choose what you wish to do to recipient'), '$verbs' => $shortlist, '$parent' => $parent, - '$prv_desc' => L10n::t('Make this post private'), - '$submit' => L10n::t('Submit'), + '$prv_desc' => DI::l10n()->t('Make this post private'), + '$submit' => DI::l10n()->t('Submit'), '$name' => $name, '$id' => $id ]); diff --git a/mod/profile_photo.php b/mod/profile_photo.php index acdf90985..dddd1957d 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -29,7 +29,7 @@ function profile_photo_init(App $a) function profile_photo_post(App $a) { if (!local_user()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return; } @@ -55,7 +55,7 @@ function profile_photo_post(App $a) // phase 2 - we have finished cropping if ($a->argc != 2) { - notice(L10n::t('Image uploaded but image cropping failed.') . EOL); + notice(DI::l10n()->t('Image uploaded but image cropping failed.') . EOL); return; } @@ -82,28 +82,28 @@ function profile_photo_post(App $a) $Image->crop(300, $srcX, $srcY, $srcW, $srcH); $r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'], - L10n::t('Profile Photos'), 4, $is_default_profile); + DI::l10n()->t('Profile Photos'), 4, $is_default_profile); if ($r === false) { - notice(L10n::t('Image size reduction [%s] failed.', "300") . EOL); + notice(DI::l10n()->t('Image size reduction [%s] failed.', "300") . EOL); } $Image->scaleDown(80); $r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'], - L10n::t('Profile Photos'), 5, $is_default_profile); + DI::l10n()->t('Profile Photos'), 5, $is_default_profile); if ($r === false) { - notice(L10n::t('Image size reduction [%s] failed.', "80") . EOL); + notice(DI::l10n()->t('Image size reduction [%s] failed.', "80") . EOL); } $Image->scaleDown(48); $r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'], - L10n::t('Profile Photos'), 6, $is_default_profile); + DI::l10n()->t('Profile Photos'), 6, $is_default_profile); if ($r === false) { - notice(L10n::t('Image size reduction [%s] failed.', "48") . EOL); + notice(DI::l10n()->t('Image size reduction [%s] failed.', "48") . EOL); } // If setting for the default profile, unset the profile photo flag from any other photos I own @@ -122,7 +122,7 @@ function profile_photo_post(App $a) Contact::updateSelfFromUserID(local_user(), true); - info(L10n::t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL); + info(DI::l10n()->t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL); // Update global directory in background if ($path && strlen(Config::get('system', 'directory'))) { Worker::add(PRIORITY_LOW, "Directory", DI::baseUrl()->get() . '/' . $path); @@ -130,7 +130,7 @@ function profile_photo_post(App $a) Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user()); } else { - notice(L10n::t('Unable to process image') . EOL); + notice(DI::l10n()->t('Unable to process image') . EOL); } } @@ -149,7 +149,7 @@ function profile_photo_post(App $a) $maximagesize = Config::get('system', 'maximagesize'); if (($maximagesize) && ($filesize > $maximagesize)) { - notice(L10n::t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)) . EOL); + notice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)) . EOL); @unlink($src); return; } @@ -158,7 +158,7 @@ function profile_photo_post(App $a) $ph = new Image($imagedata, $filetype); if (!$ph->isValid()) { - notice(L10n::t('Unable to process image.') . EOL); + notice(DI::l10n()->t('Unable to process image.') . EOL); @unlink($src); return; } @@ -174,7 +174,7 @@ function profile_photo_content(App $a) { if (!local_user()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return; } @@ -194,7 +194,7 @@ function profile_photo_content(App $a) $r = Photo::selectToArray([], ["resource-id" => $resource_id, "uid" => local_user()], ["order" => ["scale" => false]]); if (!DBA::isResult($r)) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return; } @@ -207,7 +207,7 @@ function profile_photo_content(App $a) // set an already uloaded photo as profile photo // if photo is in 'Profile Photos', change it in db - if (($r[0]['album'] == L10n::t('Profile Photos')) && ($havescale)) { + if (($r[0]['album'] == DI::l10n()->t('Profile Photos')) && ($havescale)) { q("UPDATE `photo` SET `profile`=0 WHERE `profile`=1 AND `uid`=%d", intval(local_user())); q("UPDATE `photo` SET `profile`=1 WHERE `uid` = %d AND `resource-id` = '%s'", intval(local_user()), @@ -241,14 +241,14 @@ function profile_photo_content(App $a) $o = Renderer::replaceMacros($tpl, [ '$user' => $a->user['nickname'], - '$lbl_upfile' => L10n::t('Upload File:'), - '$lbl_profiles' => L10n::t('Select a profile:'), - '$title' => L10n::t('Upload Profile Photo'), - '$submit' => L10n::t('Upload'), + '$lbl_upfile' => DI::l10n()->t('Upload File:'), + '$lbl_profiles' => DI::l10n()->t('Select a profile:'), + '$title' => DI::l10n()->t('Upload Profile Photo'), + '$submit' => DI::l10n()->t('Upload'), '$profiles' => $profiles, '$form_security_token' => BaseModule::getFormSecurityToken("profile_photo"), - '$select' => sprintf('%s %s', L10n::t('or'), - ($newuser) ? '' . L10n::t('skip this step') . '' : '' . L10n::t('select a photo from your photo albums') . '') + '$select' => sprintf('%s %s', DI::l10n()->t('or'), + ($newuser) ? '' . DI::l10n()->t('skip this step') . '' : '' . DI::l10n()->t('select a photo from your photo albums') . '') ]); return $o; @@ -261,10 +261,10 @@ function profile_photo_content(App $a) '$profile' => (isset($_REQUEST['profile']) ? intval($_REQUEST['profile']) : 0), '$resource' => $imagecrop['hash'] . '-' . $imagecrop['resolution'], '$image_url' => DI::baseUrl() . '/photo/' . $filename, - '$title' => L10n::t('Crop Image'), - '$desc' => L10n::t('Please adjust the image cropping for optimum viewing.'), + '$title' => DI::l10n()->t('Crop Image'), + '$desc' => DI::l10n()->t('Please adjust the image cropping for optimum viewing.'), '$form_security_token' => BaseModule::getFormSecurityToken("profile_photo"), - '$done' => L10n::t('Done Editing') + '$done' => DI::l10n()->t('Done Editing') ]); return $o; } @@ -295,20 +295,20 @@ function profile_photo_crop_ui_head(Image $image) $smallest = 0; $filename = ''; - $r = Photo::store($image, local_user(), 0, $hash, $filename, L10n::t('Profile Photos'), 0); + $r = Photo::store($image, local_user(), 0, $hash, $filename, DI::l10n()->t('Profile Photos'), 0); if ($r) { - info(L10n::t('Image uploaded successfully.') . EOL); + info(DI::l10n()->t('Image uploaded successfully.') . EOL); } else { - notice(L10n::t('Image upload failed.') . EOL); + notice(DI::l10n()->t('Image upload failed.') . EOL); } if ($width > 640 || $height > 640) { $image->scaleDown(640); - $r = Photo::store($image, local_user(), 0, $hash, $filename, L10n::t('Profile Photos'), 1); + $r = Photo::store($image, local_user(), 0, $hash, $filename, DI::l10n()->t('Profile Photos'), 1); if ($r === false) { - notice(L10n::t('Image size reduction [%s] failed.', "640") . EOL); + notice(DI::l10n()->t('Image size reduction [%s] failed.', "640") . EOL); } else { $smallest = 1; } diff --git a/mod/profiles.php b/mod/profiles.php index f333e302f..2e530a175 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -39,7 +39,7 @@ function profiles_init(App $a) { intval(local_user()) ); if (! DBA::isResult($r)) { - notice(L10n::t('Profile not found.') . EOL); + notice(DI::l10n()->t('Profile not found.') . EOL); DI::baseUrl()->redirect('profiles'); return; // NOTREACHED } @@ -58,7 +58,7 @@ function profiles_init(App $a) { intval(local_user()) ); if (DBA::isResult($r)) { - info(L10n::t('Profile deleted.').EOL); + info(DI::l10n()->t('Profile deleted.').EOL); } DI::baseUrl()->redirect('profiles'); @@ -74,7 +74,7 @@ function profiles_init(App $a) { $num_profiles = (DBA::isResult($r0) ? count($r0) : 0); - $name = L10n::t('Profile-') . ($num_profiles + 1); + $name = DI::l10n()->t('Profile-') . ($num_profiles + 1); $r1 = q("SELECT `name`, `photo`, `thumb` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1", intval(local_user())); @@ -93,7 +93,7 @@ function profiles_init(App $a) { DBA::escape($name) ); - info(L10n::t('New profile created.') . EOL); + info(DI::l10n()->t('New profile created.') . EOL); if (DBA::isResult($r3) && count($r3) == 1) { DI::baseUrl()->redirect('profiles/' . $r3[0]['id']); } @@ -110,13 +110,13 @@ function profiles_init(App $a) { $num_profiles = (DBA::isResult($r0) ? count($r0) : 0); - $name = L10n::t('Profile-') . ($num_profiles + 1); + $name = DI::l10n()->t('Profile-') . ($num_profiles + 1); $r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1", intval(local_user()), intval($a->argv[2]) ); if(! DBA::isResult($r1)) { - notice(L10n::t('Profile unavailable to clone.') . EOL); + notice(DI::l10n()->t('Profile unavailable to clone.') . EOL); exit(); } unset($r1[0]['id']); @@ -131,7 +131,7 @@ function profiles_init(App $a) { intval(local_user()), DBA::escape($name) ); - info(L10n::t('New profile created.') . EOL); + info(DI::l10n()->t('New profile created.') . EOL); if ((DBA::isResult($r3)) && (count($r3) == 1)) { DI::baseUrl()->redirect('profiles/'.$r3[0]['id']); } @@ -148,7 +148,7 @@ function profiles_init(App $a) { intval(local_user()) ); if (! DBA::isResult($r)) { - notice(L10n::t('Profile not found.') . EOL); + notice(DI::l10n()->t('Profile not found.') . EOL); exit(); } @@ -178,7 +178,7 @@ function profile_clean_keywords($keywords) function profiles_post(App $a) { if (! local_user()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return; } @@ -192,7 +192,7 @@ function profiles_post(App $a) { intval(local_user()) ); if (! DBA::isResult($orig)) { - notice(L10n::t('Profile not found.') . EOL); + notice(DI::l10n()->t('Profile not found.') . EOL); return; } @@ -202,7 +202,7 @@ function profiles_post(App $a) { $profile_name = Strings::escapeTags(trim($_POST['profile_name'])); if (! strlen($profile_name)) { - notice(L10n::t('Profile Name is required.') . EOL); + notice(DI::l10n()->t('Profile Name is required.') . EOL); return; } @@ -342,50 +342,50 @@ function profiles_post(App $a) { $changes = []; if ($is_default) { if ($marital != $orig[0]['marital']) { - $changes[] = '[color=#ff0000]♥[/color] ' . L10n::t('Marital Status'); + $changes[] = '[color=#ff0000]♥[/color] ' . DI::l10n()->t('Marital Status'); } if ($withchanged) { - $changes[] = '[color=#ff0000]♥[/color] ' . L10n::t('Romantic Partner'); + $changes[] = '[color=#ff0000]♥[/color] ' . DI::l10n()->t('Romantic Partner'); } if ($likes != $orig[0]['likes']) { - $changes[] = L10n::t('Likes'); + $changes[] = DI::l10n()->t('Likes'); } if ($dislikes != $orig[0]['dislikes']) { - $changes[] = L10n::t('Dislikes'); + $changes[] = DI::l10n()->t('Dislikes'); } if ($work != $orig[0]['work']) { - $changes[] = L10n::t('Work/Employment'); + $changes[] = DI::l10n()->t('Work/Employment'); } if ($religion != $orig[0]['religion']) { - $changes[] = L10n::t('Religion'); + $changes[] = DI::l10n()->t('Religion'); } if ($politic != $orig[0]['politic']) { - $changes[] = L10n::t('Political Views'); + $changes[] = DI::l10n()->t('Political Views'); } if ($gender != $orig[0]['gender']) { - $changes[] = L10n::t('Gender'); + $changes[] = DI::l10n()->t('Gender'); } if ($sexual != $orig[0]['sexual']) { - $changes[] = L10n::t('Sexual Preference'); + $changes[] = DI::l10n()->t('Sexual Preference'); } if ($xmpp != $orig[0]['xmpp']) { - $changes[] = L10n::t('XMPP'); + $changes[] = DI::l10n()->t('XMPP'); } if ($homepage != $orig[0]['homepage']) { - $changes[] = L10n::t('Homepage'); + $changes[] = DI::l10n()->t('Homepage'); } if ($interest != $orig[0]['interest']) { - $changes[] = L10n::t('Interests'); + $changes[] = DI::l10n()->t('Interests'); } if ($address != $orig[0]['address']) { - $changes[] = L10n::t('Address'); + $changes[] = DI::l10n()->t('Address'); // New address not sent in notifications, potential privacy issues // in case this leaks to unintended recipients. Yes, it's in the public // profile but that doesn't mean we have to broadcast it to everybody. } if ($locality != $orig[0]['locality'] || $region != $orig[0]['region'] || $country_name != $orig[0]['country-name']) { - $changes[] = L10n::t('Location'); + $changes[] = DI::l10n()->t('Location'); } } @@ -465,7 +465,7 @@ function profiles_post(App $a) { /// @TODO decide to use DBA::isResult() here and check $r if ($r) { - info(L10n::t('Profile updated.') . EOL); + info(DI::l10n()->t('Profile updated.') . EOL); } if ($is_default) { @@ -495,7 +495,7 @@ function profiles_post(App $a) { function profiles_content(App $a) { if (! local_user()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return Login::form(); } @@ -507,7 +507,7 @@ function profiles_content(App $a) { intval(local_user()) ); if (! DBA::isResult($r)) { - notice(L10n::t('Profile not found.') . EOL); + notice(DI::l10n()->t('Profile not found.') . EOL); return; } @@ -519,14 +519,14 @@ function profiles_content(App $a) { $hide_friends = Renderer::replaceMacros($opt_tpl,[ '$yesno' => [ 'hide-friends', //Name - L10n::t('Hide contacts and friends:'), //Label + DI::l10n()->t('Hide contacts and friends:'), //Label !!$r[0]['hide-friends'], //Value '', //Help string - [L10n::t('No'), L10n::t('Yes')] //Off - On strings + [DI::l10n()->t('No'), DI::l10n()->t('Yes')] //Off - On strings ], - '$desc' => L10n::t('Hide your contact/friend list from viewers of this profile?'), - '$yes_str' => L10n::t('Yes'), - '$no_str' => L10n::t('No'), + '$desc' => DI::l10n()->t('Hide your contact/friend list from viewers of this profile?'), + '$yes_str' => DI::l10n()->t('Yes'), + '$no_str' => DI::l10n()->t('No'), '$yes_selected' => (($r[0]['hide-friends']) ? " checked=\"checked\" " : ""), '$no_selected' => (($r[0]['hide-friends'] == 0) ? " checked=\"checked\" " : "") ]); @@ -544,10 +544,10 @@ function profiles_content(App $a) { '$details' => [ 'detailed_profile', //Name - L10n::t('Show more profile fields:'), //Label + DI::l10n()->t('Show more profile fields:'), //Label $detailed_profile, //Value '', //Help string - [L10n::t('No'), L10n::t('Yes')] //Off - On strings + [DI::l10n()->t('No'), DI::l10n()->t('Yes')] //Off - On strings ], '$multi_profiles' => Feature::isEnabled(local_user(), 'multi_profiles'), @@ -556,75 +556,75 @@ function profiles_content(App $a) { '$profile_clone_link' => ((Feature::isEnabled(local_user(), 'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . BaseModule::getFormSecurityToken("profile_clone") : ""), '$profile_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t=' . BaseModule::getFormSecurityToken("profile_drop"), - '$profile_action' => L10n::t('Profile Actions'), - '$banner' => L10n::t('Edit Profile Details'), - '$submit' => L10n::t('Submit'), - '$profpic' => L10n::t('Change Profile Photo'), + '$profile_action' => DI::l10n()->t('Profile Actions'), + '$banner' => DI::l10n()->t('Edit Profile Details'), + '$submit' => DI::l10n()->t('Submit'), + '$profpic' => DI::l10n()->t('Change Profile Photo'), '$profpiclink' => '/photos/' . $a->user['nickname'], - '$viewprof' => L10n::t('View this profile'), - '$viewallprof' => L10n::t('View all profiles'), - '$editvis' => L10n::t('Edit visibility'), - '$cr_prof' => L10n::t('Create a new profile using these settings'), - '$cl_prof' => L10n::t('Clone this profile'), - '$del_prof' => L10n::t('Delete this profile'), + '$viewprof' => DI::l10n()->t('View this profile'), + '$viewallprof' => DI::l10n()->t('View all profiles'), + '$editvis' => DI::l10n()->t('Edit visibility'), + '$cr_prof' => DI::l10n()->t('Create a new profile using these settings'), + '$cl_prof' => DI::l10n()->t('Clone this profile'), + '$del_prof' => DI::l10n()->t('Delete this profile'), - '$lbl_basic_section' => L10n::t('Basic information'), - '$lbl_picture_section' => L10n::t('Profile picture'), - '$lbl_location_section' => L10n::t('Location'), - '$lbl_preferences_section' => L10n::t('Preferences'), - '$lbl_status_section' => L10n::t('Status information'), - '$lbl_about_section' => L10n::t('Additional information'), - '$lbl_interests_section' => L10n::t('Interests'), - '$lbl_personal_section' => L10n::t('Personal'), - '$lbl_relation_section' => L10n::t('Relation'), - '$lbl_miscellaneous_section' => L10n::t('Miscellaneous'), + '$lbl_basic_section' => DI::l10n()->t('Basic information'), + '$lbl_picture_section' => DI::l10n()->t('Profile picture'), + '$lbl_location_section' => DI::l10n()->t('Location'), + '$lbl_preferences_section' => DI::l10n()->t('Preferences'), + '$lbl_status_section' => DI::l10n()->t('Status information'), + '$lbl_about_section' => DI::l10n()->t('Additional information'), + '$lbl_interests_section' => DI::l10n()->t('Interests'), + '$lbl_personal_section' => DI::l10n()->t('Personal'), + '$lbl_relation_section' => DI::l10n()->t('Relation'), + '$lbl_miscellaneous_section' => DI::l10n()->t('Miscellaneous'), - '$lbl_profile_photo' => L10n::t('Upload Profile Photo'), - '$lbl_gender' => L10n::t('Your Gender:'), - '$lbl_marital' => L10n::t('♥ Marital Status:'), - '$lbl_sexual' => L10n::t('Sexual Preference:'), - '$lbl_ex2' => L10n::t('Example: fishing photography software'), + '$lbl_profile_photo' => DI::l10n()->t('Upload Profile Photo'), + '$lbl_gender' => DI::l10n()->t('Your Gender:'), + '$lbl_marital' => DI::l10n()->t('♥ Marital Status:'), + '$lbl_sexual' => DI::l10n()->t('Sexual Preference:'), + '$lbl_ex2' => DI::l10n()->t('Example: fishing photography software'), '$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''), '$baseurl' => DI::baseUrl()->get(true), '$profile_id' => $r[0]['id'], - '$profile_name' => ['profile_name', L10n::t('Profile Name:'), $r[0]['profile-name'], L10n::t('Required'), '*'], + '$profile_name' => ['profile_name', DI::l10n()->t('Profile Name:'), $r[0]['profile-name'], DI::l10n()->t('Required'), '*'], '$is_default' => $is_default, - '$default' => (($is_default) ? '

' . L10n::t('This is your public profile.
It may be visible to anybody using the internet.') . '

' : ""), - '$name' => ['name', L10n::t('Your Full Name:'), $r[0]['name']], - '$pdesc' => ['pdesc', L10n::t('Title/Description:'), $r[0]['pdesc']], + '$default' => (($is_default) ? '

' . DI::l10n()->t('This is your public profile.
It may be visible to anybody using the internet.') . '

' : ""), + '$name' => ['name', DI::l10n()->t('Your Full Name:'), $r[0]['name']], + '$pdesc' => ['pdesc', DI::l10n()->t('Title/Description:'), $r[0]['pdesc']], '$dob' => Temporal::getDateofBirthField($r[0]['dob'], $a->user['timezone']), '$hide_friends' => $hide_friends, - '$address' => ['address', L10n::t('Street Address:'), $r[0]['address']], - '$locality' => ['locality', L10n::t('Locality/City:'), $r[0]['locality']], - '$region' => ['region', L10n::t('Region/State:'), $r[0]['region']], - '$postal_code' => ['postal_code', L10n::t('Postal/Zip Code:'), $r[0]['postal-code']], - '$country_name' => ['country_name', L10n::t('Country:'), $r[0]['country-name']], - '$age' => ((intval($r[0]['dob'])) ? '(' . L10n::t('Age: ') . Temporal::getAgeByTimezone($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''), - '$gender' => L10n::t(ContactSelector::gender($r[0]['gender'])), - '$marital' => ['selector' => ContactSelector::maritalStatus($r[0]['marital']), 'value' => L10n::t($r[0]['marital'])], - '$with' => ['with', L10n::t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), L10n::t('Examples: cathy123, Cathy Williams, cathy@example.com')], - '$howlong' => ['howlong', L10n::t('Since [date]:'), ($r[0]['howlong'] <= DBA::NULL_DATETIME ? '' : DateTimeFormat::local($r[0]['howlong']))], - '$sexual' => ['selector' => ContactSelector::sexualPreference($r[0]['sexual']), 'value' => L10n::t($r[0]['sexual'])], - '$about' => ['about', L10n::t('Tell us about yourself...'), $r[0]['about']], - '$xmpp' => ['xmpp', L10n::t("XMPP \x28Jabber\x29 address:"), $r[0]['xmpp'], L10n::t("The XMPP address will be propagated to your contacts so that they can follow you.")], - '$homepage' => ['homepage', L10n::t('Homepage URL:'), $r[0]['homepage']], - '$hometown' => ['hometown', L10n::t('Hometown:'), $r[0]['hometown']], - '$politic' => ['politic', L10n::t('Political Views:'), $r[0]['politic']], - '$religion' => ['religion', L10n::t('Religious Views:'), $r[0]['religion']], - '$pub_keywords' => ['pub_keywords', L10n::t('Public Keywords:'), $r[0]['pub_keywords'], L10n::t("\x28Used for suggesting potential friends, can be seen by others\x29")], - '$prv_keywords' => ['prv_keywords', L10n::t('Private Keywords:'), $r[0]['prv_keywords'], L10n::t("\x28Used for searching profiles, never shown to others\x29")], - '$likes' => ['likes', L10n::t('Likes:'), $r[0]['likes']], - '$dislikes' => ['dislikes', L10n::t('Dislikes:'), $r[0]['dislikes']], - '$music' => ['music', L10n::t('Musical interests'), $r[0]['music']], - '$book' => ['book', L10n::t('Books, literature'), $r[0]['book']], - '$tv' => ['tv', L10n::t('Television'), $r[0]['tv']], - '$film' => ['film', L10n::t('Film/dance/culture/entertainment'), $r[0]['film']], - '$interest' => ['interest', L10n::t('Hobbies/Interests'), $r[0]['interest']], - '$romance' => ['romance', L10n::t('Love/romance'), $r[0]['romance']], - '$work' => ['work', L10n::t('Work/employment'), $r[0]['work']], - '$education' => ['education', L10n::t('School/education'), $r[0]['education']], - '$contact' => ['contact', L10n::t('Contact information and Social Networks'), $r[0]['contact']], + '$address' => ['address', DI::l10n()->t('Street Address:'), $r[0]['address']], + '$locality' => ['locality', DI::l10n()->t('Locality/City:'), $r[0]['locality']], + '$region' => ['region', DI::l10n()->t('Region/State:'), $r[0]['region']], + '$postal_code' => ['postal_code', DI::l10n()->t('Postal/Zip Code:'), $r[0]['postal-code']], + '$country_name' => ['country_name', DI::l10n()->t('Country:'), $r[0]['country-name']], + '$age' => ((intval($r[0]['dob'])) ? '(' . DI::l10n()->t('Age: ') . Temporal::getAgeByTimezone($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''), + '$gender' => DI::l10n()->t(ContactSelector::gender($r[0]['gender'])), + '$marital' => ['selector' => ContactSelector::maritalStatus($r[0]['marital']), 'value' => DI::l10n()->t($r[0]['marital'])], + '$with' => ['with', DI::l10n()->t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), DI::l10n()->t('Examples: cathy123, Cathy Williams, cathy@example.com')], + '$howlong' => ['howlong', DI::l10n()->t('Since [date]:'), ($r[0]['howlong'] <= DBA::NULL_DATETIME ? '' : DateTimeFormat::local($r[0]['howlong']))], + '$sexual' => ['selector' => ContactSelector::sexualPreference($r[0]['sexual']), 'value' => DI::l10n()->t($r[0]['sexual'])], + '$about' => ['about', DI::l10n()->t('Tell us about yourself...'), $r[0]['about']], + '$xmpp' => ['xmpp', DI::l10n()->t("XMPP \x28Jabber\x29 address:"), $r[0]['xmpp'], DI::l10n()->t("The XMPP address will be propagated to your contacts so that they can follow you.")], + '$homepage' => ['homepage', DI::l10n()->t('Homepage URL:'), $r[0]['homepage']], + '$hometown' => ['hometown', DI::l10n()->t('Hometown:'), $r[0]['hometown']], + '$politic' => ['politic', DI::l10n()->t('Political Views:'), $r[0]['politic']], + '$religion' => ['religion', DI::l10n()->t('Religious Views:'), $r[0]['religion']], + '$pub_keywords' => ['pub_keywords', DI::l10n()->t('Public Keywords:'), $r[0]['pub_keywords'], DI::l10n()->t("\x28Used for suggesting potential friends, can be seen by others\x29")], + '$prv_keywords' => ['prv_keywords', DI::l10n()->t('Private Keywords:'), $r[0]['prv_keywords'], DI::l10n()->t("\x28Used for searching profiles, never shown to others\x29")], + '$likes' => ['likes', DI::l10n()->t('Likes:'), $r[0]['likes']], + '$dislikes' => ['dislikes', DI::l10n()->t('Dislikes:'), $r[0]['dislikes']], + '$music' => ['music', DI::l10n()->t('Musical interests'), $r[0]['music']], + '$book' => ['book', DI::l10n()->t('Books, literature'), $r[0]['book']], + '$tv' => ['tv', DI::l10n()->t('Television'), $r[0]['tv']], + '$film' => ['film', DI::l10n()->t('Film/dance/culture/entertainment'), $r[0]['film']], + '$interest' => ['interest', DI::l10n()->t('Hobbies/Interests'), $r[0]['interest']], + '$romance' => ['romance', DI::l10n()->t('Love/romance'), $r[0]['romance']], + '$work' => ['work', DI::l10n()->t('Work/employment'), $r[0]['work']], + '$education' => ['education', DI::l10n()->t('School/education'), $r[0]['education']], + '$contact' => ['contact', DI::l10n()->t('Contact information and Social Networks'), $r[0]['contact']], ]); $arr = ['profile' => $r[0], 'entry' => $o]; @@ -655,18 +655,18 @@ function profiles_content(App $a) { $profiles .= Renderer::replaceMacros($tpl, [ '$photo' => DI::baseUrl()->remove($rr['thumb']), '$id' => $rr['id'], - '$alt' => L10n::t('Profile Image'), + '$alt' => DI::l10n()->t('Profile Image'), '$profile_name' => $rr['profile-name'], - '$visible' => (($rr['is-default']) ? '' . L10n::t('visible to everybody') . '' - : '' . L10n::t('Edit visibility') . '') + '$visible' => (($rr['is-default']) ? '' . DI::l10n()->t('visible to everybody') . '' + : '' . DI::l10n()->t('Edit visibility') . '') ]); } $tpl_header = Renderer::getMarkupTemplate('profile_listing_header.tpl'); $o .= Renderer::replaceMacros($tpl_header,[ - '$header' => L10n::t('Edit/Manage Profiles'), - '$chg_photo' => L10n::t('Change profile photo'), - '$cr_new' => L10n::t('Create New Profile'), + '$header' => DI::l10n()->t('Edit/Manage Profiles'), + '$chg_photo' => DI::l10n()->t('Change profile photo'), + '$cr_new' => DI::l10n()->t('Create New Profile'), '$cr_new_link' => 'profiles/new?t=' . BaseModule::getFormSecurityToken("profile_new"), '$profiles' => $profiles ]); diff --git a/mod/profperm.php b/mod/profperm.php index a79358c81..5c4325048 100644 --- a/mod/profperm.php +++ b/mod/profperm.php @@ -27,13 +27,13 @@ function profperm_init(App $a) function profperm_content(App $a) { if (!local_user()) { - notice(L10n::t('Permission denied') . EOL); + notice(DI::l10n()->t('Permission denied') . EOL); return; } if ($a->argc < 2) { - notice(L10n::t('Invalid profile identifier.') . EOL ); + notice(DI::l10n()->t('Invalid profile identifier.') . EOL ); return; } @@ -66,7 +66,7 @@ function profperm_content(App $a) { intval(local_user()) ); if (!DBA::isResult($r)) { - notice(L10n::t('Invalid profile identifier.') . EOL ); + notice(DI::l10n()->t('Invalid profile identifier.') . EOL ); return; } $profile = $r[0]; @@ -112,11 +112,11 @@ function profperm_content(App $a) { $ingroup[] = $member['id']; } - $o .= '

' . L10n::t('Profile Visibility Editor') . '

'; + $o .= '

' . DI::l10n()->t('Profile Visibility Editor') . '

'; - $o .= '

' . L10n::t('Profile') . ' \'' . $profile['profile-name'] . '\'

'; + $o .= '

' . DI::l10n()->t('Profile') . ' \'' . $profile['profile-name'] . '\'

'; - $o .= '
' . L10n::t('Click on a contact to add or remove.') . '
'; + $o .= '
' . DI::l10n()->t('Click on a contact to add or remove.') . '
'; } @@ -125,7 +125,7 @@ function profperm_content(App $a) { $o = ''; $o .= '
'; - $o .= '

' . L10n::t('Visible To') . '

'; + $o .= '

' . DI::l10n()->t('Visible To') . '

'; $o .= '
'; $o .= '
'; @@ -141,7 +141,7 @@ function profperm_content(App $a) { $o .= '
'; $o .= '
'; - $o .= '

' . L10n::t("All Contacts \x28with secure profile access\x29") . '

'; + $o .= '

' . DI::l10n()->t("All Contacts \x28with secure profile access\x29") . '

'; $o .= '
'; $o .= '
'; diff --git a/mod/redir.php b/mod/redir.php index 4c687e40d..990ebc194 100644 --- a/mod/redir.php +++ b/mod/redir.php @@ -30,7 +30,7 @@ function redir_init(App $a) { $fields = ['id', 'uid', 'nurl', 'url', 'addr', 'name', 'network', 'poll', 'issued-id', 'dfrn-id', 'duplex', 'pending']; $contact = DBA::selectFirst('contact', $fields, ['id' => $cid, 'uid' => [0, local_user()]]); if (!DBA::isResult($contact)) { - notice(L10n::t('Contact not found.')); + notice(DI::l10n()->t('Contact not found.')); DI::baseUrl()->redirect(); } @@ -120,7 +120,7 @@ function redir_init(App $a) { $a->redirect($url); } - notice(L10n::t('Contact not found.')); + notice(DI::l10n()->t('Contact not found.')); DI::baseUrl()->redirect(); } @@ -135,7 +135,7 @@ function redir_magic($a, $cid, $url) if (!DBA::isResult($contact)) { Logger::info('Contact not found', ['id' => $cid]); // Shouldn't happen under normal conditions - notice(L10n::t('Contact not found.')); + notice(DI::l10n()->t('Contact not found.')); if (!empty($url)) { System::externalRedirect($url); } else { diff --git a/mod/regmod.php b/mod/regmod.php index 49845e873..4cdd03845 100644 --- a/mod/regmod.php +++ b/mod/regmod.php @@ -47,7 +47,7 @@ function user_allow($hash) ); if ($res) { - info(L10n::t('Account approved.') . EOL); + info(DI::l10n()->t('Account approved.') . EOL); return true; } } @@ -71,19 +71,19 @@ function user_deny($hash) Register::deleteByHash($register['hash']); - notice(L10n::t('Registration revoked for %s', $user['username']) . EOL); + notice(DI::l10n()->t('Registration revoked for %s', $user['username']) . EOL); return true; } function regmod_content(App $a) { if (!local_user()) { - info(L10n::t('Please login.') . EOL); + info(DI::l10n()->t('Please login.') . EOL); return Login::form(DI::args()->getQueryString(), intval(Config::get('config', 'register_policy')) === \Friendica\Module\Register::CLOSED ? 0 : 1); } if (!is_site_admin() || !empty($_SESSION['submanage'])) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return ''; } diff --git a/mod/removeme.php b/mod/removeme.php index ecf65c04c..85b0eaa11 100644 --- a/mod/removeme.php +++ b/mod/removeme.php @@ -44,9 +44,9 @@ function removeme_post(App $a) } notification([ 'type' => SYSTEM_EMAIL, - 'subject' => L10n::t('[Friendica System Notify]') . ' ' . L10n::t('User deleted their account'), - 'preamble' => L10n::t('On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups.'), - 'body' => L10n::t('The user id is %d', local_user()), + 'subject' => DI::l10n()->t('[Friendica System Notify]') . ' ' . DI::l10n()->t('User deleted their account'), + 'preamble' => DI::l10n()->t('On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups.'), + 'body' => DI::l10n()->t('The user id is %d', local_user()), 'to_email' => $admin['email'], 'to_name' => $admin['username'], 'uid' => $admin['uid'], @@ -82,10 +82,10 @@ function removeme_content(App $a) $o = Renderer::replaceMacros($tpl, [ '$basedir' => DI::baseUrl()->get(), '$hash' => $hash, - '$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') + '$title' => DI::l10n()->t('Remove My Account'), + '$desc' => DI::l10n()->t('This will completely remove your account. Once this has been done it is not recoverable.'), + '$passwd' => DI::l10n()->t('Please enter your password for verification:'), + '$submit' => DI::l10n()->t('Remove My Account') ]); return $o; diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php index a4ba0b72e..8ae9f3b26 100644 --- a/mod/repair_ostatus.php +++ b/mod/repair_ostatus.php @@ -13,12 +13,12 @@ use Friendica\Model\Contact; function repair_ostatus_content(App $a) { if (! local_user()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); DI::baseUrl()->redirect('ostatus_repair'); // NOTREACHED } - $o = "

".L10n::t("Resubscribing to OStatus contacts")."

"; + $o = "

".DI::l10n()->t("Resubscribing to OStatus contacts")."

"; $uid = local_user(); @@ -32,7 +32,7 @@ function repair_ostatus_content(App $a) { intval(Contact::SHARING)); if (!DBA::isResult($r)) { - return ($o . L10n::t("Error")); + return ($o . DI::l10n()->t("Error")); } $total = $r[0]["total"]; @@ -47,13 +47,13 @@ function repair_ostatus_content(App $a) { intval(Contact::SHARING), $counter++); if (!DBA::isResult($r)) { - $o .= L10n::t("Done"); + $o .= DI::l10n()->t("Done"); return $o; } $o .= "

".$counter."/".$total.": ".$r[0]["url"]."

"; - $o .= "

".L10n::t("Keep this window open until done.")."

"; + $o .= "

".DI::l10n()->t("Keep this window open until done.")."

"; Contact::createFromProbe($uid, $r[0]["url"], true); diff --git a/mod/settings.php b/mod/settings.php index 8213fda7c..412748aab 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -47,7 +47,7 @@ function get_theme_config_file($theme) function settings_init(App $a) { if (!local_user()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return; } @@ -55,12 +55,12 @@ function settings_init(App $a) $tpl = Renderer::getMarkupTemplate('settings/head.tpl'); DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [ - '$ispublic' => L10n::t('everybody') + '$ispublic' => DI::l10n()->t('everybody') ]); $tabs = [ [ - 'label' => L10n::t('Account'), + 'label' => DI::l10n()->t('Account'), 'url' => 'settings', 'selected' => (($a->argc == 1) && ($a->argv[0] === 'settings')?'active':''), 'accesskey' => 'o', @@ -68,14 +68,14 @@ function settings_init(App $a) ]; $tabs[] = [ - 'label' => L10n::t('Two-factor authentication'), + 'label' => DI::l10n()->t('Two-factor authentication'), 'url' => 'settings/2fa', 'selected' => (($a->argc > 1) && ($a->argv[1] === '2fa') ? 'active' : ''), 'accesskey' => 'o', ]; $tabs[] = [ - 'label' => L10n::t('Profiles'), + 'label' => DI::l10n()->t('Profiles'), 'url' => 'profiles', 'selected' => (($a->argc == 1) && ($a->argv[0] === 'profiles')?'active':''), 'accesskey' => 'p', @@ -83,7 +83,7 @@ function settings_init(App $a) if (Feature::get()) { $tabs[] = [ - 'label' => L10n::t('Additional features'), + 'label' => DI::l10n()->t('Additional features'), 'url' => 'settings/features', 'selected' => (($a->argc > 1) && ($a->argv[1] === 'features') ? 'active' : ''), 'accesskey' => 't', @@ -91,49 +91,49 @@ function settings_init(App $a) } $tabs[] = [ - 'label' => L10n::t('Display'), + 'label' => DI::l10n()->t('Display'), 'url' => 'settings/display', 'selected' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''), 'accesskey' => 'i', ]; $tabs[] = [ - 'label' => L10n::t('Social Networks'), + 'label' => DI::l10n()->t('Social Networks'), 'url' => 'settings/connectors', 'selected' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''), 'accesskey' => 'w', ]; $tabs[] = [ - 'label' => L10n::t('Addons'), + 'label' => DI::l10n()->t('Addons'), 'url' => 'settings/addon', 'selected' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''), 'accesskey' => 'l', ]; $tabs[] = [ - 'label' => L10n::t('Delegations'), + 'label' => DI::l10n()->t('Delegations'), 'url' => 'settings/delegation', 'selected' => (($a->argc > 1) && ($a->argv[1] === 'delegation')?'active':''), 'accesskey' => 'd', ]; $tabs[] = [ - 'label' => L10n::t('Connected apps'), + 'label' => DI::l10n()->t('Connected apps'), 'url' => 'settings/oauth', 'selected' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''), 'accesskey' => 'b', ]; $tabs[] = [ - 'label' => L10n::t('Export personal data'), + 'label' => DI::l10n()->t('Export personal data'), 'url' => 'settings/userexport', 'selected' => (($a->argc > 1) && ($a->argv[1] === 'userexport')?'active':''), 'accesskey' => 'e', ]; $tabs[] = [ - 'label' => L10n::t('Remove account'), + 'label' => DI::l10n()->t('Remove account'), 'url' => 'removeme', 'selected' => (($a->argc == 1) && ($a->argv[0] === 'removeme')?'active':''), 'accesskey' => 'r', @@ -142,7 +142,7 @@ function settings_init(App $a) $tabtpl = Renderer::getMarkupTemplate("generic_links_widget.tpl"); DI::page()['aside'] = Renderer::replaceMacros($tabtpl, [ - '$title' => L10n::t('Settings'), + '$title' => DI::l10n()->t('Settings'), '$class' => 'settings-widget', '$items' => $tabs, ]); @@ -160,7 +160,7 @@ function settings_post(App $a) } 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; } @@ -185,9 +185,9 @@ function settings_post(App $a) $icon = $_POST['icon'] ?? ''; if ($name == "" || $key == "" || $secret == "") { - notice(L10n::t("Missing some important data!")); + notice(DI::l10n()->t("Missing some important data!")); } else { - if ($_POST['submit'] == L10n::t("Update")) { + if ($_POST['submit'] == DI::l10n()->t("Update")) { q("UPDATE clients SET client_id='%s', pw='%s', @@ -295,12 +295,12 @@ function settings_post(App $a) unset($dcrpass); if (!$mbox) { $failed = true; - notice(L10n::t('Failed to connect with email account using the settings provided.') . EOL); + notice(DI::l10n()->t('Failed to connect with email account using the settings provided.') . EOL); } } } if (!$failed) { - info(L10n::t('Email settings updated.') . EOL); + info(DI::l10n()->t('Email settings updated.') . EOL); } } } @@ -316,7 +316,7 @@ function settings_post(App $a) DI::pConfig()->set(local_user(), 'feature', substr($k, 8), ((intval($v)) ? 1 : 0)); } } - info(L10n::t('Features updated') . EOL); + info(DI::l10n()->t('Features updated') . EOL); return; } @@ -377,7 +377,7 @@ function settings_post(App $a) DBA::update('user', ['theme' => $theme], ['uid' => local_user()]); } } else { - notice(L10n::t('The theme you chose isn\'t available.')); + notice(DI::l10n()->t('The theme you chose isn\'t available.')); } Hook::callAll('display_settings_post', $_POST); @@ -393,7 +393,7 @@ function settings_post(App $a) // was there an error if ($_FILES['importcontact-filename']['error'] > 0) { Logger::notice('Contact CSV file upload error'); - info(L10n::t('Contact CSV file upload error')); + info(DI::l10n()->t('Contact CSV file upload error')); } else { $csvArray = array_map('str_getcsv', file($_FILES['importcontact-filename']['tmp_name'])); // import contacts @@ -407,7 +407,7 @@ function settings_post(App $a) $arr = Contact::createFromProbe($_SESSION['uid'], $csvRow[0], '', false); } } - info(L10n::t('Importing Contacts done')); + info(DI::l10n()->t('Importing Contacts done')); // delete temp file unlink($filename); } @@ -416,7 +416,7 @@ function settings_post(App $a) if (!empty($_POST['resend_relocate'])) { Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::RELOCATION, local_user()); - info(L10n::t("Relocate message has been send to your contacts")); + info(DI::l10n()->t("Relocate message has been send to your contacts")); DI::baseUrl()->redirect('settings'); } @@ -428,7 +428,7 @@ function settings_post(App $a) try { if ($newpass != $confirm) { - throw new Exception(L10n::t('Passwords do not match.')); + throw new Exception(DI::l10n()->t('Passwords do not match.')); } // check if the old password was supplied correctly before changing it to the new value @@ -436,13 +436,13 @@ function settings_post(App $a) $result = User::updatePassword(local_user(), $newpass); if (!DBA::isResult($result)) { - throw new Exception(L10n::t('Password update failed. Please try again.')); + throw new Exception(DI::l10n()->t('Password update failed. Please try again.')); } - info(L10n::t('Password changed.')); + info(DI::l10n()->t('Password changed.')); } catch (Exception $e) { notice($e->getMessage()); - notice(L10n::t('Password unchanged.')); + notice(DI::l10n()->t('Password unchanged.')); } } @@ -524,28 +524,28 @@ function settings_post(App $a) if ($username != $a->user['username']) { if (strlen($username) > 40) { - $err .= L10n::t(' Please use a shorter name.'); + $err .= DI::l10n()->t(' Please use a shorter name.'); } if (strlen($username) < 3) { - $err .= L10n::t(' Name too short.'); + $err .= DI::l10n()->t(' Name too short.'); } } if ($email != $a->user['email']) { // check for the correct password if (!User::authenticate(intval(local_user()), $_POST['mpassword'])) { - $err .= L10n::t('Wrong Password') . EOL; + $err .= DI::l10n()->t('Wrong Password') . EOL; $email = $a->user['email']; } // check the email is valid if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { - $err .= L10n::t('Invalid email.'); + $err .= DI::l10n()->t('Invalid email.'); } // ensure new email is not the admin mail if (Config::get('config', 'admin_email')) { $adminlist = explode(",", str_replace(" ", "", strtolower(Config::get('config', 'admin_email')))); if (in_array(strtolower($email), $adminlist)) { - $err .= L10n::t('Cannot change to that email.'); + $err .= DI::l10n()->t('Cannot change to that email.'); $email = $a->user['email']; } } @@ -582,10 +582,10 @@ function settings_post(App $a) $hidewall = 1; if (!$str_contact_allow && !$str_group_allow && !$str_contact_deny && !$str_group_deny) { if ($def_gid) { - info(L10n::t('Private forum has no privacy permissions. Using default privacy group.'). EOL); + info(DI::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); + notice(DI::l10n()->t('Private forum has no privacy permissions and no default privacy group.') . EOL); } } } @@ -602,7 +602,7 @@ function settings_post(App $a) } if (DBA::update('user', $fields, ['uid' => local_user()])) { - info(L10n::t('Settings updated.') . EOL); + info(DI::l10n()->t('Settings updated.') . EOL); } // clear session language @@ -647,12 +647,12 @@ function settings_content(App $a) Nav::setSelected('settings'); if (!local_user()) { - //notice(L10n::t('Permission denied.') . EOL); + //notice(DI::l10n()->t('Permission denied.') . EOL); return Login::form(); } if (!empty($_SESSION['submanage'])) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return; } @@ -661,14 +661,14 @@ function settings_content(App $a) $tpl = Renderer::getMarkupTemplate('settings/oauth_edit.tpl'); $o .= Renderer::replaceMacros($tpl, [ '$form_security_token' => BaseModule::getFormSecurityToken("settings_oauth"), - '$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'), '', ''], + '$title' => DI::l10n()->t('Add application'), + '$submit' => DI::l10n()->t('Save Settings'), + '$cancel' => DI::l10n()->t('Cancel'), + '$name' => ['name', DI::l10n()->t('Name'), '', ''], + '$key' => ['key', DI::l10n()->t('Consumer Key'), '', ''], + '$secret' => ['secret', DI::l10n()->t('Consumer Secret'), '', ''], + '$redirect' => ['redirect', DI::l10n()->t('Redirect'), '', ''], + '$icon' => ['icon', DI::l10n()->t('Icon url'), '', ''], ]); return $o; } @@ -679,7 +679,7 @@ function settings_content(App $a) local_user()); if (!DBA::isResult($r)) { - notice(L10n::t("You can't edit this application.")); + notice(DI::l10n()->t("You can't edit this application.")); return; } $app = $r[0]; @@ -687,14 +687,14 @@ function settings_content(App $a) $tpl = Renderer::getMarkupTemplate('settings/oauth_edit.tpl'); $o .= Renderer::replaceMacros($tpl, [ '$form_security_token' => BaseModule::getFormSecurityToken("settings_oauth"), - '$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'], ''], + '$title' => DI::l10n()->t('Add application'), + '$submit' => DI::l10n()->t('Update'), + '$cancel' => DI::l10n()->t('Cancel'), + '$name' => ['name', DI::l10n()->t('Name'), $app['name'] , ''], + '$key' => ['key', DI::l10n()->t('Consumer Key'), $app['client_id'], ''], + '$secret' => ['secret', DI::l10n()->t('Consumer Secret'), $app['pw'], ''], + '$redirect' => ['redirect', DI::l10n()->t('Redirect'), $app['redirect_uri'], ''], + '$icon' => ['icon', DI::l10n()->t('Icon url'), $app['icon'], ''], ]); return $o; } @@ -720,13 +720,13 @@ function settings_content(App $a) $o .= Renderer::replaceMacros($tpl, [ '$form_security_token' => BaseModule::getFormSecurityToken("settings_oauth"), '$baseurl' => DI::baseUrl()->get(true), - '$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'), + '$title' => DI::l10n()->t('Connected Apps'), + '$add' => DI::l10n()->t('Add application'), + '$edit' => DI::l10n()->t('Edit'), + '$delete' => DI::l10n()->t('Delete'), + '$consumerkey' => DI::l10n()->t('Client key starts with'), + '$noname' => DI::l10n()->t('No name'), + '$remove' => DI::l10n()->t('Remove authorization'), '$apps' => $r, ]); return $o; @@ -737,7 +737,7 @@ function settings_content(App $a) $r = q("SELECT * FROM `hook` WHERE `hook` = 'addon_settings' "); if (!DBA::isResult($r)) { - $settings_addons = L10n::t('No Addon settings configured'); + $settings_addons = DI::l10n()->t('No Addon settings configured'); } Hook::callAll('addon_settings', $settings_addons); @@ -746,7 +746,7 @@ function settings_content(App $a) $tpl = Renderer::getMarkupTemplate('settings/addons.tpl'); $o .= Renderer::replaceMacros($tpl, [ '$form_security_token' => BaseModule::getFormSecurityToken("settings_addon"), - '$title' => L10n::t('Addon Settings'), + '$title' => DI::l10n()->t('Addon Settings'), '$settings_addons' => $settings_addons ]); return $o; @@ -760,16 +760,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],[L10n::t('Off'), L10n::t('On')]]; + $arr[$fname][1][] = ['feature_' .$f[0], $f[1],((intval(Feature::isEnabled(local_user(), $f[0]))) ? "1" : ''), $f[2],[DI::l10n()->t('Off'), DI::l10n()->t('On')]]; } } $tpl = Renderer::getMarkupTemplate('settings/features.tpl'); $o .= Renderer::replaceMacros($tpl, [ '$form_security_token' => BaseModule::getFormSecurityToken("settings_features"), - '$title' => L10n::t('Additional Features'), + '$title' => DI::l10n()->t('Additional Features'), '$features' => $arr, - '$submit' => L10n::t('Save Settings'), + '$submit' => DI::l10n()->t('Save Settings'), ]); return $o; } @@ -792,8 +792,8 @@ function settings_content(App $a) Hook::callAll('connector_settings', $settings_connectors); if (is_site_admin()) { - $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 \x28OStatus\x29"), ((Config::get('system', 'ostatus_disabled')) ? L10n::t('disabled') : L10n::t('enabled'))); + $diasp_enabled = DI::l10n()->t('Built-in support for %s connectivity is %s', DI::l10n()->t('Diaspora'), ((Config::get('system', 'diaspora_enabled')) ? DI::l10n()->t('enabled') : DI::l10n()->t('disabled'))); + $ostat_enabled = DI::l10n()->t('Built-in support for %s connectivity is %s', DI::l10n()->t("GNU Social \x28OStatus\x29"), ((Config::get('system', 'ostatus_disabled')) ? DI::l10n()->t('disabled') : DI::l10n()->t('enabled'))); } else { $diasp_enabled = ""; $ostat_enabled = ""; @@ -824,50 +824,50 @@ function settings_content(App $a) $tpl = Renderer::getMarkupTemplate('settings/connectors.tpl'); - $mail_disabled_message = ($mail_disabled ? L10n::t('Email access is disabled on this site.') : ''); + $mail_disabled_message = ($mail_disabled ? DI::l10n()->t('Email access is disabled on this site.') : ''); $ssl_options = ['TLS' => 'TLS', 'SSL' => 'SSL']; if (Config::get('system', 'insecure_imap')) { - $ssl_options['notls'] = L10n::t('None'); + $ssl_options['notls'] = DI::l10n()->t('None'); } $o .= Renderer::replaceMacros($tpl, [ '$form_security_token' => BaseModule::getFormSecurityToken("settings_connectors"), - '$title' => L10n::t('Social Networks'), + '$title' => DI::l10n()->t('Social Networks'), '$diasp_enabled' => $diasp_enabled, '$ostat_enabled' => $ostat_enabled, - '$general_settings' => L10n::t('General Social Media Settings'), - '$accept_only_sharer' => ['accept_only_sharer', L10n::t('Accept only top level posts by contacts you follow'), $accept_only_sharer, L10n::t('The system does an auto completion of threads when a comment arrives. This has got the side effect that you can receive posts that had been started by a non-follower but had been commented by someone you follow. This setting deactivates this behaviour. When activated, you strictly only will receive posts from people you really do follow.')], - '$disable_cw' => ['disable_cw', L10n::t('Disable Content Warning'), $disable_cw, L10n::t('Users on networks like Mastodon or Pleroma are able to set a content warning field which collapse their post by default. This disables the automatic collapsing and sets the content warning as the post title. Doesn\'t affect any other content filtering you eventually set up.')], - '$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.')], - '$attach_link_title' => ['attach_link_title', L10n::t('Attach the link title'), $attach_link_title, L10n::t('When activated, the title of the attached link will be added as a title on posts to Diaspora. This is mostly helpful with "remote-self" contacts that share feed content.')], - '$ostatus_autofriend' => ['snautofollow', L10n::t("Automatically follow any GNU Social \x28OStatus\x29 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 \x28in the format user@domain.tld\x29, your contacts will be added automatically. The field will be emptied when done.")], + '$general_settings' => DI::l10n()->t('General Social Media Settings'), + '$accept_only_sharer' => ['accept_only_sharer', DI::l10n()->t('Accept only top level posts by contacts you follow'), $accept_only_sharer, DI::l10n()->t('The system does an auto completion of threads when a comment arrives. This has got the side effect that you can receive posts that had been started by a non-follower but had been commented by someone you follow. This setting deactivates this behaviour. When activated, you strictly only will receive posts from people you really do follow.')], + '$disable_cw' => ['disable_cw', DI::l10n()->t('Disable Content Warning'), $disable_cw, DI::l10n()->t('Users on networks like Mastodon or Pleroma are able to set a content warning field which collapse their post by default. This disables the automatic collapsing and sets the content warning as the post title. Doesn\'t affect any other content filtering you eventually set up.')], + '$no_intelligent_shortening' => ['no_intelligent_shortening', DI::l10n()->t('Disable intelligent shortening'), $no_intelligent_shortening, DI::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.')], + '$attach_link_title' => ['attach_link_title', DI::l10n()->t('Attach the link title'), $attach_link_title, DI::l10n()->t('When activated, the title of the attached link will be added as a title on posts to Diaspora. This is mostly helpful with "remote-self" contacts that share feed content.')], + '$ostatus_autofriend' => ['snautofollow', DI::l10n()->t("Automatically follow any GNU Social \x28OStatus\x29 followers/mentioners"), $ostatus_autofriend, DI::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, DI::l10n()->t("Default group for OStatus contacts")), + '$legacy_contact' => ['legacy_contact', DI::l10n()->t('Your legacy GNU Social account'), $legacy_contact, DI::l10n()->t("If you enter your old GNU Social/Statusnet account name here \x28in the format user@domain.tld\x29, your contacts will be added automatically. The field will be emptied when done.")], '$repair_ostatus_url' => DI::baseUrl() . '/repair_ostatus', - '$repair_ostatus_text' => L10n::t('Repair OStatus subscriptions'), + '$repair_ostatus_text' => DI::l10n()->t('Repair OStatus subscriptions'), '$settings_connectors' => $settings_connectors, - '$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, ''], + '$h_imap' => DI::l10n()->t('Email/Mailbox Setup'), + '$imap_desc' => DI::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', DI::l10n()->t('Last successful email check:'), $mail_chk, ''], '$mail_disabled' => $mail_disabled_message, - '$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), '', $ssl_options], - '$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'), + '$mail_server' => ['mail_server', DI::l10n()->t('IMAP server name:'), $mail_server, ''], + '$mail_port' => ['mail_port', DI::l10n()->t('IMAP port:'), $mail_port, ''], + '$mail_ssl' => ['mail_ssl', DI::l10n()->t('Security:'), strtoupper($mail_ssl), '', $ssl_options], + '$mail_user' => ['mail_user', DI::l10n()->t('Email login name:'), $mail_user, ''], + '$mail_pass' => ['mail_pass', DI::l10n()->t('Email password:'), '', ''], + '$mail_replyto' => ['mail_replyto', DI::l10n()->t('Reply-to address:'), $mail_replyto, 'Optional'], + '$mail_pubmail' => ['mail_pubmail', DI::l10n()->t('Send public posts to all email contacts:'), $mail_pubmail, ''], + '$mail_action' => ['mail_action', DI::l10n()->t('Action after import:'), $mail_action, '', [0 => DI::l10n()->t('None'), 1 => DI::l10n()->t('Delete'), 2 => DI::l10n()->t('Mark as seen'), 3 => DI::l10n()->t('Move to folder')]], + '$mail_movetofolder' => ['mail_movetofolder', DI::l10n()->t('Move to folder:'), $mail_movetofolder, ''], + '$submit' => DI::l10n()->t('Save Settings'), ]); Hook::callAll('display_settings', $o); @@ -890,7 +890,7 @@ function settings_content(App $a) $allowed_themes = Theme::getAllowedList(); $themes = []; - $mobile_themes = ["---" => L10n::t('No special theme for mobile devices')]; + $mobile_themes = ["---" => DI::l10n()->t('No special theme for mobile devices')]; foreach ($allowed_themes as $theme) { $is_experimental = file_exists('view/theme/' . $theme . '/experimental'); $is_unsupported = file_exists('view/theme/' . $theme . '/unsupported'); @@ -898,9 +898,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 = L10n::t('%s - (Unsupported)', $theme_name); + $theme_name = DI::l10n()->t('%s - (Unsupported)', $theme_name); } elseif ($is_experimental) { - $theme_name = L10n::t('%s - (Experimental)', $theme_name); + $theme_name = DI::l10n()->t('%s - (Experimental)', $theme_name); } if ($is_mobile) { @@ -928,7 +928,7 @@ function settings_content(App $a) $nosmile = DI::pConfig()->get(local_user(), 'system', 'no_smilies', 0); $first_day_of_week = DI::pConfig()->get(local_user(), 'system', 'first_day_of_week', 0); - $weekdays = [0 => L10n::t("Sunday"), 1 => L10n::t("Monday")]; + $weekdays = [0 => DI::l10n()->t("Sunday"), 1 => DI::l10n()->t("Monday")]; $noinfo = DI::pConfig()->get(local_user(), 'system', 'ignore_info', 0); $infinite_scroll = DI::pConfig()->get(local_user(), 'system', 'infinite_scroll', 0); @@ -944,31 +944,31 @@ function settings_content(App $a) $tpl = Renderer::getMarkupTemplate('settings/display.tpl'); $o = Renderer::replaceMacros($tpl, [ - '$ptitle' => L10n::t('Display Settings'), + '$ptitle' => DI::l10n()->t('Display Settings'), '$form_security_token' => BaseModule::getFormSecurityToken("settings_display"), - '$submit' => L10n::t('Save Settings'), + '$submit' => DI::l10n()->t('Save Settings'), '$baseurl' => DI::baseUrl()->get(true), '$uid' => local_user(), - '$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('Bandwidth Saver Mode'), $bandwidth_saver, L10n::t('When enabled, embedded content is not displayed on automatic updates, they only show on page reload.')], - '$no_smart_threading' => ['no_smart_threading', L10n::t('Disable Smart Threading'), $no_smart_threading, L10n::t('Disable the automatic suppression of extraneous thread indentation.')], + '$theme' => ['theme', DI::l10n()->t('Display Theme:'), $theme_selected, '', $themes, true], + '$mobile_theme' => ['mobile_theme', DI::l10n()->t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, false], + '$nowarn_insecure' => ['nowarn_insecure', DI::l10n()->t('Suppress warning of insecure networks'), $nowarn_insecure, DI::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', DI::l10n()->t("Update browser every xx seconds"), $browser_update, DI::l10n()->t('Minimum of 10 seconds. Enter -1 to disable it.')], + '$itemspage_network' => ['itemspage_network', DI::l10n()->t("Number of items to display per page:"), $itemspage_network, DI::l10n()->t('Maximum of 100 items')], + '$itemspage_mobile_network' => ['itemspage_mobile_network', DI::l10n()->t("Number of items to display per page when viewed from mobile device:"), $itemspage_mobile_network, DI::l10n()->t('Maximum of 100 items')], + '$nosmile' => ['nosmile', DI::l10n()->t("Don't show emoticons"), $nosmile, ''], + '$calendar_title' => DI::l10n()->t('Calendar'), + '$first_day_of_week' => ['first_day_of_week', DI::l10n()->t('Beginning of week:'), $first_day_of_week, '', $weekdays, false], + '$noinfo' => ['noinfo', DI::l10n()->t("Don't show notices"), $noinfo, ''], + '$infinite_scroll' => ['infinite_scroll', DI::l10n()->t("Infinite scroll"), $infinite_scroll, ''], + '$no_auto_update' => ['no_auto_update', DI::l10n()->t("Automatic updates only at the top of the network page"), $no_auto_update, DI::l10n()->t('When disabled, the network page is updated all the time, which could be confusing while reading.')], + '$bandwidth_saver' => ['bandwidth_saver', DI::l10n()->t('Bandwidth Saver Mode'), $bandwidth_saver, DI::l10n()->t('When enabled, embedded content is not displayed on automatic updates, they only show on page reload.')], + '$no_smart_threading' => ['no_smart_threading', DI::l10n()->t('Disable Smart Threading'), $no_smart_threading, DI::l10n()->t('Disable the automatic suppression of extraneous thread indentation.')], - '$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'), + '$d_tset' => DI::l10n()->t('General Theme Settings'), + '$d_ctset' => DI::l10n()->t('Custom Theme Settings'), + '$d_cset' => DI::l10n()->t('Content Settings'), + 'stitle' => DI::l10n()->t('Theme settings'), '$theme_config' => $theme_config, ]); @@ -982,7 +982,7 @@ function settings_content(App $a) $profile = DBA::selectFirst('profile', [], ['is-default' => true, 'uid' => local_user()]); if (!DBA::isResult($profile)) { - notice(L10n::t('Unable to find your profile. Please contact your admin.') . EOL); + notice(DI::l10n()->t('Unable to find your profile. Please contact your admin.') . EOL); return; } @@ -1021,49 +1021,49 @@ function settings_content(App $a) $pageset_tpl = Renderer::getMarkupTemplate('settings/pagetypes.tpl'); $pagetype = Renderer::replaceMacros($pageset_tpl, [ - '$account_types' => L10n::t("Account Types"), - '$user' => L10n::t("Personal Page Subtypes"), - '$community' => L10n::t("Community Forum Subtypes"), + '$account_types' => DI::l10n()->t("Account Types"), + '$user' => DI::l10n()->t("Personal Page Subtypes"), + '$community' => DI::l10n()->t("Community Forum Subtypes"), '$account_type' => $a->user['account-type'], '$type_person' => User::ACCOUNT_TYPE_PERSON, '$type_organisation' => User::ACCOUNT_TYPE_ORGANISATION, '$type_news' => User::ACCOUNT_TYPE_NEWS, '$type_community' => User::ACCOUNT_TYPE_COMMUNITY, - '$account_person' => ['account-type', L10n::t('Personal Page'), User::ACCOUNT_TYPE_PERSON, - L10n::t('Account for a personal profile.'), + '$account_person' => ['account-type', DI::l10n()->t('Personal Page'), User::ACCOUNT_TYPE_PERSON, + DI::l10n()->t('Account for a personal profile.'), ($a->user['account-type'] == User::ACCOUNT_TYPE_PERSON)], - '$account_organisation' => ['account-type', L10n::t('Organisation Page'), User::ACCOUNT_TYPE_ORGANISATION, - L10n::t('Account for an organisation that automatically approves contact requests as "Followers".'), + '$account_organisation' => ['account-type', DI::l10n()->t('Organisation Page'), User::ACCOUNT_TYPE_ORGANISATION, + DI::l10n()->t('Account for an organisation that automatically approves contact requests as "Followers".'), ($a->user['account-type'] == User::ACCOUNT_TYPE_ORGANISATION)], - '$account_news' => ['account-type', L10n::t('News Page'), User::ACCOUNT_TYPE_NEWS, - L10n::t('Account for a news reflector that automatically approves contact requests as "Followers".'), + '$account_news' => ['account-type', DI::l10n()->t('News Page'), User::ACCOUNT_TYPE_NEWS, + DI::l10n()->t('Account for a news reflector that automatically approves contact requests as "Followers".'), ($a->user['account-type'] == User::ACCOUNT_TYPE_NEWS)], - '$account_community' => ['account-type', L10n::t('Community Forum'), User::ACCOUNT_TYPE_COMMUNITY, - L10n::t('Account for community discussions.'), + '$account_community' => ['account-type', DI::l10n()->t('Community Forum'), User::ACCOUNT_TYPE_COMMUNITY, + DI::l10n()->t('Account for community discussions.'), ($a->user['account-type'] == User::ACCOUNT_TYPE_COMMUNITY)], - '$page_normal' => ['page-flags', L10n::t('Normal Account Page'), User::PAGE_FLAGS_NORMAL, - L10n::t('Account for a regular personal profile that requires manual approval of "Friends" and "Followers".'), + '$page_normal' => ['page-flags', DI::l10n()->t('Normal Account Page'), User::PAGE_FLAGS_NORMAL, + DI::l10n()->t('Account for a regular personal profile that requires manual approval of "Friends" and "Followers".'), ($a->user['page-flags'] == User::PAGE_FLAGS_NORMAL)], - '$page_soapbox' => ['page-flags', L10n::t('Soapbox Page'), User::PAGE_FLAGS_SOAPBOX, - L10n::t('Account for a public profile that automatically approves contact requests as "Followers".'), + '$page_soapbox' => ['page-flags', DI::l10n()->t('Soapbox Page'), User::PAGE_FLAGS_SOAPBOX, + DI::l10n()->t('Account for a public profile that automatically approves contact requests as "Followers".'), ($a->user['page-flags'] == User::PAGE_FLAGS_SOAPBOX)], - '$page_community' => ['page-flags', L10n::t('Public Forum'), User::PAGE_FLAGS_COMMUNITY, - L10n::t('Automatically approves all contact requests.'), + '$page_community' => ['page-flags', DI::l10n()->t('Public Forum'), User::PAGE_FLAGS_COMMUNITY, + DI::l10n()->t('Automatically approves all contact requests.'), ($a->user['page-flags'] == User::PAGE_FLAGS_COMMUNITY)], - '$page_freelove' => ['page-flags', L10n::t('Automatic Friend Page'), User::PAGE_FLAGS_FREELOVE, - L10n::t('Account for a popular profile that automatically approves contact requests as "Friends".'), + '$page_freelove' => ['page-flags', DI::l10n()->t('Automatic Friend Page'), User::PAGE_FLAGS_FREELOVE, + DI::l10n()->t('Account for a popular profile that automatically approves contact requests as "Friends".'), ($a->user['page-flags'] == User::PAGE_FLAGS_FREELOVE)], - '$page_prvgroup' => ['page-flags', L10n::t('Private Forum [Experimental]'), User::PAGE_FLAGS_PRVGROUP, - L10n::t('Requires manual approval of contact requests.'), + '$page_prvgroup' => ['page-flags', DI::l10n()->t('Private Forum [Experimental]'), User::PAGE_FLAGS_PRVGROUP, + DI::l10n()->t('Requires manual approval of contact requests.'), ($a->user['page-flags'] == User::PAGE_FLAGS_PRVGROUP)], @@ -1074,7 +1074,7 @@ function settings_content(App $a) if ($noid) { $openid_field = false; } else { - $openid_field = ['openid_url', L10n::t('OpenID:'), $openid, L10n::t("\x28Optional\x29 Allow this OpenID to login to this account."), "", "readonly", "url"]; + $openid_field = ['openid_url', DI::l10n()->t('OpenID:'), $openid, DI::l10n()->t("\x28Optional\x29 Allow this OpenID to login to this account."), "", "readonly", "url"]; } $opt_tpl = Renderer::getMarkupTemplate("field_yesno.tpl"); @@ -1082,64 +1082,64 @@ function settings_content(App $a) $profile_in_dir = ''; } else { $profile_in_dir = Renderer::replaceMacros($opt_tpl, [ - '$field' => ['profile_in_directory', L10n::t('Publish your default profile in your local site directory?'), $profile['publish'], L10n::t('Your profile will be published in this node\'s local directory. Your profile details may be publicly visible depending on the system settings.', DI::baseUrl().'/directory'), [L10n::t('No'), L10n::t('Yes')]] + '$field' => ['profile_in_directory', DI::l10n()->t('Publish your default profile in your local site directory?'), $profile['publish'], DI::l10n()->t('Your profile will be published in this node\'s local directory. Your profile details may be publicly visible depending on the system settings.', DI::baseUrl().'/directory'), [DI::l10n()->t('No'), DI::l10n()->t('Yes')]] ]); } if (strlen(Config::get('system', 'directory'))) { $profile_in_net_dir = Renderer::replaceMacros($opt_tpl, [ - '$field' => ['profile_in_netdirectory', L10n::t('Publish your default profile in the global social directory?'), $profile['net-publish'], L10n::t('Your profile will be published in the global friendica directories (e.g. %s). Your profile will be visible in public.', Config::get('system', 'directory'), Config::get('system', 'directory')) . " " . L10n::t("This setting also determines whether Friendica will inform search engines that your profile should be indexed or not. Third-party search engines may or may not respect this setting."), [L10n::t('No'), L10n::t('Yes')]] + '$field' => ['profile_in_netdirectory', DI::l10n()->t('Publish your default profile in the global social directory?'), $profile['net-publish'], DI::l10n()->t('Your profile will be published in the global friendica directories (e.g. %s). Your profile will be visible in public.', Config::get('system', 'directory'), Config::get('system', 'directory')) . " " . DI::l10n()->t("This setting also determines whether Friendica will inform search engines that your profile should be indexed or not. Third-party search engines may or may not respect this setting."), [DI::l10n()->t('No'), DI::l10n()->t('Yes')]] ]); } else { $profile_in_net_dir = ''; } $hide_friends = Renderer::replaceMacros($opt_tpl, [ - '$field' => ['hide-friends', L10n::t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], L10n::t('Your contact list won\'t be shown in your default profile page. You can decide to show your contact list separately for each additional profile you create'), [L10n::t('No'), L10n::t('Yes')]], + '$field' => ['hide-friends', DI::l10n()->t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], DI::l10n()->t('Your contact list won\'t be shown in your default profile page. You can decide to show your contact list separately for each additional profile you create'), [DI::l10n()->t('No'), DI::l10n()->t('Yes')]], ]); $hide_wall = Renderer::replaceMacros($opt_tpl, [ - '$field' => ['hidewall', L10n::t('Hide your profile details from anonymous viewers?'), $a->user['hidewall'], L10n::t('Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies will still be accessible by other means.'), [L10n::t('No'), L10n::t('Yes')]], + '$field' => ['hidewall', DI::l10n()->t('Hide your profile details from anonymous viewers?'), $a->user['hidewall'], DI::l10n()->t('Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies will still be accessible by other means.'), [DI::l10n()->t('No'), DI::l10n()->t('Yes')]], ]); $blockwall = Renderer::replaceMacros($opt_tpl, [ - '$field' => ['blockwall', L10n::t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), L10n::t('Your contacts may write posts on your profile wall. These posts will be distributed to your contacts'), [L10n::t('No'), L10n::t('Yes')]], + '$field' => ['blockwall', DI::l10n()->t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), DI::l10n()->t('Your contacts may write posts on your profile wall. These posts will be distributed to your contacts'), [DI::l10n()->t('No'), DI::l10n()->t('Yes')]], ]); $blocktags = Renderer::replaceMacros($opt_tpl, [ - '$field' => ['blocktags', L10n::t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), L10n::t('Your contacts can add additional tags to your posts.'), [L10n::t('No'), L10n::t('Yes')]], + '$field' => ['blocktags', DI::l10n()->t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), DI::l10n()->t('Your contacts can add additional tags to your posts.'), [DI::l10n()->t('No'), DI::l10n()->t('Yes')]], ]); $suggestme = Renderer::replaceMacros($opt_tpl, [ - '$field' => ['suggestme', L10n::t('Allow us to suggest you as a potential friend to new members?'), $suggestme, L10n::t('If you like, Friendica may suggest new members to add you as a contact.'), [L10n::t('No'), L10n::t('Yes')]], + '$field' => ['suggestme', DI::l10n()->t('Allow us to suggest you as a potential friend to new members?'), $suggestme, DI::l10n()->t('If you like, Friendica may suggest new members to add you as a contact.'), [DI::l10n()->t('No'), DI::l10n()->t('Yes')]], ]); $unkmail = Renderer::replaceMacros($opt_tpl, [ - '$field' => ['unkmail', L10n::t('Permit unknown people to send you private mail?'), $unkmail, L10n::t('Friendica network users may send you private messages even if they are not in your contact list.'), [L10n::t('No'), L10n::t('Yes')]], + '$field' => ['unkmail', DI::l10n()->t('Permit unknown people to send you private mail?'), $unkmail, DI::l10n()->t('Friendica network users may send you private messages even if they are not in your contact list.'), [DI::l10n()->t('No'), DI::l10n()->t('Yes')]], ]); if (!$profile['publish'] && !$profile['net-publish']) { - info(L10n::t('Profile is not published.') . EOL); + info(DI::l10n()->t('Profile is not published.') . EOL); } $tpl_addr = Renderer::getMarkupTemplate('settings/nick_set.tpl'); $prof_addr = Renderer::replaceMacros($tpl_addr,[ - '$desc' => L10n::t("Your Identity Address is '%s' or '%s'.", $nickname . '@' . DI::baseUrl()->getHostname() . DI::baseUrl()->getUrlPath(), DI::baseUrl() . '/profile/' . $nickname), + '$desc' => DI::l10n()->t("Your Identity Address is '%s' or '%s'.", $nickname . '@' . DI::baseUrl()->getHostname() . DI::baseUrl()->getUrlPath(), DI::baseUrl() . '/profile/' . $nickname), '$basepath' => DI::baseUrl()->getHostname() ]); $stpl = Renderer::getMarkupTemplate('settings/settings.tpl'); $expire_arr = [ - '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')]], + 'days' => ['expire', DI::l10n()->t("Automatically expire posts after this many days:"), $expire, DI::l10n()->t('If empty, posts will not expire. Expired posts will be deleted')], + 'advanced' => DI::l10n()->t('Advanced expiration settings'), + 'label' => DI::l10n()->t('Advanced Expiration'), + 'items' => ['expire_items', DI::l10n()->t("Expire posts:"), $expire_items, '', [DI::l10n()->t('No'), DI::l10n()->t('Yes')]], + 'notes' => ['expire_notes', DI::l10n()->t("Expire personal notes:"), $expire_notes, '', [DI::l10n()->t('No'), DI::l10n()->t('Yes')]], + 'starred' => ['expire_starred', DI::l10n()->t("Expire starred posts:"), $expire_starred, '', [DI::l10n()->t('No'), DI::l10n()->t('Yes')]], + 'photos' => ['expire_photos', DI::l10n()->t("Expire photos:"), $expire_photos, '', [DI::l10n()->t('No'), DI::l10n()->t('Yes')]], + 'network_only' => ['expire_network_only', DI::l10n()->t("Only expire posts by others:"), $expire_network_only, '', [DI::l10n()->t('No'), DI::l10n()->t('Yes')]], ]; $group_select = Group::displayGroupSelection(local_user(), $a->user['def_gid']); @@ -1169,52 +1169,52 @@ function settings_content(App $a) /// @TODO Fix indending (or so) $o .= Renderer::replaceMacros($stpl, [ - '$ptitle' => L10n::t('Account Settings'), + '$ptitle' => DI::l10n()->t('Account Settings'), - '$submit' => L10n::t('Save Settings'), + '$submit' => DI::l10n()->t('Save Settings'), '$baseurl' => DI::baseUrl()->get(true), '$uid' => local_user(), '$form_security_token' => BaseModule::getFormSecurityToken("settings"), '$nickname_block' => $prof_addr, - '$h_pass' => L10n::t('Password Settings'), - '$password1'=> ['password', L10n::t('New Password:'), '', L10n::t('Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:).')], - '$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')], + '$h_pass' => DI::l10n()->t('Password Settings'), + '$password1'=> ['password', DI::l10n()->t('New Password:'), '', DI::l10n()->t('Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:).')], + '$password2'=> ['confirm', DI::l10n()->t('Confirm:'), '', DI::l10n()->t('Leave password fields blank unless changing')], + '$password3'=> ['opassword', DI::l10n()->t('Current Password:'), '', DI::l10n()->t('Your current password to confirm the changes')], + '$password4'=> ['mpassword', DI::l10n()->t('Password:'), '', DI::l10n()->t('Your current password to confirm the changes')], '$oid_enable' => (!Config::get('system', 'no_openid')), '$openid' => $openid_field, - '$delete_openid' => ['delete_openid', L10n::t('Delete OpenID URL'), false, ''], + '$delete_openid' => ['delete_openid', DI::l10n()->t('Delete OpenID URL'), false, ''], - '$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:'), Temporal::getTimezoneSelect($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_basic' => DI::l10n()->t('Basic Settings'), + '$username' => ['username', DI::l10n()->t('Full Name:'), $username, ''], + '$email' => ['email', DI::l10n()->t('Email Address:'), $email, '', '', '', 'email'], + '$timezone' => ['timezone_select' , DI::l10n()->t('Your Timezone:'), Temporal::getTimezoneSelect($timezone), ''], + '$language' => ['language', DI::l10n()->t('Your Language:'), $language, DI::l10n()->t('Set the language we use to show you friendica interface and to send you emails'), $lang_choices], + '$defloc' => ['defloc', DI::l10n()->t('Default Post Location:'), $defloc, ''], + '$allowloc' => ['allow_location', DI::l10n()->t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''], - '$h_prv' => L10n::t('Security and Privacy Settings'), + '$h_prv' => DI::l10n()->t('Security and Privacy Settings'), - '$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"), + '$maxreq' => ['maxreq', DI::l10n()->t('Maximum Friend Requests/Day:'), $maxreq , DI::l10n()->t("\x28to prevent spam abuse\x29")], + '$permissions' => DI::l10n()->t('Default Post Permissions'), + '$permdesc' => DI::l10n()->t("\x28click to open/close\x29"), '$visibility' => $profile['net-publish'], '$aclselect' => ACL::getFullSelectorHTML(DI::page(), $a->user), '$suggestme' => $suggestme, - '$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, ''), + '$blockwall'=> $blockwall, // array('blockwall', DI::l10n()->t('Allow friends to post to your profile page:'), !$blockwall, ''), + '$blocktags'=> $blocktags, // array('blocktags', DI::l10n()->t('Allow friends to tag your posts:'), !$blocktags, ''), // ACL permissions box - '$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'), + '$group_perms' => DI::l10n()->t('Show to Groups'), + '$contact_perms' => DI::l10n()->t('Show to Contacts'), + '$private' => DI::l10n()->t('Default Private Post'), + '$public' => DI::l10n()->t('Default Public Post'), '$is_private' => $private_post, '$return_path' => $query_str, '$public_link' => $public_post_link, - '$settings_perms' => L10n::t('Default Permissions for New Posts'), + '$settings_perms' => DI::l10n()->t('Default Permissions for New Posts'), '$group_select' => $group_select, @@ -1226,41 +1226,41 @@ function settings_content(App $a) '$hide_friends' => $hide_friends, '$hide_wall' => $hide_wall, '$unkmail' => $unkmail, - '$cntunkmail' => ['cntunkmail', L10n::t('Maximum private messages per day from unknown people:'), $cntunkmail , L10n::t("\x28to prevent spam abuse\x29")], + '$cntunkmail' => ['cntunkmail', DI::l10n()->t('Maximum private messages per day from unknown people:'), $cntunkmail , DI::l10n()->t("\x28to prevent spam abuse\x29")], - '$h_not' => L10n::t('Notification Settings'), - '$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, ''], + '$h_not' => DI::l10n()->t('Notification Settings'), + '$lbl_not' => DI::l10n()->t('Send a notification email when:'), + '$notify1' => ['notify1', DI::l10n()->t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''], + '$notify2' => ['notify2', DI::l10n()->t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''], + '$notify3' => ['notify3', DI::l10n()->t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, ''], + '$notify4' => ['notify4', DI::l10n()->t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''], + '$notify5' => ['notify5', DI::l10n()->t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''], + '$notify6' => ['notify6', DI::l10n()->t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, ''], + '$notify7' => ['notify7', DI::l10n()->t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''], + '$notify8' => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''], - '$desktop_notifications' => ['desktop_notifications', L10n::t('Activate desktop notifications') , false, L10n::t('Show desktop popup on new notifications')], + '$desktop_notifications' => ['desktop_notifications', DI::l10n()->t('Activate desktop notifications') , false, DI::l10n()->t('Show desktop popup on new notifications')], - '$email_textonly' => ['email_textonly', L10n::t('Text-only notification emails'), + '$email_textonly' => ['email_textonly', DI::l10n()->t('Text-only notification emails'), DI::pConfig()->get(local_user(), 'system', 'email_textonly'), - L10n::t('Send text only notification emails, without the html part')], + DI::l10n()->t('Send text only notification emails, without the html part')], - '$detailed_notif' => ['detailed_notif', L10n::t('Show detailled notifications'), + '$detailed_notif' => ['detailed_notif', DI::l10n()->t('Show detailled notifications'), DI::pConfig()->get(local_user(), 'system', 'detailed_notif'), - L10n::t('Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed.')], + DI::l10n()->t('Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed.')], - '$h_advn' => L10n::t('Advanced Account/Page Type Settings'), - '$h_descadvn' => L10n::t('Change the behaviour of this account for special situations'), + '$h_advn' => DI::l10n()->t('Advanced Account/Page Type Settings'), + '$h_descadvn' => DI::l10n()->t('Change the behaviour of this account for special situations'), '$pagetype' => $pagetype, - '$importcontact' => L10n::t('Import Contacts'), - '$importcontact_text' => L10n::t('Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'), - '$importcontact_button' => L10n::t('Upload File'), + '$importcontact' => DI::l10n()->t('Import Contacts'), + '$importcontact_text' => DI::l10n()->t('Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'), + '$importcontact_button' => DI::l10n()->t('Upload File'), '$importcontact_maxsize' => Config::get('system', 'max_csv_file_size', 30720), - '$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"), + '$relocate' => DI::l10n()->t('Relocate'), + '$relocate_text' => DI::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' => DI::l10n()->t("Resend relocate message to contacts"), ]); diff --git a/mod/subthread.php b/mod/subthread.php index 02d5cdcce..506843734 100644 --- a/mod/subthread.php +++ b/mod/subthread.php @@ -89,7 +89,7 @@ function subthread_content(App $a) { $uri = Item::newURI($owner_uid); - $post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status')); + $post_type = (($item['resource-id']) ? DI::l10n()->t('photo') : DI::l10n()->t('status')); $objtype = (($item['resource-id']) ? Activity\ObjectType::IMAGE : Activity\ObjectType::NOTE ); $link = XML::escape('' . "\n"); $body = $item['body']; @@ -105,7 +105,7 @@ function subthread_content(App $a) { $body
EOT; - $bodyverb = L10n::t('%1$s is following %2$s\'s %3$s'); + $bodyverb = DI::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 31f02fa4c..ec8c9ce78 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -25,7 +25,7 @@ function suggest_post(App $a) { if (!empty($_POST['ignore']) && !empty($_POST['confirm'])) { DBA::insert('gcign', ['uid' => local_user(), 'gcid' => $_POST['ignore']]); - notice(L10n::t('Contact suggestion successfully ignored.')); + notice(DI::l10n()->t('Contact suggestion successfully ignored.')); } DI::baseUrl()->redirect('suggest'); @@ -36,7 +36,7 @@ function suggest_content(App $a) $o = ''; if (! local_user()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return; } @@ -49,7 +49,7 @@ function suggest_content(App $a) $r = GContact::suggestionQuery(local_user()); if (! DBA::isResult($r)) { - $o .= L10n::t('No suggestions available. If this is a new site, please try again in 24 hours.'); + $o .= DI::l10n()->t('No suggestions available. If this is a new site, please try again in 24 hours.'); return $o; } @@ -68,12 +68,12 @@ function suggest_content(App $a) return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [ '$method' => 'post', - '$message' => L10n::t('Do you really want to delete this suggestion?'), + '$message' => DI::l10n()->t('Do you really want to delete this suggestion?'), '$extra_inputs' => $inputs, - '$confirm' => L10n::t('Yes'), + '$confirm' => DI::l10n()->t('Yes'), '$confirm_url' => $query['base'], '$confirm_name' => 'confirm', - '$cancel' => L10n::t('Cancel'), + '$cancel' => DI::l10n()->t('Cancel'), ]); } @@ -84,9 +84,9 @@ function suggest_content(App $a) $connlnk = DI::baseUrl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']); $ignlnk = DI::baseUrl() . '/suggest?ignore=' . $rr['id']; $photo_menu = [ - 'profile' => [L10n::t("View Profile"), Contact::magicLink($rr["url"])], - 'follow' => [L10n::t("Connect/Follow"), $connlnk], - 'hide' => [L10n::t('Ignore/Hide'), $ignlnk] + 'profile' => [DI::l10n()->t("View Profile"), Contact::magicLink($rr["url"])], + 'follow' => [DI::l10n()->t("Connect/Follow"), $connlnk], + 'hide' => [DI::l10n()->t('Ignore/Hide'), $ignlnk] ]; $contact_details = Contact::getDetailsByURL($rr["url"], local_user(), $rr); @@ -103,10 +103,10 @@ function suggest_content(App $a) 'account_type' => Contact::getAccountType($contact_details), 'ignlnk' => $ignlnk, 'ignid' => $rr['id'], - 'conntxt' => L10n::t('Connect'), + 'conntxt' => DI::l10n()->t('Connect'), 'connlnk' => $connlnk, 'photo_menu' => $photo_menu, - 'ignore' => L10n::t('Ignore/Hide'), + 'ignore' => DI::l10n()->t('Ignore/Hide'), 'network' => ContactSelector::networkToName($rr['network'], $rr['url']), 'id' => ++$id, ]; @@ -116,7 +116,7 @@ function suggest_content(App $a) $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl'); $o .= Renderer::replaceMacros($tpl,[ - '$title' => L10n::t('Friend Suggestions'), + '$title' => DI::l10n()->t('Friend Suggestions'), '$contacts' => $entries, ]); diff --git a/mod/tagger.php b/mod/tagger.php index a366976bd..38a13df9c 100644 --- a/mod/tagger.php +++ b/mod/tagger.php @@ -70,7 +70,7 @@ function tagger_content(App $a) { $uri = Item::newURI($owner_uid); $xterm = XML::escape($term); - $post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status')); + $post_type = (($item['resource-id']) ? DI::l10n()->t('photo') : DI::l10n()->t('status')); $targettype = (($item['resource-id']) ? Activity\ObjectType::IMAGE : Activity\ObjectType::NOTE ); $href = DI::baseUrl() . '/display/' . $item['guid']; @@ -103,7 +103,7 @@ EOT; EOT; - $bodyverb = L10n::t('%1$s tagged %2$s\'s %3$s with %4$s'); + $bodyverb = DI::l10n()->t('%1$s tagged %2$s\'s %3$s with %4$s'); if (!isset($bodyverb)) { return; diff --git a/mod/tagrm.php b/mod/tagrm.php index 267ee718c..ebb9c5093 100644 --- a/mod/tagrm.php +++ b/mod/tagrm.php @@ -18,7 +18,7 @@ function tagrm_post(App $a) DI::baseUrl()->redirect($_SESSION['photo_return']); } - if (!empty($_POST['submit']) && ($_POST['submit'] === L10n::t('Cancel'))) { + if (!empty($_POST['submit']) && ($_POST['submit'] === DI::l10n()->t('Cancel'))) { DI::baseUrl()->redirect($_SESSION['photo_return']); } @@ -29,7 +29,7 @@ function tagrm_post(App $a) $item_id = $_POST['item'] ?? 0; update_tags($item_id, $tags); - info(L10n::t('Tag(s) removed') . EOL); + info(DI::l10n()->t('Tag(s) removed') . EOL); DI::baseUrl()->redirect($_SESSION['photo_return']); // NOTREACHED @@ -99,9 +99,9 @@ function tagrm_content(App $a) DI::baseUrl()->redirect($_SESSION['photo_return']); } - $o .= '

' . L10n::t('Remove Item Tag') . '

'; + $o .= '

' . DI::l10n()->t('Remove Item Tag') . '

'; - $o .= '

' . L10n::t('Select a tag to remove: ') . '

'; + $o .= '

' . DI::l10n()->t('Select a tag to remove: ') . '

'; $o .= '
'; $o .= ''; @@ -112,8 +112,8 @@ function tagrm_content(App $a) } $o .= ''; - $o .= ''; - $o .= ''; + $o .= ''; + $o .= ''; $o .= '
'; return $o; diff --git a/mod/uimport.php b/mod/uimport.php index 66201161a..7bc2702dd 100644 --- a/mod/uimport.php +++ b/mod/uimport.php @@ -14,7 +14,7 @@ use Friendica\Core\Renderer; function uimport_post(App $a) { if ((Config::get('config', 'register_policy') != \Friendica\Module\Register::OPEN) && !is_site_admin()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return; } @@ -27,7 +27,7 @@ function uimport_post(App $a) function uimport_content(App $a) { if ((Config::get('config', 'register_policy') != \Friendica\Module\Register::OPEN) && !is_site_admin()) { - notice(L10n::t('User imports on closed servers can only be done by an administrator.') . EOL); + notice(DI::l10n()->t('User imports on closed servers can only be done by an administrator.') . EOL); return; } @@ -36,20 +36,20 @@ function uimport_content(App $a) $r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day"); if ($r && $r[0]['total'] >= $max_dailies) { Logger::log('max daily registrations exceeded.'); - notice(L10n::t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.') . EOL); + notice(DI::l10n()->t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.') . EOL); return; } } $tpl = Renderer::getMarkupTemplate("uimport.tpl"); return Renderer::replaceMacros($tpl, [ - '$regbutt' => L10n::t('Import'), + '$regbutt' => DI::l10n()->t('Import'), '$import' => [ - '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 \x28GNU Social/Statusnet\x29 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"')], + 'title' => DI::l10n()->t("Move account"), + 'intro' => DI::l10n()->t("You can import an account from another Friendica server."), + 'instruct' => DI::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' => DI::l10n()->t("This feature is experimental. We can't import contacts from the OStatus network \x28GNU Social/Statusnet\x29 or from Diaspora"), + 'field' => ['accountfile', DI::l10n()->t('Account file'), '', DI::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 280ca164e..96dc06ab0 100644 --- a/mod/unfollow.php +++ b/mod/unfollow.php @@ -19,7 +19,7 @@ function unfollow_post(App $a) $base_return_path = 'contact'; if (!local_user()) { - notice(L10n::t('Permission denied.')); + notice(DI::l10n()->t('Permission denied.')); DI::baseUrl()->redirect('login'); // NOTREACHED } @@ -33,7 +33,7 @@ function unfollow_post(App $a) $contact = DBA::selectFirst('contact', [], $condition); if (!DBA::isResult($contact)) { - notice(L10n::t("You aren't following this contact.")); + notice(DI::l10n()->t("You aren't following this contact.")); DI::baseUrl()->redirect($base_return_path); // NOTREACHED } @@ -43,7 +43,7 @@ function unfollow_post(App $a) } if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) { - notice(L10n::t('Unfollowing is currently not supported by your network.')); + notice(DI::l10n()->t('Unfollowing is currently not supported by your network.')); DI::baseUrl()->redirect($base_return_path . '/' . $contact['id']); // NOTREACHED } @@ -64,7 +64,7 @@ function unfollow_post(App $a) $return_path = $base_return_path . '/' . $contact['id']; } - info(L10n::t('Contact unfollowed')); + info(DI::l10n()->t('Contact unfollowed')); DI::baseUrl()->redirect($return_path); // NOTREACHED } @@ -74,7 +74,7 @@ function unfollow_content(App $a) $base_return_path = 'contact'; if (!local_user()) { - notice(L10n::t('Permission denied.')); + notice(DI::l10n()->t('Permission denied.')); DI::baseUrl()->redirect('login'); // NOTREACHED } @@ -89,13 +89,13 @@ function unfollow_content(App $a) $contact = DBA::selectFirst('contact', ['url', 'network', 'addr', 'name'], $condition); if (!DBA::isResult($contact)) { - notice(L10n::t("You aren't following this contact.")); + notice(DI::l10n()->t("You aren't following this contact.")); DI::baseUrl()->redirect($base_return_path); // NOTREACHED } if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) { - notice(L10n::t('Unfollowing is currently not supported by your network.')); + notice(DI::l10n()->t('Unfollowing is currently not supported by your network.')); DI::baseUrl()->redirect($base_return_path . '/' . $contact['id']); // NOTREACHED } @@ -106,7 +106,7 @@ function unfollow_content(App $a) $self = DBA::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]); if (!DBA::isResult($self)) { - notice(L10n::t('Permission denied.')); + notice(DI::l10n()->t('Permission denied.')); DI::baseUrl()->redirect($base_return_path); // NOTREACHED } @@ -115,7 +115,7 @@ function unfollow_content(App $a) $_SESSION['fastlane'] = $contact['url']; $o = Renderer::replaceMacros($tpl, [ - '$header' => L10n::t('Disconnect/Unfollow'), + '$header' => DI::l10n()->t('Disconnect/Unfollow'), '$desc' => '', '$pls_answer' => '', '$does_know_you' => '', @@ -125,16 +125,16 @@ function unfollow_content(App $a) '$statusnet' => '', '$diaspora' => '', '$diasnote' => '', - '$your_address' => L10n::t('Your Identity Address:'), + '$your_address' => DI::l10n()->t('Your Identity Address:'), '$invite_desc' => '', '$emailnet' => '', - '$submit' => L10n::t('Submit Request'), - '$cancel' => L10n::t('Cancel'), + '$submit' => DI::l10n()->t('Submit Request'), + '$cancel' => DI::l10n()->t('Cancel'), '$nickname' => '', '$name' => $contact['name'], '$url' => $contact['url'], '$zrl' => Contact::magicLink($contact['url']), - '$url_label' => L10n::t('Profile URL'), + '$url_label' => DI::l10n()->t('Profile URL'), '$myaddr' => $self['url'], '$request' => $request, '$keywords' => '', @@ -144,7 +144,7 @@ function unfollow_content(App $a) DI::page()['aside'] = ''; Profile::load($a, '', 0, Contact::getDetailsByURL($contact['url'])); - $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => L10n::t('Status Messages and Posts')]); + $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => DI::l10n()->t('Status Messages and Posts')]); // Show last public posts $o .= Contact::getPostsFromUrl($contact['url']); diff --git a/mod/update_community.php b/mod/update_community.php index 2f23bb7de..4f1cd263b 100644 --- a/mod/update_community.php +++ b/mod/update_community.php @@ -20,7 +20,7 @@ function update_community_content(App $a) { } if (DI::pConfig()->get(local_user(), "system", "bandwidth_saver")) { - $replace = "
".L10n::t("[Embedded content - reload page to view]")."
"; + $replace = "
".DI::l10n()->t("[Embedded content - reload page to view]")."
"; $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; $text = preg_replace($pattern, $replace, $text); $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i"; diff --git a/mod/update_contact.php b/mod/update_contact.php index 5092dd835..a347873da 100644 --- a/mod/update_contact.php +++ b/mod/update_contact.php @@ -20,7 +20,7 @@ function update_contact_content(App $a) } if (DI::pConfig()->get(local_user(), "system", "bandwidth_saver")) { - $replace = "
".L10n::t("[Embedded content - reload page to view]")."
"; + $replace = "
".DI::l10n()->t("[Embedded content - reload page to view]")."
"; $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; $text = preg_replace($pattern, $replace, $text); $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i"; diff --git a/mod/update_display.php b/mod/update_display.php index 569c76ab3..9d725fed2 100644 --- a/mod/update_display.php +++ b/mod/update_display.php @@ -21,7 +21,7 @@ function update_display_content(App $a) $text = display_content($a, true, $profile_uid); if (DI::pConfig()->get(local_user(), "system", "bandwidth_saver")) { - $replace = "
" . L10n::t("[Embedded content - reload page to view]") . "
"; + $replace = "
" . DI::l10n()->t("[Embedded content - reload page to view]") . "
"; $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; $text = preg_replace($pattern, $replace, $text); $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i"; diff --git a/mod/update_network.php b/mod/update_network.php index 2ae9ccb78..212b6a6b1 100644 --- a/mod/update_network.php +++ b/mod/update_network.php @@ -30,7 +30,7 @@ function update_network_content(App $a) } if (DI::pConfig()->get(local_user(), "system", "bandwidth_saver")) { - $replace = "
" . L10n::t("[Embedded content - reload page to view]") . "
"; + $replace = "
" . DI::l10n()->t("[Embedded content - reload page to view]") . "
"; $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; $text = preg_replace($pattern, $replace, $text); $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i"; diff --git a/mod/update_notes.php b/mod/update_notes.php index 989af976a..4027d4a33 100644 --- a/mod/update_notes.php +++ b/mod/update_notes.php @@ -33,7 +33,7 @@ function update_notes_content(App $a) { $text = notes_content($a, $profile_uid); if (DI::pConfig()->get(local_user(), "system", "bandwidth_saver")) { - $replace = "
".L10n::t("[Embedded content - reload page to view]")."
"; + $replace = "
".DI::l10n()->t("[Embedded content - reload page to view]")."
"; $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; $text = preg_replace($pattern, $replace, $text); $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i"; diff --git a/mod/update_profile.php b/mod/update_profile.php index 38802866d..8d94d34a1 100644 --- a/mod/update_profile.php +++ b/mod/update_profile.php @@ -31,7 +31,7 @@ function update_profile_content(App $a) { $text = Profile::content([], $profile_uid); if (DI::pConfig()->get(local_user(), "system", "bandwidth_saver")) { - $replace = "
".L10n::t("[Embedded content - reload page to view]")."
"; + $replace = "
".DI::l10n()->t("[Embedded content - reload page to view]")."
"; $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; $text = preg_replace($pattern, $replace, $text); $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i"; diff --git a/mod/videos.php b/mod/videos.php index ad3a27b00..368eec3c9 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -110,12 +110,12 @@ function videos_content(App $a) if (Config::get('system', 'block_public') && !Session::isAuthenticated()) { - notice(L10n::t('Public access denied.') . EOL); + notice(DI::l10n()->t('Public access denied.') . EOL); return; } if (empty($a->data['user'])) { - notice(L10n::t('No videos selected') . EOL ); + notice(DI::l10n()->t('No videos selected') . EOL ); return; } @@ -163,7 +163,7 @@ function videos_content(App $a) } if ($a->data['user']['hidewall'] && (local_user() != $owner_uid) && !$remote_contact) { - notice(L10n::t('Access to this item is restricted.') . EOL); + notice(DI::l10n()->t('Access to this item is restricted.') . EOL); return; } @@ -233,14 +233,14 @@ function videos_content(App $a) $videos[] = [ 'id' => $rr['id'], 'link' => DI::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['hash'], - 'title' => L10n::t('View Video'), + 'title' => DI::l10n()->t('View Video'), 'src' => DI::baseUrl() . '/attach/' . $rr['id'] . '?attachment=0', 'alt' => $alt_e, 'mime' => $rr['filetype'], 'album' => [ 'link' => DI::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']), 'name' => $name_e, - 'alt' => L10n::t('View Album'), + 'alt' => DI::l10n()->t('View Album'), ], ]; } @@ -248,9 +248,9 @@ function videos_content(App $a) $tpl = Renderer::getMarkupTemplate('videos_recent.tpl'); $o .= Renderer::replaceMacros($tpl, [ - '$title' => L10n::t('Recent Videos'), + '$title' => DI::l10n()->t('Recent Videos'), '$can_post' => $can_post, - '$upload' => [L10n::t('Upload New Videos'), DI::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/upload'], + '$upload' => [DI::l10n()->t('Upload New Videos'), DI::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/upload'], '$videos' => $videos, '$delete_url' => (($can_post) ? DI::baseUrl() . '/videos/' . $a->data['user']['nickname'] : false) ]); diff --git a/mod/wall_attach.php b/mod/wall_attach.php index 0324a5581..a8f704cd9 100644 --- a/mod/wall_attach.php +++ b/mod/wall_attach.php @@ -24,14 +24,14 @@ function wall_attach_post(App $a) { if (! DBA::isResult($r)) { if ($r_json) { - echo json_encode(['error' => L10n::t('Invalid request.')]); + echo json_encode(['error' => DI::l10n()->t('Invalid request.')]); exit(); } return; } } else { if ($r_json) { - echo json_encode(['error' => L10n::t('Invalid request.')]); + echo json_encode(['error' => DI::l10n()->t('Invalid request.')]); exit(); } @@ -60,16 +60,16 @@ function wall_attach_post(App $a) { if (!$can_post) { if ($r_json) { - echo json_encode(['error' => L10n::t('Permission denied.')]); + echo json_encode(['error' => DI::l10n()->t('Permission denied.')]); exit(); } - notice(L10n::t('Permission denied.') . EOL ); + notice(DI::l10n()->t('Permission denied.') . EOL ); exit(); } if (empty($_FILES['userfile'])) { if ($r_json) { - echo json_encode(['error' => L10n::t('Invalid request.')]); + echo json_encode(['error' => DI::l10n()->t('Invalid request.')]); } exit(); } @@ -87,7 +87,7 @@ function wall_attach_post(App $a) { */ if ($filesize <= 0) { - $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?')); + $msg = DI::l10n()->t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(DI::l10n()->t('Or - did you try to upload an empty file?')); if ($r_json) { echo json_encode(['error' => $msg]); } else { @@ -98,7 +98,7 @@ function wall_attach_post(App $a) { } if ($maxfilesize && $filesize > $maxfilesize) { - $msg = L10n::t('File exceeds size limit of %s', Strings::formatBytes($maxfilesize)); + $msg = DI::l10n()->t('File exceeds size limit of %s', Strings::formatBytes($maxfilesize)); if ($r_json) { echo json_encode(['error' => $msg]); } else { @@ -113,7 +113,7 @@ function wall_attach_post(App $a) { @unlink($src); if ($newid === false) { - $msg = L10n::t('File upload failed.'); + $msg = DI::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 5c5fd7f18..814a32fd4 100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -40,7 +40,7 @@ function wall_upload_post(App $a, $desktopmode = true) if (!DBA::isResult($r)) { if ($r_json) { - echo json_encode(['error' => L10n::t('Invalid request.')]); + echo json_encode(['error' => DI::l10n()->t('Invalid request.')]); exit(); } return; @@ -56,7 +56,7 @@ function wall_upload_post(App $a, $desktopmode = true) } } else { if ($r_json) { - echo json_encode(['error' => L10n::t('Invalid request.')]); + echo json_encode(['error' => DI::l10n()->t('Invalid request.')]); exit(); } return; @@ -92,16 +92,16 @@ function wall_upload_post(App $a, $desktopmode = true) if (!$can_post) { if ($r_json) { - echo json_encode(['error' => L10n::t('Permission denied.')]); + echo json_encode(['error' => DI::l10n()->t('Permission denied.')]); exit(); } - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); exit(); } if (empty($_FILES['userfile']) && empty($_FILES['media'])) { if ($r_json) { - echo json_encode(['error' => L10n::t('Invalid request.')]); + echo json_encode(['error' => DI::l10n()->t('Invalid request.')]); } exit(); } @@ -152,10 +152,10 @@ function wall_upload_post(App $a, $desktopmode = true) if ($src == "") { if ($r_json) { - echo json_encode(['error' => L10n::t('Invalid request.')]); + echo json_encode(['error' => DI::l10n()->t('Invalid request.')]); exit(); } - notice(L10n::t('Invalid request.').EOL); + notice(DI::l10n()->t('Invalid request.').EOL); exit(); } @@ -183,7 +183,7 @@ function wall_upload_post(App $a, $desktopmode = true) $maximagesize = Config::get('system', 'maximagesize'); if (($maximagesize) && ($filesize > $maximagesize)) { - $msg = L10n::t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)); + $msg = DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)); if ($r_json) { echo json_encode(['error' => $msg]); } else { @@ -197,7 +197,7 @@ function wall_upload_post(App $a, $desktopmode = true) $Image = new Image($imagedata, $filetype); if (!$Image->isValid()) { - $msg = L10n::t('Unable to process image.'); + $msg = DI::l10n()->t('Unable to process image.'); if ($r_json) { echo json_encode(['error' => $msg]); } else { @@ -228,7 +228,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 = L10n::t('Wall Photos'); + $album = DI::l10n()->t('Wall Photos'); } $defperm = '<' . $default_cid . '>'; @@ -236,7 +236,7 @@ function wall_upload_post(App $a, $desktopmode = true) $r = Photo::store($Image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 0, 0, $defperm); if (!$r) { - $msg = L10n::t('Image upload failed.'); + $msg = DI::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 1d7af7136..cf9759b71 100644 --- a/mod/wallmessage.php +++ b/mod/wallmessage.php @@ -16,7 +16,7 @@ function wallmessage_post(App $a) { $replyto = Profile::getMyURL(); if (!$replyto) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return; } @@ -40,7 +40,7 @@ function wallmessage_post(App $a) { $user = $r[0]; if (! intval($user['unkmail'])) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return; } @@ -49,7 +49,7 @@ function wallmessage_post(App $a) { ); if ($r[0]['total'] > $user['cntunkmail']) { - notice(L10n::t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])); + notice(DI::l10n()->t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])); return; } @@ -57,19 +57,19 @@ function wallmessage_post(App $a) { switch ($ret) { case -1: - notice(L10n::t('No recipient selected.') . EOL); + notice(DI::l10n()->t('No recipient selected.') . EOL); break; case -2: - notice(L10n::t('Unable to check your home location.') . EOL); + notice(DI::l10n()->t('Unable to check your home location.') . EOL); break; case -3: - notice(L10n::t('Message could not be sent.') . EOL); + notice(DI::l10n()->t('Message could not be sent.') . EOL); break; case -4: - notice(L10n::t('Message collection failure.') . EOL); + notice(DI::l10n()->t('Message collection failure.') . EOL); break; default: - info(L10n::t('Message sent.') . EOL); + info(DI::l10n()->t('Message sent.') . EOL); } DI::baseUrl()->redirect('profile/'.$user['nickname']); @@ -79,14 +79,14 @@ function wallmessage_post(App $a) { function wallmessage_content(App $a) { if (!Profile::getMyURL()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return; } $recipient = (($a->argc > 1) ? $a->argv[1] : ''); if (!$recipient) { - notice(L10n::t('No recipient.') . EOL); + notice(DI::l10n()->t('No recipient.') . EOL); return; } @@ -95,7 +95,7 @@ function wallmessage_content(App $a) { ); if (! DBA::isResult($r)) { - notice(L10n::t('No recipient.') . EOL); + notice(DI::l10n()->t('No recipient.') . EOL); Logger::log('wallmessage: no recipient'); return; } @@ -103,7 +103,7 @@ function wallmessage_content(App $a) { $user = $r[0]; if (!intval($user['unkmail'])) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return; } @@ -112,7 +112,7 @@ function wallmessage_content(App $a) { ); if ($r[0]['total'] > $user['cntunkmail']) { - notice(L10n::t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])); + notice(DI::l10n()->t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])); return; } @@ -120,25 +120,25 @@ function wallmessage_content(App $a) { DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [ '$baseurl' => DI::baseUrl()->get(true), '$nickname' => $user['nickname'], - '$linkurl' => L10n::t('Please enter a link URL:') + '$linkurl' => DI::l10n()->t('Please enter a link URL:') ]); $tpl = Renderer::getMarkupTemplate('wallmessage.tpl'); $o = Renderer::replaceMacros($tpl, [ - '$header' => L10n::t('Send Private Message'), - '$subheader' => 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:'), + '$header' => DI::l10n()->t('Send Private Message'), + '$subheader' => DI::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' => DI::l10n()->t('To:'), + '$subject' => DI::l10n()->t('Subject:'), '$recipname' => $user['username'], '$nickname' => $user['nickname'], '$subjtxt' => $_REQUEST['subject'] ?? '', '$text' => $_REQUEST['body'] ?? '', '$readonly' => '', - '$yourmessage'=> L10n::t('Your message:'), + '$yourmessage'=> DI::l10n()->t('Your message:'), '$parent' => '', - '$upload' => L10n::t('Upload photo'), - '$insert' => L10n::t('Insert web link'), - '$wait' => L10n::t('Please wait') + '$upload' => DI::l10n()->t('Upload photo'), + '$insert' => DI::l10n()->t('Insert web link'), + '$wait' => DI::l10n()->t('Please wait') ]); return $o; diff --git a/src/App/Router.php b/src/App/Router.php index c9ba21bb3..968855acb 100644 --- a/src/App/Router.php +++ b/src/App/Router.php @@ -181,9 +181,9 @@ class Router $moduleClass = $routeInfo[1]; $this->parameters = $routeInfo[2]; } elseif ($routeInfo[0] === Dispatcher::METHOD_NOT_ALLOWED) { - throw new HTTPException\MethodNotAllowedException(L10n::t('Method not allowed for this module. Allowed method(s): %s', implode(', ', $routeInfo[1]))); + throw new HTTPException\MethodNotAllowedException(DI::l10n()->t('Method not allowed for this module. Allowed method(s): %s', implode(', ', $routeInfo[1]))); } else { - throw new HTTPException\NotFoundException(L10n::t('Page not found.')); + throw new HTTPException\NotFoundException(DI::l10n()->t('Page not found.')); } return $moduleClass; diff --git a/src/BaseModule.php b/src/BaseModule.php index a993a95ad..666496ba9 100644 --- a/src/BaseModule.php +++ b/src/BaseModule.php @@ -130,7 +130,7 @@ abstract class BaseModule public static function getFormSecurityStandardErrorMessage() { - return L10n::t("The form security token was not correct. This probably happened because the form has been opened for too long \x28>3 hours\x29 before submitting it.") . EOL; + return DI::l10n()->t("The form security token was not correct. This probably happened because the form has been opened for too long \x28>3 hours\x29 before submitting it.") . EOL; } public static function checkFormSecurityTokenRedirectOnError($err_redirect, $typename = '', $formname = 'form_security_token') diff --git a/src/Console/ArchiveContact.php b/src/Console/ArchiveContact.php index 4055e4866..e7a1f540e 100644 --- a/src/Console/ArchiveContact.php +++ b/src/Console/ArchiveContact.php @@ -83,7 +83,7 @@ HELP; $nurl = Strings::normaliseLink($this->getArgument(0)); if (!$this->dba->exists('contact', ['nurl' => $nurl, 'archive' => false])) { - throw new RuntimeException(L10n::t('Could not find any unarchived contact entry for this URL (%s)', $nurl)); + throw new RuntimeException(DI::l10n()->t('Could not find any unarchived contact entry for this URL (%s)', $nurl)); } if ($this->dba->update('contact', ['archive' => true], ['nurl' => $nurl])) { $this->out($this->l10n->t('The contact entries have been archived')); diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php index faba6269f..f9d6b0494 100644 --- a/src/Content/ContactSelector.php +++ b/src/Content/ContactSelector.php @@ -55,12 +55,12 @@ class ContactSelector $o .= "'; + $output .= ''; return $output; } diff --git a/src/Module/Debug/Probe.php b/src/Module/Debug/Probe.php index 85c5f900f..b5380c536 100644 --- a/src/Module/Debug/Probe.php +++ b/src/Module/Debug/Probe.php @@ -16,8 +16,8 @@ class Probe extends BaseModule public static function content(array $parameters = []) { if (!local_user()) { - $e = new HTTPException\ForbiddenException(L10n::t('Only logged in users are permitted to perform a probing.')); - $e->httpdesc = L10n::t('Public access denied.'); + $e = new HTTPException\ForbiddenException(DI::l10n()->t('Only logged in users are permitted to perform a probing.')); + $e->httpdesc = DI::l10n()->t('Public access denied.'); throw $e; } @@ -32,7 +32,7 @@ class Probe extends BaseModule $tpl = Renderer::getMarkupTemplate('probe.tpl'); return Renderer::replaceMacros($tpl, [ '$addr' => ['addr', - L10n::t('Lookup address'), + DI::l10n()->t('Lookup address'), $addr, '', 'required' diff --git a/src/Module/Debug/WebFinger.php b/src/Module/Debug/WebFinger.php index 90da40bf0..ad3963cb9 100644 --- a/src/Module/Debug/WebFinger.php +++ b/src/Module/Debug/WebFinger.php @@ -15,8 +15,8 @@ class WebFinger extends BaseModule public static function content(array $parameters = []) { if (!local_user()) { - $e = new \Friendica\Network\HTTPException\ForbiddenException(L10n::t('Only logged in users are permitted to perform a probing.')); - $e->httpdesc = L10n::t('Public access denied.'); + $e = new \Friendica\Network\HTTPException\ForbiddenException(DI::l10n()->t('Only logged in users are permitted to perform a probing.')); + $e->httpdesc = DI::l10n()->t('Public access denied.'); throw $e; } diff --git a/src/Module/Delegation.php b/src/Module/Delegation.php index cb2f24ce1..ef6a5edf9 100644 --- a/src/Module/Delegation.php +++ b/src/Module/Delegation.php @@ -96,7 +96,7 @@ class Delegation extends BaseModule public static function content(array $parameters = []) { if (!local_user()) { - throw new ForbiddenException(L10n::t('Permission denied.')); + throw new ForbiddenException(DI::l10n()->t('Permission denied.')); } $identities = DI::app()->identities; @@ -125,11 +125,11 @@ class Delegation extends BaseModule } $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('delegation.tpl'), [ - '$title' => L10n::t('Manage Identities and/or Pages'), - '$desc' => L10n::t('Toggle between different identities or community/group pages which share your account details or which you have been granted "manage" permissions'), - '$choose' => L10n::t('Select an identity to manage: '), + '$title' => DI::l10n()->t('Manage Identities and/or Pages'), + '$desc' => DI::l10n()->t('Toggle between different identities or community/group pages which share your account details or which you have been granted "manage" permissions'), + '$choose' => DI::l10n()->t('Select an identity to manage: '), '$identities' => $identities, - '$submit' => L10n::t('Submit'), + '$submit' => DI::l10n()->t('Submit'), ]); return $o; diff --git a/src/Module/Directory.php b/src/Module/Directory.php index 41f275028..9dec1ca23 100644 --- a/src/Module/Directory.php +++ b/src/Module/Directory.php @@ -29,7 +29,7 @@ class Directory extends BaseModule if (($config->get('system', 'block_public') && !Session::isAuthenticated()) || ($config->get('system', 'block_local_dir') && !Session::isAuthenticated())) { - throw new HTTPException\ForbiddenException(L10n::t('Public access denied.')); + throw new HTTPException\ForbiddenException(DI::l10n()->t('Public access denied.')); } if (local_user()) { @@ -57,7 +57,7 @@ class Directory extends BaseModule $profiles = Profile::searchProfiles($pager->getStart(), $pager->getItemsPerPage(), $search); if ($profiles['total'] === 0) { - info(L10n::t('No entries (some entries may be hidden).') . EOL); + info(DI::l10n()->t('No entries (some entries may be hidden).') . EOL); } else { if (in_array('small', $app->argv)) { $photo = 'thumb'; @@ -74,15 +74,15 @@ class Directory extends BaseModule $output .= Renderer::replaceMacros($tpl, [ '$search' => $search, - '$globaldir' => L10n::t('Global Directory'), + '$globaldir' => DI::l10n()->t('Global Directory'), '$gDirPath' => $gDirPath, - '$desc' => L10n::t('Find on this site'), + '$desc' => DI::l10n()->t('Find on this site'), '$contacts' => $entries, - '$finding' => L10n::t('Results for:'), + '$finding' => DI::l10n()->t('Results for:'), '$findterm' => (strlen($search) ? $search : ""), - '$title' => L10n::t('Site Directory'), + '$title' => DI::l10n()->t('Site Directory'), '$search_mod' => 'directory', - '$submit' => L10n::t('Find'), + '$submit' => DI::l10n()->t('Find'), '$paginate' => $pager->renderFull($profiles['total']), ]); @@ -133,20 +133,20 @@ class Directory extends BaseModule || !empty($profile['postal-code']) || !empty($profile['country-name']) ) { - $location = L10n::t('Location:'); + $location = DI::l10n()->t('Location:'); } else { $location = ''; } - $gender = (!empty($profile['gender']) ? L10n::t('Gender:') : false); - $marital = (!empty($profile['marital']) ? L10n::t('Status:') : false); - $homepage = (!empty($profile['homepage']) ? L10n::t('Homepage:') : false); - $about = (!empty($profile['about']) ? L10n::t('About:') : false); + $gender = (!empty($profile['gender']) ? DI::l10n()->t('Gender:') : false); + $marital = (!empty($profile['marital']) ? DI::l10n()->t('Status:') : false); + $homepage = (!empty($profile['homepage']) ? DI::l10n()->t('Homepage:') : false); + $about = (!empty($profile['about']) ? DI::l10n()->t('About:') : false); $location_e = $location; $photo_menu = [ - 'profile' => [L10n::t("View Profile"), Contact::magicLink($profile_link)] + 'profile' => [DI::l10n()->t("View Profile"), Contact::magicLink($profile_link)] ]; $entry = [ diff --git a/src/Module/Filer/SaveTag.php b/src/Module/Filer/SaveTag.php index 0b6a41ae2..93cb5f5a8 100644 --- a/src/Module/Filer/SaveTag.php +++ b/src/Module/Filer/SaveTag.php @@ -17,7 +17,7 @@ class SaveTag extends BaseModule public static function init(array $parameters = []) { if (!local_user()) { - info(L10n::t('You must be logged in to use this module')); + info(DI::l10n()->t('You must be logged in to use this module')); DI::baseUrl()->redirect(); } } @@ -36,7 +36,7 @@ class SaveTag extends BaseModule if ($item_id && strlen($term)) { // file item Model\FileTag::saveFile(local_user(), $item_id, $term); - info(L10n::t('Filetag %s saved to item', $term)); + info(DI::l10n()->t('Filetag %s saved to item', $term)); } // return filer dialog @@ -45,8 +45,8 @@ class SaveTag extends BaseModule $tpl = Renderer::getMarkupTemplate("filer_dialog.tpl"); echo Renderer::replaceMacros($tpl, [ - '$field' => ['term', L10n::t("Save to Folder:"), '', '', $filetags, L10n::t('- select -')], - '$submit' => L10n::t('Save'), + '$field' => ['term', DI::l10n()->t("Save to Folder:"), '', '', $filetags, DI::l10n()->t('- select -')], + '$submit' => DI::l10n()->t('Save'), ]); exit; diff --git a/src/Module/FollowConfirm.php b/src/Module/FollowConfirm.php index 2da2685b6..5ff618ae6 100644 --- a/src/Module/FollowConfirm.php +++ b/src/Module/FollowConfirm.php @@ -15,7 +15,7 @@ class FollowConfirm extends BaseModule { $uid = local_user(); if (!$uid) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return; } diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php index 53bb6eaf6..b48ad7f03 100644 --- a/src/Module/Friendica.php +++ b/src/Module/Friendica.php @@ -37,27 +37,27 @@ class Friendica extends BaseModule } } $addon = [ - 'title' => L10n::t('Installed addons/apps:'), + 'title' => DI::l10n()->t('Installed addons/apps:'), 'list' => $sortedAddonList, ]; } else { $addon = [ - 'title' => L10n::t('No installed addons/apps'), + 'title' => DI::l10n()->t('No installed addons/apps'), ]; } $tos = ($config->get('system', 'tosdisplay')) ? - L10n::t('Read about the Terms of Service of this node.', DI::baseUrl()->get()) : + DI::l10n()->t('Read about the Terms of Service of this node.', DI::baseUrl()->get()) : ''; $blockList = $config->get('system', 'blocklist'); if (!empty($blockList)) { $blocked = [ - 'title' => L10n::t('On this server the following remote servers are blocked.'), + 'title' => DI::l10n()->t('On this server the following remote servers are blocked.'), 'header' => [ - L10n::t('Blocked domain'), - L10n::t('Reason for the block'), + DI::l10n()->t('Blocked domain'), + DI::l10n()->t('Reason for the block'), ], 'list' => $blockList, ]; @@ -72,14 +72,14 @@ class Friendica extends BaseModule $tpl = Renderer::getMarkupTemplate('friendica.tpl'); return Renderer::replaceMacros($tpl, [ - 'about' => L10n::t('This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s.', + 'about' => DI::l10n()->t('This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s.', '' . FRIENDICA_VERSION . '', DI::baseUrl()->get(), '' . DB_UPDATE_VERSION . '', '' . $config->get('system', 'post_update_version') . ''), - 'friendica' => L10n::t('Please visit Friendi.ca to learn more about the Friendica project.'), - 'bugs' => L10n::t('Bug reports and issues: please visit') . ' ' . '' . L10n::t('the bugtracker at github') . '', - 'info' => L10n::t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca'), + 'friendica' => DI::l10n()->t('Please visit Friendi.ca to learn more about the Friendica project.'), + 'bugs' => DI::l10n()->t('Bug reports and issues: please visit') . ' ' . '' . DI::l10n()->t('the bugtracker at github') . '', + 'info' => DI::l10n()->t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca'), 'visible_addons' => $addon, 'tos' => $tos, diff --git a/src/Module/Group.php b/src/Module/Group.php index 6542cc74a..e9d4020ea 100644 --- a/src/Module/Group.php +++ b/src/Module/Group.php @@ -28,7 +28,7 @@ class Group extends BaseModule } if (!local_user()) { - notice(L10n::t('Permission denied.')); + notice(DI::l10n()->t('Permission denied.')); DI::baseUrl()->redirect(); } @@ -39,13 +39,13 @@ class Group extends BaseModule $name = Strings::escapeTags(trim($_POST['groupname'])); $r = Model\Group::create(local_user(), $name); if ($r) { - info(L10n::t('Group created.')); + info(DI::l10n()->t('Group created.')); $r = Model\Group::getIdByName(local_user(), $name); if ($r) { DI::baseUrl()->redirect('group/' . $r); } } else { - notice(L10n::t('Could not create group.')); + notice(DI::l10n()->t('Could not create group.')); } DI::baseUrl()->redirect('group'); } @@ -56,13 +56,13 @@ class Group extends BaseModule $group = DBA::selectFirst('group', ['id', 'name'], ['id' => $a->argv[1], 'uid' => local_user()]); if (!DBA::isResult($group)) { - notice(L10n::t('Group not found.')); + notice(DI::l10n()->t('Group not found.')); DI::baseUrl()->redirect('contact'); } $groupname = Strings::escapeTags(trim($_POST['groupname'])); if (strlen($groupname) && ($groupname != $group['name'])) { if (Model\Group::update($group['id'], $groupname)) { - info(L10n::t('Group name changed.')); + info(DI::l10n()->t('Group name changed.')); } } } @@ -74,7 +74,7 @@ class Group extends BaseModule $a = DI::app(); if (!local_user()) { - throw new \Exception(L10n::t('Permission denied.'), 403); + throw new \Exception(DI::l10n()->t('Permission denied.'), 403); } // POST /group/123/add/123 @@ -84,38 +84,38 @@ class Group extends BaseModule list($group_id, $command, $contact_id) = array_slice($a->argv, 1); if (!Model\Group::exists($group_id, local_user())) { - throw new \Exception(L10n::t('Unknown group.'), 404); + throw new \Exception(DI::l10n()->t('Unknown group.'), 404); } $contact = DBA::selectFirst('contact', ['deleted'], ['id' => $contact_id, 'uid' => local_user()]); if (!DBA::isResult($contact)) { - throw new \Exception(L10n::t('Contact not found.'), 404); + throw new \Exception(DI::l10n()->t('Contact not found.'), 404); } if ($contact['deleted']) { - throw new \Exception(L10n::t('Contact is deleted.'), 410); + throw new \Exception(DI::l10n()->t('Contact is deleted.'), 410); } switch($command) { case 'add': if (!Model\Group::addMember($group_id, $contact_id)) { - throw new \Exception(L10n::t('Unable to add the contact to the group.'), 500); + throw new \Exception(DI::l10n()->t('Unable to add the contact to the group.'), 500); } - $message = L10n::t('Contact successfully added to group.'); + $message = DI::l10n()->t('Contact successfully added to group.'); break; case 'remove': if (!Model\Group::removeMember($group_id, $contact_id)) { - throw new \Exception(L10n::t('Unable to remove the contact from the group.'), 500); + throw new \Exception(DI::l10n()->t('Unable to remove the contact from the group.'), 500); } - $message = L10n::t('Contact successfully removed from group.'); + $message = DI::l10n()->t('Contact successfully removed from group.'); break; default: - throw new \Exception(L10n::t('Unknown group command.'), 400); + throw new \Exception(DI::l10n()->t('Unknown group command.'), 400); } } else { - throw new \Exception(L10n::t('Bad request.'), 400); + throw new \Exception(DI::l10n()->t('Bad request.'), 400); } notice($message); @@ -154,15 +154,15 @@ class Group extends BaseModule $context = [ - '$submit' => L10n::t('Save Group'), - '$submit_filter' => L10n::t('Filter'), + '$submit' => DI::l10n()->t('Save Group'), + '$submit_filter' => DI::l10n()->t('Filter'), ]; // @TODO: Replace with parameter from router if (($a->argc == 2) && ($a->argv[1] === 'new')) { return Renderer::replaceMacros($tpl, $context + [ - '$title' => L10n::t('Create a group of contacts/friends.'), - '$gname' => ['groupname', L10n::t('Group Name: '), '', ''], + '$title' => DI::l10n()->t('Create a group of contacts/friends.'), + '$gname' => ['groupname', DI::l10n()->t('Group Name: '), '', ''], '$gid' => 'new', '$form_security_token' => BaseModule::getFormSecurityToken("group_edit"), ]); @@ -177,7 +177,7 @@ class Group extends BaseModule $nogroup = true; $group = [ 'id' => $id, - 'name' => L10n::t('Contacts not in any group'), + 'name' => DI::l10n()->t('Contacts not in any group'), ]; $members = []; @@ -185,7 +185,7 @@ class Group extends BaseModule $context = $context + [ '$title' => $group['name'], - '$gname' => ['groupname', L10n::t('Group Name: '), $group['name'], ''], + '$gname' => ['groupname', DI::l10n()->t('Group Name: '), $group['name'], ''], '$gid' => $id, '$editable' => 0, ]; @@ -198,14 +198,14 @@ class Group extends BaseModule // @TODO: Replace with parameter from router if (intval($a->argv[2])) { if (!Model\Group::exists($a->argv[2], local_user())) { - notice(L10n::t('Group not found.')); + notice(DI::l10n()->t('Group not found.')); DI::baseUrl()->redirect('contact'); } if (Model\Group::remove($a->argv[2])) { - info(L10n::t('Group removed.')); + info(DI::l10n()->t('Group removed.')); } else { - notice(L10n::t('Unable to remove group.')); + notice(DI::l10n()->t('Unable to remove group.')); } } DI::baseUrl()->redirect('group'); @@ -224,7 +224,7 @@ class Group extends BaseModule if (($a->argc > 1) && intval($a->argv[1])) { $group = DBA::selectFirst('group', ['id', 'name'], ['id' => $a->argv[1], 'uid' => local_user(), 'deleted' => false]); if (!DBA::isResult($group)) { - notice(L10n::t('Group not found.')); + notice(DI::l10n()->t('Group not found.')); DI::baseUrl()->redirect('contact'); } @@ -256,17 +256,17 @@ class Group extends BaseModule $drop_tpl = Renderer::getMarkupTemplate('group_drop.tpl'); $drop_txt = Renderer::replaceMacros($drop_tpl, [ '$id' => $group['id'], - '$delete' => L10n::t('Delete Group'), + '$delete' => DI::l10n()->t('Delete Group'), '$form_security_token' => BaseModule::getFormSecurityToken("group_drop"), ]); $context = $context + [ '$title' => $group['name'], - '$gname' => ['groupname', L10n::t('Group Name: '), $group['name'], ''], + '$gname' => ['groupname', DI::l10n()->t('Group Name: '), $group['name'], ''], '$gid' => $group['id'], '$drop' => $drop_txt, '$form_security_token' => BaseModule::getFormSecurityToken('group_edit'), - '$edit_name' => L10n::t('Edit Group Name'), + '$edit_name' => DI::l10n()->t('Edit Group Name'), '$editable' => 1, ]; } @@ -276,10 +276,10 @@ class Group extends BaseModule } $groupeditor = [ - 'label_members' => L10n::t('Members'), + 'label_members' => DI::l10n()->t('Members'), 'members' => [], - 'label_contacts' => L10n::t('All Contacts'), - 'group_is_empty' => L10n::t('Group is empty'), + 'label_contacts' => DI::l10n()->t('All Contacts'), + 'group_is_empty' => DI::l10n()->t('Group is empty'), 'contacts' => [], ]; @@ -292,7 +292,7 @@ class Group extends BaseModule $entry['label'] = 'members'; $entry['photo_menu'] = ''; $entry['change_member'] = [ - 'title' => L10n::t("Remove contact from group"), + 'title' => DI::l10n()->t("Remove contact from group"), 'gid' => $group['id'], 'cid' => $member['id'], 'sec_token' => $sec_token @@ -312,7 +312,7 @@ class Group extends BaseModule ['order' => ['name']] ); $contacts = DBA::toArray($contacts_stmt); - $context['$desc'] = L10n::t('Click on a contact to add or remove.'); + $context['$desc'] = DI::l10n()->t('Click on a contact to add or remove.'); } if (DBA::isResult($contacts)) { @@ -326,7 +326,7 @@ class Group extends BaseModule if (!$nogroup) { $entry['change_member'] = [ - 'title' => L10n::t("Add contact to group"), + 'title' => DI::l10n()->t("Add contact to group"), 'gid' => $group['id'], 'cid' => $member['id'], 'sec_token' => $sec_token diff --git a/src/Module/HTTPException/MethodNotAllowed.php b/src/Module/HTTPException/MethodNotAllowed.php index b4f9e9766..f75bdd8ca 100644 --- a/src/Module/HTTPException/MethodNotAllowed.php +++ b/src/Module/HTTPException/MethodNotAllowed.php @@ -10,6 +10,6 @@ class MethodNotAllowed extends BaseModule { public static function content(array $parameters = []) { - throw new HTTPException\MethodNotAllowedException(L10n::t('Method Not Allowed.')); + throw new HTTPException\MethodNotAllowedException(DI::l10n()->t('Method Not Allowed.')); } } diff --git a/src/Module/HTTPException/PageNotFound.php b/src/Module/HTTPException/PageNotFound.php index c79d9c277..6c2395b0e 100644 --- a/src/Module/HTTPException/PageNotFound.php +++ b/src/Module/HTTPException/PageNotFound.php @@ -10,6 +10,6 @@ class PageNotFound extends BaseModule { public static function content(array $parameters = []) { - throw new HTTPException\NotFoundException(L10n::t('Page not found.')); + throw new HTTPException\NotFoundException(DI::l10n()->t('Page not found.')); } } diff --git a/src/Module/Help.php b/src/Module/Help.php index b18500a10..061ab2a43 100644 --- a/src/Module/Help.php +++ b/src/Module/Help.php @@ -41,14 +41,14 @@ class Help extends BaseModule $title = basename($path); $filename = $path; $text = self::loadDocFile('doc/' . $path . '.md', $lang); - DI::page()['title'] = L10n::t('Help:') . ' ' . str_replace('-', ' ', Strings::escapeTags($title)); + DI::page()['title'] = DI::l10n()->t('Help:') . ' ' . str_replace('-', ' ', Strings::escapeTags($title)); } $home = self::loadDocFile('doc/Home.md', $lang); if (!$text) { $text = $home; $filename = "Home"; - DI::page()['title'] = L10n::t('Help'); + DI::page()['title'] = DI::l10n()->t('Help'); } else { DI::page()['aside'] = Markdown::convert($home, false); } diff --git a/src/Module/Home.php b/src/Module/Home.php index 77eec34c4..6ce025208 100644 --- a/src/Module/Home.php +++ b/src/Module/Home.php @@ -33,7 +33,7 @@ class Home extends BaseModule } $customHome = ''; - $defaultHeader = ($config->get('config', 'sitename') ? L10n::t('Welcome to %s', $config->get('config', 'sitename')) : ''); + $defaultHeader = ($config->get('config', 'sitename') ? DI::l10n()->t('Welcome to %s', $config->get('config', 'sitename')) : ''); $homeFilePath = $app->getBasePath() . '/home.html'; $cssFilePath = $app->getBasePath() . '/home.css'; diff --git a/src/Module/Install.php b/src/Module/Install.php index 537338da1..4b0809e1f 100644 --- a/src/Module/Install.php +++ b/src/Module/Install.php @@ -156,7 +156,7 @@ class Install extends BaseModule $output = ''; - $install_title = L10n::t('Friendica Communications Server - Setup'); + $install_title = DI::l10n()->t('Friendica Communications Server - Setup'); switch (self::$currentWizardStep) { case self::SYSTEM_CHECK: @@ -167,49 +167,49 @@ class Install extends BaseModule $tpl = Renderer::getMarkupTemplate('install_checks.tpl'); $output .= Renderer::replaceMacros($tpl, [ '$title' => $install_title, - '$pass' => L10n::t('System check'), + '$pass' => DI::l10n()->t('System check'), '$checks' => self::$installer->getChecks(), '$passed' => $status, - '$see_install' => L10n::t('Please see the file "INSTALL.txt".'), - '$next' => L10n::t('Next'), - '$reload' => L10n::t('Check again'), + '$see_install' => DI::l10n()->t('Please see the file "INSTALL.txt".'), + '$next' => DI::l10n()->t('Next'), + '$reload' => DI::l10n()->t('Check again'), '$php_path' => $php_path, ]); break; case self::BASE_CONFIG: $ssl_choices = [ - App\BaseURL::SSL_POLICY_NONE => L10n::t("No SSL policy, links will track page SSL state"), - App\BaseURL::SSL_POLICY_FULL => L10n::t("Force all links to use SSL"), - App\BaseURL::SSL_POLICY_SELFSIGN => L10n::t("Self-signed certificate, use SSL for local links only \x28discouraged\x29") + App\BaseURL::SSL_POLICY_NONE => DI::l10n()->t("No SSL policy, links will track page SSL state"), + App\BaseURL::SSL_POLICY_FULL => DI::l10n()->t("Force all links to use SSL"), + App\BaseURL::SSL_POLICY_SELFSIGN => DI::l10n()->t("Self-signed certificate, use SSL for local links only \x28discouraged\x29") ]; $tpl = Renderer::getMarkupTemplate('install_base.tpl'); $output .= Renderer::replaceMacros($tpl, [ '$title' => $install_title, - '$pass' => L10n::t('Base settings'), + '$pass' => DI::l10n()->t('Base settings'), '$ssl_policy' => ['system-ssl_policy', - L10n::t("SSL link policy"), + DI::l10n()->t("SSL link policy"), $configCache->get('system', 'ssl_policy'), - L10n::t("Determines whether generated links should be forced to use SSL"), + DI::l10n()->t("Determines whether generated links should be forced to use SSL"), $ssl_choices], '$hostname' => ['config-hostname', - L10n::t('Host name'), + DI::l10n()->t('Host name'), $configCache->get('config', 'hostname'), - L10n::t('Overwrite this field in case the determinated hostname isn\'t right, otherweise leave it as is.'), + DI::l10n()->t('Overwrite this field in case the determinated hostname isn\'t right, otherweise leave it as is.'), 'required'], '$basepath' => ['system-basepath', - L10n::t("Base path to installation"), + DI::l10n()->t("Base path to installation"), $configCache->get('system', 'basepath'), - L10n::t("If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."), + DI::l10n()->t("If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."), 'required'], '$urlpath' => ['system-urlpath', - L10n::t('Sub path of the URL'), + DI::l10n()->t('Sub path of the URL'), $configCache->get('system', 'urlpath'), - L10n::t('Overwrite this field in case the sub path determination isn\'t right, otherwise leave it as is. Leaving this field blank means the installation is at the base URL without sub path.'), + DI::l10n()->t('Overwrite this field in case the sub path determination isn\'t right, otherwise leave it as is. Leaving this field blank means the installation is at the base URL without sub path.'), ''], '$php_path' => $configCache->get('config', 'php_path'), - '$submit' => L10n::t('Submit'), + '$submit' => DI::l10n()->t('Submit'), ]); break; @@ -217,39 +217,39 @@ class Install extends BaseModule $tpl = Renderer::getMarkupTemplate('install_db.tpl'); $output .= Renderer::replaceMacros($tpl, [ '$title' => $install_title, - '$pass' => L10n::t('Database connection'), - '$info_01' => L10n::t('In order to install Friendica we need to know how to connect to your database.'), - '$info_02' => L10n::t('Please contact your hosting provider or site administrator if you have questions about these settings.'), - '$info_03' => L10n::t('The database you specify below should already exist. If it does not, please create it before continuing.'), + '$pass' => DI::l10n()->t('Database connection'), + '$info_01' => DI::l10n()->t('In order to install Friendica we need to know how to connect to your database.'), + '$info_02' => DI::l10n()->t('Please contact your hosting provider or site administrator if you have questions about these settings.'), + '$info_03' => DI::l10n()->t('The database you specify below should already exist. If it does not, please create it before continuing.'), 'checks' => self::$installer->getChecks(), '$hostname' => $configCache->get('config', 'hostname'), '$ssl_policy' => $configCache->get('system', 'ssl_policy'), '$basepath' => $configCache->get('system', 'basepath'), '$urlpath' => $configCache->get('system', 'urlpath'), '$dbhost' => ['database-hostname', - L10n::t('Database Server Name'), + DI::l10n()->t('Database Server Name'), $configCache->get('database', 'hostname'), '', 'required'], '$dbuser' => ['database-username', - L10n::t('Database Login Name'), + DI::l10n()->t('Database Login Name'), $configCache->get('database', 'username'), '', 'required', 'autofocus'], '$dbpass' => ['database-password', - L10n::t('Database Login Password'), + DI::l10n()->t('Database Login Password'), $configCache->get('database', 'password'), - L10n::t("For security reasons the password must not be empty"), + DI::l10n()->t("For security reasons the password must not be empty"), 'required'], '$dbdata' => ['database-database', - L10n::t('Database Name'), + DI::l10n()->t('Database Name'), $configCache->get('database', 'database'), '', 'required'], - '$lbl_10' => L10n::t('Please select a default timezone for your website'), + '$lbl_10' => DI::l10n()->t('Please select a default timezone for your website'), '$php_path' => $configCache->get('config', 'php_path'), - '$submit' => L10n::t('Submit') + '$submit' => DI::l10n()->t('Submit') ]); break; @@ -261,7 +261,7 @@ class Install extends BaseModule $output .= Renderer::replaceMacros($tpl, [ '$title' => $install_title, '$checks' => self::$installer->getChecks(), - '$pass' => L10n::t('Site settings'), + '$pass' => DI::l10n()->t('Site settings'), '$hostname' => $configCache->get('config', 'hostname'), '$ssl_policy' => $configCache->get('system', 'ssl_policy'), '$basepath' => $configCache->get('system', 'basepath'), @@ -271,21 +271,21 @@ class Install extends BaseModule '$dbpass' => $configCache->get('database', 'password'), '$dbdata' => $configCache->get('database', 'database'), '$adminmail' => ['config-admin_email', - L10n::t('Site administrator email address'), + DI::l10n()->t('Site administrator email address'), $configCache->get('config', 'admin_email'), - L10n::t('Your account email address must match this in order to use the web admin panel.'), + DI::l10n()->t('Your account email address must match this in order to use the web admin panel.'), 'required', 'autofocus', 'email'], '$timezone' => Temporal::getTimezoneField('system-default_timezone', - L10n::t('Please select a default timezone for your website'), + DI::l10n()->t('Please select a default timezone for your website'), $configCache->get('system', 'default_timezone'), ''), '$language' => ['system-language', - L10n::t('System Language:'), + DI::l10n()->t('System Language:'), $configCache->get('system', 'language'), - L10n::t('Set the default language for your Friendica installation interface and to send emails.'), + DI::l10n()->t('Set the default language for your Friendica installation interface and to send emails.'), $lang_choices], '$php_path' => $configCache->get('config', 'php_path'), - '$submit' => L10n::t('Submit') + '$submit' => DI::l10n()->t('Submit') ]); break; @@ -294,7 +294,7 @@ class Install extends BaseModule if (count(self::$installer->getChecks()) == 0) { $txt = '

'; - $txt .= L10n::t('Your Friendica site database has been installed.') . EOL; + $txt .= DI::l10n()->t('Your Friendica site database has been installed.') . EOL; $db_return_text .= $txt; } @@ -302,7 +302,7 @@ class Install extends BaseModule $output .= Renderer::replaceMacros($tpl, [ '$title' => $install_title, '$checks' => self::$installer->getChecks(), - '$pass' => L10n::t('Installation finished'), + '$pass' => DI::l10n()->t('Installation finished'), '$text' => $db_return_text . self::whatNext(), ]); @@ -322,11 +322,11 @@ class Install extends BaseModule { $baseurl = DI::baseUrl()->get(); return - L10n::t('

What next

') - . "

" . L10n::t('IMPORTANT: You will need to [manually] setup a scheduled task for the worker.') - . L10n::t('Please see the file "INSTALL.txt".') + DI::l10n()->t('

What next

') + . "

" . DI::l10n()->t('IMPORTANT: You will need to [manually] setup a scheduled task for the worker.') + . DI::l10n()->t('Please see the file "INSTALL.txt".') . "

" - . L10n::t('Go to your new Friendica node registration page and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.', $baseurl) + . DI::l10n()->t('Go to your new Friendica node registration page and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.', $baseurl) . "

"; } diff --git a/src/Module/Invite.php b/src/Module/Invite.php index b06efc5a2..cdc5ac637 100644 --- a/src/Module/Invite.php +++ b/src/Module/Invite.php @@ -19,7 +19,7 @@ class Invite extends BaseModule public static function post(array $parameters = []) { if (!local_user()) { - throw new HTTPException\ForbiddenException(L10n::t('Permission denied.')); + throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); } self::checkFormSecurityTokenRedirectOnError('/', 'send_invite'); @@ -34,7 +34,7 @@ class Invite extends BaseModule $current_invites = intval(DI::pConfig()->get(local_user(), 'system', 'sent_invites')); if ($current_invites > $max_invites) { - throw new HTTPException\ForbiddenException(L10n::t('Total invitation limit exceeded.')); + throw new HTTPException\ForbiddenException(DI::l10n()->t('Total invitation limit exceeded.')); } @@ -57,7 +57,7 @@ class Invite extends BaseModule $recipient = trim($recipient); if (!filter_var($recipient, FILTER_VALIDATE_EMAIL)) { - notice(L10n::t('%s : Not a valid email address.', $recipient) . EOL); + notice(DI::l10n()->t('%s : Not a valid email address.', $recipient) . EOL); continue; } @@ -84,7 +84,7 @@ class Invite extends BaseModule $res = mail( $recipient, - Email::encodeHeader(L10n::t('Please join us on Friendica'), 'UTF-8'), + Email::encodeHeader(DI::l10n()->t('Please join us on Friendica'), 'UTF-8'), $nmessage, $additional_headers); @@ -93,11 +93,11 @@ class Invite extends BaseModule $current_invites++; DI::pConfig()->set(local_user(), 'system', 'sent_invites', $current_invites); if ($current_invites > $max_invites) { - notice(L10n::t('Invitation limit exceeded. Please contact your site administrator.') . EOL); + notice(DI::l10n()->t('Invitation limit exceeded. Please contact your site administrator.') . EOL); return; } } else { - notice(L10n::t('%s : Message delivery failed.', $recipient) . EOL); + notice(DI::l10n()->t('%s : Message delivery failed.', $recipient) . EOL); } } @@ -107,7 +107,7 @@ class Invite extends BaseModule public static function content(array $parameters = []) { if (!local_user()) { - throw new HTTPException\ForbiddenException(L10n::t('Permission denied.')); + throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); } $app = DI::app(); @@ -119,42 +119,42 @@ class Invite extends BaseModule $inviteOnly = true; $x = DI::pConfig()->get(local_user(), 'system', 'invites_remaining'); if ((!$x) && (!is_site_admin())) { - throw new HTTPException\ForbiddenException(L10n::t('You have no more invitations available')); + throw new HTTPException\ForbiddenException(DI::l10n()->t('You have no more invitations available')); } } $dirLocation = $config->get('system', 'directory'); if (strlen($dirLocation)) { if ($config->get('config', 'register_policy') === Register::CLOSED) { - $linkTxt = L10n::t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.', $dirLocation . '/servers'); + $linkTxt = DI::l10n()->t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.', $dirLocation . '/servers'); } else { - $linkTxt = L10n::t('To accept this invitation, please visit and register at %s or any other public Friendica website.', DI::baseUrl()->get()) - . "\r\n" . "\r\n" . L10n::t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.', $dirLocation . '/servers'); + $linkTxt = DI::l10n()->t('To accept this invitation, please visit and register at %s or any other public Friendica website.', DI::baseUrl()->get()) + . "\r\n" . "\r\n" . DI::l10n()->t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.', $dirLocation . '/servers'); } } else { // there is no global directory URL defined if ($config->get('config', 'register_policy') === Register::CLOSED) { - return L10n::t('Our apologies. This system is not currently configured to connect with other public sites or invite members.'); + return DI::l10n()->t('Our apologies. This system is not currently configured to connect with other public sites or invite members.'); } else { - $linkTxt = L10n::t('To accept this invitation, please visit and register at %s.', DI::baseUrl()->get() - . "\r\n" . "\r\n" . L10n::t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks.')); + $linkTxt = DI::l10n()->t('To accept this invitation, please visit and register at %s.', DI::baseUrl()->get() + . "\r\n" . "\r\n" . DI::l10n()->t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks.')); } } $tpl = Renderer::getMarkupTemplate('invite.tpl'); return Renderer::replaceMacros($tpl, [ '$form_security_token' => self::getFormSecurityToken('send_invite'), - '$title' => L10n::t('Send invitations'), - '$recipients' => ['recipients', L10n::t('Enter email addresses, one per line:')], + '$title' => DI::l10n()->t('Send invitations'), + '$recipients' => ['recipients', DI::l10n()->t('Enter email addresses, one per line:')], '$message' => [ 'message', - L10n::t('Your message:'), - L10n::t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n" + DI::l10n()->t('Your message:'), + DI::l10n()->t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n" . $linkTxt - . "\r\n" . "\r\n" . (($inviteOnly) ? L10n::t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') . L10n::t('Once you have registered, please connect with me via my profile page at:') + . "\r\n" . "\r\n" . (($inviteOnly) ? DI::l10n()->t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') . DI::l10n()->t('Once you have registered, please connect with me via my profile page at:') . "\r\n" . "\r\n" . DI::baseUrl()->get() . '/profile/' . $app->user['nickname'] - . "\r\n" . "\r\n" . L10n::t('For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca') . "\r\n" . "\r\n", + . "\r\n" . "\r\n" . DI::l10n()->t('For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca') . "\r\n" . "\r\n", ], - '$submit' => L10n::t('Submit') + '$submit' => DI::l10n()->t('Submit') ]); } } diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php index d30b0d86f..c033f097d 100644 --- a/src/Module/Item/Compose.php +++ b/src/Module/Item/Compose.php @@ -25,7 +25,7 @@ class Compose extends BaseModule require_once 'mod/item.php'; item_post(DI::app()); } else { - notice(L10n::t('Please enter a post body.')); + notice(DI::l10n()->t('Please enter a post body.')); } } @@ -38,7 +38,7 @@ class Compose extends BaseModule $a = DI::app(); if ($a->getCurrentTheme() !== 'frio') { - throw new NotImplementedException(L10n::t('This feature is only available with the frio theme.')); + throw new NotImplementedException(DI::l10n()->t('This feature is only available with the frio theme.')); } /// @TODO Retrieve parameter from router @@ -65,7 +65,7 @@ class Compose extends BaseModule switch ($posttype) { case Item::PT_PERSONAL_NOTE: - $compose_title = L10n::t('Compose new personal note'); + $compose_title = DI::l10n()->t('Compose new personal note'); $type = 'note'; $doesFederate = false; $contact_allow_list = [$a->contact['id']]; @@ -74,7 +74,7 @@ class Compose extends BaseModule $group_deny_list = []; break; default: - $compose_title = L10n::t('Compose new post'); + $compose_title = DI::l10n()->t('Compose new post'); $type = 'post'; $doesFederate = true; @@ -114,33 +114,33 @@ class Compose extends BaseModule $tpl = Renderer::getMarkupTemplate('item/compose.tpl'); return Renderer::replaceMacros($tpl, [ '$compose_title'=> $compose_title, - '$visibility_title'=> L10n::t('Visibility'), + '$visibility_title'=> DI::l10n()->t('Visibility'), '$id' => 0, '$posttype' => $posttype, '$type' => $type, '$wall' => $wall, '$default' => '', '$mylink' => DI::baseUrl()->remove($a->contact['url']), - '$mytitle' => L10n::t('This is you'), + '$mytitle' => DI::l10n()->t('This is you'), '$myphoto' => DI::baseUrl()->remove($a->contact['thumb']), - '$submit' => L10n::t('Submit'), - '$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'), - '$prompttext' => L10n::t('Please enter a image/video/audio/webpage URL:'), - '$preview' => L10n::t('Preview'), - '$location_set' => L10n::t('Set your location'), - '$location_clear' => L10n::t('Clear the location'), - '$location_unavailable' => L10n::t('Location services are unavailable on your device'), - '$location_disabled' => L10n::t('Location services are disabled. Please check the website\'s permissions on your device'), - '$wait' => L10n::t('Please wait'), - '$placeholdertitle' => L10n::t('Set title'), - '$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? L10n::t('Categories (comma-separated list)') : ''), + '$submit' => DI::l10n()->t('Submit'), + '$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'), + '$prompttext' => DI::l10n()->t('Please enter a image/video/audio/webpage URL:'), + '$preview' => DI::l10n()->t('Preview'), + '$location_set' => DI::l10n()->t('Set your location'), + '$location_clear' => DI::l10n()->t('Clear the location'), + '$location_unavailable' => DI::l10n()->t('Location services are unavailable on your device'), + '$location_disabled' => DI::l10n()->t('Location services are disabled. Please check the website\'s permissions on your device'), + '$wait' => DI::l10n()->t('Please wait'), + '$placeholdertitle' => DI::l10n()->t('Set title'), + '$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? DI::l10n()->t('Categories (comma-separated list)') : ''), '$title' => $title, '$category' => $category, @@ -153,7 +153,7 @@ class Compose extends BaseModule '$group_deny' => implode(',', $group_deny_list), '$jotplugins' => $jotplugins, - '$sourceapp' => L10n::t($a->sourcename), + '$sourceapp' => DI::l10n()->t($a->sourcename), '$rand_num' => Crypto::randomDigits(12), '$acl_selector' => ACL::getFullSelectorHTML(DI::page(), $a->user, $doesFederate, [ 'allow_cid' => $contact_allow_list, diff --git a/src/Module/Maintenance.php b/src/Module/Maintenance.php index bee9ab53f..09cdb02da 100644 --- a/src/Module/Maintenance.php +++ b/src/Module/Maintenance.php @@ -25,7 +25,7 @@ class Maintenance extends BaseModule } $exception = new HTTPException\ServiceUnavailableException($reason); - $exception->httpdesc = L10n::t('System down for maintenance'); + $exception->httpdesc = DI::l10n()->t('System down for maintenance'); throw $exception; } } diff --git a/src/Module/Notifications/Notify.php b/src/Module/Notifications/Notify.php index bb52ce812..7aeb1c226 100644 --- a/src/Module/Notifications/Notify.php +++ b/src/Module/Notifications/Notify.php @@ -16,7 +16,7 @@ class Notify extends BaseModule public static function init(array $parameters = []) { if (!local_user()) { - throw new HTTPException\UnauthorizedException(L10n::t('Permission denied.')); + throw new HTTPException\UnauthorizedException(DI::l10n()->t('Permission denied.')); } } diff --git a/src/Module/Photo.php b/src/Module/Photo.php index 47ab051ad..cc341bad2 100644 --- a/src/Module/Photo.php +++ b/src/Module/Photo.php @@ -85,7 +85,7 @@ class Photo extends BaseModule if (is_null($img) || !$img->isValid()) { Logger::log("Invalid photo with id {$photo["id"]}."); - throw new \Friendica\Network\HTTPException\InternalServerErrorException(L10n::t('Invalid photo with id %s.', $photo["id"])); + throw new \Friendica\Network\HTTPException\InternalServerErrorException(DI::l10n()->t('Invalid photo with id %s.', $photo["id"])); } // if customsize is set and image is not a gif, resize it diff --git a/src/Module/Profile.php b/src/Module/Profile.php index 3dc35cb2d..77033741c 100644 --- a/src/Module/Profile.php +++ b/src/Module/Profile.php @@ -114,10 +114,10 @@ class Profile extends BaseModule $page['htmlhead'] .= '' . "\n"; } - $page['htmlhead'] .= '' . "\n"; - $page['htmlhead'] .= '' . "\n"; - $page['htmlhead'] .= '' . "\n"; - $page['htmlhead'] .= '' . "\n"; + $page['htmlhead'] .= '' . "\n"; + $page['htmlhead'] .= '' . "\n"; + $page['htmlhead'] .= '' . "\n"; + $page['htmlhead'] .= '' . "\n"; $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . DI::baseUrl()->getHostname() . (DI::baseUrl()->getUrlPath() ? '/' . DI::baseUrl()->getUrlPath() : '')); $page['htmlhead'] .= '' . "\n"; header('Link: <' . DI::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false); @@ -169,7 +169,7 @@ class Profile extends BaseModule $last_updated_key = "profile:" . $a->profile['profile_uid'] . ":" . local_user() . ":" . $remote_contact; if (!empty($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 ''; } diff --git a/src/Module/Profile/Contacts.php b/src/Module/Profile/Contacts.php index f848945bc..afde70e34 100644 --- a/src/Module/Profile/Contacts.php +++ b/src/Module/Profile/Contacts.php @@ -22,7 +22,7 @@ class Contacts extends BaseModule public static function content(array $parameters = []) { if (Config::get('system', 'block_public') && !Session::isAuthenticated()) { - throw new \Friendica\Network\HTTPException\NotFoundException(L10n::t('User not found.')); + throw new \Friendica\Network\HTTPException\NotFoundException(DI::l10n()->t('User not found.')); } $a = DI::app(); @@ -35,7 +35,7 @@ class Contacts extends BaseModule $user = DBA::selectFirst('user', [], ['nickname' => $nickname, 'blocked' => false]); if (!DBA::isResult($user)) { - throw new \Friendica\Network\HTTPException\NotFoundException(L10n::t('User not found.')); + throw new \Friendica\Network\HTTPException\NotFoundException(DI::l10n()->t('User not found.')); } $a->profile_uid = $user['uid']; @@ -48,7 +48,7 @@ class Contacts extends BaseModule $o = Profile::getTabs($a, 'contacts', $is_owner, $nickname); if (!count($a->profile) || $a->profile['hide-friends']) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return $o; } @@ -76,7 +76,7 @@ class Contacts extends BaseModule $contacts_stmt = DBA::select('contact', [], $condition, $params); if (!DBA::isResult($contacts_stmt)) { - info(L10n::t('No contacts.') . EOL); + info(DI::l10n()->t('No contacts.') . EOL); return $o; } @@ -91,7 +91,7 @@ class Contacts extends BaseModule $contacts[] = [ 'id' => $contact['id'], - 'img_hover' => L10n::t('Visit %s\'s profile [%s]', $contact_details['name'], $contact['url']), + 'img_hover' => DI::l10n()->t('Visit %s\'s profile [%s]', $contact_details['name'], $contact['url']), 'photo_menu' => Contact::photoMenu($contact), 'thumb' => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB), 'name' => substr($contact_details['name'], 0, 20), @@ -123,10 +123,10 @@ class Contacts extends BaseModule '$nickname' => $nickname, '$type' => $type, - '$all_label' => L10n::t('All contacts'), - '$followers_label' => L10n::t('Followers'), - '$following_label' => L10n::t('Following'), - '$mutuals_label' => L10n::t('Mutual friends'), + '$all_label' => DI::l10n()->t('All contacts'), + '$followers_label' => DI::l10n()->t('Followers'), + '$following_label' => DI::l10n()->t('Following'), + '$mutuals_label' => DI::l10n()->t('Mutual friends'), '$contacts' => $contacts, '$paginate' => $pager->renderFull($total), diff --git a/src/Module/Register.php b/src/Module/Register.php index 215def13e..dfe0a534f 100644 --- a/src/Module/Register.php +++ b/src/Module/Register.php @@ -42,20 +42,20 @@ class Register extends BaseModule $block = Config::get('system', 'block_extended_register'); if (local_user() && $block) { - notice(L10n::t('Permission denied.')); + notice(DI::l10n()->t('Permission denied.')); return ''; } if (local_user()) { $user = DBA::selectFirst('user', ['parent-uid'], ['uid' => local_user()]); if (!empty($user['parent-uid'])) { - notice(L10n::t('Only parent users can create additional accounts.')); + notice(DI::l10n()->t('Only parent users can create additional accounts.')); return ''; } } if (!local_user() && (intval(Config::get('config', 'register_policy')) === self::CLOSED)) { - notice(L10n::t('Permission denied.')); + notice(DI::l10n()->t('Permission denied.')); return ''; } @@ -64,7 +64,7 @@ class Register extends BaseModule $count = DBA::count('user', ['`register_date` > UTC_TIMESTAMP - INTERVAL 1 day']); if ($count >= $max_dailies) { Logger::log('max daily registrations exceeded.'); - notice(L10n::t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.')); + notice(DI::l10n()->t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.')); return ''; } } @@ -81,9 +81,9 @@ class Register extends BaseModule $fillext = ''; $oidlabel = ''; } else { - $fillwith = L10n::t('You may (optionally) 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 (optional): '); + $fillwith = DI::l10n()->t('You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking "Register".'); + $fillext = DI::l10n()->t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'); + $oidlabel = DI::l10n()->t('Your OpenID (optional): '); } if (Config::get('system', 'publish_all')) { @@ -92,11 +92,11 @@ class Register extends BaseModule $publish_tpl = Renderer::getMarkupTemplate('profile_publish.tpl'); $profile_publish = Renderer::replaceMacros($publish_tpl, [ '$instance' => 'reg', - '$pubdesc' => L10n::t('Include your profile in member directory?'), + '$pubdesc' => DI::l10n()->t('Include your profile in member directory?'), '$yes_selected' => '', '$no_selected' => ' checked="checked"', - '$str_yes' => L10n::t('Yes'), - '$str_no' => L10n::t('No'), + '$str_yes' => DI::l10n()->t('Yes'), + '$str_no' => DI::l10n()->t('No'), ]); } @@ -115,42 +115,42 @@ class Register extends BaseModule $o = Renderer::replaceMacros($tpl, [ '$invitations' => Config::get('system', 'invitation_only'), '$permonly' => intval(Config::get('config', 'register_policy')) === self::APPROVE, - '$permonlybox' => ['permonlybox', L10n::t('Note for the admin'), '', L10n::t('Leave a message for the admin, why you want to join this node'), 'required'], - '$invite_desc' => L10n::t('Membership on this site is by invitation only.'), - '$invite_label' => L10n::t('Your invitation code: '), + '$permonlybox' => ['permonlybox', DI::l10n()->t('Note for the admin'), '', DI::l10n()->t('Leave a message for the admin, why you want to join this node'), 'required'], + '$invite_desc' => DI::l10n()->t('Membership on this site is by invitation only.'), + '$invite_label' => DI::l10n()->t('Your invitation code: '), '$invite_id' => $invite_id, - '$regtitle' => L10n::t('Registration'), + '$regtitle' => DI::l10n()->t('Registration'), '$registertext' => BBCode::convert(Config::get('config', 'register_text', '')), '$fillwith' => $fillwith, '$fillext' => $fillext, '$oidlabel' => $oidlabel, '$openid' => $openid_url, - '$namelabel' => L10n::t('Your Full Name (e.g. Joe Smith, real or real-looking): '), - '$addrlabel' => L10n::t('Your Email Address: (Initial information will be send there, so this has to be an existing address.)'), - '$addrlabel2' => L10n::t('Please repeat your e-mail address:'), + '$namelabel' => DI::l10n()->t('Your Full Name (e.g. Joe Smith, real or real-looking): '), + '$addrlabel' => DI::l10n()->t('Your Email Address: (Initial information will be send there, so this has to be an existing address.)'), + '$addrlabel2' => DI::l10n()->t('Please repeat your e-mail address:'), '$ask_password' => $ask_password, - '$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".', DI::baseUrl()->getHostname()), - '$nicklabel' => L10n::t('Choose a nickname: '), + '$password1' => ['password1', DI::l10n()->t('New Password:'), '', DI::l10n()->t('Leave empty for an auto generated password.')], + '$password2' => ['confirm', DI::l10n()->t('Confirm:'), '', ''], + '$nickdesc' => DI::l10n()->t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be "nickname@%s".', DI::baseUrl()->getHostname()), + '$nicklabel' => DI::l10n()->t('Choose a nickname: '), '$photo' => $photo, '$publish' => $profile_publish, - '$regbutt' => L10n::t('Register'), + '$regbutt' => DI::l10n()->t('Register'), '$username' => $username, '$email' => $email, '$nickname' => $nickname, '$sitename' => DI::baseUrl()->getHostname(), - '$importh' => L10n::t('Import'), - '$importt' => L10n::t('Import your profile to this friendica instance'), + '$importh' => DI::l10n()->t('Import'), + '$importt' => DI::l10n()->t('Import your profile to this friendica instance'), '$showtoslink' => Config::get('system', 'tosdisplay'), - '$tostext' => L10n::t('Terms of Service'), + '$tostext' => DI::l10n()->t('Terms of Service'), '$showprivstatement' => Config::get('system', 'tosprivstatement'), '$privstatement'=> $tos->privacy_complete, '$form_security_token' => BaseModule::getFormSecurityToken('register'), '$explicit_content' => Config::get('system', 'explicit_content', false), - '$explicit_content_note' => L10n::t('Note: This node explicitly contains adult content'), + '$explicit_content_note' => DI::l10n()->t('Note: This node explicitly contains adult content'), '$additional' => !empty(local_user()), - '$parent_password' => ['parent_password', L10n::t('Parent Password:'), '', L10n::t('Please enter the password of the parent account to legitimize your request.')] + '$parent_password' => ['parent_password', DI::l10n()->t('Parent Password:'), '', DI::l10n()->t('Please enter the password of the parent account to legitimize your request.')] ]); @@ -175,19 +175,19 @@ class Register extends BaseModule $additional_account = false; if (!local_user() && !empty($arr['post']['parent_password'])) { - notice(L10n::t('Permission denied.')); + notice(DI::l10n()->t('Permission denied.')); return; } elseif (local_user() && !empty($arr['post']['parent_password'])) { try { Model\User::getIdFromPasswordAuthentication(local_user(), $arr['post']['parent_password']); } catch (\Exception $ex) { - notice(L10n::t("Password doesn't match.")); + notice(DI::l10n()->t("Password doesn't match.")); $regdata = ['nickname' => $arr['post']['nickname'], 'username' => $arr['post']['username']]; DI::baseUrl()->redirect('register?' . http_build_query($regdata)); } $additional_account = true; } elseif (local_user()) { - notice(L10n::t('Please enter your password.')); + notice(DI::l10n()->t('Please enter your password.')); $regdata = ['nickname' => $arr['post']['nickname'], 'username' => $arr['post']['username']]; DI::baseUrl()->redirect('register?' . http_build_query($regdata)); } @@ -214,7 +214,7 @@ class Register extends BaseModule case self::CLOSED: default: if (empty($_SESSION['authenticated']) && empty($_SESSION['administrator'])) { - notice(L10n::t('Permission denied.')); + notice(DI::l10n()->t('Permission denied.')); return; } $blocked = 1; @@ -229,7 +229,7 @@ class Register extends BaseModule // Is there text in the tar pit? if (!empty($arr['email'])) { Logger::info('Tar pit', $arr); - notice(L10n::t('You have entered too much information.')); + notice(DI::l10n()->t('You have entered too much information.')); DI::baseUrl()->redirect('register/'); } @@ -240,7 +240,7 @@ class Register extends BaseModule if ($additional_account) { $user = DBA::selectFirst('user', ['email'], ['uid' => local_user()]); if (!DBA::isResult($user)) { - notice(L10n::t('User not found.')); + notice(DI::l10n()->t('User not found.')); DI::baseUrl()->redirect('register'); } @@ -253,7 +253,7 @@ class Register extends BaseModule if ($arr['email'] != $arr['repeat']) { Logger::info('Mail mismatch', $arr); - notice(L10n::t('Please enter the identical mail address in the second field.')); + notice(DI::l10n()->t('Please enter the identical mail address in the second field.')); $regdata = ['email' => $arr['email'], 'nickname' => $arr['nickname'], 'username' => $arr['username']]; DI::baseUrl()->redirect('register?' . http_build_query($regdata)); } @@ -280,7 +280,7 @@ class Register extends BaseModule if ($additional_account) { DBA::update('user', ['parent-uid' => local_user()], ['uid' => $user['uid']]); - info(L10n::t('The additional account was created.')); + info(DI::l10n()->t('The additional account was created.')); DI::baseUrl()->redirect('delegation'); } @@ -305,29 +305,29 @@ class Register extends BaseModule ); if ($res) { - info(L10n::t('Registration successful. Please check your email for further instructions.')); + info(DI::l10n()->t('Registration successful. Please check your email for further instructions.')); DI::baseUrl()->redirect(); } else { notice( - L10n::t('Failed to send email message. Here your accout details:
login: %s
password: %s

You can change your password after login.', + DI::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']) ); } } else { - info(L10n::t('Registration successful.')); + info(DI::l10n()->t('Registration successful.')); DI::baseUrl()->redirect(); } } elseif (intval(Config::get('config', 'register_policy')) === self::APPROVE) { if (!strlen(Config::get('config', 'admin_email'))) { - notice(L10n::t('Your registration can not be processed.')); + notice(DI::l10n()->t('Your registration can not be processed.')); DI::baseUrl()->redirect(); } // Check if the note to the admin is actually filled out if (empty($_POST['permonlybox'])) { - notice(L10n::t('You have to leave a request note for the admin.') - . L10n::t('Your registration can not be processed.')); + notice(DI::l10n()->t('You have to leave a request note for the admin.') + . DI::l10n()->t('Your registration can not be processed.')); DI::baseUrl()->redirect('register/'); } @@ -374,7 +374,7 @@ class Register extends BaseModule $result['password'] ); - info(L10n::t('Your registration is pending approval by the site owner.')); + info(DI::l10n()->t('Your registration is pending approval by the site owner.')); DI::baseUrl()->redirect(); } diff --git a/src/Module/Search/Acl.php b/src/Module/Search/Acl.php index 74ce55fb5..2455e2cb8 100644 --- a/src/Module/Search/Acl.php +++ b/src/Module/Search/Acl.php @@ -34,7 +34,7 @@ class Acl extends BaseModule public static function rawContent(array $parameters = []) { if (!local_user()) { - throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this module.')); + throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this module.')); } $type = $_REQUEST['type'] ?? self::TYPE_MENTION_CONTACT_GROUP; diff --git a/src/Module/Search/Directory.php b/src/Module/Search/Directory.php index 55510aa53..093c0f9fb 100644 --- a/src/Module/Search/Directory.php +++ b/src/Module/Search/Directory.php @@ -17,7 +17,7 @@ class Directory extends BaseSearchModule public static function content(array $parameters = []) { if (!local_user()) { - notice(L10n::t('Permission denied.')); + notice(DI::l10n()->t('Permission denied.')); return Login::form(); } diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php index 98c593f45..2b86617c1 100644 --- a/src/Module/Search/Index.php +++ b/src/Module/Search/Index.php @@ -28,12 +28,12 @@ class Index extends BaseSearchModule $search = (!empty($_GET['q']) ? Strings::escapeTags(trim(rawurldecode($_GET['q']))) : ''); if (Config::get('system', 'block_public') && !Session::isAuthenticated()) { - throw new HTTPException\ForbiddenException(L10n::t('Public access denied.')); + throw new HTTPException\ForbiddenException(DI::l10n()->t('Public access denied.')); } if (Config::get('system', 'local_search') && !Session::isAuthenticated()) { - $e = new HTTPException\ForbiddenException(L10n::t('Only logged in users are permitted to perform a search.')); - $e->httpdesc = L10n::t('Public access denied.'); + $e = new HTTPException\ForbiddenException(DI::l10n()->t('Only logged in users are permitted to perform a search.')); + $e->httpdesc = DI::l10n()->t('Public access denied.'); throw $e; } @@ -54,7 +54,7 @@ class Index extends BaseSearchModule if (!is_null($result)) { $resultdata = json_decode($result); if (($resultdata->time > (time() - $crawl_permit_period)) && ($resultdata->accesses > $free_crawls)) { - throw new HTTPException\TooManyRequestsException(L10n::t('Only one search per minute is permitted for not logged in users.')); + throw new HTTPException\TooManyRequestsException(DI::l10n()->t('Only one search per minute is permitted for not logged in users.')); } DI::cache()->set('remote_search:' . $remote, json_encode(['time' => time(), 'accesses' => $resultdata->accesses + 1]), Duration::HOUR); } else { @@ -77,7 +77,7 @@ class Index extends BaseSearchModule // contruct a wrapper for the search header $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('content_wrapper.tpl'), [ 'name' => 'search-header', - '$title' => L10n::t('Search'), + '$title' => DI::l10n()->t('Search'), '$title_size' => 3, '$content' => HTML::search($search, 'search-box', false) ]); @@ -167,14 +167,14 @@ class Index extends BaseSearchModule } if (!DBA::isResult($r)) { - info(L10n::t('No results.')); + info(DI::l10n()->t('No results.')); return $o; } if ($tag) { - $title = L10n::t('Items tagged with: %s', $search); + $title = DI::l10n()->t('Items tagged with: %s', $search); } else { - $title = L10n::t('Results for: %s', $search); + $title = DI::l10n()->t('Results for: %s', $search); } $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), [ diff --git a/src/Module/Search/Saved.php b/src/Module/Search/Saved.php index 47925b0ae..72232ac7d 100644 --- a/src/Module/Search/Saved.php +++ b/src/Module/Search/Saved.php @@ -23,15 +23,15 @@ class Saved extends BaseModule $fields = ['uid' => local_user(), 'term' => $search]; if (!DBA::exists('search', $fields)) { DBA::insert('search', $fields); - info(L10n::t('Search term successfully saved.')); + info(DI::l10n()->t('Search term successfully saved.')); } else { - info(L10n::t('Search term already saved.')); + info(DI::l10n()->t('Search term already saved.')); } break; case 'remove': DBA::delete('search', ['uid' => local_user(), 'term' => $search]); - info(L10n::t('Search term successfully removed.')); + info(DI::l10n()->t('Search term successfully removed.')); break; } } diff --git a/src/Module/Security/Login.php b/src/Module/Security/Login.php index e2e9ff04d..9e5a7b18a 100644 --- a/src/Module/Security/Login.php +++ b/src/Module/Security/Login.php @@ -87,8 +87,8 @@ class Login extends BaseModule $reg = false; if ($register && intval(DI::config()->get('config', 'register_policy')) !== Register::CLOSED) { $reg = [ - 'title' => L10n::t('Create a New Account'), - 'desc' => L10n::t('Register'), + 'title' => DI::l10n()->t('Create a New Account'), + 'desc' => DI::l10n()->t('Register'), 'url' => self::getRegisterURL() ]; } @@ -112,12 +112,12 @@ class Login extends BaseModule } if (!empty(Session::get('openid_identity'))) { - $openid_title = L10n::t('Your OpenID: '); + $openid_title = DI::l10n()->t('Your OpenID: '); $openid_readonly = true; $identity = Session::get('openid_identity'); - $username_desc = L10n::t('Please enter your username and password to add the OpenID to your existing account.'); + $username_desc = DI::l10n()->t('Please enter your username and password to add the OpenID to your existing account.'); } else { - $openid_title = L10n::t('Or login using OpenID: '); + $openid_title = DI::l10n()->t('Or login using OpenID: '); $openid_readonly = false; $identity = ''; $username_desc = ''; @@ -127,12 +127,12 @@ class Login extends BaseModule $tpl, [ '$dest_url' => DI::baseUrl()->get(true) . '/login', - '$logout' => L10n::t('Logout'), - '$login' => L10n::t('Login'), + '$logout' => DI::l10n()->t('Logout'), + '$login' => DI::l10n()->t('Login'), - '$lname' => ['username', L10n::t('Nickname or Email: '), '', $username_desc], - '$lpassword' => ['password', L10n::t('Password: '), '', ''], - '$lremember' => ['remember', L10n::t('Remember me'), 0, ''], + '$lname' => ['username', DI::l10n()->t('Nickname or Email: '), '', $username_desc], + '$lpassword' => ['password', DI::l10n()->t('Password: '), '', ''], + '$lremember' => ['remember', DI::l10n()->t('Remember me'), 0, ''], '$openid' => !$noid, '$lopenid' => ['openid_url', $openid_title, $identity, '', $openid_readonly], @@ -141,14 +141,14 @@ class Login extends BaseModule '$register' => $reg, - '$lostpass' => L10n::t('Forgot your password?'), - '$lostlink' => L10n::t('Password Reset'), + '$lostpass' => DI::l10n()->t('Forgot your password?'), + '$lostlink' => DI::l10n()->t('Password Reset'), - '$tostitle' => L10n::t('Website Terms of Service'), - '$toslink' => L10n::t('terms of service'), + '$tostitle' => DI::l10n()->t('Website Terms of Service'), + '$toslink' => DI::l10n()->t('terms of service'), - '$privacytitle' => L10n::t('Website Privacy Policy'), - '$privacylink' => L10n::t('privacy policy'), + '$privacytitle' => DI::l10n()->t('Website Privacy Policy'), + '$privacylink' => DI::l10n()->t('privacy policy'), ] ); diff --git a/src/Module/Security/TwoFactor/Recovery.php b/src/Module/Security/TwoFactor/Recovery.php index bbbb2d445..443256d97 100644 --- a/src/Module/Security/TwoFactor/Recovery.php +++ b/src/Module/Security/TwoFactor/Recovery.php @@ -40,11 +40,11 @@ class Recovery extends BaseModule if (RecoveryCode::existsForUser(local_user(), $recovery_code)) { RecoveryCode::markUsedForUser(local_user(), $recovery_code); Session::set('2fa', true); - notice(L10n::t('Remaining recovery codes: %d', RecoveryCode::countValidForUser(local_user()))); + notice(DI::l10n()->t('Remaining recovery codes: %d', RecoveryCode::countValidForUser(local_user()))); DI::auth()->setForUser($a, $a->user, true, true); } else { - notice(L10n::t('Invalid code, please retry.')); + notice(DI::l10n()->t('Invalid code, please retry.')); } } } @@ -63,11 +63,11 @@ class Recovery extends BaseModule return Renderer::replaceMacros(Renderer::getMarkupTemplate('twofactor/recovery.tpl'), [ '$form_security_token' => self::getFormSecurityToken('twofactor_recovery'), - '$title' => L10n::t('Two-factor recovery'), - '$message' => L10n::t('

You can enter one of your one-time recovery codes in case you lost access to your mobile device.

'), - '$recovery_message' => L10n::t('Don’t have your phone? Enter a two-factor recovery code', '2fa/recovery'), - '$recovery_code' => ['recovery_code', L10n::t('Please enter a recovery code'), '', '', '', 'placeholder="000000-000000"'], - '$recovery_label' => L10n::t('Submit recovery code and complete login'), + '$title' => DI::l10n()->t('Two-factor recovery'), + '$message' => DI::l10n()->t('

You can enter one of your one-time recovery codes in case you lost access to your mobile device.

'), + '$recovery_message' => DI::l10n()->t('Don’t have your phone? Enter a two-factor recovery code', '2fa/recovery'), + '$recovery_code' => ['recovery_code', DI::l10n()->t('Please enter a recovery code'), '', '', '', 'placeholder="000000-000000"'], + '$recovery_label' => DI::l10n()->t('Submit recovery code and complete login'), ]); } } diff --git a/src/Module/Security/TwoFactor/Verify.php b/src/Module/Security/TwoFactor/Verify.php index c00c8abe5..a95b02d42 100644 --- a/src/Module/Security/TwoFactor/Verify.php +++ b/src/Module/Security/TwoFactor/Verify.php @@ -40,7 +40,7 @@ class Verify extends BaseModule // Resume normal login workflow DI::auth()->setForUser($a, $a->user, true, true); } else { - self::$errors[] = L10n::t('Invalid code, please retry.'); + self::$errors[] = DI::l10n()->t('Invalid code, please retry.'); } } } @@ -59,13 +59,13 @@ class Verify extends BaseModule return Renderer::replaceMacros(Renderer::getMarkupTemplate('twofactor/verify.tpl'), [ '$form_security_token' => self::getFormSecurityToken('twofactor_verify'), - '$title' => L10n::t('Two-factor authentication'), - '$message' => L10n::t('

Open the two-factor authentication app on your device to get an authentication code and verify your identity.

'), + '$title' => DI::l10n()->t('Two-factor authentication'), + '$message' => DI::l10n()->t('

Open the two-factor authentication app on your device to get an authentication code and verify your identity.

'), '$errors_label' => L10n::tt('Error', 'Errors', count(self::$errors)), '$errors' => self::$errors, - '$recovery_message' => L10n::t('Don’t have your phone? Enter a two-factor recovery code', '2fa/recovery'), - '$verify_code' => ['verify_code', L10n::t('Please enter a code from your authentication app'), '', '', 'required', 'autofocus placeholder="000000"', 'tel'], - '$verify_label' => L10n::t('Verify code and complete login'), + '$recovery_message' => DI::l10n()->t('Don’t have your phone? Enter a two-factor recovery code', '2fa/recovery'), + '$verify_code' => ['verify_code', DI::l10n()->t('Please enter a code from your authentication app'), '', '', 'required', 'autofocus placeholder="000000"', 'tel'], + '$verify_label' => DI::l10n()->t('Verify code and complete login'), ]); } } diff --git a/src/Module/Settings/Delegation.php b/src/Module/Settings/Delegation.php index f0a335550..dffb23eb6 100644 --- a/src/Module/Settings/Delegation.php +++ b/src/Module/Settings/Delegation.php @@ -23,7 +23,7 @@ class Delegation extends BaseSettingsModule public static function post(array $parameters = []) { if (!local_user() || !empty(DI::app()->user['uid']) && DI::app()->user['uid'] != local_user()) { - throw new HTTPException\ForbiddenException(L10n::t('Permission denied.')); + throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); } BaseModule::checkFormSecurityTokenRedirectOnError('settings/delegation', 'delegate'); @@ -34,13 +34,13 @@ class Delegation extends BaseSettingsModule if ($parent_uid != 0) { try { User::getIdFromPasswordAuthentication($parent_uid, $parent_password); - info(L10n::t('Delegation successfully granted.')); + info(DI::l10n()->t('Delegation successfully granted.')); } catch (\Exception $ex) { - notice(L10n::t('Parent user not found, unavailable or password doesn\'t match.')); + notice(DI::l10n()->t('Parent user not found, unavailable or password doesn\'t match.')); return; } } else { - info(L10n::t('Delegation successfully revoked.')); + info(DI::l10n()->t('Delegation successfully revoked.')); } DBA::update('user', ['parent-uid' => $parent_uid], ['uid' => local_user()]); @@ -51,7 +51,7 @@ class Delegation extends BaseSettingsModule parent::content($parameters); if (!local_user()) { - throw new HTTPException\ForbiddenException(L10n::t('Permission denied.')); + throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); } $args = DI::args(); @@ -62,7 +62,7 @@ class Delegation extends BaseSettingsModule if ($action === 'add' && $user_id) { if (Session::get('submanage')) { - notice(L10n::t('Delegated administrators can view but not change delegation permissions.')); + notice(DI::l10n()->t('Delegated administrators can view but not change delegation permissions.')); DI::baseUrl()->redirect('settings/delegation'); } @@ -76,7 +76,7 @@ class Delegation extends BaseSettingsModule DBA::insert('manage', ['uid' => $user_id, 'mid' => local_user()]); } } else { - notice(L10n::t('Delegate user not found.')); + notice(DI::l10n()->t('Delegate user not found.')); } DI::baseUrl()->redirect('settings/delegation'); @@ -84,7 +84,7 @@ class Delegation extends BaseSettingsModule if ($action === 'remove' && $user_id) { if (Session::get('submanage')) { - notice(L10n::t('Delegated administrators can view but not change delegation permissions.')); + notice(DI::l10n()->t('Delegated administrators can view but not change delegation permissions.')); DI::baseUrl()->redirect('settings/delegation'); } @@ -123,7 +123,7 @@ class Delegation extends BaseSettingsModule $user = User::getById(local_user(), ['parent-uid', 'email']); if (DBA::isResult($user) && !DBA::exists('user', ['parent-uid' => local_user()])) { $parent_uid = $user['parent-uid']; - $parents = [0 => L10n::t('No parent user')]; + $parents = [0 => DI::l10n()->t('No parent user')]; $fields = ['uid', 'username', 'nickname']; $condition = ['email' => $user['email'], 'verified' => true, 'blocked' => false, 'parent-uid' => 0]; @@ -135,33 +135,33 @@ class Delegation extends BaseSettingsModule } $parent_user = ['parent_user', '', $parent_uid, '', $parents]; - $parent_password = ['parent_password', L10n::t('Parent Password:'), '', L10n::t('Please enter the password of the parent account to legitimize your request.')]; + $parent_password = ['parent_password', DI::l10n()->t('Parent Password:'), '', DI::l10n()->t('Please enter the password of the parent account to legitimize your request.')]; } $is_child_user = !empty($user['parent-uid']); $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('settings/delegation.tpl'), [ '$form_security_token' => BaseModule::getFormSecurityToken('delegate'), - '$account_header' => L10n::t('Additional Accounts'), - '$account_desc' => L10n::t('Register additional accounts that are automatically connected to your existing account so you can manage it from this account.'), - '$add_account' => L10n::t('Register an additional account'), - '$parent_header' => L10n::t('Parent User'), + '$account_header' => DI::l10n()->t('Additional Accounts'), + '$account_desc' => DI::l10n()->t('Register additional accounts that are automatically connected to your existing account so you can manage it from this account.'), + '$add_account' => DI::l10n()->t('Register an additional account'), + '$parent_header' => DI::l10n()->t('Parent User'), '$parent_user' => $parent_user, '$parent_password' => $parent_password, - '$parent_desc' => L10n::t('Parent users have total control about this account, including the account settings. Please double check whom you give this access.'), + '$parent_desc' => DI::l10n()->t('Parent users have total control about this account, including the account settings. Please double check whom you give this access.'), '$is_child_user' => $is_child_user, - '$submit' => L10n::t('Save Settings'), - '$header' => L10n::t('Manage Accounts'), - '$delegates_header' => L10n::t('Delegates'), + '$submit' => DI::l10n()->t('Save Settings'), + '$header' => DI::l10n()->t('Manage Accounts'), + '$delegates_header' => DI::l10n()->t('Delegates'), '$base' => DI::baseUrl(), - '$desc' => L10n::t('Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely.'), - '$head_delegates' => L10n::t('Existing Page Delegates'), + '$desc' => DI::l10n()->t('Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely.'), + '$head_delegates' => DI::l10n()->t('Existing Page Delegates'), '$delegates' => $delegates, - '$head_potentials' => L10n::t('Potential Delegates'), + '$head_potentials' => DI::l10n()->t('Potential Delegates'), '$potentials' => $potentials, - '$remove' => L10n::t('Remove'), - '$add' => L10n::t('Add'), - '$none' => L10n::t('No entries.') + '$remove' => DI::l10n()->t('Remove'), + '$add' => DI::l10n()->t('Add'), + '$none' => DI::l10n()->t('No entries.') ]); return $o; diff --git a/src/Module/Settings/TwoFactor/AppSpecific.php b/src/Module/Settings/TwoFactor/AppSpecific.php index d87247346..f80e466a8 100644 --- a/src/Module/Settings/TwoFactor/AppSpecific.php +++ b/src/Module/Settings/TwoFactor/AppSpecific.php @@ -31,7 +31,7 @@ class AppSpecific extends BaseSettingsModule } if (!self::checkFormSecurityToken('settings_2fa_password', 't')) { - notice(L10n::t('Please enter your password to access this page.')); + notice(DI::l10n()->t('Please enter your password to access this page.')); DI::baseUrl()->redirect('settings/2fa'); } } @@ -49,20 +49,20 @@ class AppSpecific extends BaseSettingsModule case 'generate': $description = $_POST['description'] ?? ''; if (empty($description)) { - notice(L10n::t('App-specific password generation failed: The description is empty.')); + notice(DI::l10n()->t('App-specific password generation failed: The description is empty.')); DI::baseUrl()->redirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password')); } elseif (AppSpecificPassword::checkDuplicateForUser(local_user(), $description)) { - notice(L10n::t('App-specific password generation failed: This description already exists.')); + notice(DI::l10n()->t('App-specific password generation failed: This description already exists.')); DI::baseUrl()->redirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password')); } else { self::$appSpecificPassword = AppSpecificPassword::generateForUser(local_user(), $_POST['description'] ?? ''); - notice(L10n::t('New app-specific password generated.')); + notice(DI::l10n()->t('New app-specific password generated.')); } break; case 'revoke_all' : AppSpecificPassword::deleteAllForUser(local_user()); - notice(L10n::t('App-specific passwords successfully revoked.')); + notice(DI::l10n()->t('App-specific passwords successfully revoked.')); DI::baseUrl()->redirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password')); break; } @@ -72,7 +72,7 @@ class AppSpecific extends BaseSettingsModule self::checkFormSecurityTokenRedirectOnError('settings/2fa/app_specific', 'settings_2fa_app_specific'); if (AppSpecificPassword::deleteForUser(local_user(), $_POST['revoke_id'])) { - notice(L10n::t('App-specific password successfully revoked.')); + notice(DI::l10n()->t('App-specific password successfully revoked.')); } DI::baseUrl()->redirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password')); @@ -93,22 +93,22 @@ class AppSpecific extends BaseSettingsModule '$form_security_token' => self::getFormSecurityToken('settings_2fa_app_specific'), '$password_security_token' => self::getFormSecurityToken('settings_2fa_password'), - '$title' => L10n::t('Two-factor app-specific passwords'), - '$help_label' => L10n::t('Help'), - '$message' => L10n::t('

App-specific passwords are randomly generated passwords used instead your regular password to authenticate your account on third-party applications that don\'t support two-factor authentication.

'), - '$generated_message' => L10n::t('Make sure to copy your new app-specific password now. You won’t be able to see it again!'), + '$title' => DI::l10n()->t('Two-factor app-specific passwords'), + '$help_label' => DI::l10n()->t('Help'), + '$message' => DI::l10n()->t('

App-specific passwords are randomly generated passwords used instead your regular password to authenticate your account on third-party applications that don\'t support two-factor authentication.

'), + '$generated_message' => DI::l10n()->t('Make sure to copy your new app-specific password now. You won’t be able to see it again!'), '$generated_app_specific_password' => self::$appSpecificPassword, - '$description_label' => L10n::t('Description'), - '$last_used_label' => L10n::t('Last Used'), - '$revoke_label' => L10n::t('Revoke'), - '$revoke_all_label' => L10n::t('Revoke All'), + '$description_label' => DI::l10n()->t('Description'), + '$last_used_label' => DI::l10n()->t('Last Used'), + '$revoke_label' => DI::l10n()->t('Revoke'), + '$revoke_all_label' => DI::l10n()->t('Revoke All'), '$app_specific_passwords' => $appSpecificPasswords, - '$generate_message' => L10n::t('When you generate a new app-specific password, you must use it right away, it will be shown to you once after you generate it.'), - '$generate_title' => L10n::t('Generate new app-specific password'), - '$description_placeholder_label' => L10n::t('Friendiqa on my Fairphone 2...'), - '$generate_label' => L10n::t('Generate'), + '$generate_message' => DI::l10n()->t('When you generate a new app-specific password, you must use it right away, it will be shown to you once after you generate it.'), + '$generate_title' => DI::l10n()->t('Generate new app-specific password'), + '$description_placeholder_label' => DI::l10n()->t('Friendiqa on my Fairphone 2...'), + '$generate_label' => DI::l10n()->t('Generate'), ]); } } diff --git a/src/Module/Settings/TwoFactor/Index.php b/src/Module/Settings/TwoFactor/Index.php index df06333fc..0385b8dba 100644 --- a/src/Module/Settings/TwoFactor/Index.php +++ b/src/Module/Settings/TwoFactor/Index.php @@ -46,7 +46,7 @@ class Index extends BaseSettingsModule DI::pConfig()->delete(local_user(), '2fa', 'verified'); Session::remove('2fa'); - notice(L10n::t('Two-factor authentication successfully disabled.')); + notice(DI::l10n()->t('Two-factor authentication successfully disabled.')); DI::baseUrl()->redirect('settings/2fa'); } break; @@ -67,7 +67,7 @@ class Index extends BaseSettingsModule break; } } catch (\Exception $e) { - notice(L10n::t('Wrong Password')); + notice(DI::l10n()->t('Wrong Password')); } } @@ -84,35 +84,35 @@ class Index extends BaseSettingsModule return Renderer::replaceMacros(Renderer::getMarkupTemplate('settings/twofactor/index.tpl'), [ '$form_security_token' => self::getFormSecurityToken('settings_2fa'), - '$title' => L10n::t('Two-factor authentication'), - '$help_label' => L10n::t('Help'), - '$status_title' => L10n::t('Status'), - '$message' => L10n::t('

Use an application on a mobile device to get two-factor authentication codes when prompted on login.

'), + '$title' => DI::l10n()->t('Two-factor authentication'), + '$help_label' => DI::l10n()->t('Help'), + '$status_title' => DI::l10n()->t('Status'), + '$message' => DI::l10n()->t('

Use an application on a mobile device to get two-factor authentication codes when prompted on login.

'), '$has_secret' => $has_secret, '$verified' => $verified, - '$auth_app_label' => L10n::t('Authenticator app'), - '$app_status' => $has_secret ? $verified ? L10n::t('Configured') : L10n::t('Not Configured') : L10n::t('Disabled'), - '$not_configured_message' => L10n::t('

You haven\'t finished configuring your authenticator app.

'), - '$configured_message' => L10n::t('

Your authenticator app is correctly configured.

'), + '$auth_app_label' => DI::l10n()->t('Authenticator app'), + '$app_status' => $has_secret ? $verified ? DI::l10n()->t('Configured') : DI::l10n()->t('Not Configured') : DI::l10n()->t('Disabled'), + '$not_configured_message' => DI::l10n()->t('

You haven\'t finished configuring your authenticator app.

'), + '$configured_message' => DI::l10n()->t('

Your authenticator app is correctly configured.

'), - '$recovery_codes_title' => L10n::t('Recovery codes'), - '$recovery_codes_remaining' => L10n::t('Remaining valid codes'), + '$recovery_codes_title' => DI::l10n()->t('Recovery codes'), + '$recovery_codes_remaining' => DI::l10n()->t('Remaining valid codes'), '$recovery_codes_count' => RecoveryCode::countValidForUser(local_user()), - '$recovery_codes_message' => L10n::t('

These one-use codes can replace an authenticator app code in case you have lost access to it.

'), + '$recovery_codes_message' => DI::l10n()->t('

These one-use codes can replace an authenticator app code in case you have lost access to it.

'), - '$app_specific_passwords_title' => L10n::t('App-specific passwords'), - '$app_specific_passwords_remaining' => L10n::t('Generated app-specific passwords'), + '$app_specific_passwords_title' => DI::l10n()->t('App-specific passwords'), + '$app_specific_passwords_remaining' => DI::l10n()->t('Generated app-specific passwords'), '$app_specific_passwords_count' => AppSpecificPassword::countForUser(local_user()), - '$app_specific_passwords_message' => L10n::t('

These randomly generated passwords allow you to authenticate on apps not supporting two-factor authentication.

'), + '$app_specific_passwords_message' => DI::l10n()->t('

These randomly generated passwords allow you to authenticate on apps not supporting two-factor authentication.

'), - '$action_title' => L10n::t('Actions'), - '$password' => ['password', L10n::t('Current password:'), '', L10n::t('You need to provide your current password to change two-factor authentication settings.'), 'required', 'autofocus'], - '$enable_label' => L10n::t('Enable two-factor authentication'), - '$disable_label' => L10n::t('Disable two-factor authentication'), - '$recovery_codes_label' => L10n::t('Show recovery codes'), - '$app_specific_passwords_label' => L10n::t('Manage app-specific passwords'), - '$configure_label' => L10n::t('Finish app configuration'), + '$action_title' => DI::l10n()->t('Actions'), + '$password' => ['password', DI::l10n()->t('Current password:'), '', DI::l10n()->t('You need to provide your current password to change two-factor authentication settings.'), 'required', 'autofocus'], + '$enable_label' => DI::l10n()->t('Enable two-factor authentication'), + '$disable_label' => DI::l10n()->t('Disable two-factor authentication'), + '$recovery_codes_label' => DI::l10n()->t('Show recovery codes'), + '$app_specific_passwords_label' => DI::l10n()->t('Manage app-specific passwords'), + '$configure_label' => DI::l10n()->t('Finish app configuration'), ]); } } diff --git a/src/Module/Settings/TwoFactor/Recovery.php b/src/Module/Settings/TwoFactor/Recovery.php index 604eca480..fbfb0b183 100644 --- a/src/Module/Settings/TwoFactor/Recovery.php +++ b/src/Module/Settings/TwoFactor/Recovery.php @@ -29,7 +29,7 @@ class Recovery extends BaseSettingsModule } if (!self::checkFormSecurityToken('settings_2fa_password', 't')) { - notice(L10n::t('Please enter your password to access this page.')); + notice(DI::l10n()->t('Please enter your password to access this page.')); DI::baseUrl()->redirect('settings/2fa'); } } @@ -45,7 +45,7 @@ class Recovery extends BaseSettingsModule if ($_POST['action'] == 'regenerate') { RecoveryCode::regenerateForUser(local_user()); - notice(L10n::t('New recovery codes successfully generated.')); + notice(DI::l10n()->t('New recovery codes successfully generated.')); DI::baseUrl()->redirect('settings/2fa/recovery?t=' . self::getFormSecurityToken('settings_2fa_password')); } } @@ -71,14 +71,14 @@ class Recovery extends BaseSettingsModule '$form_security_token' => self::getFormSecurityToken('settings_2fa_recovery'), '$password_security_token' => self::getFormSecurityToken('settings_2fa_password'), - '$title' => L10n::t('Two-factor recovery codes'), - '$help_label' => L10n::t('Help'), - '$message' => L10n::t('

Recovery codes can be used to access your account in the event you lose access to your device and cannot receive two-factor authentication codes.

Put these in a safe spot! If you lose your device and don’t have the recovery codes you will lose access to your account.

'), + '$title' => DI::l10n()->t('Two-factor recovery codes'), + '$help_label' => DI::l10n()->t('Help'), + '$message' => DI::l10n()->t('

Recovery codes can be used to access your account in the event you lose access to your device and cannot receive two-factor authentication codes.

Put these in a safe spot! If you lose your device and don’t have the recovery codes you will lose access to your account.

'), '$recovery_codes' => $recoveryCodes, - '$regenerate_message' => L10n::t('When you generate new recovery codes, you must copy the new codes. Your old codes won’t work anymore.'), - '$regenerate_label' => L10n::t('Generate new recovery codes'), + '$regenerate_message' => DI::l10n()->t('When you generate new recovery codes, you must copy the new codes. Your old codes won’t work anymore.'), + '$regenerate_label' => DI::l10n()->t('Generate new recovery codes'), '$verified' => $verified, - '$verify_label' => L10n::t('Next: Verification'), + '$verify_label' => DI::l10n()->t('Next: Verification'), ]); } } diff --git a/src/Module/Settings/TwoFactor/Verify.php b/src/Module/Settings/TwoFactor/Verify.php index 8371064c3..62867d82b 100644 --- a/src/Module/Settings/TwoFactor/Verify.php +++ b/src/Module/Settings/TwoFactor/Verify.php @@ -35,7 +35,7 @@ class Verify extends BaseSettingsModule } if (!self::checkFormSecurityToken('settings_2fa_password', 't')) { - notice(L10n::t('Please enter your password to access this page.')); + notice(DI::l10n()->t('Please enter your password to access this page.')); DI::baseUrl()->redirect('settings/2fa'); } } @@ -57,11 +57,11 @@ class Verify extends BaseSettingsModule DI::pConfig()->set(local_user(), '2fa', 'verified', true); Session::set('2fa', true); - notice(L10n::t('Two-factor authentication successfully activated.')); + notice(DI::l10n()->t('Two-factor authentication successfully activated.')); DI::baseUrl()->redirect('settings/2fa'); } else { - notice(L10n::t('Invalid code, please retry.')); + notice(DI::l10n()->t('Invalid code, please retry.')); } } } @@ -90,7 +90,7 @@ class Verify extends BaseSettingsModule $shortOtpauthUrl = explode('?', $otpauthUrl)[0]; - $manual_message = L10n::t('

Or you can submit the authentication settings manually:

+ $manual_message = DI::l10n()->t('

Or you can submit the authentication settings manually:

Issuer
%s
@@ -110,18 +110,18 @@ class Verify extends BaseSettingsModule '$form_security_token' => self::getFormSecurityToken('settings_2fa_verify'), '$password_security_token' => self::getFormSecurityToken('settings_2fa_password'), - '$title' => L10n::t('Two-factor code verification'), - '$help_label' => L10n::t('Help'), - '$message' => L10n::t('

Please scan this QR Code with your authenticator app and submit the provided code.

'), + '$title' => DI::l10n()->t('Two-factor code verification'), + '$help_label' => DI::l10n()->t('Help'), + '$message' => DI::l10n()->t('

Please scan this QR Code with your authenticator app and submit the provided code.

'), '$qrcode_image' => $qrcode_image, - '$qrcode_url_message' => L10n::t('

Or you can open the following URL in your mobile devicde:

%s

', $otpauthUrl, $shortOtpauthUrl), + '$qrcode_url_message' => DI::l10n()->t('

Or you can open the following URL in your mobile devicde:

%s

', $otpauthUrl, $shortOtpauthUrl), '$manual_message' => $manual_message, '$company' => $company, '$holder' => $holder, '$secret' => $secret, - '$verify_code' => ['verify_code', L10n::t('Please enter a code from your authentication app'), '', '', 'required', 'autofocus placeholder="000000"'], - '$verify_label' => L10n::t('Verify code and enable two-factor authentication'), + '$verify_code' => ['verify_code', DI::l10n()->t('Please enter a code from your authentication app'), '', '', 'required', 'autofocus placeholder="000000"'], + '$verify_label' => DI::l10n()->t('Verify code and enable two-factor authentication'), ]); } } diff --git a/src/Module/Settings/UserExport.php b/src/Module/Settings/UserExport.php index 1b7c723a7..36ec0ca0c 100644 --- a/src/Module/Settings/UserExport.php +++ b/src/Module/Settings/UserExport.php @@ -39,15 +39,15 @@ class UserExport extends BaseSettingsModule * list of array( 'link url', 'link text', 'help text' ) */ $options = [ - ['settings/userexport/account', L10n::t('Export account'), L10n::t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')], - ['settings/userexport/backup', L10n::t('Export all'), L10n::t("Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account \x28photos are not exported\x29")], - ['settings/userexport/contact', L10n::t('Export Contacts to CSV'), L10n::t("Export the list of the accounts you are following as CSV file. Compatible to e.g. Mastodon.")], + ['settings/userexport/account', DI::l10n()->t('Export account'), DI::l10n()->t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')], + ['settings/userexport/backup', DI::l10n()->t('Export all'), DI::l10n()->t("Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account \x28photos are not exported\x29")], + ['settings/userexport/contact', DI::l10n()->t('Export Contacts to CSV'), DI::l10n()->t("Export the list of the accounts you are following as CSV file. Compatible to e.g. Mastodon.")], ]; Hook::callAll('uexport_options', $options); $tpl = Renderer::getMarkupTemplate("settings/userexport.tpl"); return Renderer::replaceMacros($tpl, [ - '$title' => L10n::t('Export personal data'), + '$title' => DI::l10n()->t('Export personal data'), '$options' => $options ]); } diff --git a/src/Module/Special/HTTPException.php b/src/Module/Special/HTTPException.php index 36c770fba..be71278fa 100644 --- a/src/Module/Special/HTTPException.php +++ b/src/Module/Special/HTTPException.php @@ -29,30 +29,30 @@ class HTTPException $titles = [ 200 => 'OK', - 400 => L10n::t('Bad Request'), - 401 => L10n::t('Unauthorized'), - 403 => L10n::t('Forbidden'), - 404 => L10n::t('Not Found'), - 500 => L10n::t('Internal Server Error'), - 503 => L10n::t('Service Unavailable'), + 400 => DI::l10n()->t('Bad Request'), + 401 => DI::l10n()->t('Unauthorized'), + 403 => DI::l10n()->t('Forbidden'), + 404 => DI::l10n()->t('Not Found'), + 500 => DI::l10n()->t('Internal Server Error'), + 503 => DI::l10n()->t('Service Unavailable'), ]; $title = ($titles[$e->getCode()] ?? '') ?: 'Error ' . $e->getCode(); if (empty($message)) { // Explanations are taken from https://en.wikipedia.org/wiki/List_of_HTTP_status_codes $explanation = [ - 400 => L10n::t('The server cannot or will not process the request due to an apparent client error.'), - 401 => L10n::t('Authentication is required and has failed or has not yet been provided.'), - 403 => L10n::t('The request was valid, but the server is refusing action. The user might not have the necessary permissions for a resource, or may need an account.'), - 404 => L10n::t('The requested resource could not be found but may be available in the future.'), - 500 => L10n::t('An unexpected condition was encountered and no more specific message is suitable.'), - 503 => L10n::t('The server is currently unavailable (because it is overloaded or down for maintenance). Please try again later.'), + 400 => DI::l10n()->t('The server cannot or will not process the request due to an apparent client error.'), + 401 => DI::l10n()->t('Authentication is required and has failed or has not yet been provided.'), + 403 => DI::l10n()->t('The request was valid, but the server is refusing action. The user might not have the necessary permissions for a resource, or may need an account.'), + 404 => DI::l10n()->t('The requested resource could not be found but may be available in the future.'), + 500 => DI::l10n()->t('An unexpected condition was encountered and no more specific message is suitable.'), + 503 => DI::l10n()->t('The server is currently unavailable (because it is overloaded or down for maintenance). Please try again later.'), ]; $message = $explanation[$e->getCode()] ?? ''; } - return ['$title' => $title, '$message' => $message, '$back' => L10n::t('Go back')]; + return ['$title' => $title, '$message' => $message, '$back' => DI::l10n()->t('Go back')]; } /** diff --git a/src/Module/Tos.php b/src/Module/Tos.php index 5442fdf45..7380488e0 100644 --- a/src/Module/Tos.php +++ b/src/Module/Tos.php @@ -32,12 +32,12 @@ class Tos extends BaseModule **/ public function __construct() { - $this->privacy_operate = L10n::t('At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node\'s user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication.'); - $this->privacy_distribute = L10n::t('This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts.'); - $this->privacy_delete = L10n::t('At any point in time a logged in user can export their account data from the account settings. If the user wants to delete their account they can do so at %1$s/removeme. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', DI::baseUrl()); + $this->privacy_operate = DI::l10n()->t('At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node\'s user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication.'); + $this->privacy_distribute = DI::l10n()->t('This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts.'); + $this->privacy_delete = DI::l10n()->t('At any point in time a logged in user can export their account data from the account settings. If the user wants to delete their account they can do so at %1$s/removeme. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', DI::baseUrl()); // In some cases we don't need every single one of the above separate, but all in one block. // So here is an array to look over - $this->privacy_complete = [L10n::t('Privacy Statement'), $this->privacy_operate, $this->privacy_distribute, $this->privacy_delete]; + $this->privacy_complete = [DI::l10n()->t('Privacy Statement'), $this->privacy_operate, $this->privacy_distribute, $this->privacy_delete]; } /** @@ -70,13 +70,13 @@ class Tos extends BaseModule $tpl = Renderer::getMarkupTemplate('tos.tpl'); if (Config::get('system', 'tosdisplay')) { return Renderer::replaceMacros($tpl, [ - '$title' => L10n::t('Terms of Service'), + '$title' => DI::l10n()->t('Terms of Service'), '$tostext' => BBCode::convert(Config::get('system', 'tostext')), '$displayprivstatement' => Config::get('system', 'tosprivstatement'), - '$privstatementtitle' => L10n::t('Privacy Statement'), - '$privacy_operate' => L10n::t('At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node\'s user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication.'), - '$privacy_distribute' => L10n::t('This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts.'), - '$privacy_delete' => L10n::t('At any point in time a logged in user can export their account data from the account settings. If the user wants to delete their account they can do so at %1$s/removeme. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', DI::baseUrl()) + '$privstatementtitle' => DI::l10n()->t('Privacy Statement'), + '$privacy_operate' => DI::l10n()->t('At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node\'s user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication.'), + '$privacy_distribute' => DI::l10n()->t('This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts.'), + '$privacy_delete' => DI::l10n()->t('At any point in time a logged in user can export their account data from the account settings. If the user wants to delete their account they can do so at %1$s/removeme. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', DI::baseUrl()) ]); } else { return; diff --git a/src/Module/Welcome.php b/src/Module/Welcome.php index 618214633..3e757e7cf 100644 --- a/src/Module/Welcome.php +++ b/src/Module/Welcome.php @@ -23,48 +23,48 @@ class Welcome extends BaseModule $tpl = Renderer::getMarkupTemplate('welcome.tpl'); return Renderer::replaceMacros($tpl, [ - '$welcome' => L10n::t('Welcome to Friendica'), - '$checklist' => L10n::t('New Member Checklist'), - '$description' => L10n::t('We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear.'), + '$welcome' => DI::l10n()->t('Welcome to Friendica'), + '$checklist' => DI::l10n()->t('New Member Checklist'), + '$description' => DI::l10n()->t('We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear.'), - '$started' => L10n::t('Getting Started'), - '$quickstart_link' => L10n::t('Friendica Walk-Through'), - '$quickstart_txt' => L10n::t('On your Quick Start page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join.'), + '$started' => DI::l10n()->t('Getting Started'), + '$quickstart_link' => DI::l10n()->t('Friendica Walk-Through'), + '$quickstart_txt' => DI::l10n()->t('On your Quick Start page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join.'), - '$settings' => L10n::t('Settings'), - '$settings_link' => L10n::t('Go to Your Settings'), - '$settings_txt' => L10n::t('On your Settings page - change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web.'), - '$settings_other' => L10n::t('Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you.'), + '$settings' => DI::l10n()->t('Settings'), + '$settings_link' => DI::l10n()->t('Go to Your Settings'), + '$settings_txt' => DI::l10n()->t('On your Settings page - change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web.'), + '$settings_other' => DI::l10n()->t('Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you.'), - '$profile' => L10n::t('Profile'), - '$profile_photo_link' => L10n::t('Upload Profile Photo'), - '$profile_photo_txt' => L10n::t('Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not.'), - '$profiles_link' => L10n::t('Edit Your Profile'), - '$profiles_txt' => L10n::t('Edit your default profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors.'), - '$profiles_keywords_link' => L10n::t('Profile Keywords'), - '$profiles_keywords_txt' => L10n::t('Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships.'), + '$profile' => DI::l10n()->t('Profile'), + '$profile_photo_link' => DI::l10n()->t('Upload Profile Photo'), + '$profile_photo_txt' => DI::l10n()->t('Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not.'), + '$profiles_link' => DI::l10n()->t('Edit Your Profile'), + '$profiles_txt' => DI::l10n()->t('Edit your default profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors.'), + '$profiles_keywords_link' => DI::l10n()->t('Profile Keywords'), + '$profiles_keywords_txt' => DI::l10n()->t('Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships.'), - '$connecting' => L10n::t('Connecting'), + '$connecting' => DI::l10n()->t('Connecting'), '$mail_disabled' => $mail_disabled, - '$import_mail_link' => L10n::t('Importing Emails'), - '$import_mail_txt' => L10n::t('Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX'), - '$contact_link' => L10n::t('Go to Your Contacts Page'), - '$contact_txt' => L10n::t('Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the Add New Contact dialog.'), - '$directory_link' => L10n::t('Go to Your Site\'s Directory'), - '$directory_txt' => L10n::t('The Directory page lets you find other people in this network or other federated sites. Look for a Connect or Follow link on their profile page. Provide your own Identity Address if requested.'), - '$finding_link' => L10n::t('Finding New People'), - '$finding_txt' => L10n::t('On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours.'), + '$import_mail_link' => DI::l10n()->t('Importing Emails'), + '$import_mail_txt' => DI::l10n()->t('Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX'), + '$contact_link' => DI::l10n()->t('Go to Your Contacts Page'), + '$contact_txt' => DI::l10n()->t('Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the Add New Contact dialog.'), + '$directory_link' => DI::l10n()->t('Go to Your Site\'s Directory'), + '$directory_txt' => DI::l10n()->t('The Directory page lets you find other people in this network or other federated sites. Look for a Connect or Follow link on their profile page. Provide your own Identity Address if requested.'), + '$finding_link' => DI::l10n()->t('Finding New People'), + '$finding_txt' => DI::l10n()->t('On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours.'), - '$groups' => L10n::t('Groups'), - '$group_contact_link' => L10n::t('Group Your Contacts'), - '$group_contact_txt' => L10n::t('Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page.'), + '$groups' => DI::l10n()->t('Groups'), + '$group_contact_link' => DI::l10n()->t('Group Your Contacts'), + '$group_contact_txt' => DI::l10n()->t('Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page.'), '$newuser_private' => $newuser_private, - '$private_link' => L10n::t('Why Aren\'t My Posts Public?'), - '$private_txt' => L10n::t('Friendica respects your privacy. By default, your posts will only show up to people you\'ve added as friends. For more information, see the help section from the link above.'), + '$private_link' => DI::l10n()->t('Why Aren\'t My Posts Public?'), + '$private_txt' => DI::l10n()->t('Friendica respects your privacy. By default, your posts will only show up to people you\'ve added as friends. For more information, see the help section from the link above.'), - '$help' => L10n::t('Getting Help'), - '$help_link' => L10n::t('Go to the Help Section'), - '$help_txt' => L10n::t('Our help pages may be consulted for detail on other program features and resources.'), + '$help' => DI::l10n()->t('Getting Help'), + '$help_link' => DI::l10n()->t('Go to the Help Section'), + '$help_txt' => DI::l10n()->t('Our help pages may be consulted for detail on other program features and resources.'), ]); } } diff --git a/src/Object/Post.php b/src/Object/Post.php index 2df5e9a36..efaa68819 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -130,7 +130,7 @@ class Post // only if the difference is more than 1 second. if (strtotime($item['edited']) - strtotime($item['created']) > 1) { $edited = [ - 'label' => L10n::t('This entry was edited'), + 'label' => DI::l10n()->t('This entry was edited'), 'date' => DateTimeFormat::local($item['edited'], 'r'), 'relative' => Temporal::getRelativeDate($item['edited']) ]; @@ -153,7 +153,7 @@ class Post $lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])))) - ? L10n::t('Private Message') + ? DI::l10n()->t('Private Message') : false); $shareable = in_array($conv->getProfileOwner(), [0, local_user()]) && $item['private'] != 1; @@ -163,9 +163,9 @@ class Post if (local_user()) { if (Strings::compareLink($a->contact['url'], $item['author-link'])) { if ($item["event-id"] != 0) { - $edpost = ["events/event/" . $item['event-id'], L10n::t("Edit")]; + $edpost = ["events/event/" . $item['event-id'], DI::l10n()->t("Edit")]; } else { - $edpost = ["editpost/" . $item['id'], L10n::t("Edit")]; + $edpost = ["editpost/" . $item['id'], DI::l10n()->t("Edit")]; } } $dropping = in_array($item['uid'], [0, local_user()]); @@ -192,21 +192,21 @@ class Post $origin = $parent['origin']; } } elseif ($item['pinned']) { - $pinned = L10n::t('pinned item'); + $pinned = DI::l10n()->t('pinned item'); } if ($origin && ($item['id'] != $item['parent']) && ($item['network'] == Protocol::ACTIVITYPUB)) { // ActivityPub doesn't allow removal of remote comments - $delete = L10n::t('Delete locally'); + $delete = DI::l10n()->t('Delete locally'); } else { // Showing the one or the other text, depending upon if we can only hide it or really delete it. - $delete = $origin ? L10n::t('Delete globally') : L10n::t('Remove locally'); + $delete = $origin ? DI::l10n()->t('Delete globally') : DI::l10n()->t('Remove locally'); } $drop = [ 'dropping' => $dropping, 'pagedrop' => $item['pagedrop'], - 'select' => L10n::t('Select'), + 'select' => DI::l10n()->t('Select'), 'delete' => $delete, ]; @@ -214,7 +214,7 @@ class Post $drop = false; } - $filer = (($conv->getProfileOwner() == local_user() && ($item['uid'] != 0)) ? L10n::t("save to folder") : false); + $filer = (($conv->getProfileOwner() == local_user() && ($item['uid'] != 0)) ? DI::l10n()->t("save to folder") : false); $profile_name = $item['author-name']; if (!empty($item['author-link']) && empty($item['author-name'])) { @@ -249,7 +249,7 @@ class Post $response_verbs[] = 'attendmaybe'; if ($conv->isWritable()) { $isevent = true; - $attend = [L10n::t('I will attend'), L10n::t('I will not attend'), L10n::t('I might attend')]; + $attend = [DI::l10n()->t('I will attend'), DI::l10n()->t('I will not attend'), DI::l10n()->t('I might attend')]; } } @@ -277,12 +277,12 @@ class Post $thread = Item::selectFirstThreadForUser(local_user(), ['ignored'], ['iid' => $item['id']]); if (DBA::isResult($thread)) { $ignore = [ - 'do' => L10n::t("ignore thread"), - 'undo' => L10n::t("unignore thread"), - 'toggle' => L10n::t("toggle ignore status"), + 'do' => DI::l10n()->t("ignore thread"), + 'undo' => DI::l10n()->t("unignore thread"), + 'toggle' => DI::l10n()->t("toggle ignore status"), 'classdo' => $thread['ignored'] ? "hidden" : "", 'classundo' => $thread['ignored'] ? "" : "hidden", - 'ignored' => L10n::t('ignored'), + 'ignored' => DI::l10n()->t('ignored'), ]; } @@ -291,28 +291,28 @@ class Post $ispinned = ($item['pinned'] ? 'pinned' : 'unpinned'); $pin = [ - 'do' => L10n::t('pin'), - 'undo' => L10n::t('unpin'), - 'toggle' => L10n::t('toggle pin status'), + 'do' => DI::l10n()->t('pin'), + 'undo' => DI::l10n()->t('unpin'), + 'toggle' => DI::l10n()->t('toggle pin status'), 'classdo' => $item['pinned'] ? 'hidden' : '', 'classundo' => $item['pinned'] ? '' : 'hidden', - 'pinned' => L10n::t('pinned'), + 'pinned' => DI::l10n()->t('pinned'), ]; } $isstarred = (($item['starred']) ? "starred" : "unstarred"); $star = [ - 'do' => L10n::t("add star"), - 'undo' => L10n::t("remove star"), - 'toggle' => L10n::t("toggle star status"), + 'do' => DI::l10n()->t("add star"), + 'undo' => DI::l10n()->t("remove star"), + 'toggle' => DI::l10n()->t("toggle star status"), 'classdo' => $item['starred'] ? "hidden" : "", 'classundo' => $item['starred'] ? "" : "hidden", - 'starred' => L10n::t('starred'), + 'starred' => DI::l10n()->t('starred'), ]; $tagger = [ - 'add' => L10n::t("add tag"), + 'add' => DI::l10n()->t("add tag"), 'class' => "", ]; } @@ -323,11 +323,11 @@ class Post if ($conv->isWritable()) { $buttons = [ - 'like' => [L10n::t("I like this \x28toggle\x29"), L10n::t("like")], - 'dislike' => [L10n::t("I don't like this \x28toggle\x29"), L10n::t("dislike")], + 'like' => [DI::l10n()->t("I like this \x28toggle\x29"), DI::l10n()->t("like")], + 'dislike' => [DI::l10n()->t("I don't like this \x28toggle\x29"), DI::l10n()->t("dislike")], ]; if ($shareable) { - $buttons['share'] = [L10n::t('Share this'), L10n::t('share')]; + $buttons['share'] = [DI::l10n()->t('Share this'), DI::l10n()->t('share')]; } } @@ -376,7 +376,7 @@ class Post $ago = Temporal::getRelativeDate($item['created']); $ago_received = Temporal::getRelativeDate($item['received']); if (Config::get('system', 'show_received') && (abs(strtotime($item['created']) - strtotime($item['received'])) > Config::get('system', 'show_received_seconds')) && ($ago != $ago_received)) { - $ago = L10n::t('%s (Received %s)', $ago, $ago_received); + $ago = DI::l10n()->t('%s (Received %s)', $ago, $ago_received); } $tmp_item = [ @@ -387,8 +387,8 @@ class Post '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, @@ -399,12 +399,12 @@ class Post 'guid' => urlencode($item['guid']), 'isevent' => $isevent, 'attend' => $attend, - 'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, $item['author-link']), - 'olinktitle' => L10n::t('View %s\'s profile @ %s', $this->getOwnerName(), $item['owner-link']), - 'to' => L10n::t('to'), - 'via' => L10n::t('via'), - 'wall' => L10n::t('Wall-to-Wall'), - 'vwall' => L10n::t('via Wall-To-Wall:'), + 'linktitle' => DI::l10n()->t('View %s\'s profile @ %s', $profile_name, $item['author-link']), + 'olinktitle' => DI::l10n()->t('View %s\'s profile @ %s', $this->getOwnerName(), $item['owner-link']), + 'to' => DI::l10n()->t('to'), + 'via' => DI::l10n()->t('via'), + 'wall' => DI::l10n()->t('Wall-to-Wall'), + 'vwall' => DI::l10n()->t('via Wall-To-Wall:'), 'profile_url' => $profile_link, 'item_photo_menu' => item_photo_menu($item), 'name' => $name_e, @@ -413,7 +413,7 @@ class Post 'sparkle' => $sparkle, 'title' => $title_e, 'localtime' => DateTimeFormat::local($item['created'], 'r'), - 'ago' => $item['app'] ? L10n::t('%s from %s', $ago, $item['app']) : $ago, + 'ago' => $item['app'] ? DI::l10n()->t('%s from %s', $ago, $item['app']) : $ago, 'app' => $item['app'], 'created' => $ago, 'lock' => $lock, @@ -439,11 +439,11 @@ class Post 'like' => $responses['like']['output'], 'dislike' => $responses['dislike']['output'], 'responses' => $responses, - 'switchcomment' => L10n::t('Comment'), - 'reply_label' => L10n::t('Reply to %s', $name_e), + 'switchcomment' => DI::l10n()->t('Comment'), + 'reply_label' => DI::l10n()->t('Reply to %s', $name_e), 'comment' => $comment, 'previewing' => $conv->isPreview() ? ' preview ' : '', - 'wait' => L10n::t('Please wait'), + 'wait' => DI::l10n()->t('Please wait'), 'thread_level' => $thread_level, 'edited' => $edited, 'network' => $item["network"], @@ -456,11 +456,11 @@ class Post 'delivery' => [ 'queue_count' => $item['delivery_queue_count'], 'queue_done' => $item['delivery_queue_done'] + $item['delivery_queue_failed'], /// @todo Possibly display it separately in the future - 'notifier_pending' => L10n::t('Notifier task is pending'), - 'delivery_pending' => L10n::t('Delivery to remote servers is pending'), - 'delivery_underway' => L10n::t('Delivery to remote servers is underway'), - 'delivery_almost' => L10n::t('Delivery to remote servers is mostly done'), - 'delivery_done' => L10n::t('Delivery to remote servers is done'), + 'notifier_pending' => DI::l10n()->t('Notifier task is pending'), + 'delivery_pending' => DI::l10n()->t('Delivery to remote servers is pending'), + 'delivery_underway' => DI::l10n()->t('Delivery to remote servers is underway'), + 'delivery_almost' => DI::l10n()->t('Delivery to remote servers is mostly done'), + 'delivery_done' => DI::l10n()->t('Delivery to remote servers is done'), ], ]; @@ -481,8 +481,8 @@ class Post if (($nb_children > 2) || ($thread_level > 1)) { $result['children'][0]['comment_firstcollapsed'] = true; $result['children'][0]['num_comments'] = L10n::tt('%d comment', '%d comments', $total_children); - $result['children'][0]['show_text'] = L10n::t('Show more'); - $result['children'][0]['hide_text'] = L10n::t('Show fewer'); + $result['children'][0]['show_text'] = DI::l10n()->t('Show more'); + $result['children'][0]['hide_text'] = DI::l10n()->t('Show fewer'); if ($thread_level > 1) { $result['children'][$nb_children - 1]['comment_lastcollapsed'] = true; } else { @@ -899,22 +899,22 @@ class Post '$default' => $default_text, '$profile_uid' => $uid, '$mylink' => DI::baseUrl()->remove($a->contact['url']), - '$mytitle' => L10n::t('This is you'), + '$mytitle' => DI::l10n()->t('This is you'), '$myphoto' => DI::baseUrl()->remove($a->contact['thumb']), - '$comment' => L10n::t('Comment'), - '$submit' => L10n::t('Submit'), - '$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'), - '$prompttext' => L10n::t('Please enter a image/video/audio/webpage URL:'), - '$preview' => L10n::t('Preview'), + '$comment' => DI::l10n()->t('Comment'), + '$submit' => DI::l10n()->t('Submit'), + '$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'), + '$prompttext' => DI::l10n()->t('Please enter a image/video/audio/webpage URL:'), + '$preview' => DI::l10n()->t('Preview'), '$indent' => $indent, - '$sourceapp' => L10n::t($a->sourcename), + '$sourceapp' => DI::l10n()->t($a->sourcename), '$ww' => $conv->getMode() === 'network' ? $ww : '', '$rand_num' => Crypto::randomDigits(12) ]); diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index 8a9408537..e0780c78b 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -3574,7 +3574,7 @@ class Diaspora if ($item["attach"]) { $cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism', $item["attach"], $matches, PREG_SET_ORDER); if ($cnt) { - $body .= "\n".L10n::t("Attachments:")."\n"; + $body .= "\n".DI::l10n()->t("Attachments:")."\n"; foreach ($matches as $mtch) { $body .= "[".$mtch[3]."](".$mtch[1].")\n"; } diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index a250d35bc..53eab4966 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -1270,14 +1270,14 @@ class OStatus $selfUri = '/feed/' . $owner["nick"] . '/'; switch ($filter) { case 'activity': - $title = L10n::t('%s\'s timeline', $owner['name']); + $title = DI::l10n()->t('%s\'s timeline', $owner['name']); $selfUri .= $filter; break; case 'posts': - $title = L10n::t('%s\'s posts', $owner['name']); + $title = DI::l10n()->t('%s\'s posts', $owner['name']); break; case 'comments': - $title = L10n::t('%s\'s comments', $owner['name']); + $title = DI::l10n()->t('%s\'s comments', $owner['name']); $selfUri .= $filter; break; } @@ -1832,12 +1832,12 @@ class OStatus } if ($item['verb'] == Activity::FOLLOW) { - $message = L10n::t('%s is now following %s.'); - $title = L10n::t('following'); + $message = DI::l10n()->t('%s is now following %s.'); + $title = DI::l10n()->t('following'); $action = "subscription"; } else { - $message = L10n::t('%s stopped following %s.'); - $title = L10n::t('stopped following'); + $message = DI::l10n()->t('%s stopped following %s.'); + $title = DI::l10n()->t('stopped following'); $action = "unfollow"; } diff --git a/src/Util/Temporal.php b/src/Util/Temporal.php index 729dc6e34..75211a092 100644 --- a/src/Util/Temporal.php +++ b/src/Util/Temporal.php @@ -27,21 +27,21 @@ class Temporal private static function timezoneCompareCallback($a, $b) { if (strstr($a, '/') && strstr($b, '/')) { - if (L10n::t($a) == L10n::t($b)) { + if (DI::l10n()->t($a) == DI::l10n()->t($b)) { return 0; } - return (L10n::t($a) < L10n::t($b)) ? -1 : 1; + return (DI::l10n()->t($a) < DI::l10n()->t($b)) ? -1 : 1; } if (strstr($a, '/')) { return -1; } elseif (strstr($b, '/')) { return 1; - } elseif (L10n::t($a) == L10n::t($b)) { + } elseif (DI::l10n()->t($a) == DI::l10n()->t($b)) { return 0; } - return (L10n::t($a) < L10n::t($b)) ? -1 : 1; + return (DI::l10n()->t($a) < DI::l10n()->t($b)) ? -1 : 1; } /** @@ -66,7 +66,7 @@ class Temporal $o .= ''; } $continent = $ex[0]; - $o .= ''; + $o .= ''; } if (count($ex) > 2) { $city = substr($value, strpos($value, '/') + 1); @@ -75,13 +75,13 @@ class Temporal } } else { $city = $ex[0]; - if ($continent != L10n::t('Miscellaneous')) { + if ($continent != DI::l10n()->t('Miscellaneous')) { $o .= ''; - $continent = L10n::t('Miscellaneous'); - $o .= ''; + $continent = DI::l10n()->t('Miscellaneous'); + $o .= ''; } } - $city = str_replace('_', ' ', L10n::t($city)); + $city = str_replace('_', ' ', DI::l10n()->t($city)); $selected = (($value == $current) ? " selected=\"selected\" " : ""); $o .= ""; } @@ -142,11 +142,11 @@ class Temporal [ '$field' => [ 'dob', - L10n::t('Birthday:'), + DI::l10n()->t('Birthday:'), $value, - intval($age) > 0 ? L10n::t('Age: ') . $age : "", + intval($age) > 0 ? DI::l10n()->t('Age: ') . $age : "", '', - 'placeholder="' . L10n::t('YYYY-MM-DD or MM-DD') . '"' + 'placeholder="' . DI::l10n()->t('YYYY-MM-DD or MM-DD') . '"' ] ]); @@ -293,14 +293,14 @@ class Temporal $abs = strtotime($localtime); if (is_null($posted_date) || $posted_date <= DBA::NULL_DATETIME || $abs === false) { - return L10n::t('never'); + return DI::l10n()->t('never'); } $isfuture = false; $etime = time() - $abs; if ($etime < 1 && $etime >= 0) { - return L10n::t('less than a second ago'); + return DI::l10n()->t('less than a second ago'); } if ($etime < 0){ @@ -308,13 +308,13 @@ class Temporal $isfuture = true; } - $a = [12 * 30 * 24 * 60 * 60 => [L10n::t('year'), L10n::t('years')], - 30 * 24 * 60 * 60 => [L10n::t('month'), L10n::t('months')], - 7 * 24 * 60 * 60 => [L10n::t('week'), L10n::t('weeks')], - 24 * 60 * 60 => [L10n::t('day'), L10n::t('days')], - 60 * 60 => [L10n::t('hour'), L10n::t('hours')], - 60 => [L10n::t('minute'), L10n::t('minutes')], - 1 => [L10n::t('second'), L10n::t('seconds')] + $a = [12 * 30 * 24 * 60 * 60 => [DI::l10n()->t('year'), DI::l10n()->t('years')], + 30 * 24 * 60 * 60 => [DI::l10n()->t('month'), DI::l10n()->t('months')], + 7 * 24 * 60 * 60 => [DI::l10n()->t('week'), DI::l10n()->t('weeks')], + 24 * 60 * 60 => [DI::l10n()->t('day'), DI::l10n()->t('days')], + 60 * 60 => [DI::l10n()->t('hour'), DI::l10n()->t('hours')], + 60 => [DI::l10n()->t('minute'), DI::l10n()->t('minutes')], + 1 => [DI::l10n()->t('second'), DI::l10n()->t('seconds')] ]; foreach ($a as $secs => $str) { @@ -324,10 +324,10 @@ class Temporal // translators - e.g. 22 hours ago, 1 minute ago if (!$format) { if($isfuture){ - $format = L10n::t('in %1$d %2$s'); + $format = DI::l10n()->t('in %1$d %2$s'); } else { - $format = L10n::t('%1$d %2$s ago'); + $format = DI::l10n()->t('%1$d %2$s ago'); } } diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index 5e44e940c..8c3fbb8ba 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -537,7 +537,7 @@ class Delivery $reply_to = $mailacct['reply_to']; } - $subject = ($target_item['title'] ? Email::encodeHeader($target_item['title'], 'UTF-8') : L10n::t("\x28no subject\x29")); + $subject = ($target_item['title'] ? Email::encodeHeader($target_item['title'], 'UTF-8') : DI::l10n()->t("\x28no subject\x29")); // only expose our real email address to true friends diff --git a/tests/src/Core/InstallerTest.php b/tests/src/Core/InstallerTest.php index 370373850..23212665d 100644 --- a/tests/src/Core/InstallerTest.php +++ b/tests/src/Core/InstallerTest.php @@ -46,7 +46,7 @@ class InstallerTest extends MockedTest } /** - * Mocking the L10n::t() calls for the function checks + * Mocking the DI::l10n()->t() calls for the function checks */ private function mockFunctionL10TCalls() { diff --git a/update.php b/update.php index 6c902ab85..330e6da10 100644 --- a/update.php +++ b/update.php @@ -215,7 +215,7 @@ function update_1260() Config::set( 'system', 'maintenance_reason', - L10n::t( + DI::l10n()->t( '%s: Updating author-id and owner-id in item and thread table. ', DateTimeFormat::utcNow().' '.date('e') ) @@ -270,7 +270,7 @@ function update_1278() Config::set( 'system', 'maintenance_reason', - L10n::t( + DI::l10n()->t( '%s: Updating post-type.', DateTimeFormat::utcNow().' '.date('e') ) diff --git a/view/theme/duepuntozero/config.php b/view/theme/duepuntozero/config.php index 574e25648..68d005d31 100644 --- a/view/theme/duepuntozero/config.php +++ b/view/theme/duepuntozero/config.php @@ -51,13 +51,13 @@ function theme_admin_post(App $a) function clean_form(App $a, &$colorset, $user) { $colorset = [ - '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'), ]; if ($user) { @@ -68,9 +68,9 @@ function clean_form(App $a, &$colorset, $user) $t = Renderer::getMarkupTemplate("theme_settings.tpl"); $o = Renderer::replaceMacros($t, [ - '$submit' => L10n::t('Submit'), - '$title' => L10n::t("Theme settings"), - '$colorset' => ['duepuntozero_colorset', L10n::t('Variations'), $color, '', $colorset], + '$submit' => DI::l10n()->t('Submit'), + '$title' => DI::l10n()->t("Theme settings"), + '$colorset' => ['duepuntozero_colorset', DI::l10n()->t('Variations'), $color, '', $colorset], ]); return $o; diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php index 899cbfbc1..c7b016df9 100644 --- a/view/theme/frio/config.php +++ b/view/theme/frio/config.php @@ -107,7 +107,7 @@ function frio_form($arr) } $scheme_choices = []; - $scheme_choices['---'] = L10n::t('Custom'); + $scheme_choices['---'] = DI::l10n()->t('Custom'); $files = glob('view/theme/frio/scheme/*.php'); if ($files) { foreach ($files as $file) { @@ -119,31 +119,31 @@ function frio_form($arr) } } - $background_image_help = '' . L10n::t('Note') . ': ' . L10n::t('Check image permissions if all users are allowed to see the image'); + $background_image_help = '' . DI::l10n()->t('Note') . ': ' . DI::l10n()->t('Check image permissions if all users are allowed to see the image'); $t = Renderer::getMarkupTemplate('theme_settings.tpl'); $ctx = [ - '$submit' => L10n::t('Submit'), - '$title' => L10n::t('Theme settings'), - '$scheme' => ['frio_scheme', L10n::t('Select color scheme'), $arr['scheme'], '', $scheme_choices], - '$share_string' => ['frio_share_string', L10n::t('Copy or paste schemestring'), $arr['share_string'], L10n::t('You can copy this string to share your theme with others. Pasting here applies the schemestring'), false, false], - '$nav_bg' => array_key_exists('nav_bg', $disable) ? '' : ['frio_nav_bg', L10n::t('Navigation bar background color'), $arr['nav_bg'], '', false], - '$nav_icon_color' => array_key_exists('nav_icon_color', $disable) ? '' : ['frio_nav_icon_color', L10n::t('Navigation bar icon color '), $arr['nav_icon_color'], '', false], - '$link_color' => array_key_exists('link_color', $disable) ? '' : ['frio_link_color', L10n::t('Link color'), $arr['link_color'], '', false], - '$background_color' => array_key_exists('background_color', $disable) ? '' : ['frio_background_color', L10n::t('Set the background color'), $arr['background_color'], '', false], - '$contentbg_transp' => array_key_exists('contentbg_transp', $disable) ? '' : ['frio_contentbg_transp', L10n::t('Content background opacity'), ($arr['contentbg_transp'] ?? 0) ?: 100, ''], - '$background_image' => array_key_exists('background_image', $disable) ? '' : ['frio_background_image', L10n::t('Set the background image'), $arr['background_image'], $background_image_help, false], - '$bg_image_options_title' => L10n::t('Background image style'), + '$submit' => DI::l10n()->t('Submit'), + '$title' => DI::l10n()->t('Theme settings'), + '$scheme' => ['frio_scheme', DI::l10n()->t('Select color scheme'), $arr['scheme'], '', $scheme_choices], + '$share_string' => ['frio_share_string', DI::l10n()->t('Copy or paste schemestring'), $arr['share_string'], DI::l10n()->t('You can copy this string to share your theme with others. Pasting here applies the schemestring'), false, false], + '$nav_bg' => array_key_exists('nav_bg', $disable) ? '' : ['frio_nav_bg', DI::l10n()->t('Navigation bar background color'), $arr['nav_bg'], '', false], + '$nav_icon_color' => array_key_exists('nav_icon_color', $disable) ? '' : ['frio_nav_icon_color', DI::l10n()->t('Navigation bar icon color '), $arr['nav_icon_color'], '', false], + '$link_color' => array_key_exists('link_color', $disable) ? '' : ['frio_link_color', DI::l10n()->t('Link color'), $arr['link_color'], '', false], + '$background_color' => array_key_exists('background_color', $disable) ? '' : ['frio_background_color', DI::l10n()->t('Set the background color'), $arr['background_color'], '', false], + '$contentbg_transp' => array_key_exists('contentbg_transp', $disable) ? '' : ['frio_contentbg_transp', DI::l10n()->t('Content background opacity'), ($arr['contentbg_transp'] ?? 0) ?: 100, ''], + '$background_image' => array_key_exists('background_image', $disable) ? '' : ['frio_background_image', DI::l10n()->t('Set the background image'), $arr['background_image'], $background_image_help, false], + '$bg_image_options_title' => DI::l10n()->t('Background image style'), '$bg_image_options' => Image::get_options($arr), - '$enable_compose' => ['frio_enable_compose', L10n::t('Enable Compose page'), $arr['enable_compose'], L10n::t('This replaces the jot modal window for writing new posts with a link to the new Compose page.')], + '$enable_compose' => ['frio_enable_compose', DI::l10n()->t('Enable Compose page'), $arr['enable_compose'], DI::l10n()->t('This replaces the jot modal window for writing new posts with a link to the new Compose page.')], ]; if (array_key_exists('login_bg_image', $arr) && !array_key_exists('login_bg_image', $disable)) { - $ctx['$login_bg_image'] = ['frio_login_bg_image', L10n::t('Login page background image'), $arr['login_bg_image'], $background_image_help, false]; + $ctx['$login_bg_image'] = ['frio_login_bg_image', DI::l10n()->t('Login page background image'), $arr['login_bg_image'], $background_image_help, false]; } if (array_key_exists('login_bg_color', $arr) && !array_key_exists('login_bg_color', $disable)) { - $ctx['$login_bg_color'] = ['frio_login_bg_color', L10n::t('Login page background color'), $arr['login_bg_color'], L10n::t('Leave background image and color empty for theme defaults'), false]; + $ctx['$login_bg_color'] = ['frio_login_bg_color', DI::l10n()->t('Login page background color'), $arr['login_bg_color'], DI::l10n()->t('Leave background image and color empty for theme defaults'), false]; } $o = Renderer::replaceMacros($t, $ctx); diff --git a/view/theme/frio/php/Image.php b/view/theme/frio/php/Image.php index 34e9fc210..7d0c6092d 100644 --- a/view/theme/frio/php/Image.php +++ b/view/theme/frio/php/Image.php @@ -21,10 +21,10 @@ class Image public static function get_options($arr) { $bg_image_options = [ - 'stretch' => ['frio_bg_image_option', L10n::t('Top Banner'), 'stretch', L10n::t('Resize image to the width of the screen and show background color below on long pages.'), ($arr['bg_image_option'] == 'stretch')], - 'cover' => ['frio_bg_image_option', L10n::t('Full screen'), 'cover', L10n::t('Resize image to fill entire screen, clipping either the right or the bottom.'), ($arr['bg_image_option'] == 'cover')], - 'contain' => ['frio_bg_image_option', L10n::t('Single row mosaic'), 'contain', L10n::t('Resize image to repeat it on a single row, either vertical or horizontal.'), ($arr['bg_image_option'] == 'contain')], - 'repeat' => ['frio_bg_image_option', L10n::t('Mosaic'), 'repeat', L10n::t('Repeat image to fill the screen.'), ($arr['bg_image_option'] == 'repeat')], + 'stretch' => ['frio_bg_image_option', DI::l10n()->t('Top Banner'), 'stretch', DI::l10n()->t('Resize image to the width of the screen and show background color below on long pages.'), ($arr['bg_image_option'] == 'stretch')], + 'cover' => ['frio_bg_image_option', DI::l10n()->t('Full screen'), 'cover', DI::l10n()->t('Resize image to fill entire screen, clipping either the right or the bottom.'), ($arr['bg_image_option'] == 'cover')], + 'contain' => ['frio_bg_image_option', DI::l10n()->t('Single row mosaic'), 'contain', DI::l10n()->t('Resize image to repeat it on a single row, either vertical or horizontal.'), ($arr['bg_image_option'] == 'contain')], + 'repeat' => ['frio_bg_image_option', DI::l10n()->t('Mosaic'), 'repeat', DI::l10n()->t('Repeat image to fill the screen.'), ($arr['bg_image_option'] == 'repeat')], ]; return $bg_image_options; diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php index 88e786ed7..89f40a662 100644 --- a/view/theme/frio/theme.php +++ b/view/theme/frio/theme.php @@ -244,12 +244,12 @@ function frio_remote_nav($a, &$nav) $r[0]['name'] = $a->user['username']; } elseif (!local_user() && remote_user()) { $r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user())); - $nav['remote'] = L10n::t('Guest'); + $nav['remote'] = DI::l10n()->t('Guest'); } elseif (Model\Profile::getMyURL()) { $r = q("SELECT `name`, `nick`, `photo` FROM `gcontact` WHERE `addr` = '%s' AND `network` = 'dfrn'", DBA::escape($webbie)); - $nav['remote'] = L10n::t('Visitor'); + $nav['remote'] = DI::l10n()->t('Visitor'); } else { $r = false; } @@ -265,18 +265,18 @@ function frio_remote_nav($a, &$nav) if (!local_user() && !empty($server_url) && !is_null($remoteUser)) { // user menu - $nav['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'], L10n::t('Status'), '', L10n::t('Your posts and conversations')]; - $nav['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '?tab=profile', L10n::t('Profile'), '', L10n::t('Your profile page')]; - $nav['usermenu'][] = [$server_url . '/photos/' . $remoteUser['nick'], L10n::t('Photos'), '', L10n::t('Your photos')]; - $nav['usermenu'][] = [$server_url . '/videos/' . $remoteUser['nick'], L10n::t('Videos'), '', L10n::t('Your videos')]; - $nav['usermenu'][] = [$server_url . '/events/', L10n::t('Events'), '', L10n::t('Your events')]; + $nav['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'], DI::l10n()->t('Status'), '', DI::l10n()->t('Your posts and conversations')]; + $nav['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '?tab=profile', DI::l10n()->t('Profile'), '', DI::l10n()->t('Your profile page')]; + $nav['usermenu'][] = [$server_url . '/photos/' . $remoteUser['nick'], DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')]; + $nav['usermenu'][] = [$server_url . '/videos/' . $remoteUser['nick'], DI::l10n()->t('Videos'), '', DI::l10n()->t('Your videos')]; + $nav['usermenu'][] = [$server_url . '/events/', DI::l10n()->t('Events'), '', DI::l10n()->t('Your events')]; // navbar links - $nav['network'] = [$server_url . '/network', L10n::t('Network'), '', L10n::t('Conversations from your friends')]; - $nav['events'] = [$server_url . '/events', L10n::t('Events'), '', L10n::t('Events and Calendar')]; - $nav['messages'] = [$server_url . '/message', L10n::t('Messages'), '', L10n::t('Private mail')]; - $nav['settings'] = [$server_url . '/settings', L10n::t('Settings'), '', L10n::t('Account settings')]; - $nav['contacts'] = [$server_url . '/contact', L10n::t('Contacts'), '', L10n::t('Manage/edit friends and contacts')]; + $nav['network'] = [$server_url . '/network', DI::l10n()->t('Network'), '', DI::l10n()->t('Conversations from your friends')]; + $nav['events'] = [$server_url . '/events', DI::l10n()->t('Events'), '', DI::l10n()->t('Events and Calendar')]; + $nav['messages'] = [$server_url . '/message', DI::l10n()->t('Messages'), '', DI::l10n()->t('Private mail')]; + $nav['settings'] = [$server_url . '/settings', DI::l10n()->t('Settings'), '', DI::l10n()->t('Account settings')]; + $nav['contacts'] = [$server_url . '/contact', DI::l10n()->t('Contacts'), '', DI::l10n()->t('Manage/edit friends and contacts')]; $nav['sitename'] = Config::get('config', 'sitename'); } } @@ -361,7 +361,7 @@ function frio_display_item(App $a, &$arr) { $subthread = [ 'menu' => 'follow_thread', - 'title' => L10n::t('Follow Thread'), + 'title' => DI::l10n()->t('Follow Thread'), 'action' => 'dosubthread(' . $arr['item']['id'] . '); return false;', 'href' => '#' ]; diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php index eb6c5d0aa..4dcb3e207 100644 --- a/view/theme/quattro/config.php +++ b/view/theme/quattro/config.php @@ -70,12 +70,12 @@ function quattro_form(App $a, $align, $color, $tfs, $pfs) { $t = Renderer::getMarkupTemplate("theme_settings.tpl" ); $o = Renderer::replaceMacros($t, [ - '$submit' => L10n::t('Submit'), - '$title' => L10n::t("Theme settings"), - '$align' => ['quattro_align', L10n::t('Alignment'), $align, '', ['left' => L10n::t('Left'), 'center' => L10n::t('Center')]], - '$color' => ['quattro_color', L10n::t('Color scheme'), $color, '', $colors], - '$pfs' => ['quattro_pfs', L10n::t('Posts font size'), $pfs], - '$tfs' => ['quattro_tfs', L10n::t('Textareas font size'), $tfs], + '$submit' => DI::l10n()->t('Submit'), + '$title' => DI::l10n()->t("Theme settings"), + '$align' => ['quattro_align', DI::l10n()->t('Alignment'), $align, '', ['left' => DI::l10n()->t('Left'), 'center' => DI::l10n()->t('Center')]], + '$color' => ['quattro_color', DI::l10n()->t('Color scheme'), $color, '', $colors], + '$pfs' => ['quattro_pfs', DI::l10n()->t('Posts font size'), $pfs], + '$tfs' => ['quattro_tfs', DI::l10n()->t('Textareas font size'), $tfs], ]); return $o; } diff --git a/view/theme/vier/config.php b/view/theme/vier/config.php index 9bcf4cffc..cc0168748 100644 --- a/view/theme/vier/config.php +++ b/view/theme/vier/config.php @@ -74,7 +74,7 @@ function theme_admin(App $a) { $t = Renderer::getMarkupTemplate("theme_admin_settings.tpl"); $o = Renderer::replaceMacros($t, [ - '$helperlist' => ['vier_helperlist', L10n::t('Comma separated list of helper forums'), $helperlist, '', ''], + '$helperlist' => ['vier_helperlist', DI::l10n()->t('Comma separated list of helper forums'), $helperlist, '', ''], ]); $show_pages = get_vier_config('show_pages', true, true); @@ -114,19 +114,19 @@ function vier_form(App $a, $style, $show_pages, $show_profiles, $show_helpers, $ "shadow"=>"Shadow" ]; - $show_or_not = ['0' => L10n::t("don't show"), '1' => L10n::t("show"),]; + $show_or_not = ['0' => DI::l10n()->t("don't show"), '1' => DI::l10n()->t("show"),]; $t = Renderer::getMarkupTemplate("theme_settings.tpl"); $o = Renderer::replaceMacros($t, [ - '$submit' => L10n::t('Submit'), - '$title' => L10n::t("Theme settings"), - '$style' => ['vier_style', L10n::t('Set style'), $style, '', $styles], - '$show_pages' => ['vier_show_pages', L10n::t('Community Pages'), $show_pages, '', $show_or_not], - '$show_profiles' => ['vier_show_profiles', L10n::t('Community Profiles'), $show_profiles, '', $show_or_not], - '$show_helpers' => ['vier_show_helpers', L10n::t('Help or @NewHere ?'), $show_helpers, '', $show_or_not], - '$show_services' => ['vier_show_services', L10n::t('Connect Services'), $show_services, '', $show_or_not], - '$show_friends' => ['vier_show_friends', L10n::t('Find Friends'), $show_friends, '', $show_or_not], - '$show_lastusers' => ['vier_show_lastusers', L10n::t('Last users'), $show_lastusers, '', $show_or_not] + '$submit' => DI::l10n()->t('Submit'), + '$title' => DI::l10n()->t("Theme settings"), + '$style' => ['vier_style', DI::l10n()->t('Set style'), $style, '', $styles], + '$show_pages' => ['vier_show_pages', DI::l10n()->t('Community Pages'), $show_pages, '', $show_or_not], + '$show_profiles' => ['vier_show_profiles', DI::l10n()->t('Community Profiles'), $show_profiles, '', $show_or_not], + '$show_helpers' => ['vier_show_helpers', DI::l10n()->t('Help or @NewHere ?'), $show_helpers, '', $show_or_not], + '$show_services' => ['vier_show_services', DI::l10n()->t('Connect Services'), $show_services, '', $show_or_not], + '$show_friends' => ['vier_show_friends', DI::l10n()->t('Find Friends'), $show_friends, '', $show_or_not], + '$show_lastusers' => ['vier_show_lastusers', DI::l10n()->t('Last users'), $show_lastusers, '', $show_or_not] ]); return $o; } diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index e7318902a..aac2ec02d 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -125,7 +125,7 @@ function vier_community_info() $tpl = Renderer::getMarkupTemplate('ch_directory_item.tpl'); if (DBA::isResult($r)) { - $aside['$comunity_profiles_title'] = L10n::t('Community Profiles'); + $aside['$comunity_profiles_title'] = DI::l10n()->t('Community Profiles'); $aside['$comunity_profiles_items'] = []; foreach ($r as $rr) { @@ -155,7 +155,7 @@ function vier_community_info() ); if (DBA::isResult($r)) { - $aside['$lastusers_title'] = L10n::t('Last users'); + $aside['$lastusers_title'] = DI::l10n()->t('Last users'); $aside['$lastusers_items'] = []; foreach ($r as $rr) { @@ -173,18 +173,18 @@ function vier_community_info() //right_aside FIND FRIENDS if ($show_friends && local_user()) { $nv = []; - $nv['findpeople'] = L10n::t('Find People'); - $nv['desc'] = L10n::t('Enter name or interest'); - $nv['label'] = L10n::t('Connect/Follow'); - $nv['hint'] = L10n::t('Examples: Robert Morgenstein, Fishing'); - $nv['findthem'] = L10n::t('Find'); - $nv['suggest'] = L10n::t('Friend Suggestions'); - $nv['similar'] = L10n::t('Similar Interests'); - $nv['random'] = L10n::t('Random Profile'); - $nv['inv'] = L10n::t('Invite Friends'); - $nv['directory'] = L10n::t('Global Directory'); + $nv['findpeople'] = DI::l10n()->t('Find People'); + $nv['desc'] = DI::l10n()->t('Enter name or interest'); + $nv['label'] = DI::l10n()->t('Connect/Follow'); + $nv['hint'] = DI::l10n()->t('Examples: Robert Morgenstein, Fishing'); + $nv['findthem'] = DI::l10n()->t('Find'); + $nv['suggest'] = DI::l10n()->t('Friend Suggestions'); + $nv['similar'] = DI::l10n()->t('Similar Interests'); + $nv['random'] = DI::l10n()->t('Random Profile'); + $nv['inv'] = DI::l10n()->t('Invite Friends'); + $nv['directory'] = DI::l10n()->t('Global Directory'); $nv['global_dir'] = Search::getGlobalDirectory(); - $nv['local_directory'] = L10n::t('Local Directory'); + $nv['local_directory'] = DI::l10n()->t('Local Directory'); $aside['$nv'] = $nv; } @@ -224,12 +224,12 @@ function vier_community_info() $page = Renderer::replaceMacros( $tpl, [ - '$title' => L10n::t('Forums'), + '$title' => DI::l10n()->t('Forums'), '$forums' => $entries, - '$link_desc' => L10n::t('External link to forum'), + '$link_desc' => DI::l10n()->t('External link to forum'), '$total' => $total, '$visible_forums' => $visible_forums, - '$showmore' => L10n::t('show more')] + '$showmore' => DI::l10n()->t('show more')] ); $aside['$page'] = $page; @@ -262,13 +262,13 @@ function vier_community_info() $r[$index]["url"] = Contact::magicLink($helper["url"]); } - $r[] = ["url" => "help/Quick-Start-guide", "name" => L10n::t("Quick Start")]; + $r[] = ["url" => "help/Quick-Start-guide", "name" => DI::l10n()->t("Quick Start")]; $tpl = Renderer::getMarkupTemplate('ch_helpers.tpl'); if ($r) { $helpers = []; - $helpers['title'] = ["", L10n::t('Help'), "", ""]; + $helpers['title'] = ["", DI::l10n()->t('Help'), "", ""]; $aside['$helpers_items'] = []; @@ -347,7 +347,7 @@ function vier_community_info() if (DBA::isResult($r)) { $con_services = []; - $con_services['title'] = ["", L10n::t('Connect Services'), "", ""]; + $con_services['title'] = ["", DI::l10n()->t('Connect Services'), "", ""]; $aside['$con_services'] = $con_services; foreach ($r as $rr) {