Skip to content

Commit

Permalink
Merge pull request #341 from City-of-Helsinki/update-configuration
Browse files Browse the repository at this point in the history
Automatic update
  • Loading branch information
rpnykanen authored Sep 26, 2024
2 parents 1ab8517 + 3241106 commit 0ca2a18
Show file tree
Hide file tree
Showing 20 changed files with 203 additions and 164 deletions.
2 changes: 1 addition & 1 deletion .platform/schema
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8
9
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@
"oomphinc/composer-installers-extender": true
},
"audit": {
"abandoned": "report"
"abandoned": "report",
"ignore": ["GHSA-mg8j-w93w-xjgc"]
}
},
"extra": {
Expand Down
329 changes: 167 additions & 162 deletions composer.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions conf/cmi/language/ar/user.role.admin.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: Ylläpitäjä
1 change: 1 addition & 0 deletions conf/cmi/language/ar/user.role.editor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: Editor
1 change: 1 addition & 0 deletions conf/cmi/language/es/user.role.editor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: Editor
1 change: 1 addition & 0 deletions conf/cmi/language/et/user.role.editor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: Editor
1 change: 1 addition & 0 deletions conf/cmi/language/fa/user.role.editor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: Editor
1 change: 1 addition & 0 deletions conf/cmi/language/fi/system.action.media_delete_action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: 'Delete media'
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: 'Publish media'
1 change: 1 addition & 0 deletions conf/cmi/language/fi/system.action.media_save_action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: 'Save media'
17 changes: 17 additions & 0 deletions conf/cmi/language/fi/user.mail.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,27 @@
cancel_confirm:
body: "[user:display-name]\r\n\r\nA request to cancel your account has been made at [site:name].\r\n\r\nYou may now cancel your account on [site:url-brief] by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:cancel-url]\r\n\r\nNOTE: The cancellation of your account is not reversible.\r\n\r\nThis link expires in one day and nothing will happen if it is not used.\r\n\r\n-- [site:name] team"
subject: 'Account cancellation request for [user:display-name] at [site:name]'
register_admin_created:
subject: 'Ylläpitäjä loi sinulle tilin sivustolla [site:name]'
body: "[user:display-name],\r\n\r\nA site administrator at [site:name] has created an account for you. You may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password.\r\n\r\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\r\n\r\nusername: [user:name]\r\npassword: Your password\r\n\r\n-- [site:name] team"
status_activated:
body: "[user:display-name],\r\n\r\nYour account at [site:name] has been activated.\r\n\r\nYou may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password.\r\n\r\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\r\n\r\nusername: [user:account-name]\r\npassword: Your password\r\n\r\n-- [site:name] team"
subject: 'Account details for [user:display-name] at [site:name] (approved)'
status_blocked:
body: "[user:display-name],\r\n\r\nYour account on [site:name] has been blocked.\r\n\r\n-- [site:name] team"
subject: 'Account details for [user:display-name] at [site:name] (blocked)'
status_canceled:
body: "[user:display-name],\r\n\r\nYour account on [site:name] has been canceled.\r\n\r\n-- [site:name] team"
subject: 'Account details for [user:display-name] at [site:name] (canceled)'
password_reset:
subject: 'Replacement login information for [user:display-name] at [site:name]'
body: "[user:display-name],\r\n\r\nA request to reset the password for your account has been made at [site:name].\r\n\r\nYou may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password. It expires after one day and nothing will happen if it's not used.\r\n\r\n-- [site:name] team"
register_no_approval_required:
subject: 'Account details for [user:display-name] at [site:name]'
body: "[user:display-name],\r\n\r\nThank you for registering at [site:name]. You may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password.\r\n\r\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\r\n\r\nusername: [user:name]\r\npassword: Your password\r\n\r\n-- [site:name] team"
register_pending_approval:
subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)'
body: "[user:display-name],\r\n\r\nThank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.\r\n\r\n-- [site:name] team"
register_pending_approval_admin:
subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)'
body: "[user:display-name] has applied for an account.\r\n\r\n[user:edit-url]"
1 change: 1 addition & 0 deletions conf/cmi/language/fi/user.role.editor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: Editor
1 change: 1 addition & 0 deletions conf/cmi/language/fi/views.view.taxonomy_term.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ display:
display_title: Syöte
page_1:
display_title: Sivu
description: 'Content belonging to a certain taxonomy term.'
1 change: 1 addition & 0 deletions conf/cmi/language/fr/user.role.editor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: Editor
1 change: 1 addition & 0 deletions conf/cmi/language/ru/user.role.editor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: Editor
1 change: 1 addition & 0 deletions conf/cmi/language/sv/user.role.editor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: Editor
1 change: 1 addition & 0 deletions conf/cmi/language/tr/user.role.editor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: Editor
1 change: 1 addition & 0 deletions conf/cmi/language/uk/user.role.admin.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: Ylläpitäjä
1 change: 1 addition & 0 deletions conf/cmi/language/uk/user.role.editor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: Editor

0 comments on commit 0ca2a18

Please sign in to comment.