clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into scheduled-frontend

This commit is contained in:
Michael 2021-08-01 13:12:25 +00:00
parent 2e2d1bf81d 98803064eb
commit 8214401b57
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Module/Admin/Storage.php
View File

@ -80,18 +80,10 @@ class Storage extends BaseAdmin
{ {
parent::content($parameters); parent::content($parameters);
$current_storage_backend = DI::storage(); $current_storage_backend = DI::storage();
$available_storage_backends = []; $available_storage_forms = [];
$available_storage_forms = [];
// show legacy option only if it is the current backend:
// once changed can't be selected anymore
if ($current_storage_backend == null) {
$available_storage_backends[''] = DI::l10n()->t('Database (legacy)');
}
foreach (DI::storageManager()->listBackends() as $name => $class) { foreach (DI::storageManager()->listBackends() as $name => $class) {
$available_storage_backends[$name] = $name;
// build storage config form, // build storage config form,
$storage_form_prefix = preg_replace('|[^a-zA-Z0-9]|', '', $name); $storage_form_prefix = preg_replace('|[^a-zA-Z0-9]|', '', $name);
@ -116,7 +108,7 @@ class Storage extends BaseAdmin
'name' => $name, 'name' => $name,
'prefix' => $storage_form_prefix, 'prefix' => $storage_form_prefix,
'form' => $storage_form, 'form' => $storage_form,
'active' => $name === $current_storage_backend::getName(), 'active' => $current_storage_backend instanceof IStorage && $name === $current_storage_backend::getName(),
]; ];
} }
@ -132,7 +124,7 @@ class Storage extends BaseAdmin
'$noconfig' => DI::l10n()->t('This backend doesn\'t have custom settings'), '$noconfig' => DI::l10n()->t('This backend doesn\'t have custom settings'),
'$baseurl' => DI::baseUrl()->get(true), '$baseurl' => DI::baseUrl()->get(true),
'$form_security_token' => self::getFormSecurityToken("admin_storage"), '$form_security_token' => self::getFormSecurityToken("admin_storage"),
'$storagebackend' => $current_storage_backend, '$storagebackend' => $current_storage_backend instanceof IStorage ? $current_storage_backend::getName() : DI::l10n()->t('Database (legacy)'),
'$availablestorageforms' => $available_storage_forms, '$availablestorageforms' => $available_storage_forms,
]); ]);
} }

22
view/lang/C/messages.po
View File

@ -968,7 +968,7 @@ msgid "Edit post"
msgstr "" msgstr ""
#: mod/editpost.php:88 mod/notes.php:63 src/Content/Text/HTML.php:885 #: mod/editpost.php:88 mod/notes.php:63 src/Content/Text/HTML.php:885
#: src/Module/Admin/Storage.php:128 src/Module/Filer/SaveTag.php:69 #: src/Module/Admin/Storage.php:120 src/Module/Filer/SaveTag.php:69
msgid "Save" msgid "Save"
msgstr "" msgstr ""
@ -4999,7 +4999,7 @@ msgstr ""
#: src/Module/Admin/Blocklist/Server.php:88 src/Module/Admin/Federation.php:159 #: src/Module/Admin/Blocklist/Server.php:88 src/Module/Admin/Federation.php:159
#: src/Module/Admin/Item/Delete.php:65 src/Module/Admin/Logs/Settings.php:80 #: src/Module/Admin/Item/Delete.php:65 src/Module/Admin/Logs/Settings.php:80
#: src/Module/Admin/Logs/View.php:64 src/Module/Admin/Queue.php:72 #: src/Module/Admin/Logs/View.php:64 src/Module/Admin/Queue.php:72
#: src/Module/Admin/Site.php:498 src/Module/Admin/Storage.php:126 #: src/Module/Admin/Site.php:498 src/Module/Admin/Storage.php:118
#: src/Module/Admin/Summary.php:232 src/Module/Admin/Themes/Details.php:90 #: src/Module/Admin/Summary.php:232 src/Module/Admin/Themes/Details.php:90
#: src/Module/Admin/Themes/Index.php:111 src/Module/Admin/Tos.php:58 #: src/Module/Admin/Themes/Index.php:111 src/Module/Admin/Tos.php:58
#: src/Module/Admin/Users/Active.php:136 src/Module/Admin/Users/Blocked.php:137 #: src/Module/Admin/Users/Active.php:136 src/Module/Admin/Users/Blocked.php:137
@ -6462,30 +6462,30 @@ msgstr ""
msgid "Invalid storage backend setting value." msgid "Invalid storage backend setting value."
msgstr "" msgstr ""
#: src/Module/Admin/Storage.php:90 #: src/Module/Admin/Storage.php:119 src/Module/BaseAdmin.php:91
msgid "Database (legacy)"
msgstr ""
#: src/Module/Admin/Storage.php:127 src/Module/BaseAdmin.php:91
msgid "Storage" msgid "Storage"
msgstr "" msgstr ""
#: src/Module/Admin/Storage.php:129 #: src/Module/Admin/Storage.php:121
msgid "Save & Activate" msgid "Save & Activate"
msgstr "" msgstr ""
#: src/Module/Admin/Storage.php:130 #: src/Module/Admin/Storage.php:122
msgid "Activate" msgid "Activate"
msgstr "" msgstr ""
#: src/Module/Admin/Storage.php:131 #: src/Module/Admin/Storage.php:123
msgid "Save & Reload" msgid "Save & Reload"
msgstr "" msgstr ""
#: src/Module/Admin/Storage.php:132 #: src/Module/Admin/Storage.php:124
msgid "This backend doesn't have custom settings" msgid "This backend doesn't have custom settings"
msgstr "" msgstr ""
#: src/Module/Admin/Storage.php:127
msgid "Database (legacy)"
msgstr ""
#: src/Module/Admin/Summary.php:53 #: src/Module/Admin/Summary.php:53
#, php-format #, php-format
msgid "Template engine (%s) error: %s" msgid "Template engine (%s) error: %s"