Merge branch 'main' into mntor-3492

Author: flozia

locales/sl/bento.ftl

@@ -2,13 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-toolbar-app-picker-trigger-title = aplikacije in storitve { -brand-mozilla(sklon: "rodilnik") }
+toolbar-app-picker-trigger-title = Aplikacije in storitve { -brand-mozilla(sklon: "rodilnik") }
 toolbar-app-picker-product-vpn = { -brand-mozilla-vpn }
 toolbar-app-picker-product-relay = { -brand-relay }
 toolbar-app-picker-product-pocket = { -brand-pocket }
 toolbar-app-picker-product-fx-desktop = { -brand-firefox } za namizja
 toolbar-app-picker-product-fx-mobile = { -brand-firefox } za mobilne naprave
 toolbar-app-picker-by-mozilla = Izpod rok { -brand-mozilla(sklon: "rodilnik") }
-
 # Bento headline
 fx-makes-tech = { -brand-name } je tehnologija, ki se bori za vašo spletno zasebnost.

locales/sl/dashboard.ftl

@@ -20,7 +20,7 @@ exposure-chart-heading =
 #   $nr (number) - Number of fixed exposures found for the user
 exposure-chart-heading-fixed = <nr>{ $nr }</nr> <label>Popravljeno</label>
 exposure-chart-legend-heading-type = izpostavljenost
-exposure-chart-legend-heading-nr = Števila
+exposure-chart-legend-heading-nr = Število
 # Variables:
 #   $nr (number) - Number of a particular type of exposure found for the user
 exposure-chart-legend-value-nr = { $nr }×
@@ -29,7 +29,7 @@ exposure-chart-caption = Ta grafikon prikazuje, kolikokrat so vaši podatki akti
 #   $total_fixed_exposures_num (number) - Number of fixed exposures
 #   $total_exposures_num (number) - Number of total exposures
 exposure-chart-caption-fixed = Ta grafikon prikazuje skupne izpostavljenosti, ki so fiksne ({ $total_fixed_exposures_num } od { $total_exposures_num })
-exposure-chart-returning-user-upgrade-prompt = Domači naslov, družinski člani in drugo še niso vključeni.
+exposure-chart-returning-user-upgrade-prompt = Domači naslov, družinski člani in drugo še ni vključeno.
 exposure-chart-returning-user-upgrade-prompt-cta = Začnite brezplačen pregled
 exposure-chart-scan-in-progress-prompt = <b>Iskanje v teku:</b> naslov, družinski člani in drugo še niso vključeni.
 modal-active-number-of-exposures-title = O številu aktivnih izpostavljenosti

locales/sl/email-strings.ftl

@@ -11,8 +11,8 @@ email-header-button-sign-in = Prijava
 ## Email footers
 
 email-footer-support-heading = Vprašanja o { -brand-mozilla-monitor(sklon: "mestnik") }?
-email-footer-support-content = Za pomoč obiščite naš <support-link>center za podporo</support-link>
-email-footer-trigger-transactional = To e-poštno sporočilo ste prejeli kot naročnik { -brand-mozilla-monitor }.
+email-footer-support-content = Za pomoč obiščite naše <support-link>središče za podporo</support-link>
+email-footer-trigger-transactional = To e-poštno sporočilo ste prejeli kot naročnik na { -brand-mozilla-monitor(sklon: "tožilnik") }.
 email-footer-source-hibp = Podatke o krajah podatkov posredoval <hibp-link>{ -brand-HIBP }</hibp-link>
 email-footer-logo-mozilla-alt = { -brand-mozilla }
 email-footer-meta-privacy-notice = Zasebnost

locales/sl/exposure-card.ftl

@@ -28,7 +28,7 @@ exposure-card-other = Drugo
 exposure-card-description-data-breach-action-needed = Vaši podatki so bili { $data_breach_date } razkriti v <data_breach_link>podatkovni kraji podjetja { $data_breach_company }.</data_breach_link> Vodili vas bomo skozi korake za odpravo težave.
 exposure-card-description-data-breach-fixed = Izvedli ste korake, potrebne za odpravo <data_breach_link>te kraje</data_breach_link>. Nenehno bomo spremljali kraje podatkov in vas ob morebitnih novih izpostavljenostih tudi obvestili.
 exposure-card-your-exposed-info = Vaši izpostavljeni podatki:
