Merge branch 'main' into MNTOR-3248-2

mozilla · Aug 20, 2024 · 5853af0 · 5853af0
2 parents 0a87d80 + 9ab4f00
commit 5853af0
Show file tree

Hide file tree

Showing 71 changed files with 864 additions and 4,028 deletions.
diff --git a/.github/workflows/e2e_pr.yml b/.github/workflows/e2e_pr.yml
@@ -82,7 +82,7 @@ jobs:
           HIBP_API_TOKEN: ${{ secrets.HIBP_API_TOKEN }}
           HIBP_KANON_API_ROOT: "http://localhost:6060/api/mock/hibp"
           ONEREP_API_BASE: "http://localhost:6060/api/mock/onerep/"
-          # Our tests are currently set up to expect accounts to act like
+          # MNTOR-3516: Our tests are currently set up to expect accounts to act like
           # old user accounts, so let's pretend they all are:
           BROKER_SCAN_RELEASE_DATE: "3000-12-31"
           REDIS_URL: "redis://redis.mock"

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -18,4 +18,4 @@ jobs:
       - run: npm run build-nimbus
       # Mirror old linter from CircleCI, verifies that linter succeeds
       - run: npm run lint
-      - run: node scripts/check-node-version-alignment.js
+      - run: node src/scripts/build/checkNodeVersionAlignment.js
diff --git a/docs/dependency-updates.md b/docs/dependency-updates.md
@@ -284,5 +284,13 @@ Monitor provides a tool for sending test email at the endpoint `/admin/emails`.
 
 ### `adm-zip`
 
+This is used as part of downloading and unzipping location data for the auto-complete address feature.
+
+Normally this is run by cron and uploads to an S3 bucket, the upload step can be skipped with:
+
+```sh
+npm run create-location-data -- --skip-upload
+```
+
 TODO: Describe how to verify that uploading auto-complete locations still works
 as expected.
diff --git a/locales/cy/email-strings.ftl b/locales/cy/email-strings.ftl
@@ -6,74 +6,42 @@
 -product-name = Firefox Monitor
 # Firefox is a brand name and should not be translated.
 -brand-name = Firefox
-
 # Firefox Relay is a product name and should not be translated.
 -product-name-relay = Firefox Relay
 # Mozilla VPN is a product name and should not be translated.
 -product-name-vpn = Mozilla VPN
-
 # A link to legal information about mozilla products.
 legal = Cyfreithiol
-
 # Unsubscribe link in email.
 email-unsub-link = Dad-danysgrifio
-
 # This string appears in the footer of breach report and breach alert emails.
 # { $unsubLink } is a link to the user's dashboard where they can unsubscribe from Monitor
-# and uses the text from { email-unsub-link }. { $faqLink } is a link to the 
+# and uses the text from { email-unsub-link }. { $faqLink } is a link to the
 # Firefox Monitor SUMO page and uses the text from { frequently-asked-questions }.
 email-footer-blurb = Rydych yn derbyn yr e-bost hwn oherwydd eich bod wedi cofrestru ar gyfer rhybuddion { -product-name }. Dim eisiau'r e-byst hyn bellach? { $unsubLink }. Mae hwn yn e-bost awtomataidd. Am gymorth, ewch i { $faqLink }.
-
 # Button text
 verify-email-cta = Dilysu E-bost
-
 # Headline of verification email
 email-link-expires = Daw'r ddolen hon i ben mewn 24 awr
 
-## Variables:
-##   $userEmail (string) - User email address
-
 ##
 
 # Subject line of email
 email-subject-found-breaches = Mae { -product-name } wedi canfod gwybodaeth amdanoch yn y tor-data yma
-
 # Subject line of email
 email-subject-no-breaches = Nid yw { -product-name } wedi canfod unrhyw dor-data hysbys
-
 # Subject line of email
 email-subject-verify = Gwirio eich e-bost ar gyfer { -product-name }
-
 fxm-warns-you-no-breaches = Mae { -product-name } yn eich rhybuddio am dor-data sy'n cynnwys eich manylion personol. Hyd yn hyn, nid ydym wedi darganfod unrhyw dor-data. Byddwn yn anfon rhybudd atoch os bydd eich cyfeiriad e-bost yn ymddangos mewn tor-data newydd.
