Skip to content

Commit 6160c9b

Browse files
authored
Merge branch 'main' into mntor-4943
2 parents c80b3e9 + 4849208 commit 6160c9b

File tree

25 files changed

+2513
-1971
lines changed

25 files changed

+2513
-1971
lines changed

docs/dependency-updates.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,12 @@ Used for S3, by the `npm run cron:db-pull-breaches` cron job.
282282
This job runs periodically on stage and production to download Favicon files from DuckDuckGo and re-uploads them to Monitor's S3 bucket.
283283
Check in the server logs that this job completed without errors.
284284

285+
### `@google-cloud/bigquery`
286+
287+
The Node.js client for Google Cloud BigQuery is used for uploading data.
288+
289+
Currently, we use this dependency to upload the results of the [Lighthouse Report Cron](https://github.com/mozilla/blurts-server/actions/workflows/lighthouse_cron.yml) to BigQuery. To verify that the cron job is working as expected we can run the GitHub Action manually against `stage` after a dependency update.
290+
285291
### `@google-cloud/pubsub`
286292

287293
GCP PubSub is used for email breach notifications from HIBP:

eslint.config.js

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,20 @@ const compat = new FlatCompat({
2929
header.rules.header.meta.schema = false;
3030

3131
const config = [
32+
...compat.extends("next/core-web-vitals", "next/typescript"),
33+
{
34+
ignores: [
35+
"node_modules/**",
36+
".next/**",
37+
"out/**",
38+
"build/**",
39+
"next-env.d.ts",
40+
"storybook-static",
41+
"dist",
42+
"coverage",
43+
"!.storybook",
44+
],
45+
},
3246
...compat.config({
3347
extends: ["next"],
3448
}),
@@ -42,7 +56,6 @@ const config = [
4256
project: "tsconfig.json",
4357
},
4458
},
45-
ignores: ["coverage", "dist", "!.storybook"],
4659
plugins: {
4760
jsdoc,
4861
"@typescript-eslint": tsEslint,

jest.config.cjs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* License, v. 2.0. If a copy of the MPL was not distributed with this
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44

5+
// This is a CJS file, so `require` is fine here:
6+
// eslint-disable-next-line @typescript-eslint/no-require-imports
57
const nextJest = require("next/jest");
68
const createJestConfig = nextJest({ dir: "./" });
79

jest.setup.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ afterEach(() => {
4545
resetIntersectionMocking();
4646
});
4747

48-
global.TextEncoder = TextEncoder;
48+
global.TextEncoder = TextEncoder as typeof global.TextEncoder;
4949

5050
// Jest doesn't like the top-level await in envVars.ts, so we mock it.
5151
jest.mock("./src/envVars", () => {

locales/nn-NO/app.ftl

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
44

55

6-
# Strings for the main app
7-
8-
96
## The following messages are brand and should be kept entirely in English
107
## unless otherwise indicated.
118

@@ -196,7 +193,7 @@ user-menu-signout-tooltip = Logg ut frå { -brand-mozilla-monitor }
196193

197194
mozilla = { -brand-mozilla }
198195
terms-of-service = Tenestevilkår
199-
privacy-notice = Personvernerklæring
196+
privacy-notice = Personvernfråsegn
200197
github = { -brand-github }
201198
footer-nav-recent-breaches = Nylege datalekkasjar
202199
footer-external-link-faq-label = Vanlege spørsmål (FAQ)

locales/ro/data-classes.ftl

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ career-levels = niveluri de carieră
2828
cellular-network-names = denumiri de rețele celulare
2929
charitable-donations = donații caritabile
3030
chat-logs = jurnaluri de chat
31+
citizenship-statuses = Statute de cetățenie
32+
clothing-sizes = Mărimi de îmbrăcăminte
3133
credit-card-cvv = coduri de securitate (CVV/CVC) ale cardurilor de credit
3234
credit-cards = carduri de credit
3335
credit-status-information = informații privind starea creditelor
@@ -37,10 +39,14 @@ customer-interactions = interacțiuni cu clienții
3739
dates-of-birth = date de naștere
3840
deceased-date = date de deces
3941
deceased-statuses = stări de deces
42+
# Instructions that you can set up in online shopping services to get your orders
43+
# delivered (e.g. deliver to a specific neighbor, entrance location, etc.).
44+
delivery-instructions = Instrucțiuni de livrare
4045
device-information = informații despre dispozitive
4146
device-serial-numbers = Numere de serie ale dispozitivelor
4247
device-usage-tracking-data = date de urmărire a utilizării dispozitivelor
4348
drinking-habits = obiceiuri privind consumul de alcool
49+
driver-s-licenses = Permise de conducere
4450
drug-habits = obiceiuri privind consumul de droguri
4551
eating-habits = obiceiuri alimentare
4652
education-levels = nivel de educație
@@ -56,11 +62,13 @@ family-structure = structură familială
5662
financial-investments = investiții financiare
5763
financial-transactions = tranzacții financiare
5864
fitness-levels = nivel de condiție fizică
65+
flights-taken = Zboruri efectuate
5966
genders = sexe
6067
geographic-locations = localizări geografice
6168
government-issued-ids = documente de identificare emise de stat
6269
health-insurance-information = informații privind asigurările de sănătate
6370
historical-passwords = istoric de parole
71+
hiv-statuses = Statusuri HIV
6472
home-loan-information = informații despre împrumuturi rezidențiale
6573
home-ownership-statuses = stări privind deținerea de proprietăți imobiliare (case)
6674
homepage-urls = URL-uri pentru pagina de start
@@ -71,8 +79,13 @@ instant-messenger-identities = identități de mesagerie instantanee
7179
ip-addresses = adrese IP
7280
job-applications = Cereri de angajare
7381
job-titles = profesii/meserii
82+
# This string refers to vehicle license plates.
83+
licence-plates = Plăcuțe de înmatriculare
7484
living-costs = Costuri de trai
85+
# This string refers to financial loans.
86+
loan-information = Informații despre împrumuturi
7587
login-histories = Istoric de autentificări
88+
loyalty-program-details = Detalii despre programul de fidelitate
7689
mac-addresses = adrese MAC
7790
marital-statuses = stare civilă
7891
# Mnemonic phrases are a group of words used to access the content of cryptocurrency wallets.
@@ -82,10 +95,15 @@ names = nume
8295
nationalities = naționalități
8396
net-worths = valori nete
8497
nicknames = pseudonime
98+
# no data classes found
99+
none-data-class = Niciuna
85100
occupations = ocupații
101+
# various data classes grouped together
102+
other-data-class = Altele
86103
parenting-plans = planuri parentale
87104
partial-credit-card-data = date parțiale privind carduri de credit
88105
partial-dates-of-birth = Date parțiale de naștere
106+
partial-phone-numbers = Numere de telefon parțiale
89107
passport-numbers = numere de pașaport
90108
password-hints = indicii pentru parole
91109
password-strengths = Puterea parolelor
@@ -128,13 +146,15 @@ spouses-names = Numele consorților
128146
support-tickets = tichete de asistență tehnică
129147
survey-results = rezultate ale sondajelor
130148
taxation-records = registre fiscale
149+
telecommunications-carrier = Operatori de telecomunicații
131150
time-zones = fusuri orare
132151
travel-habits = obiceiuri de călătorie
133152
user-statuses = stări ale utilizatorilor
134153
user-website-urls = URL-uri ale site-urilor web ale utilizatorilor
135154
usernames = nume de utilizatori
136155
utility-bills = facturi de utilități
137156
vehicle-details = detalii despre vehicule
157+
vehicle-identification-numbers-vins = Numere de identificare a vehiculelor (VIN)
138158
website-activity = activitate pe site
139159
work-habits = obiceiuri profesionale
140160
years-of-birth = ani de naștere

locales/ro/email-strings.ftl

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,17 @@
33
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
44

55

6+
## Email headers
7+
8+
email-header-logo-alt = { -brand-mozilla-monitor }
9+
email-header-button-sign-in = Intră în cont
10+
611
## Email footers
712

13+
email-footer-support-heading = Întrebări despre { -brand-mozilla-monitor }?
14+
email-footer-support-content = Intră pe <support-link>Centrul nostru de asistență</support-link> pentru ajutor
15+
email-footer-trigger-transactional = Primești acest e-mail ca abonat la { -brand-mozilla-monitor }.
16+
email-footer-logo-mozilla-alt = { -brand-mozilla }
817
email-footer-meta-privacy-notice = Confidențialitate
918
# Firefox Relay is a product name and should not be translated.
1019
-product-name-relay = Firefox Relay
@@ -39,9 +48,22 @@ email-breach-alert-blurb =
3948
# $hibp-link-attr (String) - Link to Have I Been Pwned
4049
email-2022-hibp-attribution = Datele privind încălcările securității datelor sunt furnizate de <a { $hibp-link-attr }>{ -brand-HIBP }</a>
4150
51+
## Verification email
52+
53+
email-verify-subhead = Verifică-ți adresa de e-mail pentru a începe să-ți protejezi datele după o încălcare a securității datelor.
54+
4255
## Breach report
4356

57+
email-breach-summary = Iată rezumatul încălcării securității datelor
4458
# Variables:
4559
# $email-address (string) - Email address, bolded
4660
email-breach-detected = Rezultatele căutării pentru contul { $email-address } au detectat că este posibil ca e-mailul tău să fi fost expus. Îți recomandăm să acționezi de îndată pentru a rezolva această încălcare a securității datelor.
4761
email-dashboard-cta = Mergi la tabloul de bord
62+
63+
## Breach alert email
64+
65+
email-breach-alert-all-subject = A fost detectată o nouă încălcare a securității datelor
66+
email-breach-alert-all-preview = Te vom ghida prin pașii necesari pentru a o rezolva.
67+
email-breach-alert-all-hero-heading = Ai fost implicat(ă) într-o nouă încălcare a securității datelor
68+
email-breach-alert-all-next-steps-cta-label = Să începem
69+
email-breach-alert-all-next-steps-button-dashboard = Mergi la tabloul de bord

locales/ro/exposure-card.ftl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# License, v. 2.0. If a copy of the MPL was not distributed with this
33
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
44

5+
chevron-alt = Detalii despre expunere
56
exposure-card-exposure-type = Tip de expunere
67
exposure-card-date-found = Data expunerii
78

locales/ro/fix.ftl

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,33 @@
22
# License, v. 2.0. If a copy of the MPL was not distributed with this
33
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
44

5+
fix-flow-nav-high-risk-data-breaches = Încălcări ale securității datelor cu risc ridicat
6+
fix-flow-nav-leaked-passwords = Parole expuse
7+
fix-flow-nav-security-recommendations = Recomandări de securitate
8+
guided-resolution-flow-exit = Revino în panoul de bord
9+
10+
# Celebration screens
11+
512

613
## Security recommendations flow
714

815

916
# High Risk Data Breaches
1017

18+
high-risk-breach-skip = Omite pentru moment
19+
# Variables:
20+
# $estimated_time is the estimated time it would take for a user to complete breach resolution steps. It not be singular, and the + is meant as "or more".
21+
# An example of this string is Your estimated time: 15+ minutes.
22+
high-risk-breach-estimated-time =
23+
{ $estimated_time ->
24+
[one] Timp estimat: peste { $estimated_time } minut
25+
[few] Timp estimat: peste { $estimated_time } minute
26+
*[other] Timp estimat: peste { $estimated_time } de minute
27+
}
1128
1229
# Credit Card Breaches
1330

31+
high-risk-breach-credit-card-title = Numărul cardului tău de credit a fost expus
1432
1533
# Bank Account Breaches
1634

next-env.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/// <reference types="next" />
22
/// <reference types="next/image-types/global" />
3+
/// <reference path="./.next/types/routes.d.ts" />
34

45
// NOTE: This file should not be edited
56
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

0 commit comments

Comments
 (0)