-exposure-card-exposure-type-data-broker = Info za prodajo
+exposure-card-exposure-type-data-broker = Podatki naprodaj
 exposure-card-exposure-type-data-breach = Kraja podatkov
 exposure-card-cta = Popravi vse izpostavljenosti
 exposure-card-label-company-logo = Logotip podjetja

locales/sl/fix.ftl

@@ -86,7 +86,7 @@ high-risk-breach-bank-account-title = Vaš bančni račun je bil razkrit
 high-risk-breach-bank-account-description = Če ukrepate čim prej, si lahko zagotovite večjo pravno zaščito, ki vam bo pomagala povrniti morebitne izgube.
 high-risk-breach-bank-account-step-one = Takoj obvestite svojo banko, da je bila številka vašega računa ogrožena.
 high-risk-breach-bank-account-step-two = Spremenite številko računa.
-high-risk-breach-bank-account-step-three = Preverite svoje račune za nepooblaščene bremenitve.
+high-risk-breach-bank-account-step-three = Preverite, ali so se vam na računu pojavile nepooblaščene bremenitve.
 
 # Social Security Number Breaches
 

locales/sl/settings.ftl

@@ -15,8 +15,6 @@ settings-alert-preferences-allow-breach-alerts-title = Takojšnja opozorila o kr
 settings-alert-preferences-allow-breach-alerts-subtitle = Ta opozorila se pošljejo takoj, ko se zazna kraja podatkov
 settings-alert-preferences-option-one = Pošlji opozorila na ogrožen e-poštni naslov
 settings-alert-preferences-option-two = Pošlji vsa opozorila o krajah podatkov na glavni e-poštni naslov
-settings-alert-preferences-allow-monthly-monitor-report-title = Mesečno poročilo { -brand-monitor }a
-settings-alert-preferences-allow-monthly-monitor-report-subtitle = Mesečna posodobitev novih izpostavljenosti, kaj je bilo popravljeno in kaj zahteva vašo pozornost.
 
 ## Monitored email addresses
 
@@ -51,20 +49,19 @@ settings-email-number-of-breaches-info =
        *[other] Pojavil se je v { $breachCount } znanih krajah.
     }
 
-## Deactivate account
-
-settings-deactivate-account-title = Deaktiviraj račun
-settings-deactivate-account-info-2 = { -product-short-name } lahko izključite tako, da izbrišete svoj { -brand-mozilla-account }.
-settings-fxa-link-label-3 = Pojdite v Nastavitve { -brand-mozilla-account(sklon: "rodilnik") }
-
 ## Delete Monitor account
 
-settings-delete-monitor-free-account-title = Izbriši { -brand-monitor } račun
+settings-delete-monitor-free-account-title = Izbriši račun { -brand-monitor }
 settings-delete-monitor-free-account-description = S tem boste trajno izbrisali svoj račun { -brand-monitor } in izklopili vsa obvestila.
 settings-delete-monitor-free-account-cta-label = Izbriši račun
 settings-delete-monitor-free-account-dialog-title = Vaš račun { -brand-monitor } bo trajno izbrisan
 settings-delete-monitor-free-account-dialog-lead-v2 = Vsi podatki o vašem računu za { -brand-monitor } bodo izbrisani in vaših podatkov ne bomo več iskali v krajah. S tem ne boste izbrisali svojega { -brand-mozilla-account(sklon: "rodilnik") }.
 settings-delete-monitor-free-account-dialog-cta-label = Izbriši račun
-settings-delete-monitor-free-account-dialog-cancel-button-label = Premislil sem si, vzemite me nazaj
+settings-delete-monitor-free-account-dialog-cancel-button-label = Premislil/-a sem si, vzemite me nazaj
 settings-delete-monitor-account-confirmation-toast-label-2 = Vaš račun za { -brand-monitor } je zdaj izbrisan.
 settings-delete-monitor-account-confirmation-toast-dismiss-label = Opusti
+
+## Monthly Monitor Report
+
+settings-alert-preferences-allow-monthly-monitor-report-title = Mesečno poročilo { -brand-monitor }a
+settings-alert-preferences-allow-monthly-monitor-report-subtitle = Mesečna posodobitev novih izpostavljenosti, kaj je bilo popravljeno in kaj zahteva vašo pozornost.

