bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #10784 from tobiasd/20211001-adminpanel_messages

Browse source 
cleanup adminpanel messages
This commit is contained in:
fabrixxm 2021-10-01 14:20:50 +02:00 committed by GitHub
commit 5bcc6cca75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Module/Admin/Logs/View.php
View file

@ -68,7 +68,7 @@ class View extends BaseAdmin
} }
if (!file_exists($f)) { if (!file_exists($f)) {
$error = DI::l10n()->t('Error trying to open <strong>%1$s</strong> log file.\r\n<br/>Check to see if file %1$s exist and is readable.', $f); $error = DI::l10n()->t('Error trying to open <strong>%1$s</strong> log file.<br/>Check to see if file %1$s exist and is readable.', $f);
} else { } else {
try { try {
$data = DI::parsedLogIterator() $data = DI::parsedLogIterator()
@ -77,7 +77,7 @@ class View extends BaseAdmin
->withFilters($filters) ->withFilters($filters)
->withSearch($search); ->withSearch($search);
} catch (Exception $e) { } catch (Exception $e) {
$error = DI::l10n()->t('Couldn\'t open <strong>%1$s</strong> log file.\r\n<br/>Check to see if file %1$s is readable.', $f); $error = DI::l10n()->t('Couldn\'t open <strong>%1$s</strong> log file.<br/>Check to see if file %1$s is readable.', $f);
} }
} }
return Renderer::replaceMacros($t, [ return Renderer::replaceMacros($t, [

44
view/lang/C/messages.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2021.12-dev\n" "Project-Id-Version: 2021.12-dev\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-09-26 03:57+0000\n" "POT-Creation-Date: 2021-10-01 13:53+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -300,7 +300,7 @@ msgid "%s %s shared a new post"
msgstr "" msgstr ""
#: mod/api.php:30 mod/editpost.php:38 mod/events.php:236 mod/follow.php:56 #: mod/api.php:30 mod/editpost.php:38 mod/events.php:236 mod/follow.php:56
#: mod/follow.php:130 mod/item.php:184 mod/item.php:189 mod/item.php:934 #: mod/follow.php:130 mod/item.php:185 mod/item.php:190 mod/item.php:936
#: mod/message.php:69 mod/message.php:111 mod/notes.php:44 #: mod/message.php:69 mod/message.php:111 mod/notes.php:44
#: mod/ostatus_subscribe.php:32 mod/photos.php:163 mod/photos.php:917 #: mod/ostatus_subscribe.php:32 mod/photos.php:163 mod/photos.php:917
#: mod/repair_ostatus.php:31 mod/settings.php:47 mod/settings.php:57 #: mod/repair_ostatus.php:31 mod/settings.php:47 mod/settings.php:57
@ -765,23 +765,23 @@ msgstr ""
msgid "Unable to locate original post." msgid "Unable to locate original post."
msgstr "" msgstr ""
#: mod/item.php:340 mod/item.php:345 #: mod/item.php:341 mod/item.php:346
msgid "Empty post discarded." msgid "Empty post discarded."
msgstr "" msgstr ""
#: mod/item.php:741 #: mod/item.php:742
msgid "Post updated." msgid "Post updated."
msgstr "" msgstr ""
#: mod/item.php:751 mod/item.php:756 #: mod/item.php:752 mod/item.php:757
msgid "Item wasn't stored." msgid "Item wasn't stored."
msgstr "" msgstr ""
#: mod/item.php:767 #: mod/item.php:768
msgid "Item couldn't be fetched." msgid "Item couldn't be fetched."
msgstr "" msgstr ""
#: mod/item.php:913 src/Module/Admin/Themes/Details.php:39 #: mod/item.php:914 src/Module/Admin/Themes/Details.php:39
#: src/Module/Admin/Themes/Index.php:59 src/Module/Debug/ItemBody.php:41 #: src/Module/Admin/Themes/Index.php:59 src/Module/Debug/ItemBody.php:41
#: src/Module/Debug/ItemBody.php:56 #: src/Module/Debug/ItemBody.php:56
msgid "Item not found." msgid "Item not found."
@ -3331,39 +3331,39 @@ msgstr ""
msgid "last" msgid "last"
msgstr "" msgstr ""
#: src/Content/Text/BBCode.php:985 src/Content/Text/BBCode.php:1773 #: src/Content/Text/BBCode.php:987 src/Content/Text/BBCode.php:1775
#: src/Content/Text/BBCode.php:1774 #: src/Content/Text/BBCode.php:1776
msgid "Image/photo" msgid "Image/photo"
msgstr "" msgstr ""
#: src/Content/Text/BBCode.php:1158 #: src/Content/Text/BBCode.php:1160
#, php-format #, php-format
msgid "" msgid ""
"<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s" "<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s"
msgstr "" msgstr ""
#: src/Content/Text/BBCode.php:1183 src/Model/Item.php:3152 #: src/Content/Text/BBCode.php:1185 src/Model/Item.php:3152
#: src/Model/Item.php:3158 src/Model/Item.php:3159 #: src/Model/Item.php:3158 src/Model/Item.php:3159
msgid "Link to source" msgid "Link to source"
msgstr "" msgstr ""
#: src/Content/Text/BBCode.php:1691 src/Content/Text/HTML.php:943 #: src/Content/Text/BBCode.php:1693 src/Content/Text/HTML.php:943
msgid "Click to open/close" msgid "Click to open/close"
msgstr "" msgstr ""
#: src/Content/Text/BBCode.php:1722 #: src/Content/Text/BBCode.php:1724
msgid "$1 wrote:" msgid "$1 wrote:"
msgstr "" msgstr ""
#: src/Content/Text/BBCode.php:1778 src/Content/Text/BBCode.php:1779 #: src/Content/Text/BBCode.php:1780 src/Content/Text/BBCode.php:1781
msgid "Encrypted content" msgid "Encrypted content"
msgstr "" msgstr ""
#: src/Content/Text/BBCode.php:1995 #: src/Content/Text/BBCode.php:1997
msgid "Invalid source protocol" msgid "Invalid source protocol"
msgstr "" msgstr ""
#: src/Content/Text/BBCode.php:2010 #: src/Content/Text/BBCode.php:2012
msgid "Invalid link protocol" msgid "Invalid link protocol"
msgstr "" msgstr ""
@ -4276,7 +4276,7 @@ msgstr ""
msgid "%s: Database update" msgid "%s: Database update"
msgstr "" msgstr ""
#: src/Database/DBStructure.php:853 #: src/Database/DBStructure.php:803
#, php-format #, php-format
msgid "%s: updating %s table." msgid "%s: updating %s table."
msgstr "" msgstr ""
@ -4587,7 +4587,7 @@ msgstr ""
msgid "View on separate page" msgid "View on separate page"
msgstr "" msgstr ""
#: src/Model/Mail.php:136 src/Model/Mail.php:268 #: src/Model/Mail.php:134 src/Model/Mail.php:266
msgid "[no subject]" msgid "[no subject]"
msgstr "" msgstr ""
@ -5544,15 +5544,15 @@ msgstr ""
#: src/Module/Admin/Logs/View.php:71 #: src/Module/Admin/Logs/View.php:71
#, php-format #, php-format
msgid "" msgid ""
"Error trying to open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see " "Error trying to open <strong>%1$s</strong> log file.<br/>Check to see if "
"if file %1$s exist and is readable." "file %1$s exist and is readable."
msgstr "" msgstr ""
#: src/Module/Admin/Logs/View.php:80 #: src/Module/Admin/Logs/View.php:80
#, php-format #, php-format
msgid "" msgid ""
"Couldn't open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see if file " "Couldn't open <strong>%1$s</strong> log file.<br/>Check to see if file %1$s "
"%1$s is readable." "is readable."
msgstr "" msgstr ""
#: src/Module/Admin/Logs/View.php:85 src/Module/BaseAdmin.php:110 #: src/Module/Admin/Logs/View.php:85 src/Module/BaseAdmin.php:110

2
view/templates/admin/site.tpl
View file

@ -152,7 +152,7 @@
<form action="{{$baseurl}}/admin/site" method="post"> <form action="{{$baseurl}}/admin/site" method="post">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
<h2>{{$relocate}}</h2> <h2>{{$relocate}}</h2>
<p>{{$relocate_warning}}</p> <p>{{$relocate_warning nofilter}}</p>
{{include file="field_input.tpl" field=$relocate_url}} {{include file="field_input.tpl" field=$relocate_url}}
<input type="hidden" name="page_site" value="{{$submit}}"> <input type="hidden" name="page_site" value="{{$submit}}">
<div class="submit"><input type="submit" name="relocate" value="{{$relocate_button}}"/></div> <div class="submit"><input type="submit" name="relocate" value="{{$relocate_button}}"/></div>

2
view/theme/frio/templates/admin/site.tpl
View file

@ -339,7 +339,7 @@
<div id="admin-settings-relocate-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-relocate"> <div id="admin-settings-relocate-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-relocate">
<div class="panel-body"> <div class="panel-body">
<div class="alert alert-danger alert-dismissible"> <div class="alert alert-danger alert-dismissible">
{{$relocate_warning}} {{$relocate_warning nofilter}}
</div> </div>
{{include file="field_input.tpl" field=$relocate_url}} {{include file="field_input.tpl" field=$relocate_url}}
</div> </div>