Merge pull request #8203 from MrPetovan/task/4599-frio-jot-async

[friendica.git] / mod / editpost.php

diff --git a/mod/editpost.php b/mod/editpost.php
index b6ed782463fe7573645d747d3b613e6b62383d28..ca5db3e08105b7372f14f85a37cfc860b8962f07 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -6,7 +6,6 @@
 use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -20,14 +19,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 +36,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' => '&nbsp;', // L10n::t('Visible to <strong>everybody</strong>'),
+               '$ispublic' => '&nbsp;', // DI::l10n()->t('Visible to <strong>everybody</strong>'),
                '$geotag' => $geotag,
                '$nickname' => $a->user['nickname']
        ]);
@@ -70,23 +69,24 @@ 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'),
+               '$loading' => DI::l10n()->t('Loading...'),
+               '$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;