src/app/(proper_react)/(redesign)/(authenticated)/admin/emails/EmailTrigger.tsx

@@ -15,9 +15,11 @@ import {
   triggerVerificationEmail,
 } from "./actions";
 import { Button } from "../../../../../components/client/Button";
+import { toast } from "react-toastify";
 
 export type Props = {
   emailAddresses: string[];
+  unsubscribeLink: string | null;
 };
 
 export const EmailTrigger = (props: Props) => {
@@ -138,6 +140,18 @@ export const EmailTrigger = (props: Props) => {
         >
           First data broker removal fixed
         </Button>
+        <Button
+          variant="primary"
+          onPress={() => {
+            if (typeof props.unsubscribeLink === "string") {
+              window.open(props.unsubscribeLink, "_blank");
+            } else {
+              toast.error("No unsubscription link found");
+            }
+          }}
+        >
+          Unsubscription flow
+        </Button>
       </div>
     </main>
   );

src/app/(proper_react)/(redesign)/(authenticated)/admin/emails/page.tsx

@@ -7,6 +7,7 @@ import { notFound } from "next/navigation";
 import { isAdmin } from "../../../../../api/utils/auth";
 import { EmailTrigger } from "./EmailTrigger";
 import { getUserEmails } from "../../../../../../db/tables/emailAddresses";
+import { generateUnsubscribeLinkForSubscriber } from "../../../../../api/utils/email";
 
 export default async function DevPage() {
   const session = await getServerSession();
@@ -21,12 +22,20 @@ export default async function DevPage() {
 
   const emailRows = await getUserEmails(session.user.subscriber.id);
 
+  let unsubscribeLink = null;
+
+  if (session?.user?.subscriber) {
+    unsubscribeLink = await generateUnsubscribeLinkForSubscriber(
+      session.user.subscriber,
+    );
+  }
   return (
     <>
       <EmailTrigger
         emailAddresses={[session.user.email].concat(
           emailRows.map((emailRow) => emailRow.email),
         )}
+        unsubscribeLink={unsubscribeLink}
       />
     </>
   );

src/db/tables/subscriber_email_preferences.ts

@@ -63,7 +63,8 @@ async function addEmailPreferenceForSubscriber(
     logger.debug("add_email_preference_for_subscriber_success");
   } catch (e) {
     logger.error("error_add_subscriber_email_preference", {
-      exception: e as string,
+      message: (e as Error).message,
+      stack_trace: (e as Error).stack,
     });
 
     throw e;
@@ -119,7 +120,8 @@ async function updateEmailPreferenceForSubscriber(
     logger.debug("update_email_preference_for_subscriber_success");
   } catch (e) {
     logger.error("error_update_subscriber_email_preference", {
-      exception: e as string,
+      message: (e as Error).message,
+      stack_trace: (e as Error).stack,
     });
 
     throw e;
@@ -161,7 +163,8 @@ async function getEmailPreferenceForSubscriber(subscriberId: number) {
     );
   } catch (e) {
     logger.error("error_get_subscriber_email_preference", {
-      exception: e as string,
+      message: (e as Error).message,
+      stack_trace: (e as Error).stack,
     });
 
     throw e;
@@ -195,7 +198,8 @@ async function getEmailPreferenceForUnsubscribeToken(unsubscribeToken: string) {
     logger.error(
       "error_get_subscriber_email_preference_for_unsubscribe_token",
       {
-        exception: e as string,
+        message: (e as Error).message,
+        stack_trace: (e as Error).stack,
       },
     );
 
@@ -230,7 +234,8 @@ async function unsubscribeMonthlyMonitorReportForUnsubscribeToken(
     logger.error(
       "error_unsubscribe_monthly_monitor_report_for_unsubscribe_token",
       {
-        exception: e,
+        message: (e as Error).message,
+        stack_trace: (e as Error).stack,
       },
     );
     captureException(e);
@@ -274,7 +279,8 @@ async function getEmailPreferenceForPrimaryEmail(email: string) {
     );
   } catch (e) {
     logger.error("error_get_subscriber_email_preference_for_primary_email", {
-      exception: e as string,
+      message: (e as Error).message,
+      stack_trace: (e as Error).stack,
     });
 
     throw e;