-
 email-breach-alert-blurb = Mae { -product-name } yn eich rhybuddio am dor-data sy'n cynnwys eich manylion personol. Rydym newydd dderbyn fanylion am dor-data cwmni arall.
 
 ## 2022 email template. HTML tags should not be translated, e.g. `<a>`
 
 # Have I Been Pwned attribution
+# Variables:
+#   $hibp-link-attr (String) - Link to Have I Been Pwned
 email-2022-hibp-attribution = Data tor-data wedi'i ddarparu gan <a { $hibp-link-attr }>{ -brand-HIBP }</a>
 
-## Monthly email for unresolved breaches. HTML tags should not be translated, e.g. `<br>`
-
-## Monthly email for unresolved breaches. HTML tags should not be translated, e.g. `<br>`
-## Variables:
-##   $email-address (string) - Email address
-
-email-unresolved-heading = Mae gennych dor-data heb eu datrys
-email-unresolved-subhead = Mae eich e-bost wedi'i amlygu. <br>Trwsiwch ef ar unwaith gyda { -product-name }.
-email-is-affected = Mae eich e-bost, { $email-address }, yn cael ei effeithio gan o leiaf un tor-data
-email-more-detail = Mewngofnodwch i { -product-name } nawr i weld mwy o fanylion am eich tor-data (gan gynnwys pryd y digwyddodd hyn a pha ddata a ddatgelwyd), a dysgwch beth ddylech chi ei wneud pan fydd eich e-bost wedi'i ddatgelu mewn tor-data.
-email-breach-status = Statws tor-data presennol
-# table row 1 label
-email-monitored = Cyfanswm yr e-byst a gafodd eu monitro:
-# table row 2 label
-email-breach-total = Cyfanswm y nifer yr achosion o dor-data:
-# table row 3 label
-email-resolved = Tor-data a ddatryswyd:
-# table row 4 label
-email-unresolved = Tor-data heb eu datrys:
-email-resolve-cta = Datrys tor-data
-
 ## Verification email
 
 email-verify-heading = Diogelwch eich data, gan ddechrau nawr
@@ -82,12 +50,13 @@ email-verify-simply-click = Cliciwch ar y ddolen isod i orffen dilysu'ch cyfrif.
 
 ## Breach report
 
-## Breach report
-## Variables:
-##   $email-address (string) - Email address
-
 email-breach-summary = Dyma eich crynodeb tor-data
+# Variables:
+#   $email-address (string) - Email address, bolded
 email-breach-detected = Mae canlyniadau chwilio eich cyfrif { $email-address } wedi canfod y gallai eich e-bost fod wedi'i ddatgelu. Rydym yn argymell eich bod yn gweithredu nawr i ddatrys y tor-data hwn.
+# Variables:
+#   $email-address (string) - Email address
+email-breach-detected-2 = Mae canlyniadau chwilio eich cyfrif <b> { $email-address }</b> wedi canfod y gallai eich e-bost fod wedi'i ddatgelu. Rydym yn argymell eich bod yn gweithredu nawr i ddatrys y tor-data hwn.
 email-dashboard-cta = Mynd i'r Bwrdd Gwaith
 
 ## Breach alert

diff --git a/locales/en/app.ftl b/locales/en/app.ftl
@@ -42,9 +42,6 @@ user-delete-unknown-error = Something went wrong removing an email address. Plea
 
 user-verify-token-error = Verification token is required.
 
-user-unsubscribe-token-error = Unsubscribing requires a token.
-user-unsubscribe-token-email-error = Unsubscribing requires a token and emailHash.
-
 # compromised-data = the kind of user data exposed to hackers in data breach.
 compromised-data = Compromised data:
 
@@ -60,9 +57,6 @@ sign-out = Sign Out
 # Manage Firefox Account, link to page where account holders can change their account settings.
 manage-fxa = Manage { -brand-fxa }
 
-# Link title
-frequently-asked-questions = Frequently Asked Questions
-
 # Link title
 preferences = Preferences
 
@@ -269,4 +263,3 @@ banner-monitor-rebrand-dismiss-button-label = OK
 banner-monitor-rebrand-dismiss-button-tooltip = Dismiss
 
 loading-accessibility = Loading
-
diff --git a/locales/en/email-strings.ftl b/locales/en/email-strings.ftl
@@ -15,16 +15,6 @@
 # A link to legal information about mozilla products.
 legal = Legal
 
