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

Merge pull request #12418 from MarekBenjamin/upload_image_size_desc_fix 

Show PHP's upload_max_filesize value with binary prefix on admin site
This commit is contained in:
Hypolite Petovan 2022-12-14 17:26:57 -05:00 committed by GitHub
parent 0e543b2d4a 3576855e71
commit c76795f0f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 77 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Module/Admin/Site.php
View File

@ -475,7 +475,7 @@ class Site extends BaseAdmin
'$maximagesize' => ['maximagesize', DI::l10n()->t('Maximum image size'), DI::config()->get('system', 'maximagesize'), DI::l10n()->t('Maximum size in bytes of uploaded images. Default is 0, which means no limits. You can put k, m, or g behind the desired value for KiB, MiB, GiB, respectively. '$maximagesize' => ['maximagesize', DI::l10n()->t('Maximum image size'), DI::config()->get('system', 'maximagesize'), DI::l10n()->t('Maximum size in bytes of uploaded images. Default is 0, which means no limits. You can put k, m, or g behind the desired value for KiB, MiB, GiB, respectively.
The value of <code>upload_max_filesize</code> in your <code>PHP.ini</code> needs be set to at least the desired limit. The value of <code>upload_max_filesize</code> in your <code>PHP.ini</code> needs be set to at least the desired limit.
Currently <code>upload_max_filesize</code> is set to %s (%sB)', Strings::getBytesFromShorthand(ini_get('upload_max_filesize')), ini_get('upload_max_filesize')), Currently <code>upload_max_filesize</code> is set to %s (%s byte)', Strings::formatBytes(Strings::getBytesFromShorthand(ini_get('upload_max_filesize'))), Strings::getBytesFromShorthand(ini_get('upload_max_filesize'))),
'', 'pattern="\d+(?:\s*[kmg])?"'], '', 'pattern="\d+(?:\s*[kmg])?"'],
'$maximagelength' => ['maximagelength', DI::l10n()->t('Maximum image length'), DI::config()->get('system', 'max_image_length'), DI::l10n()->t('Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.')], '$maximagelength' => ['maximagelength', DI::l10n()->t('Maximum image length'), DI::config()->get('system', 'max_image_length'), DI::l10n()->t('Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.')],
'$jpegimagequality' => ['jpegimagequality', DI::l10n()->t('JPEG image quality'), DI::config()->get('system', 'jpeg_quality'), DI::l10n()->t('Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.')], '$jpegimagequality' => ['jpegimagequality', DI::l10n()->t('JPEG image quality'), DI::config()->get('system', 'jpeg_quality'), DI::l10n()->t('Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.')],

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

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2022.12-rc\n" "Project-Id-Version: 2022.12-rc\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-07 07:12+0000\n" "POT-Creation-Date: 2022-12-14 23:18+0100\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"
@ -1516,7 +1516,7 @@ msgstr ""
msgid "show more" msgid "show more"
msgstr "" msgstr ""
#: src/Content/Item.php:294 src/Model/Item.php:2914 #: src/Content/Item.php:294 src/Model/Item.php:2925
msgid "event" msgid "event"
msgstr "" msgstr ""
@ -1525,7 +1525,7 @@ msgstr ""
msgid "status" msgid "status"
msgstr "" msgstr ""
#: src/Content/Item.php:303 src/Model/Item.php:2916 #: src/Content/Item.php:303 src/Model/Item.php:2927
#: src/Module/Post/Tag/Add.php:123 #: src/Module/Post/Tag/Add.php:123
msgid "photo" msgid "photo"
msgstr "" msgstr ""
@ -1539,31 +1539,31 @@ msgstr ""
msgid "Follow Thread" msgid "Follow Thread"
msgstr "" msgstr ""
#: src/Content/Item.php:387 src/Model/Contact.php:1209 #: src/Content/Item.php:387 src/Model/Contact.php:1213
msgid "View Status" msgid "View Status"
msgstr "" msgstr ""
#: src/Content/Item.php:388 src/Content/Item.php:406 src/Model/Contact.php:1147 #: src/Content/Item.php:388 src/Content/Item.php:406 src/Model/Contact.php:1151
#: src/Model/Contact.php:1201 src/Model/Contact.php:1210 #: src/Model/Contact.php:1205 src/Model/Contact.php:1214
#: src/Module/Directory.php:157 src/Module/Settings/Profile/Index.php:234 #: src/Module/Directory.php:157 src/Module/Settings/Profile/Index.php:234
msgid "View Profile" msgid "View Profile"
msgstr "" msgstr ""
#: src/Content/Item.php:389 src/Model/Contact.php:1211 #: src/Content/Item.php:389 src/Model/Contact.php:1215
msgid "View Photos" msgid "View Photos"
msgstr "" msgstr ""
#: src/Content/Item.php:390 src/Model/Contact.php:1202 #: src/Content/Item.php:390 src/Model/Contact.php:1206
#: src/Model/Contact.php:1212 #: src/Model/Contact.php:1216
msgid "Network Posts" msgid "Network Posts"
msgstr "" msgstr ""
#: src/Content/Item.php:391 src/Model/Contact.php:1203 #: src/Content/Item.php:391 src/Model/Contact.php:1207
#: src/Model/Contact.php:1213 #: src/Model/Contact.php:1217
msgid "View Contact" msgid "View Contact"
msgstr "" msgstr ""
#: src/Content/Item.php:392 src/Model/Contact.php:1214 #: src/Content/Item.php:392 src/Model/Contact.php:1218
msgid "Send PM" msgid "Send PM"
msgstr "" msgstr ""
@ -1588,7 +1588,7 @@ msgid "Languages"
msgstr "" msgstr ""
#: src/Content/Item.php:403 src/Content/Widget.php:80 #: src/Content/Item.php:403 src/Content/Widget.php:80
#: src/Model/Contact.php:1204 src/Model/Contact.php:1215 #: src/Model/Contact.php:1208 src/Model/Contact.php:1219
#: src/Module/Contact/Follow.php:167 view/theme/vier/theme.php:196 #: src/Module/Contact/Follow.php:167 view/theme/vier/theme.php:196
msgid "Connect/Follow" msgid "Connect/Follow"
msgstr "" msgstr ""
@ -1920,8 +1920,8 @@ 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:1257 src/Model/Item.php:3539 #: src/Content/Text/BBCode.php:1257 src/Model/Item.php:3688
#: src/Model/Item.php:3545 src/Model/Item.php:3546 #: src/Model/Item.php:3694 src/Model/Item.php:3695
msgid "Link to source" msgid "Link to source"
msgstr "" msgstr ""
@ -2081,7 +2081,7 @@ msgstr ""
msgid "Organisations" msgid "Organisations"
msgstr "" msgstr ""
#: src/Content/Widget.php:523 src/Model/Contact.php:1641 #: src/Content/Widget.php:523 src/Model/Contact.php:1655
msgid "News" msgid "News"
msgstr "" msgstr ""
@ -2162,8 +2162,8 @@ msgstr ""
msgid "Network:" msgid "Network:"
msgstr "" msgstr ""
#: src/Content/Widget/VCard.php:111 src/Model/Contact.php:1205 #: src/Content/Widget/VCard.php:111 src/Model/Contact.php:1209
#: src/Model/Contact.php:1216 src/Model/Profile.php:465 #: src/Model/Contact.php:1220 src/Model/Profile.php:465
#: src/Module/Contact/Profile.php:419 #: src/Module/Contact/Profile.php:419
msgid "Unfollow" msgid "Unfollow"
msgstr "" msgstr ""
@ -2860,77 +2860,77 @@ msgstr ""
msgid "Legacy module file not found: %s" msgid "Legacy module file not found: %s"
msgstr "" msgstr ""
#: src/Model/Contact.php:1222 src/Module/Moderation/Users/Pending.php:102 #: src/Model/Contact.php:1226 src/Module/Moderation/Users/Pending.php:102
#: src/Module/Notifications/Introductions.php:132 #: src/Module/Notifications/Introductions.php:132
#: src/Module/Notifications/Introductions.php:204 #: src/Module/Notifications/Introductions.php:204
msgid "Approve" msgid "Approve"
msgstr "" msgstr ""
#: src/Model/Contact.php:1637 #: src/Model/Contact.php:1651
msgid "Organisation" msgid "Organisation"
msgstr "" msgstr ""
#: src/Model/Contact.php:1645 #: src/Model/Contact.php:1659
msgid "Forum" msgid "Forum"
msgstr "" msgstr ""
#: src/Model/Contact.php:2849 #: src/Model/Contact.php:2884
msgid "Disallowed profile URL." msgid "Disallowed profile URL."
msgstr "" msgstr ""
#: src/Model/Contact.php:2854 src/Module/Friendica.php:82 #: src/Model/Contact.php:2889 src/Module/Friendica.php:82
msgid "Blocked domain" msgid "Blocked domain"
msgstr "" msgstr ""
#: src/Model/Contact.php:2859 #: src/Model/Contact.php:2894
msgid "Connect URL missing." msgid "Connect URL missing."
msgstr "" msgstr ""
#: src/Model/Contact.php:2868 #: src/Model/Contact.php:2903
msgid "" msgid ""
"The contact could not be added. Please check the relevant network " "The contact could not be added. Please check the relevant network "
"credentials in your Settings -> Social Networks page." "credentials in your Settings -> Social Networks page."
msgstr "" msgstr ""
#: src/Model/Contact.php:2910 #: src/Model/Contact.php:2945
msgid "The profile address specified does not provide adequate information." msgid "The profile address specified does not provide adequate information."
msgstr "" msgstr ""
#: src/Model/Contact.php:2912 #: src/Model/Contact.php:2947
msgid "No compatible communication protocols or feeds were discovered." msgid "No compatible communication protocols or feeds were discovered."
msgstr "" msgstr ""
#: src/Model/Contact.php:2915 #: src/Model/Contact.php:2950
msgid "An author or name was not found." msgid "An author or name was not found."
msgstr "" msgstr ""
#: src/Model/Contact.php:2918 #: src/Model/Contact.php:2953
msgid "No browser URL could be matched to this address." msgid "No browser URL could be matched to this address."
msgstr "" msgstr ""
#: src/Model/Contact.php:2921 #: src/Model/Contact.php:2956
msgid "" msgid ""
"Unable to match @-style Identity Address with a known protocol or email " "Unable to match @-style Identity Address with a known protocol or email "
"contact." "contact."
msgstr "" msgstr ""
#: src/Model/Contact.php:2922 #: src/Model/Contact.php:2957
msgid "Use mailto: in front of address to force email check." msgid "Use mailto: in front of address to force email check."
msgstr "" msgstr ""
#: src/Model/Contact.php:2928 #: src/Model/Contact.php:2963
msgid "" msgid ""
"The profile address specified belongs to a network which has been disabled " "The profile address specified belongs to a network which has been disabled "
"on this site." "on this site."
msgstr "" msgstr ""
#: src/Model/Contact.php:2933 #: src/Model/Contact.php:2968
msgid "" msgid ""
"Limited profile. This person will be unable to receive direct/personal " "Limited profile. This person will be unable to receive direct/personal "
"notifications from you." "notifications from you."
msgstr "" msgstr ""
#: src/Model/Contact.php:2992 #: src/Model/Contact.php:3027
msgid "Unable to retrieve contact information." msgid "Unable to retrieve contact information."
msgstr "" msgstr ""
@ -2957,21 +2957,22 @@ msgid "Sept"
msgstr "" msgstr ""
#: src/Model/Event.php:462 src/Module/Calendar/Show.php:126 #: src/Model/Event.php:462 src/Module/Calendar/Show.php:126
#: src/Util/Temporal.php:339
msgid "today" msgid "today"
msgstr "" msgstr ""
#: src/Model/Event.php:463 src/Module/Calendar/Show.php:127 #: src/Model/Event.php:463 src/Module/Calendar/Show.php:127
#: src/Util/Temporal.php:341 #: src/Util/Temporal.php:349
msgid "month" msgid "month"
msgstr "" msgstr ""
#: src/Model/Event.php:464 src/Module/Calendar/Show.php:128 #: src/Model/Event.php:464 src/Module/Calendar/Show.php:128
#: src/Util/Temporal.php:342 #: src/Util/Temporal.php:350
msgid "week" msgid "week"
msgstr "" msgstr ""
#: src/Model/Event.php:465 src/Module/Calendar/Show.php:129 #: src/Model/Event.php:465 src/Module/Calendar/Show.php:129
#: src/Util/Temporal.php:343 #: src/Util/Temporal.php:351
msgid "day" msgid "day"
msgstr "" msgstr ""
@ -3083,69 +3084,69 @@ msgstr ""
msgid "Detected languages in this post:\\n%s" msgid "Detected languages in this post:\\n%s"
msgstr "" msgstr ""
#: src/Model/Item.php:2918 #: src/Model/Item.php:2929
msgid "activity" msgid "activity"
msgstr "" msgstr ""
#: src/Model/Item.php:2920 #: src/Model/Item.php:2931
msgid "comment" msgid "comment"
msgstr "" msgstr ""
#: src/Model/Item.php:2923 #: src/Model/Item.php:2934
msgid "post" msgid "post"
msgstr "" msgstr ""
#: src/Model/Item.php:3064 #: src/Model/Item.php:3077
#, php-format #, php-format
msgid "Content warning: %s" msgid "Content warning: %s"
msgstr "" msgstr ""
#: src/Model/Item.php:3451 #: src/Model/Item.php:3600
msgid "bytes" msgid "bytes"
msgstr "" msgstr ""
#: src/Model/Item.php:3482 #: src/Model/Item.php:3631
#, php-format #, php-format
msgid "%2$s (%3$d%%, %1$d vote)" msgid "%2$s (%3$d%%, %1$d vote)"
msgid_plural "%2$s (%3$d%%, %1$d votes)" msgid_plural "%2$s (%3$d%%, %1$d votes)"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3484 #: src/Model/Item.php:3633
#, php-format #, php-format
msgid "%2$s (%1$d vote)" msgid "%2$s (%1$d vote)"
msgid_plural "%2$s (%1$d votes)" msgid_plural "%2$s (%1$d votes)"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3489 #: src/Model/Item.php:3638
#, php-format #, php-format
msgid "%d voter. Poll end: %s" msgid "%d voter. Poll end: %s"
msgid_plural "%d voters. Poll end: %s" msgid_plural "%d voters. Poll end: %s"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3491 #: src/Model/Item.php:3640
#, php-format #, php-format
msgid "%d voter." msgid "%d voter."
msgid_plural "%d voters." msgid_plural "%d voters."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3493 #: src/Model/Item.php:3642
#, php-format #, php-format
msgid "Poll end: %s" msgid "Poll end: %s"
msgstr "" msgstr ""
#: src/Model/Item.php:3527 src/Model/Item.php:3528 #: src/Model/Item.php:3676 src/Model/Item.php:3677
msgid "View on separate page" msgid "View on separate page"
msgstr "" msgstr ""
#: src/Model/Mail.php:137 src/Model/Mail.php:265 #: src/Model/Mail.php:136 src/Model/Mail.php:264
msgid "[no subject]" msgid "[no subject]"
msgstr "" msgstr ""
#: src/Model/Photo.php:1152 src/Module/Media/Photo/Upload.php:198 #: src/Model/Photo.php:1178 src/Module/Media/Photo/Upload.php:198
msgid "Wall Photos" msgid "Wall Photos"
msgstr "" msgstr ""
@ -4261,7 +4262,7 @@ msgid ""
"\t\t\t\t\t\t\t\t\t\t\t\t\tThe value of <code>upload_max_filesize</code> in " "\t\t\t\t\t\t\t\t\t\t\t\t\tThe value of <code>upload_max_filesize</code> in "
"your <code>PHP.ini</code> needs be set to at least the desired limit.\n" "your <code>PHP.ini</code> needs be set to at least the desired limit.\n"
"\t\t\t\t\t\t\t\t\t\t\t\t\tCurrently <code>upload_max_filesize</code> is set " "\t\t\t\t\t\t\t\t\t\t\t\t\tCurrently <code>upload_max_filesize</code> is set "
"to %s (%sB)" "to %s (%s byte)"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:480 #: src/Module/Admin/Site.php:480
@ -5328,26 +5329,26 @@ msgstr ""
msgid "User registrations waiting for confirmation" msgid "User registrations waiting for confirmation"
msgstr "" msgstr ""
#: src/Module/BaseApi.php:242 src/Module/BaseApi.php:258 #: src/Module/BaseApi.php:254 src/Module/BaseApi.php:270
#: src/Module/BaseApi.php:274 #: src/Module/BaseApi.php:286
msgid "Too Many Requests" msgid "Too Many Requests"
msgstr "" msgstr ""
#: src/Module/BaseApi.php:243 #: src/Module/BaseApi.php:255
#, php-format #, php-format
msgid "Daily posting limit of %d post reached. The post was rejected." msgid "Daily posting limit of %d post reached. The post was rejected."
msgid_plural "Daily posting limit of %d posts reached. The post was rejected." msgid_plural "Daily posting limit of %d posts reached. The post was rejected."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Module/BaseApi.php:259 #: src/Module/BaseApi.php:271
#, php-format #, php-format
msgid "Weekly posting limit of %d post reached. The post was rejected." msgid "Weekly posting limit of %d post reached. The post was rejected."
msgid_plural "Weekly posting limit of %d posts reached. The post was rejected." msgid_plural "Weekly posting limit of %d posts reached. The post was rejected."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Module/BaseApi.php:275 #: src/Module/BaseApi.php:287
#, php-format #, php-format
msgid "Monthly posting limit of %d post reached. The post was rejected." msgid "Monthly posting limit of %d post reached. The post was rejected."
msgid_plural "" msgid_plural ""
@ -7962,11 +7963,11 @@ msgstr ""
msgid "Show unread" msgid "Show unread"
msgstr "" msgstr ""
#: src/Module/Notifications/Ping.php:240 #: src/Module/Notifications/Ping.php:245
msgid "{0} requested registration" msgid "{0} requested registration"
msgstr "" msgstr ""
#: src/Module/Notifications/Ping.php:249 #: src/Module/Notifications/Ping.php:254
#, php-format #, php-format
msgid "{0} and %d others requested registration" msgid "{0} and %d others requested registration"
msgstr "" msgstr ""
@ -10547,11 +10548,11 @@ msgid ""
"features and resources." "features and resources."
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/FormattedNavNotification.php:151 #: src/Navigation/Notifications/Factory/FormattedNavNotification.php:161
msgid "{0} wants to follow you" msgid "{0} wants to follow you"
msgstr "" msgstr ""
#: src/Navigation/Notifications/Factory/FormattedNavNotification.php:153 #: src/Navigation/Notifications/Factory/FormattedNavNotification.php:163
msgid "{0} has started following you" msgid "{0} has started following you"
msgstr "" msgstr ""
@ -11288,64 +11289,64 @@ msgstr ""
msgid "Time zone: <strong>%s</strong> <a href=\"%s\">Change in Settings</a>" msgid "Time zone: <strong>%s</strong> <a href=\"%s\">Change in Settings</a>"
msgstr "" msgstr ""
#: src/Util/Temporal.php:317 src/Util/Temporal.php:324 #: src/Util/Temporal.php:318 src/Util/Temporal.php:325
msgid "never" msgid "never"
msgstr "" msgstr ""
#: src/Util/Temporal.php:331 #: src/Util/Temporal.php:339
msgid "less than a second ago" msgid "less than a second ago"
msgstr "" msgstr ""
#: src/Util/Temporal.php:340 #: src/Util/Temporal.php:348
msgid "year" msgid "year"
msgstr "" msgstr ""
#: src/Util/Temporal.php:340 #: src/Util/Temporal.php:348
msgid "years" msgid "years"
msgstr "" msgstr ""
#: src/Util/Temporal.php:341 #: src/Util/Temporal.php:349
msgid "months" msgid "months"
msgstr "" msgstr ""
#: src/Util/Temporal.php:342 #: src/Util/Temporal.php:350
msgid "weeks" msgid "weeks"
msgstr "" msgstr ""
#: src/Util/Temporal.php:343 #: src/Util/Temporal.php:351
msgid "days" msgid "days"
msgstr "" msgstr ""
#: src/Util/Temporal.php:344 #: src/Util/Temporal.php:352
msgid "hour" msgid "hour"
msgstr "" msgstr ""
#: src/Util/Temporal.php:344 #: src/Util/Temporal.php:352
msgid "hours" msgid "hours"
msgstr "" msgstr ""
#: src/Util/Temporal.php:345 #: src/Util/Temporal.php:353
msgid "minute" msgid "minute"
msgstr "" msgstr ""
#: src/Util/Temporal.php:345 #: src/Util/Temporal.php:353
msgid "minutes" msgid "minutes"
msgstr "" msgstr ""
#: src/Util/Temporal.php:346 #: src/Util/Temporal.php:354
msgid "second" msgid "second"
msgstr "" msgstr ""
#: src/Util/Temporal.php:346 #: src/Util/Temporal.php:354
msgid "seconds" msgid "seconds"
msgstr "" msgstr ""
#: src/Util/Temporal.php:356 #: src/Util/Temporal.php:364
#, php-format #, php-format
msgid "in %1$d %2$s" msgid "in %1$d %2$s"
msgstr "" msgstr ""
#: src/Util/Temporal.php:359 #: src/Util/Temporal.php:367
#, php-format #, php-format
msgid "%1$d %2$s ago" msgid "%1$d %2$s ago"
msgstr "" msgstr ""