Merge branch 'dev' of https://github.com/umami-software/umami into dev

db/mysql/migrations/01_init/migration.sql

@@ -11,7 +11,7 @@ CREATE TABLE `user` (
     UNIQUE INDEX `user_user_id_key`(`user_id`),
     UNIQUE INDEX `user_username_key`(`username`),
     PRIMARY KEY (`user_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 -- CreateTable
 CREATE TABLE `session` (
@@ -33,7 +33,7 @@ CREATE TABLE `session` (
     INDEX `session_created_at_idx`(`created_at`),
     INDEX `session_website_id_idx`(`website_id`),
     PRIMARY KEY (`session_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 -- CreateTable
 CREATE TABLE `website` (
@@ -53,7 +53,7 @@ CREATE TABLE `website` (
     INDEX `website_created_at_idx`(`created_at`),
     INDEX `website_share_id_idx`(`share_id`),
     PRIMARY KEY (`website_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 -- CreateTable
 CREATE TABLE `website_event` (
@@ -76,7 +76,7 @@ CREATE TABLE `website_event` (
     INDEX `website_event_website_id_created_at_idx`(`website_id`, `created_at`),
     INDEX `website_event_website_id_session_id_created_at_idx`(`website_id`, `session_id`, `created_at`),
     PRIMARY KEY (`event_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 -- CreateTable
 CREATE TABLE `event_data` (
@@ -95,7 +95,7 @@ CREATE TABLE `event_data` (
     INDEX `event_data_website_event_id_idx`(`website_event_id`),
     INDEX `event_data_website_id_website_event_id_created_at_idx`(`website_id`, `website_event_id`, `created_at`),
     PRIMARY KEY (`event_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 -- CreateTable
 CREATE TABLE `team` (
@@ -109,7 +109,7 @@ CREATE TABLE `team` (
     UNIQUE INDEX `team_access_code_key`(`access_code`),
     INDEX `team_access_code_idx`(`access_code`),
     PRIMARY KEY (`team_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 -- CreateTable
 CREATE TABLE `team_user` (
@@ -124,7 +124,7 @@ CREATE TABLE `team_user` (
     INDEX `team_user_team_id_idx`(`team_id`),
     INDEX `team_user_user_id_idx`(`user_id`),
     PRIMARY KEY (`team_user_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 -- CreateTable
 CREATE TABLE `team_website` (
@@ -137,7 +137,7 @@ CREATE TABLE `team_website` (
     INDEX `team_website_team_id_idx`(`team_id`),
     INDEX `team_website_website_id_idx`(`website_id`),
     PRIMARY KEY (`team_website_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 -- AddSystemUser
 INSERT INTO user (user_id, username, role, password) VALUES ('41e2b680-648e-4b09-bcd7-3e2b10c06264' , 'admin', 'admin', '$2b$10$BUli0c.muyCW1ErNJc3jL.vFRFtFJWrT8/GcR4A.sUdCznaXiqFXa');

db/mysql/migrations/02_report_schema_session_data/migration.sql

@@ -21,7 +21,7 @@ CREATE TABLE `session_data` (
     INDEX `session_data_website_id_idx`(`website_id`),
     INDEX `session_data_session_id_idx`(`session_id`),
     PRIMARY KEY (`session_data_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 -- CreateTable
 CREATE TABLE `report` (
@@ -41,7 +41,7 @@ CREATE TABLE `report` (
     INDEX `report_type_idx`(`type`),
     INDEX `report_name_idx`(`name`),
     PRIMARY KEY (`report_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 -- EventData migration
 UPDATE event_data

package.json

@@ -123,7 +123,7 @@
   },
   "devDependencies": {
     "@formatjs/cli": "^4.2.29",
-    "@netlify/plugin-nextjs": "^5.1.0",
+    "@netlify/plugin-nextjs": "^5.8.1",
     "@rollup/plugin-alias": "^5.0.0",
     "@rollup/plugin-commonjs": "^25.0.4",
     "@rollup/plugin-json": "^6.0.0",

src/lang/fr-FR.json

@@ -66,7 +66,7 @@
   "label.edit-member": "Modifier le membre",
   "label.enable-share-url": "Activer l'URL de partage",
   "label.end-step": "End Step",
-  "label.entry": "Entry URL",
+  "label.entry": "URL d'entrée",
   "label.event": "Évènement",
   "label.event-data": "Données d'évènements",
   "label.events": "Évènements",
@@ -78,12 +78,12 @@
   "label.filter-combined": "Combiné",
   "label.filter-raw": "Brut",
   "label.filters": "Filtres",
-  "label.first-seen": "First seen",
+  "label.first-seen": "Vu pour la première fois",
   "label.funnel": "Entonnoir",
   "label.funnel-description": "Suivi des conversions et des taux d'abandons.",
   "label.goal": "Goal",
   "label.goals": "Goals",
-  "label.goals-description": "Track your goals for pageviews and events.",
+  "label.goals-description": "Suivez vos objectifs en matière de pages vues et d'événements.",
   "label.greater-than": "Supérieur à",
   "label.greater-than-equals": "Supérieur ou égal à",
   "label.host": "Host",
@@ -97,7 +97,7 @@
   "label.join": "Rejoindre",
   "label.join-team": "Rejoindre une équipe",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users navigate through your website.",
+  "label.journey-description": "Comprendre comment les utilisateurs naviguent sur votre site web.",
   "label.language": "Langue",
   "label.languages": "Langues",
   "label.laptop": "Portable",
@@ -137,12 +137,12 @@
   "label.path": "Path",
   "label.paths": "Paths",
   "label.powered-by": "Propulsé par {name}",
-  "label.previous": "Previous",
+  "label.previous": "Précédent",
-  "label.previous-period": "Previous period",
+  "label.previous-period": "Période précédente",
-  "label.previous-year": "Previous year",
+  "label.previous-year": "Année précédente",
   "label.profile": "Profil",
-  "label.properties": "Properties",
+  "label.properties": "Propriétés",
-  "label.property": "Property",
+  "label.property": "Propriété",
   "label.queries": "Requêtes",
   "label.query": "Requête",
   "label.query-parameters": "Paramètres de requête",
@@ -162,14 +162,14 @@
   "label.retention": "Rétention",
   "label.retention-description": "Mesure de l'attractivité du site en visualisant les taux de visiteurs qui reviennent.",
   "label.revenue": "Revenue",
-  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-description": "Examinez vos revenus au fil du temps.",
-  "label.revenue-property": "Revenue Property",
+  "label.revenue-property": "Propriétés des revenues",
   "label.role": "Rôle",
   "label.run-query": "Éxécuter la requête",
   "label.save": "Enregistrer",
   "label.screens": "Résolutions d'écran",
   "label.search": "Rechercher",
-  "label.select": "Select",
+  "label.select": "Selectionner",
   "label.select-date": "Choisir une période",
   "label.select-role": "Choisir un rôle",
   "label.select-website": "Choisir un site",
@@ -178,17 +178,17 @@
   "label.settings": "Paramètres",
   "label.share-url": "URL de partage",
   "label.single-day": "Journée",
-  "label.start-step": "Start Step",
+  "label.start-step": "Etape de démarrage",
   "label.steps": "Étapes",
   "label.sum": "Somme",
   "label.tablet": "Tablette",
   "label.team": "Équipe",
   "label.team-id": "ID d'équipe",
-  "label.team-manager": "Team manager",
+  "label.team-manager": "Manager de l'équipe",
   "label.team-member": "Membre de l'équipe",
   "label.team-name": "Nom de l'équipe",
   "label.team-owner": "Propriétaire de l'équipe",
-  "label.team-view-only": "Team view only",
+  "label.team-view-only": "Vue d'équipe uniquement",
   "label.team-websites": "Sites d'équipes",
   "label.teams": "Équipes",
   "label.theme": "Thème",
@@ -209,14 +209,14 @@
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Visiteurs uniques",
-  "label.uniqueCustomers": "Unique Customers",
+  "label.uniqueCustomers": "Clients uniques",
   "label.unknown": "Inconnu",
   "label.untitled": "Sans titre",
   "label.update": "Modifier",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Utilisateur",
-  "label.user-property": "User Property",
+  "label.user-property": "Propriétés d'utilisateurs",
   "label.username": "Nom d'utilisateur",
   "label.users": "Utilisateurs",
   "label.utm": "UTM",

src/lang/ro-RO.json

@@ -5,8 +5,8 @@
   "label.add": "Adaugă",
   "label.add-description": "Adaugă descriere",
   "label.add-member": "Adaugă membru",
-  "label.add-step": "Add step",
+  "label.add-step": "Adaugă pas",
-  "label.add-website": "Adăugare site web",
+  "label.add-website": "Adaugă site web",
   "label.admin": "Administrator",
   "label.after": "După",
   "label.all": "Toate",
@@ -24,12 +24,12 @@
   "label.cities": "Orașe",
   "label.city": "Oraș",
   "label.clear-all": "Șterge tot",
-  "label.compare": "Compare",
+  "label.compare": "Compară",
   "label.confirm": "Confirm",
   "label.confirm-password": "Confirmare parolă",
   "label.contains": "Conține",
   "label.continue": "Continuă",
-  "label.count": "Count",
+  "label.count": "Număr",
   "label.countries": "Țări",
   "label.country": "Țară",
   "label.create": "Crează",
@@ -37,21 +37,21 @@
   "label.create-team": "Crează echipă",
   "label.create-user": "Crează utilizator",
   "label.created": "Creat",
-  "label.created-by": "Created By",
+  "label.created-by": "Creat de",
-  "label.current": "Current",
+  "label.current": "Curent",
   "label.current-password": "Parola curentă",
   "label.custom-range": "Interval personalizat",
   "label.dashboard": "Tablou de bord",
   "label.data": "Date",
-  "label.date": "Data",
+  "label.date": "Dată",
-  "label.date-range": "Interval de date",
+  "label.date-range": "Interval",
   "label.day": "Zi",
-  "label.default-date-range": "Interval de date implicit",
+  "label.default-date-range": "Interval implicit",
   "label.delete": "Șterge",
   "label.delete-report": "Șterge raport",
   "label.delete-team": "Șterge echipă",
   "label.delete-user": "Șterge utilizator",
-  "label.delete-website": "Ștergere site web",
+  "label.delete-website": "Șterge site web",
   "label.description": "Descriere",
   "label.desktop": "Desktop",
   "label.details": "Detalii",
@@ -65,12 +65,12 @@
   "label.edit-dashboard": "Editare tablou de bord",
   "label.edit-member": "Editare membru",
   "label.enable-share-url": "Activare adresă URL de distribuire",
-  "label.end-step": "End Step",
+  "label.end-step": "Pas final",
-  "label.entry": "Entry URL",
+  "label.entry": "URL de intrare",
   "label.event": "Eveniment",
   "label.event-data": "Date despre eveniment",
   "label.events": "Evenimente",
-  "label.exit": "Exit URL",
+  "label.exit": "URL de ieșire",
   "label.false": "Fals",
   "label.field": "Câmp",
   "label.fields": "Câmpuri",
@@ -78,12 +78,12 @@
   "label.filter-combined": "Combinat",
   "label.filter-raw": "Brut",
   "label.filters": "Filtre",
-  "label.first-seen": "First seen",
+  "label.first-seen": "Văzut pentru prima dată",
   "label.funnel": "Parcursul utilizatorului",
   "label.funnel-description": "Înțelege rata de conversie și rata de abandon a utilizatorilor.",
-  "label.goal": "Goal",
+  "label.goal": "Obiectiv",
-  "label.goals": "Goals",
+  "label.goals": "Obiective",
-  "label.goals-description": "Track your goals for pageviews and events.",
+  "label.goals-description": "Urmărește obiectivele de vizualizări și evenimente.",
   "label.greater-than": "Mai mare decât",
   "label.greater-than-equals": "Mai mare sau egal cu",
   "label.host": "Host",
@@ -96,15 +96,15 @@
   "label.is-set": "Este setat",
   "label.join": "Alătură-te",
   "label.join-team": "Alătură-te echipei",
-  "label.journey": "Journey",
+  "label.journey": "Traseu",
-  "label.journey-description": "Understand how users navigate through your website.",
+  "label.journey-description": "Înțelege cum navighează vizitatorii prin website.",
   "label.language": "Limbă",
   "label.languages": "Limbi",
   "label.laptop": "Laptop",
   "label.last-days": "Ultimele {x} zile",
   "label.last-hours": "Ultimele {x} ore",
-  "label.last-months": "Last {x} months",
+  "label.last-months": "Ultimele {x} luni",
-  "label.last-seen": "Last seen",
+  "label.last-seen": "Văzut ultima dată",
   "label.leave": "Părăsește",
   "label.leave-team": "Părăsește echipa",
   "label.less-than": "Mai puțin decât",
@@ -134,15 +134,15 @@
   "label.pageTitle": "Titlul paginii",
   "label.pages": "Pagini",
   "label.password": "Parolă",
-  "label.path": "Path",
+  "label.path": "Rută",
-  "label.paths": "Paths",
+  "label.paths": "Rute",
   "label.powered-by": "Cu sprijinul {name}",
-  "label.previous": "Previous",
+  "label.previous": "Anterior",
-  "label.previous-period": "Previous period",
+  "label.previous-period": "Perioda anterioară",
-  "label.previous-year": "Previous year",
+  "label.previous-year": "Anul anterior",
   "label.profile": "Profil",
-  "label.properties": "Properties",
+  "label.properties": "Proprietăți",
-  "label.property": "Property",
+  "label.property": "Proprietate",
   "label.queries": "Interogări",
   "label.query": "Interogare",
   "label.query-parameters": "Parametri de interogare",
@@ -161,8 +161,8 @@
   "label.reset-website": "Resetează statisticile pentru site",
   "label.retention": "Retenție",
   "label.retention-description": "Măsoară atractivitatea site-ului tău prin urmărirea frecvenței cu care utilizatorii se întorc.",
-  "label.revenue": "Revenue",
+  "label.revenue": "Venit",
-  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-description": "Urmărește venitul în timp.",
   "label.revenue-property": "Revenue Property",
   "label.role": "Rol",
   "label.run-query": "Execută interogarea",
@@ -173,18 +173,18 @@
   "label.select-date": "Selectează data",
   "label.select-role": "Selectează rolul",
   "label.select-website": "Selectează website",
-  "label.session": "Session",
+  "label.session": "Sesiune",
   "label.sessions": "Sesiuni",
   "label.settings": "Setări",
   "label.share-url": "Partajare URL",
   "label.single-day": "O singură zi",
-  "label.start-step": "Start Step",
+  "label.start-step": "Pas de început",
-  "label.steps": "Steps",
+  "label.steps": "Pași",
   "label.sum": "Sumă",
   "label.tablet": "Tabletă",
   "label.team": "Echipă",
-  "label.team-id": "ID Echipa",
+  "label.team-id": "ID Echipă",
-  "label.team-manager": "Team manager",
+  "label.team-manager": "Manager echipă",
   "label.team-member": "Membru echipă",
   "label.team-name": "Nume echipă",
   "label.team-owner": "Titular echipă",
@@ -202,34 +202,34 @@
   "label.total": "Total",
   "label.total-records": "Total înregistrări",
   "label.tracking-code": "Cod de urmărire",
-  "label.transactions": "Transactions",
+  "label.transactions": "Tranzacții",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "Adevărat",
   "label.type": "Tip",
   "label.unique": "Unici",
   "label.unique-visitors": "Vizitatori unici",
-  "label.uniqueCustomers": "Unique Customers",
+  "label.uniqueCustomers": "Clienți unici",
   "label.unknown": "Necunoscut",
   "label.untitled": "Fără titlu",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Utilizator",
-  "label.user-property": "User Property",
+  "label.user-property": "Proprietatea utilizatorului",
   "label.username": "Nume utilizator",
   "label.users": "Utilizatori",
   "label.utm": "UTM",
-  "label.utm-description": "Track your campaigns through UTM parameters.",
+  "label.utm-description": "Urmărește campaniile tale cu parametri UTM.",
   "label.value": "Valoare",
   "label.view": "Vizualizare",
   "label.view-details": "Vizualizare detalii",
   "label.view-only": "Doar vizualizare",
   "label.views": "Vizualizări",
-  "label.views-per-visit": "Views per visit",
+  "label.views-per-visit": "Vizualizări per vizită",
   "label.visit-duration": "Timp mediu de vizitare",
   "label.visitors": "Vizitatori",
-  "label.visits": "Visits",
+  "label.visits": "Vizite",
   "label.website": "Website",
   "label.website-id": "ID Website",
   "label.websites": "Site-uri web",
@@ -237,7 +237,7 @@
   "label.yesterday": "Ieri",
   "message.action-confirmation": "Scrie {confirmation} în câmpul de mai jos pentru a confirma.",
   "message.active-users": "{x} {x, plural, one {vizitator activ} other {vizitatori activi}}",
-  "message.collected-data": "Collected data",
+  "message.collected-data": "Date colectate",
   "message.confirm-delete": "Ești sigur că vrei să ștergi {target}?",
   "message.confirm-leave": "Ești sigur că vrei să părăsești {target}?",
   "message.confirm-remove": "Ești sigur că vrei să ștergi {target}?",

yarn.lock

@@ -2192,10 +2192,10 @@
   resolved "https://registry.yarnpkg.com/@kurkle/color/-/color-0.3.2.tgz#5acd38242e8bde4f9986e7913c8fdf49d3aa199f"
   integrity sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==
 
-"@netlify/plugin-nextjs@^5.1.0":
+"@netlify/plugin-nextjs@^5.8.1":
-  version "5.6.0"
+  version "5.8.1"
-  resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-5.6.0.tgz#970f96b11bee4fe115fad8e3e4f3c6121f97a370"
+  resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-5.8.1.tgz#9da15bb4a13c5644e9b58b968c7da51939206ee4"
-  integrity sha512-PBrsd/GJZ9MN8BdyIoleTkY22lAUMfcRxrbb8wgxGzXtTW0RU0GW2mc99ISB6zOwWMZ11rSjeN0GS6znnukvww==
+  integrity sha512-WB1N0FslhWZ1yAVYTcB6CcFrFOUSQ0O2LfavYZrbAypeNxu2I+oO+cgmhfDgZ8Eoq1g4EMeoIGMkNoZ4ogZTsg==
 
 "@next/env@14.2.10":
   version "14.2.10"