-# Unsubscribe link in email.
-email-unsub-link =  Unsubscribe
-
-# This string appears in the footer of breach report and breach alert emails.
-# { $unsubLink } is a link to the user's dashboard where they can unsubscribe from Monitor
-# and uses the text from { email-unsub-link }. { $faqLink } is a link to the
-# Firefox Monitor SUMO page and uses the text from { frequently-asked-questions }.
-email-footer-blurb = You’re receiving this email because you signed up for { -product-name }
-  alerts. No longer want these emails? { $unsubLink }. This is an automated email. For support, visit { $faqLink }.
-
 # Button text
 verify-email-cta = Verify Email
 

diff --git a/locales/hu/email-strings.ftl b/locales/hu/email-strings.ftl
@@ -48,25 +48,6 @@ email-breach-alert-blurb =
 #   $hibp-link-attr (String) - Link to Have I Been Pwned
 email-2022-hibp-attribution = Az adatvédelmi incidensek adatait a <a { $hibp-link-attr }>{ -brand-HIBP }</a> szolgáltatta
 
-## Monthly email for unresolved breaches. HTML tags should not be translated, e.g. `<br>`
-## Variables:
-##   $email-address (string) - Email address
-
-email-unresolved-heading = Meg nem oldott adatvédelmi incidensek vannak
-email-unresolved-subhead = Kikerült az Ön e-mail-címe. <br>Javítsa azonnal a { -product-name } segítségével.
-email-is-affected = Az Ön ({ $email-address }) e-mail-címét legalább egy adatvédelmi incidens érintette
-email-more-detail = Jelentkezzen be most a { -product-name } szolgáltatásba, hogy további részleteket tudjon meg az adatvédelmi incidensekről (beleértve, hogy mikor történtek és milyen adatok kerültek nyilvánosságra), és hogy megtudja, mit kell tennie, ha az e-mail-címe adatvédelmi incidens miatt került nyilvánosságra.
-email-breach-status = Az adatvédelmi incidens jelenlegi állapota
-# table row 1 label
-email-monitored = Összes megfigyelt e-mail-cím:
-# table row 2 label
-email-breach-total = Adatértések teljes száma:
-# table row 3 label
-email-resolved = Megoldott adatvédelmi incidensek:
-# table row 4 label
-email-unresolved = Meg nem oldott adatvédelmi incidensek:
-email-resolve-cta = Adatvédelmi incidensek megoldása
-
 ## Verification email
 
 email-verify-heading = Védje meg az adatait, már most
@@ -81,7 +62,7 @@ email-breach-summary = Íme az adatvédelmi incidens összefoglalója
 email-breach-detected = Az Ön { $email-address } fiókjához tartozó keresési találatok azt észlelték, hogy e-mail-címe nyilvánosságra került. Javasoljuk, hogy azonnal intézkedjen az adatvédelmi incidens megszüntetése érdekében.
 # Variables:
 #   $email-address (string) - Email address
-email-breach-detected-2 = A(z) <b>{ $email-address }</b> fiókja találatai azt észlelték, hogy az e-mail címe kikerülhetett. Javasoljuk, hogy cselekedjen most az adatvédelmi incidens megoldása érdekében.
+email-breach-detected-2 = Az Ön <b>{ $email-address }</b> fiókjához tartozó keresési találatok azt észlelték, hogy e-mail-címe nyilvánosságra került. Javasoljuk, hogy azonnal intézkedjen az adatvédelmi incidens megszüntetése érdekében.
 email-dashboard-cta = Ugrás a vezérlőpulthoz
 
 ## Breach alert

diff --git a/locales/ja/add-email.ftl b/locales/ja/add-email.ftl
@@ -10,3 +10,9 @@ add-email-add-another-heading = 別のメールアドレスを追加
 add-email-your-account-includes = 最大 { $total } 個のメールアドレスを監視できます。新しいメールアドレスを追加して、侵害が無いか確認してください。
 add-email-address-input-label = メールアドレス
 add-email-send-verification-button = 認証リンクを送信する
+# $email is the newly added email address. $settings-href is the URL for the Settings page. HTML tags should not be translated, e.g. `<a>`
+# This string will be deprecated when the new Plus plan is live.
+add-email-verify-the-link = { $email } に送信されたリンクを確認して、{ -brand-fx-monitor } に追加します。すべてのメール アドレスは、<a { $settings-href }>設定</a> で管理できます。
+# Variables:
+#   $email (string) - An email address submitted by the user for monitoring, e.g. `[email protected]`
+add-email-verify-the-link-2 = <b>{ $email }</b> に送信されたリンクを確認して、{ -brand-mozilla-monitor } に追加します。
diff --git a/locales/ja/app.ftl b/locales/ja/app.ftl
@@ -29,7 +29,6 @@
 
 ##
 
