This commit is contained in:
Josué Tille 2020-04-08 22:46:53 +02:00
parent 562b41a47d
commit 4ebf716d21
No known key found for this signature in database
GPG key ID: 716A6C99B04194EF
2 changed files with 4 additions and 4 deletions

View file

@ -1,8 +1,8 @@
{
"aborting": "Aborting.",
"action_invalid": "Invalid action '{action:s}'",
"additional_urls_already_added": "Additionnal url '{url:s} already added in the additional URL for permission {permission:s}'",
"additional_urls_already_removed": "Additionnal url '{url:s} already removed in the additional URL for permission {permission:s}'",
"additional_urls_already_added": "Additionnal url '{url:s}' already added in the additional URL for permission '{permission:s}'",
"additional_urls_already_removed": "Additionnal url '{url:s}' already removed in the additional URL for permission '{permission:s}'",
"admin_password": "Administration password",
"admin_password_change_failed": "Cannot change password",
"admin_password_changed": "The administration password was changed",

View file

@ -381,7 +381,7 @@ def permission_url(operation_logger, permission,
if add_url:
for ur in add_url:
if ur in current_additional_urls:
logger.warning(m18n.n('additional_urls_already_added', permission=permission, url=url))
logger.warning(m18n.n('additional_urls_already_added', permission=permission, url=ur))
else:
ur = _check_and_normalize_permission_path(ur)
domain, path = _get_full_url(ur, app_main_path).split('/', 1)
@ -403,7 +403,7 @@ def permission_url(operation_logger, permission,
if remove_url:
for ur in remove_url:
if ur not in current_additional_urls:
logger.warning(m18n.n('additional_urls_already_removed', permission=permission, url=url))
logger.warning(m18n.n('additional_urls_already_removed', permission=permission, url=ur))
new_additional_urls = [u for u in new_additional_urls if u not in remove_url]