yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-15 11:36:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into filter-translation-neq-removal

Browse Source
This commit is contained in:
David Lüder 2022-09-13 02:29:59 +02:00 committed by GitHub
commit 4ea9d481a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/admin/admin/src/pages/AuthPage/utils/forms.js
View File

@ -52,7 +52,7 @@ const forms = {
fieldsToDisable: ['email'],
fieldsToOmit: ['userInfo.confirmPassword', 'userInfo.news', 'userInfo.email'],
schema: yup.object().shape({
firstname: yup.string().required(translatedErrors.required),
firstname: yup.string().trim().required(translatedErrors.required),
lastname: yup.string(),
password: yup
.string()
@ -76,7 +76,7 @@ const forms = {
fieldsToDisable: [],
fieldsToOmit: ['confirmPassword', 'news'],
schema: yup.object().shape({
firstname: yup.string().required(translatedErrors.required),
firstname: yup.string().trim().required(translatedErrors.required),
lastname: yup.string(),
password: yup
.string()

2
packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/schema.js
View File

@ -2,7 +2,7 @@ import * as yup from 'yup';
import { translatedErrors } from '@strapi/helper-plugin';
const schema = yup.object().shape({
firstname: yup.string().required(translatedErrors.required),
firstname: yup.string().trim().required(translatedErrors.required),
lastname: yup.string(),
email: yup.string().email(translatedErrors.email).required(translatedErrors.required),
roles: yup.array().min(1, translatedErrors.required).required(translatedErrors.required),

4
packages/core/admin/admin/src/pages/SettingsPage/pages/Users/utils/validations/users/profile.js
View File

@ -2,8 +2,8 @@ import * as yup from 'yup';
import { translatedErrors } from '@strapi/helper-plugin';
export const commonUserSchema = {
firstname: yup.mixed().required(translatedErrors.required),
lastname: yup.mixed(),
firstname: yup.string().trim().required(translatedErrors.required),
lastname: yup.string(),
email: yup.string().email(translatedErrors.email).lowercase().required(translatedErrors.required),
username: yup.string().nullable(),
password: yup

32
packages/core/admin/admin/src/translations/fr.json
View File

@ -588,6 +588,38 @@
"content-manager.success.record.save": "Sauvegardé",
"content-manager.success.record.unpublish": "Publication annulée",
"content-manager.utils.data-loaded": "{number, plural, =1 {L'entrée a été chargée} other {Les entrées on été chargées} avec succès",
"content-manager.apiError.This attribute must be unique": "Le champ {field} doit être unique",
"form.button.continue": "Continuer",
"global.search": "Rechercher",
"global.actions": "Actions",
"global.back": "Retour",
"global.cancel": "Annuler",
"global.change-password": "Modifier le mot de passe",
"global.content-manager": "Gestion du contenu",
"global.continue": "Continuer",
"global.delete": "Supprimer",
"global.delete-target": "Supprimer {target}",
"global.description": "Description",
"global.details": "Détails",
"global.disabled": "Désactivé",
"global.documentation": "Documentation",
"global.enabled": "Activé",
"global.finish": "Terminer",
"global.marketplace": "Marketplace",
"global.name": "Nom",
"global.none": "Aucun",
"global.password": "Mot de passe",
"global.plugins": "Plugins",
"global.profile": "Profil",
"global.reset-password": "Réinitialiser le mot de passe",
"global.roles": "Rôles",
"global.save": "Enregistrer",
"global.see-more": "Voir plus",
"global.select": "Sélectionner",
"global.select-all-entries": "Sélectionner toutes les entrées",
"global.settings": "Paramètres",
"global.type": "Type",
"global.users": "Utilisateurs",
"form.button.done": "Terminer",
"global.prompt.unsaved": "Êtes-vous sûr de vouloir quitter cette page? Toutes vos modifications seront perdues",
"notification.contentType.relations.conflict": "Le Type de Contenu à des relations qui rentrent en conflit",

2
packages/core/admin/server/validation/common-validators.js
View File

@ -16,7 +16,7 @@ const getActionFromProvider = (actionId) => {
const email = yup.string().email().lowercase();
const firstname = yup.string().min(1);
const firstname = yup.string().trim().min(1);
const lastname = yup.string();

2
packages/core/strapi/lib/commands/admin-create.js
View File

@ -17,7 +17,7 @@ const passwordValidator = yup
const adminCreateSchema = yup.object().shape({
email: emailValidator,
password: passwordValidator,
firstname: yup.string().required('First name is required'),
firstname: yup.string().trim().required('First name is required'),
lastname: yup.string(),
});