Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5] Action Log: Block/Unblock user #41377 - alpha sorting #2966

Closed
jgerman-bot opened this issue Sep 6, 2023 · 0 comments · Fixed by #2964
Closed

[5] Action Log: Block/Unblock user #41377 - alpha sorting #2966

jgerman-bot opened this issue Sep 6, 2023 · 0 comments · Fixed by #2964

Comments

@jgerman-bot
Copy link

New language relevant PR in upstream repo: joomla/joomla-cms#41602 Here are the upstream changes:

Click to expand the diff!
diff --git a/administrator/language/en-GB/plg_actionlog_joomla.ini b/administrator/language/en-GB/plg_actionlog_joomla.ini
index c539bb7c22cf..17005e021b34 100644
--- a/administrator/language/en-GB/plg_actionlog_joomla.ini
+++ b/administrator/language/en-GB/plg_actionlog_joomla.ini
@@ -39,6 +39,7 @@ PLG_ACTIONLOG_JOOMLA_TYPE_TEMPLATE="template"
 PLG_ACTIONLOG_JOOMLA_TYPE_USER="user"
 PLG_ACTIONLOG_JOOMLA_TYPE_USER_GROUP="user group"
 PLG_ACTIONLOG_JOOMLA_TYPE_USER_NOTE="user note"
+PLG_ACTIONLOG_JOOMLA_USER_BLOCK="User <a href='{accountlink}'>{username}</a> blocked user <a href='{itemlink}'>{title}</a>"
 PLG_ACTIONLOG_JOOMLA_USER_CACHE="User <a href='{accountlink}'>{username}</a> deleted cache group {group}"
 PLG_ACTIONLOG_JOOMLA_USER_CHECKIN="User <a href='{accountlink}'>{username}</a> performed a check in to table {table}"
 PLG_ACTIONLOG_JOOMLA_USER_LOG="User <a href='{accountlink}'>{username}</a> purged one or more rows from the action log"
@@ -51,9 +52,8 @@ PLG_ACTIONLOG_JOOMLA_USER_REGISTRATION_ACTIVATE="User <a href='{accountlink}'>{u
 PLG_ACTIONLOG_JOOMLA_USER_REMIND="User <a href='{accountlink}'>{username}</a> requested a username reminder for their account"
 PLG_ACTIONLOG_JOOMLA_USER_RESET_COMPLETE="User <a href='{accountlink}'>{username}</a> completed the password reset for their account"
 PLG_ACTIONLOG_JOOMLA_USER_RESET_REQUEST="User <a href='{accountlink}'>{username}</a> requested a password reset for their account"
-PLG_ACTIONLOG_JOOMLA_USER_UPDATE="User <a href='{accountlink}'>{username}</a> updated Joomla from {oldversion} to {version}"
-PLG_ACTIONLOG_JOOMLA_USER_BLOCK="User <a href='{accountlink}'>{username}</a> blocked user <a href='{itemlink}'>{title}</a>"
 PLG_ACTIONLOG_JOOMLA_USER_UNBLOCK="User <a href='{accountlink}'>{username}</a> unblocked user <a href='{itemlink}'>{title}</a>"
+PLG_ACTIONLOG_JOOMLA_USER_UPDATE="User <a href='{accountlink}'>{username}</a> updated Joomla from {oldversion} to {version}"
 ; Component
 PLG_ACTIONLOG_JOOMLA_APPLICATION_CONFIG_UPDATED="User <a href='{accountlink}'>{username}</a> changed settings of the application configuration"
 PLG_ACTIONLOG_JOOMLA_COMPONENT_CONFIG_UPDATED="User <a href='{accountlink}'>{username}</a> changed settings of the component {extension_name}"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging a pull request may close this issue.

4 participants