Skip to content

Commit

Permalink
fix: sync with base branch
Browse files Browse the repository at this point in the history
  • Loading branch information
mirovladimitrovski committed Jul 21, 2023
1 parent 262dbbe commit 7db6763
Show file tree
Hide file tree
Showing 9 changed files with 142 additions and 112 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"@typescript-eslint/eslint-plugin": "^5.17.0",
"@typescript-eslint/parser": "^5.17.0",
"@vitejs/plugin-react": "^1.0.7",
"@vitest/coverage-c8": "^0.32.4",
"@vitest/coverage-v8": "^0.33.0",
"allure-commandline": "^2.17.2",
"codeceptjs": "3.4.1",
"confusing-browser-globals": "^1.0.10",
Expand Down Expand Up @@ -128,7 +128,7 @@
"vite-plugin-pwa": "^0.14.0",
"vite-plugin-static-copy": "^0.13.0",
"vite-plugin-stylelint": "^4.0.1",
"vitest": "^0.32.3",
"vitest": "^0.33.0",
"workbox-build": "^6.5.4",
"workbox-window": "^6.5.4"
},
Expand Down
2 changes: 1 addition & 1 deletion public/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"close": "Cancel",
"confirm": "Yes"
},
"default_site_name": "My OTT Application",
"default_description": "JW OTT Webapp is an open-source, dynamically generated video website.",
"default_site_name": "My OTT Application",
"filter_videos_by": "Filter videos by {{name}}",
"filter_videos_by_genre": "Filter videos by genre",
"home": "Home",
Expand Down
2 changes: 1 addition & 1 deletion public/locales/en/demo.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"app_config_not_found": "Invalid or Missing App Config",
"app_config_learn_more": "Learn more about App Configs",
"app_config_not_found": "Invalid or Missing App Config",
"cancel_config_id": "Cancel",
"click_to_unselect_config": "(click here to unselect this config)",
"currently_previewing_config": "You are currently previewing config: '{{configSource}}'",
Expand Down
2 changes: 1 addition & 1 deletion public/locales/en/user.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
"firstname": "First name",
"hide_password": "Hide password",
"lastname": "Last name",
"other_registration_details": "Other registration details",
"password": "Password",
"save": "Save",
"other_registration_details": "Other registration details",
"security": "Password",
"terms_and_tracking": "Legal & Marketing",
"update_consents": "Update consents",
Expand Down
2 changes: 1 addition & 1 deletion public/locales/es/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"close": "Cancelar",
"confirm": ""
},
"default_site_name": "Mi aplicación OTT",
"default_description": "La OTT WebApp de JW es un sitio web de videos de código abierto generado dinamicamente.",
"default_site_name": "Mi aplicación OTT",
"filter_videos_by": "Filtrar videos por {{name}}",
"filter_videos_by_genre": "Filtrar videos por género",
"home": "Inicio",
Expand Down
2 changes: 1 addition & 1 deletion public/locales/es/demo.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"app_config_not_found": "Configuración de aplicación inválida o no encontrada",
"app_config_learn_more": "Más información sobre App Configs",
"app_config_not_found": "Configuración de aplicación inválida o no encontrada",
"cancel_config_id": "Cancelar",
"click_to_unselect_config": "(haz clic aquí para deseleccionar esta configuración)",
"currently_previewing_config": "Actualmente estás previsualizando la configuración: '{{configSource}}'",
Expand Down
1 change: 1 addition & 0 deletions public/locales/es/user.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"firstname": "Nombre",
"hide_password": "Ocultar contraseña",
"lastname": "Apellido",
"other_registration_details": "",
"password": "Contraseña",
"save": "Guardar",
"security": "Contraseña",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vitest Snapshot v1
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`<CustomRegisterField> > renders and matches snapshot <Checkbox> 1`] = `
<div>
Expand Down
Loading

0 comments on commit 7db6763

Please sign in to comment.