From cc62ee50730023adf1028a77aa4b3ea671eaac18 Mon Sep 17 00:00:00 2001 From: brian teeman Date: Sun, 2 Apr 2023 11:29:56 +0100 Subject: [PATCH 1/3] [5.0] Remove deprecated strings This PR removes language strings marked for deprecation in 5.0 --- administrator/language/en-GB/com_media.ini | 4 ---- administrator/language/en-GB/com_users.ini | 8 -------- administrator/language/en-GB/joomla.ini | 6 ------ api/language/en-GB/joomla.ini | 6 ------ language/en-GB/com_media.ini | 4 ---- 5 files changed, 28 deletions(-) diff --git a/administrator/language/en-GB/com_media.ini b/administrator/language/en-GB/com_media.ini index 61ae6cb410017..915cca96a746d 100644 --- a/administrator/language/en-GB/com_media.ini +++ b/administrator/language/en-GB/com_media.ini @@ -43,10 +43,6 @@ COM_MEDIA_FIELD_CHECK_MIME_DESC="Use MIME Magic or Fileinfo to attempt to verify COM_MEDIA_FIELD_CHECK_MIME_LABEL="Check MIME Types" COM_MEDIA_FIELD_IGNORED_EXTENSIONS_DESC="Ignored file extensions for MIME type checking and restricted uploads." COM_MEDIA_FIELD_IGNORED_EXTENSIONS_LABEL="Ignored Extensions" -; Deprecated, will be removed with 5.0 -COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_DESC="A comma separated list of forbidden MIME types to upload." -; Deprecated, will be removed with 5.0 -COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_LABEL="Forbidden MIME Types" COM_MEDIA_FIELD_LEGAL_AUDIO_EXTENSIONS_DESC="Audio extensions (file types) you are allowed to upload (comma separated). These are used to check for valid audio headers." COM_MEDIA_FIELD_LEGAL_AUDIO_EXTENSIONS_LABEL="Legal Audio Extensions (File Types)" COM_MEDIA_FIELD_LEGAL_DOCUMENT_EXTENSIONS_DESC="Document extensions (file types) you are allowed to upload (comma separated). These are used to check for valid document headers." diff --git a/administrator/language/en-GB/com_users.ini b/administrator/language/en-GB/com_users.ini index 4d866542ef1e2..579ad4bd67411 100644 --- a/administrator/language/en-GB/com_users.ini +++ b/administrator/language/en-GB/com_users.ini @@ -219,14 +219,6 @@ COM_USERS_MAIL_MASSMAIL_MAIL_TITLE="Users: Mass Mail Users" COM_USERS_MAIL_NO_USERS_COULD_BE_FOUND_IN_THIS_GROUP="No users could be found in this group." COM_USERS_MAIL_ONLY_YOU_COULD_BE_FOUND_IN_THIS_GROUP="You are the only user in this group." COM_USERS_MAIL_PASSWORD_RESET_DESC="Sent to a user by the "Forgot your password?" link eg in a login form." -COM_USERS_MAIL_PASSWORD_RESET_TITLE="Users: Password Reset" -; Deprecated, will be removed with 5.0 -COM_USERS_MAIL_PLEASE_FILL_IN_THE_FORM_CORRECTLY="Please fill in the form correctly." -; Deprecated, will be removed with 5.0 -COM_USERS_MAIL_PLEASE_FILL_IN_THE_MESSAGE="Please enter a message" -; Deprecated, will be removed with 5.0 -COM_USERS_MAIL_PLEASE_FILL_IN_THE_SUBJECT="Please enter a subject" -; Deprecated, will be removed with 5.0 COM_USERS_MAIL_PLEASE_SELECT_A_GROUP="Please select a Group" COM_USERS_MAIL_REGISTRATION_ADMIN_NEW_NOTIFICATION_DESC="Notification to the admin that a new, activated account has been created." COM_USERS_MAIL_REGISTRATION_ADMIN_NEW_NOTIFICATION_TITLE="Users: New account notification to admin" diff --git a/administrator/language/en-GB/joomla.ini b/administrator/language/en-GB/joomla.ini index 80c80f351d5e9..83121b6d4cf5a 100644 --- a/administrator/language/en-GB/joomla.ini +++ b/administrator/language/en-GB/joomla.ini @@ -203,14 +203,8 @@ JFIELD_ALIAS_LABEL="Alias" JFIELD_ALIAS_PLACEHOLDER="Auto-generate from title" JFIELD_ALT_COMPONENT_LAYOUT_DESC="Use a layout from the supplied component view or overrides in the templates." JFIELD_ALT_LAYOUT_LABEL="Layout" -; Deprecated, will be removed with 5.0 -JFIELD_ALT_MODULE_LAYOUT_DESC="Use a layout from the supplied module or overrides in the templates." JFIELD_ALT_PAGE_TITLE_DESC="An optional alternative page title to set that will change the TITLE tag in the HTML output." JFIELD_ALT_PAGE_TITLE_LABEL="Alternative Page Title" -; Deprecated, will be removed with 5.0 -JFIELD_ASSET_ID_DESC="Asset ID" -; Deprecated, will be removed with 5.0 -JFIELD_ASSET_ID_LABEL="Asset ID" JFIELD_BASIC_LOGIN_DESCRIPTION_LABEL="Login Description Text" JFIELD_BASIC_LOGIN_DESCRIPTION_SHOW_LABEL="Login Description" JFIELD_BASIC_LOGOUT_DESCRIPTION_LABEL="Logout Description Text" diff --git a/api/language/en-GB/joomla.ini b/api/language/en-GB/joomla.ini index 8486a3cc6de75..be675aa3131ee 100644 --- a/api/language/en-GB/joomla.ini +++ b/api/language/en-GB/joomla.ini @@ -201,14 +201,8 @@ JFIELD_ALIAS_LABEL="Alias" JFIELD_ALIAS_PLACEHOLDER="Auto-generate from title" JFIELD_ALT_COMPONENT_LAYOUT_DESC="Use a layout from the supplied component view or overrides in the templates." JFIELD_ALT_LAYOUT_LABEL="Layout" -; Deprecated, will be removed with 5.0 -JFIELD_ALT_MODULE_LAYOUT_DESC="Use a layout from the supplied module or overrides in the templates." JFIELD_ALT_PAGE_TITLE_DESC="An optional alternative page title to set that will change the TITLE tag in the HTML output." JFIELD_ALT_PAGE_TITLE_LABEL="Alternative Page Title" -; Deprecated, will be removed with 5.0 -JFIELD_ASSET_ID_DESC="Asset ID" -; Deprecated, will be removed with 5.0 -JFIELD_ASSET_ID_LABEL="Asset ID" JFIELD_BASIC_LOGIN_DESCRIPTION_LABEL="Login Description Text" JFIELD_BASIC_LOGIN_DESCRIPTION_SHOW_LABEL="Login Description" JFIELD_BASIC_LOGOUT_DESCRIPTION_LABEL="Logout Description Text" diff --git a/language/en-GB/com_media.ini b/language/en-GB/com_media.ini index 37e1947201b98..3ec34a0f5c8c4 100644 --- a/language/en-GB/com_media.ini +++ b/language/en-GB/com_media.ini @@ -53,10 +53,6 @@ COM_MEDIA_FIELD_CHECK_MIME_DESC="Use MIME Magic or Fileinfo to try to verify fil COM_MEDIA_FIELD_CHECK_MIME_LABEL="Check MIME Types" COM_MEDIA_FIELD_IGNORED_EXTENSIONS_DESC="Ignored file extensions for MIME type checking and restricted uploads." COM_MEDIA_FIELD_IGNORED_EXTENSIONS_LABEL="Ignored Extensions" -; Deprecated, will be removed with 5.0 -COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_DESC="A comma separated list of forbidden MIME types to upload." -; Deprecated, will be removed with 5.0 -COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_LABEL="Forbidden MIME Types" COM_MEDIA_FIELD_LEGAL_EXTENSIONS_DESC="Extensions (file types) you are allowed to upload (comma separated)." COM_MEDIA_FIELD_LEGAL_EXTENSIONS_LABEL="Legal Extensions (File Types)" COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_DESC="Image extensions (file types) you are allowed to upload (comma separated). These are used to check for valid image headers." From 3b0a74041330f3b29e7cba8856d189084868291b Mon Sep 17 00:00:00 2001 From: brian teeman Date: Sun, 2 Apr 2023 11:34:01 +0100 Subject: [PATCH 2/3] Revert "Auxiliary commit to revert individual files from cc62ee50730023adf1028a77aa4b3ea671eaac18" This reverts commit 6d76cdfb4cbf54b06a18fab7b17aa8a27098e0e8. --- administrator/language/en-GB/com_users.ini | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/administrator/language/en-GB/com_users.ini b/administrator/language/en-GB/com_users.ini index 579ad4bd67411..4d866542ef1e2 100644 --- a/administrator/language/en-GB/com_users.ini +++ b/administrator/language/en-GB/com_users.ini @@ -219,6 +219,14 @@ COM_USERS_MAIL_MASSMAIL_MAIL_TITLE="Users: Mass Mail Users" COM_USERS_MAIL_NO_USERS_COULD_BE_FOUND_IN_THIS_GROUP="No users could be found in this group." COM_USERS_MAIL_ONLY_YOU_COULD_BE_FOUND_IN_THIS_GROUP="You are the only user in this group." COM_USERS_MAIL_PASSWORD_RESET_DESC="Sent to a user by the "Forgot your password?" link eg in a login form." +COM_USERS_MAIL_PASSWORD_RESET_TITLE="Users: Password Reset" +; Deprecated, will be removed with 5.0 +COM_USERS_MAIL_PLEASE_FILL_IN_THE_FORM_CORRECTLY="Please fill in the form correctly." +; Deprecated, will be removed with 5.0 +COM_USERS_MAIL_PLEASE_FILL_IN_THE_MESSAGE="Please enter a message" +; Deprecated, will be removed with 5.0 +COM_USERS_MAIL_PLEASE_FILL_IN_THE_SUBJECT="Please enter a subject" +; Deprecated, will be removed with 5.0 COM_USERS_MAIL_PLEASE_SELECT_A_GROUP="Please select a Group" COM_USERS_MAIL_REGISTRATION_ADMIN_NEW_NOTIFICATION_DESC="Notification to the admin that a new, activated account has been created." COM_USERS_MAIL_REGISTRATION_ADMIN_NEW_NOTIFICATION_TITLE="Users: New account notification to admin" From 996c30677ebedc73aca4450a2b2bcf9078e03591 Mon Sep 17 00:00:00 2001 From: brian teeman Date: Sun, 2 Apr 2023 15:47:11 +0100 Subject: [PATCH 3/3] om users --- administrator/language/en-GB/com_users.ini | 8 -------- 1 file changed, 8 deletions(-) diff --git a/administrator/language/en-GB/com_users.ini b/administrator/language/en-GB/com_users.ini index 4d866542ef1e2..4bc6645c66946 100644 --- a/administrator/language/en-GB/com_users.ini +++ b/administrator/language/en-GB/com_users.ini @@ -219,15 +219,7 @@ COM_USERS_MAIL_MASSMAIL_MAIL_TITLE="Users: Mass Mail Users" COM_USERS_MAIL_NO_USERS_COULD_BE_FOUND_IN_THIS_GROUP="No users could be found in this group." COM_USERS_MAIL_ONLY_YOU_COULD_BE_FOUND_IN_THIS_GROUP="You are the only user in this group." COM_USERS_MAIL_PASSWORD_RESET_DESC="Sent to a user by the "Forgot your password?" link eg in a login form." -COM_USERS_MAIL_PASSWORD_RESET_TITLE="Users: Password Reset" -; Deprecated, will be removed with 5.0 COM_USERS_MAIL_PLEASE_FILL_IN_THE_FORM_CORRECTLY="Please fill in the form correctly." -; Deprecated, will be removed with 5.0 -COM_USERS_MAIL_PLEASE_FILL_IN_THE_MESSAGE="Please enter a message" -; Deprecated, will be removed with 5.0 -COM_USERS_MAIL_PLEASE_FILL_IN_THE_SUBJECT="Please enter a subject" -; Deprecated, will be removed with 5.0 -COM_USERS_MAIL_PLEASE_SELECT_A_GROUP="Please select a Group" COM_USERS_MAIL_REGISTRATION_ADMIN_NEW_NOTIFICATION_DESC="Notification to the admin that a new, activated account has been created." COM_USERS_MAIL_REGISTRATION_ADMIN_NEW_NOTIFICATION_TITLE="Users: New account notification to admin" COM_USERS_MAIL_REGISTRATION_ADMIN_VERIFICATION_REQUEST_DESC="Notification to admins to verify a new, verified account."