-error-could-not-add-email = メールアドレスをデータベースに追加できませんでした。
 error-not-subscribed = このメールアドレスは { -product-name } に登録されていません。
 error-hibp-throttled = { -brand-HIBP } への接続数が多すぎます。
 error-hibp-connect = { -brand-HIBP } への接続でエラーが発生しました。
@@ -121,6 +120,8 @@ breach-added-label = 侵害が追加された日:
 # Section headline
 rec-section-headline = この侵害への対処方法
 rec-section-subhead = あなたの個人情報を安全に保ち、デジタル ID を保護するために、以下の手順を行うことをおすすめします。
+# Section headline
+rec-section-headline-no-pw = 個人情報を保護するためにするべきこと
 
 ##
 
@@ -136,6 +137,8 @@ rec-section-subhead = あなたの個人情報を安全に保ち、デジタル
 
 ## Header
 
+# Deprecated
+brand-fx-monitor = { -brand-fx-monitor }
 sign-in = ログイン
 brand-mozilla-monitor = { -brand-fx-monitor }
 
@@ -163,6 +166,8 @@ user-menu-signout-tooltip = { -brand-mozilla-monitor } からログアウトす
 ## Footer
 
 mozilla = { -brand-mozilla }
+github = { -brand-github }
+footer-nav-all-breaches = すべての侵害
 footer-external-link-faq-label = FAQ
 footer-external-link-faq-tooltip = よくある質問
 
@@ -176,12 +181,16 @@ error-page-error-404-cta-button = 戻る
 
 ## Breach overview page
 
+all-breaches-headline-2 = { -brand-fx-monitor } によって検知されたすべての侵害
+all-breaches-lead = 個人情報が漏えいしていないか確認するために、既知のデータ侵害を監視しています。2007 年以降に報告されたすべての侵害の完全なリストです。
 search-breaches = データ侵害を検索
 # the kind of user data exposed to hackers in data breach.
 exposed-data = 侵害されたデータ:
 
 ## Public breach detail page
 
+breach-detail-cta-signup = データ侵害を確認する
 
 ## Firefox Monitor -> Mozilla Monitor rebrand banner
 
+banner-monitor-rebrand-dismiss-button-label = OK
diff --git a/locales/ja/bento.ftl b/locales/ja/bento.ftl
@@ -8,5 +8,6 @@ toolbar-app-picker-product-relay = { -brand-relay }
 toolbar-app-picker-product-pocket = { -brand-pocket }
 toolbar-app-picker-product-fx-desktop = デスクトップ版 { -brand-firefox }
 toolbar-app-picker-product-fx-mobile = モバイル版 { -brand-firefox }
+toolbar-app-picker-by-mozilla = Made by { -brand-mozilla }
 # Bento headline
 fx-makes-tech = { -brand-name } は、オンラインプライバシーに立ち向かう技術です。
diff --git a/locales/ja/breaches.ftl b/locales/ja/breaches.ftl
@@ -2,10 +2,13 @@
 # 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/.
 
+breach-all-meta-title = { -brand-fx-monitor } - すべてのデータ侵害
 breach-all-meta-social-title = { -brand-fx-monitor } によって検出されたすべての侵害
 
 ## Links that we might refer to when prompting the user to make changes after a breach
 
+breach-checklist-link-firefox-relay = { -brand-relay }
+breach-checklist-link-mozilla-vpn = { -brand-mozilla-vpn }
 
 ## Prompts the user for changes when there is a breach detected of password
 

diff --git a/locales/ja/dashboard.ftl b/locales/ja/dashboard.ftl
@@ -17,7 +17,12 @@ exposure-chart-caption = このグラフは、あなたの個人情報がいく
 #   $total_exposures_num (number) - Number of total exposures
 exposure-chart-caption-fixed = このグラフは、修復された侵害の合計数を表しています ({ $total_exposures_num } / { $total_fixed_exposures_num })
 modal-cta-ok = OK
