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

chore: rename sieve security to sieve filter #10100

Merged
merged 1 commit into from
Sep 4, 2024
Merged

Conversation

kesselb
Copy link
Contributor

@kesselb kesselb commented Sep 4, 2024

  • Rename "Enable sieve security" to "Enable sieve filter"
  • Use the translation function
  • Add a small introduction for the feature

image

@kesselb kesselb added this to the v4.0.0 milestone Sep 4, 2024
@kesselb kesselb self-assigned this Sep 4, 2024
@kesselb
Copy link
Contributor Author

kesselb commented Sep 4, 2024

/backport to stable4.0

@@ -4,9 +4,12 @@
-->
<template>
<form id="sieve-form">
<p>
{{ t('mail', 'Sieve is a powerful language for writing filters for your mailbox. You can control the sieve scripts from Nextcloud Mail if your email service supports it.')}}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{{ t('mail', 'Sieve is a powerful language for writing filters for your mailbox. You can control the sieve scripts from Nextcloud Mail if your email service supports it.')}}
{{ t('mail', 'Sieve is a powerful language for writing filters for your mailbox. You can control the sieve scripts from {product} Mail if your email service supports it.', { product: OCA.theme.????? })}}

we use it in other places too. forgot the exact variable ;-)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

return t('mail', 'Welcome to {cloudName} Mail', { cloudName: window?.OC?.theme?.name ?? 'Nextcloud' })

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the idea 👍

f17aba4 did not work, even if window?.OC?.theme?.name evaluates to "Testcloud". I assume that OC.theme is not populated when the component is rendered, but didn't look at it properly.

Pushed another fixup to use a wording without Nextcloud. Let me know if you want me to take a look later to include the instance name or product name, I will create an issue then.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then let's avoid the name 👍

- Rename "Enable sieve security" to "Enable sieve filter"
- Use the translation function
- Add a small introduction for the feature

Signed-off-by: Daniel Kesselberg <[email protected]>
@kesselb kesselb merged commit cd7917d into main Sep 4, 2024
32 checks passed
@kesselb kesselb deleted the bug/noid/sieve-security branch September 4, 2024 12:45
@st3iny st3iny modified the milestones: v4.0.0, v4.1.0 Sep 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants