Restructure #1301

Closed
nupplaphil wants to merge 4 commits from restructure into 2022.12-rc
14 changed files with 12012 additions and 104 deletions

11894
advancedcontentfilter/asset/vue/dist/vue.js vendored Normal file

File diff suppressed because it is too large Load diff

File diff suppressed because one or more lines are too long

View file

@ -17,6 +17,6 @@
</script>
<!-- JS -->
<script src="{{$baseurl}}/view/asset/vue/dist/vue.min.js"></script>
<script src="{{$baseurl}}/addon/advancedcontentfilter/asset/vue/dist/vue.min.js"></script>
<script src="{{$baseurl}}/addon/advancedcontentfilter/advancedcontentfilter.js"></script>
</div>

View file

@ -94,7 +94,7 @@ function diaspora_settings(App $a, array &$data)
$html = Renderer::replaceMacros($t, [
'$l10n' => [
'info_header' => DI::l10n()->t('Information'),
'error_header' => DI::l10n()->t('Error'),
'error_header' => DI::l10n()->tt('Error', 'Errors', 1),
],
'$info' => $info,

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-11-21 19:17-0500\n"
"POT-Creation-Date: 2022-10-29 20:48+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,84 +17,87 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: diaspora.php:44
#: diaspora.php:43
msgid "Post to Diaspora"
msgstr ""
#: diaspora.php:67
#: diaspora.php:66
#, php-format
msgid ""
"Please remember: You can always be reached from Diaspora with your Friendica "
"handle <strong>%s</strong>. "
msgstr ""
#: diaspora.php:68
#: diaspora.php:67
msgid ""
"This connector is only meant if you still want to use your old Diaspora "
"account for some time. "
msgstr ""
#: diaspora.php:69
#: diaspora.php:68
#, php-format
msgid ""
"However, it is preferred that you tell your Diaspora contacts the new handle "
"<strong>%s</strong> instead."
msgstr ""
#: diaspora.php:79
#: diaspora.php:78
msgid "All aspects"
msgstr ""
#: diaspora.php:80
#: diaspora.php:79
msgid "Public"
msgstr ""
#: diaspora.php:86
#: diaspora.php:85
msgid "Post to aspect:"
msgstr ""
#: diaspora.php:87
#: diaspora.php:86
#, php-format
msgid "Connected with your Diaspora account <strong>%s</strong>"
msgstr ""
#: diaspora.php:90
#: diaspora.php:89
msgid ""
"Can't login to your Diaspora account. Please check handle (in the format "
"user@domain.tld) and password."
msgstr ""
#: diaspora.php:97
#: diaspora.php:96
msgid "Information"
msgstr ""
#: diaspora.php:98
#: diaspora.php:97
msgid "Error"
msgstr ""
msgid_plural "Errors"
msgstr[0] ""
msgstr[1] ""
#: diaspora.php:104
#: diaspora.php:103
msgid "Enable Diaspora Post Addon"
msgstr ""
#: diaspora.php:105
#: diaspora.php:104
msgid "Diaspora handle"
msgstr ""
#: diaspora.php:106
#: diaspora.php:105
msgid "Diaspora password"
msgstr ""
#: diaspora.php:106
#: diaspora.php:105
msgid ""
"Privacy notice: Your Diaspora password will be stored unencrypted to "
"authenticate you with your Diaspora pod. This means your Friendica node "
"administrator can have access to it."
msgstr ""
#: diaspora.php:108
#: diaspora.php:107
msgid "Post to Diaspora by default"
msgstr ""
#: diaspora.php:113
#: diaspora.php:112
msgid "Diaspora Export"
msgstr ""

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-11-21 19:15-0500\n"
"POT-Creation-Date: 2022-10-29 20:48+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,80 +17,80 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: mailstream.php:77
#: mailstream.php:78
msgid "From Address"
msgstr ""
#: mailstream.php:79
#: mailstream.php:80
msgid "Email address that stream items will appear to be from."
msgstr ""
#: mailstream.php:82
#: mailstream.php:83
msgid "Save Settings"
msgstr ""
#: mailstream.php:301
#: mailstream.php:312
msgid "Re:"
msgstr ""
#: mailstream.php:314 mailstream.php:317
#: mailstream.php:325 mailstream.php:328
msgid "Friendica post"
msgstr ""
#: mailstream.php:320
#: mailstream.php:331
msgid "Diaspora post"
msgstr ""
#: mailstream.php:330
#: mailstream.php:341
msgid "Feed item"
msgstr ""
#: mailstream.php:333
#: mailstream.php:344
msgid "Email"
msgstr ""
#: mailstream.php:335
#: mailstream.php:346
msgid "Friendica Item"
msgstr ""
#: mailstream.php:404
#: mailstream.php:416
msgid "Upstream"
msgstr ""
#: mailstream.php:405
#: mailstream.php:417
msgid "Local"
msgstr ""
#: mailstream.php:481
#: mailstream.php:493
msgid "Enabled"
msgstr ""
#: mailstream.php:486
#: mailstream.php:498
msgid "Email Address"
msgstr ""
#: mailstream.php:488
#: mailstream.php:500
msgid "Leave blank to use your account email address"
msgstr ""
#: mailstream.php:492
#: mailstream.php:504
msgid "Exclude Likes"
msgstr ""
#: mailstream.php:494
#: mailstream.php:506
msgid "Check this to omit mailing \"Like\" notifications"
msgstr ""
#: mailstream.php:498
#: mailstream.php:510
msgid "Attach Images"
msgstr ""
#: mailstream.php:500
#: mailstream.php:512
msgid ""
"Download images in posts and attach them to the email. Useful for reading "
"email while offline."
msgstr ""
#: mailstream.php:507
#: mailstream.php:519
msgid "Mail Stream Settings"
msgstr ""

View file

@ -19,7 +19,7 @@ use Friendica\Model\Contact;
use Friendica\Model\Item;
use Friendica\Model\Post;
use Friendica\Model\User;
use Friendica\Network\HTTPClient\Client\HttpClientAccept;
use Friendica\Library\Network\HTTPClient\Client\HttpClientAccept;
use Friendica\Protocol\Activity;
use Friendica\Util\DateTimeFormat;

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-11-21 19:17-0500\n"
"POT-Creation-Date: 2022-10-29 20:48+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,76 +17,76 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: pumpio.php:57
#: pumpio.php:63
msgid "Permission denied."
msgstr ""
#: pumpio.php:152
#: pumpio.php:160
#, php-format
msgid "Unable to register the client at the pump.io server '%s'."
msgstr ""
#: pumpio.php:192
#: pumpio.php:200
msgid "You are now authenticated to pumpio."
msgstr ""
#: pumpio.php:193
#: pumpio.php:201
msgid "return to the connector page"
msgstr ""
#: pumpio.php:213
#: pumpio.php:221
msgid "Post to pumpio"
msgstr ""
#: pumpio.php:237
#: pumpio.php:245
msgid "Save Settings"
msgstr ""
#: pumpio.php:239
#: pumpio.php:247
msgid "Delete this preset"
msgstr ""
#: pumpio.php:245
#: pumpio.php:253
msgid "Authenticate your pump.io connection"
msgstr ""
#: pumpio.php:252
#: pumpio.php:260
msgid "Pump.io servername (without \"http://\" or \"https://\" )"
msgstr ""
#: pumpio.php:253
#: pumpio.php:261
msgid "Pump.io username (without the servername)"
msgstr ""
#: pumpio.php:254
#: pumpio.php:262
msgid "Import the remote timeline"
msgstr ""
#: pumpio.php:255
#: pumpio.php:263
msgid "Enable Pump.io Post Addon"
msgstr ""
#: pumpio.php:256
#: pumpio.php:264
msgid "Post to Pump.io by default"
msgstr ""
#: pumpio.php:257
#: pumpio.php:265
msgid "Should posts be public?"
msgstr ""
#: pumpio.php:258
#: pumpio.php:266
msgid "Mirror all public posts"
msgstr ""
#: pumpio.php:263
#: pumpio.php:271
msgid "Pump.io Import/Export/Mirror"
msgstr ""
#: pumpio.php:920
#: pumpio.php:938
msgid "status"
msgstr ""
#: pumpio.php:924
#: pumpio.php:942
#, php-format
msgid "%1$s likes %2$s's %3$s"
msgstr ""

View file

@ -22,8 +22,8 @@ use Friendica\Model\Group;
use Friendica\Model\Item;
use Friendica\Model\Post;
use Friendica\Model\User;
use Friendica\Network\HTTPClient\Client\HttpClientAccept;
use Friendica\Network\HTTPClient\Client\HttpClientOptions;
use Friendica\Library\Network\HTTPClient\Client\HttpClientAccept;
use Friendica\Library\Network\HTTPClient\Client\HttpClientOptions;
use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityNamespace;
use Friendica\Core\Config\Util\ConfigFileLoader;

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-11-21 19:17-0500\n"
"POT-Creation-Date: 2022-10-29 20:48+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,30 +17,30 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: statusnet.php:97
#: statusnet.php:98
msgid "Post to GNU Social"
msgstr ""
#: statusnet.php:148
#: statusnet.php:149
msgid ""
"Please contact your site administrator.<br />The provided API URL is not "
"valid."
msgstr ""
#: statusnet.php:176
#: statusnet.php:177
msgid "We could not contact the GNU Social API with the Path you entered."
msgstr ""
#: statusnet.php:243 statusnet.php:656
#: statusnet.php:244 statusnet.php:659
msgid "Save Settings"
msgstr ""
#: statusnet.php:255
#: statusnet.php:256
#, php-format
msgid "Currently connected to: <a href=\"%s\" target=\"_statusnet\">%s</a>"
msgstr ""
#: statusnet.php:260
#: statusnet.php:261
msgid ""
"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
"details from unknown viewers?</em>) the link potentially included in public "
@ -48,30 +48,30 @@ msgid ""
"informing the visitor that the access to your profile has been restricted."
msgstr ""
#: statusnet.php:263
#: statusnet.php:264
msgid "Clear OAuth configuration"
msgstr ""
#: statusnet.php:275
#: statusnet.php:276
msgid "Cancel GNU Social Connection"
msgstr ""
#: statusnet.php:283
#: statusnet.php:284
msgid "Globally Available GNU Social OAuthKeys"
msgstr ""
#: statusnet.php:284
#: statusnet.php:285
msgid ""
"There are preconfigured OAuth key pairs for some GNU Social servers "
"available. If you are using one of them, please use these credentials. If "
"not feel free to connect to any other GNU Social instance (see below)."
msgstr ""
#: statusnet.php:285
#: statusnet.php:286
msgid "Provide your own OAuth Credentials"
msgstr ""
#: statusnet.php:286
#: statusnet.php:287
msgid ""
"No consumer key pair for GNU Social found. Register your Friendica Account "
"as a desktop application on your GNU Social account, copy the consumer key "
@ -80,7 +80,7 @@ msgid ""
"Friendica installation at your favorite GNU Social installation."
msgstr ""
#: statusnet.php:287
#: statusnet.php:288
msgid ""
"To connect to your GNU Social account click the button below to get a "
"security code from GNU Social which you have to copy into the input box "
@ -88,86 +88,86 @@ msgid ""
"posted to GNU Social."
msgstr ""
#: statusnet.php:288
#: statusnet.php:289
msgid "Log in with GNU Social"
msgstr ""
#: statusnet.php:289
#: statusnet.php:290
msgid "Cancel Connection Process"
msgstr ""
#: statusnet.php:290
#: statusnet.php:291
#, php-format
msgid "Current GNU Social API is: %s"
msgstr ""
#: statusnet.php:307
#: statusnet.php:308
msgid "OAuth Consumer Key"
msgstr ""
#: statusnet.php:308
#: statusnet.php:309
msgid "OAuth Consumer Secret"
msgstr ""
#: statusnet.php:310 statusnet.php:636 statusnet.php:648
#: statusnet.php:311 statusnet.php:639 statusnet.php:651
msgid "Base API Path (remember the trailing /)"
msgstr ""
#: statusnet.php:311
#: statusnet.php:312
msgid "Copy the security code from GNU Social here"
msgstr ""
#: statusnet.php:313
#: statusnet.php:314
msgid "Allow posting to GNU Social"
msgstr ""
#: statusnet.php:313
#: statusnet.php:314
msgid ""
"If enabled all your <strong>public</strong> postings can be posted to the "
"associated GNU Social account. You can choose to do so by default (here) or "
"for every posting separately in the posting options when writing the entry."
msgstr ""
#: statusnet.php:314
#: statusnet.php:315
msgid "Post to GNU Social by default"
msgstr ""
#: statusnet.php:315
#: statusnet.php:316
msgid "Mirror all public posts"
msgstr ""
#: statusnet.php:316
#: statusnet.php:317
msgid "Automatically create contacts"
msgstr ""
#: statusnet.php:317
#: statusnet.php:318
msgid "Import the remote timeline"
msgstr ""
#: statusnet.php:318
#: statusnet.php:319
msgid "Disabled"
msgstr ""
#: statusnet.php:319
#: statusnet.php:320
msgid "Full Timeline"
msgstr ""
#: statusnet.php:320
#: statusnet.php:321
msgid "Only Mentions"
msgstr ""
#: statusnet.php:326
#: statusnet.php:327
msgid "GNU Social Import/Export/Mirror"
msgstr ""
#: statusnet.php:647
#: statusnet.php:650
msgid "Site name"
msgstr ""
#: statusnet.php:649
#: statusnet.php:652
msgid "Consumer Secret"
msgstr ""
#: statusnet.php:650
#: statusnet.php:653
msgid "Consumer Key"
msgstr ""

View file

@ -56,7 +56,7 @@ use Friendica\Model\Item;
use Friendica\Model\Photo;
use Friendica\Model\Post;
use Friendica\Model\User;
use Friendica\Network\HTTPClient\Client\HttpClientAccept;
use Friendica\Library\Network\HTTPClient\Client\HttpClientAccept;
use Friendica\Protocol\Activity;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings;

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-10-04 11:59+0200\n"
"POT-Creation-Date: 2022-10-29 20:48+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

View file

@ -6,8 +6,8 @@ use Exception;
use Friendica\Core\Storage\Capability\ICanWriteToStorage;
use Friendica\Core\Storage\Exception\ReferenceStorageException;
use Friendica\Core\Storage\Exception\StorageException;
use Friendica\Network\HTTPClient\Client\HttpClientOptions;
use Friendica\Network\HTTPClient\Capability\ICanSendHttpRequests;
use Friendica\Library\Network\HTTPClient\Client\HttpClientOptions;
use Friendica\Library\Network\HTTPClient\Capability\ICanSendHttpRequests;
use Friendica\Util\Strings;
use Psr\Log\LoggerInterface;

View file

@ -5,8 +5,8 @@ namespace Friendica\Addon\webdav_storage\src;
use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\L10n;
use Friendica\Core\Storage\Capability\ICanConfigureStorage;
use Friendica\Network\HTTPClient\Client\HttpClientOptions;
use Friendica\Network\HTTPClient\Capability\ICanSendHttpRequests;
use Friendica\Library\Network\HTTPClient\Client\HttpClientOptions;
use Friendica\Library\Network\HTTPClient\Capability\ICanSendHttpRequests;
/**
* The WebDav Backend Storage configuration class
@ -24,7 +24,7 @@ class WebDavConfig implements ICanConfigureStorage
/** @var string */
private $url;
/** @var \Friendica\Network\HTTPClient\Capability\ICanSendHttpRequests */
/** @var \Friendica\Library\Network\HTTPClient\Capability\ICanSendHttpRequests */
private $client;
/** @var array */