+progress-card-heres-what-we-fixed-headline-all = 修復済みの侵害
+progress-card-manually-fixed-headline = 手動で修復
+dashboard-tab-label-action-needed = 対処が必要
+dashboard-tab-label-fixed = 修正済み
 dashboard-exposures-all-fixed-label = すべて修復済みです！
+dashboard-fixed-area-headline-all = 修復されたすべての漏えいを確認
 # This is the label on a button that opens a popover menu, which shows a menu to adjust filters for the listed exposures.
 dashboard-exposures-filter = 絞り込み
 dashboard-exposures-filter-company = 会社名
@@ -27,6 +32,7 @@ dashboard-exposures-filter-date-found-last-thirty-days = 最近 30 日間
 dashboard-exposures-filter-date-found-last-year = 昨年
 dashboard-exposures-filter-status = ステータス
 dashboard-exposures-filter-show-all = すべて表示
+dashboard-exposures-filter-show-results = 結果を表示
 dashboard-exposures-filter-reset = リセット
 
 ## Top banner on the dashboard
@@ -35,6 +41,9 @@ dashboard-top-banner-your-data-is-protected-title = あなたのデータは保
 dashboard-top-banner-your-data-is-protected-cta = 修復されたものを確認する
 dashboard-top-banner-no-exposures-found-title = 侵害は見つかりませんでした
 dashboard-no-exposures-label = 侵害は見つかりませんでした
+# Variables:
+# $exposures_resolved_num is the number of exposures the user has resolved.
+dashboard-top-banner-non-us-your-data-is-protected-description = 素晴らしい！{ $exposures_resolved_num } 件すべてのデータ漏えいが修復されました。引き続き監視し、新たな漏えいがあればお知らせします。
 
-# About Exposure Statuses Modal
+# About Exposure Indicators Modal
 
diff --git a/locales/ja/email-strings.ftl b/locales/ja/email-strings.ftl
@@ -6,65 +6,47 @@
 -product-name = Firefox Monitor
 # Firefox is a brand name and should not be translated.
 -brand-name = Firefox
-
 # Firefox Relay is a product name and should not be translated.
 -product-name-relay = Firefox Relay
 # Mozilla VPN is a product name and should not be translated.
 -product-name-vpn = Mozilla VPN
-
 # A link to legal information about mozilla products.
 legal = 法的通知
-
 # Unsubscribe link in email.
 email-unsub-link = 登録解除
-
 # This string appears in the footer of breach report and breach alert emails.
 # { $unsubLink } is a link to the user's dashboard where they can unsubscribe from Monitor
-# and uses the text from { email-unsub-link }. { $faqLink } is a link to the 
+# and uses the text from { email-unsub-link }. { $faqLink } is a link to the
 # Firefox Monitor SUMO page and uses the text from { frequently-asked-questions }.
 email-footer-blurb =
     このアラートメールは、{ -product-name } に登録されている方に届きます。
     これらのメールはもう必要ありませんか？ { $unsubLink }。これは自動化されたメールです。サポートについては、{ $faqLink } にアクセスしてください。
-
 # Button text
 verify-email-cta = メールアドレスを確認
-
 # Headline of verification email
 email-link-expires = このリンクは 24 時間で有効期限が切れます
 
-## Variables:
-##   $userEmail (string) - User email address
-
 ##
 
 # Subject line of email
 email-subject-found-breaches = { -product-name } が、これらのデータ侵害であなたの情報を発見しました。
-
 # Subject line of email
 email-subject-no-breaches = { -product-name } は既知のデータ侵害を検出しませんでした
-
 # Subject line of email
 email-subject-verify = { -product-name } のメールを確認してください
 
 ## 2022 email template. HTML tags should not be translated, e.g. `<a>`
 
-
-## Monthly email for unresolved breaches. HTML tags should not be translated, e.g. `<br>`
-
-
-## Monthly email for unresolved breaches. HTML tags should not be translated, e.g. `<br>`
-## Variables:
-##   $email-address (string) - Email address
+# Have I Been Pwned attribution
+# Variables:
+#   $hibp-link-attr (String) - Link to Have I Been Pwned
+email-2022-hibp-attribution = 侵害データ提供元: <a { $hibp-link-attr }>{ -brand-HIBP }</a>
 
 ## Verification email
 
 
 ## Breach report
 
 
-## Breach report
-## Variables:
-##   $email-address (string) - Email address
-
 ## Breach alert