feat(i18n): traduire les messages flash et de validation
198 appels flash dans les sept modules de routes, plus les 23 messages de validation de app/validators.py. Le catalogue compte desormais 631 chaines, aucune non traduite. validators.py utilise lazy_gettext : les champs de schema sont construits a l'import, donc avant qu'une requete existe. Un gettext ordinaire s'y resoudrait une seule fois, dans la langue active au demarrage. Un bug introduit par la conversion, puis corrige Le convertisseur automatique ne voyait que le premier litteral d'un appel flash, ce qui a casse deux chaines concatenees sur plusieurs lignes dans users.py -- le resultat n'etait meme pas du Python valide. Ma premiere verification ne l'a pas vu : elle enchainait py_compile sur head, or head reussit toujours, donc le "OK" s'affichait quoi qu'il arrive. Les deux appels sont reecrits et la verification refaite correctement. Un bug plus interessant, revele par le test de fumee La langue choisie ne survivait pas a la connexion. login() et logout() appellent tous deux session.clear() -- l'un contre la fixation de session, l'autre pour terminer la session -- et le choix de langue partait avec le reste. Concretement : quelqu'un qui lisait la page de connexion en anglais se retrouvait en francais des qu'il se connectait. La langue est une preference d'affichage, pas un etat appartenant au compte. Les deux endroits la reportent maintenant explicitement, a cote du jeton CSRF. Quatre tests couvrent le cas, dont un qui verifie que corriger une cle preservee n'a pas fait tomber l'autre. Detail de nommage : le convertisseur avait genere %(value)s pour une expression conditionnelle, ce qui n'aide pas un traducteur. Renomme en %(player)s. Les 14 traductions ecrites avec une apostrophe droite sont normalisees en apostrophe typographique. Sans consequence en HTML, ou ' s'affiche correctement -- mais les blocs <script> ne decodent pas les entites, et autant que le catalogue soit homogene. 200 tests. Co-Authored-By: Claude Opus 5 <[email protected]>
This commit is contained in:
+28
-27
@@ -11,6 +11,7 @@ Usage:
|
||||
"""
|
||||
|
||||
import re
|
||||
from flask_babel import lazy_gettext as _l
|
||||
from marshmallow import Schema, fields, validate, ValidationError, pre_load, validates_schema, EXCLUDE
|
||||
from app.models import USER_TYPES
|
||||
|
||||
@@ -38,10 +39,10 @@ def validate_password(value):
|
||||
ValidationError: If password does not meet requirements.
|
||||
"""
|
||||
if not PASSWORD_POLICY.match(value):
|
||||
raise ValidationError(
|
||||
raise ValidationError(_l(
|
||||
'Password must be at least 8 characters with uppercase, '
|
||||
'lowercase, and a number.'
|
||||
)
|
||||
))
|
||||
|
||||
|
||||
def validate_username(value):
|
||||
@@ -57,9 +58,9 @@ def validate_username(value):
|
||||
ValidationError: If username does not meet requirements.
|
||||
"""
|
||||
if not re.match(r'^[a-zA-Z0-9_-]{3,30}$', value):
|
||||
raise ValidationError(
|
||||
raise ValidationError(_l(
|
||||
'Username must be 3-30 characters (letters, numbers, underscore, hyphen).'
|
||||
)
|
||||
))
|
||||
|
||||
|
||||
def validate_discord_username(value):
|
||||
@@ -77,7 +78,7 @@ def validate_discord_username(value):
|
||||
if not value:
|
||||
return
|
||||
if not re.match(r'^[a-zA-Z0-9_.]{2,32}$', value):
|
||||
raise ValidationError('Invalid Discord username format.')
|
||||
raise ValidationError(_l('Invalid Discord username format.'))
|
||||
|
||||
|
||||
def validate_discord_user_id(value):
|
||||
@@ -94,7 +95,7 @@ def validate_discord_user_id(value):
|
||||
if not value:
|
||||
return
|
||||
if not re.match(r'^\d{17,20}$', value):
|
||||
raise ValidationError('Discord User ID must be a 17-20 digit number.')
|
||||
raise ValidationError(_l('Discord User ID must be a 17-20 digit number.'))
|
||||
|
||||
|
||||
def validate_phone(value):
|
||||
@@ -112,7 +113,7 @@ def validate_phone(value):
|
||||
return
|
||||
cleaned = re.sub(r'[\s\-\(\)\.]', '', value)
|
||||
if not re.match(r'^\+?\d{7,15}$', cleaned):
|
||||
raise ValidationError('Invalid phone number format.')
|
||||
raise ValidationError(_l('Invalid phone number format.'))
|
||||
|
||||
|
||||
# =============================================================================
|
||||
@@ -151,11 +152,11 @@ class LoginSchema(StripMixin):
|
||||
"""
|
||||
username = fields.String(
|
||||
required=True,
|
||||
validate=validate.Length(min=1, max=80, error='Username is required.'),
|
||||
validate=validate.Length(min=1, max=80, error=_l('Username is required.')),
|
||||
)
|
||||
password = fields.String(
|
||||
required=True,
|
||||
validate=validate.Length(min=1, error='Password is required.'),
|
||||
validate=validate.Length(min=1, error=_l('Password is required.')),
|
||||
)
|
||||
|
||||
|
||||
@@ -176,13 +177,13 @@ class RegisterSchema(StripMixin):
|
||||
username = fields.String(
|
||||
required=True,
|
||||
validate=[
|
||||
validate.Length(min=3, max=80, error='Username must be 3-80 characters.'),
|
||||
validate.Length(min=3, max=80, error=_l('Username must be 3-80 characters.')),
|
||||
validate_username,
|
||||
],
|
||||
)
|
||||
email = fields.Email(
|
||||
required=True,
|
||||
validate=validate.Length(max=120, error='Email must be 120 characters or less.'),
|
||||
validate=validate.Length(max=120, error=_l('Email must be 120 characters or less.')),
|
||||
)
|
||||
password = fields.String(
|
||||
required=True,
|
||||
@@ -195,7 +196,7 @@ class RegisterSchema(StripMixin):
|
||||
)
|
||||
full_name = fields.String(
|
||||
required=True,
|
||||
validate=validate.Length(min=1, max=100, error='Full name is required.'),
|
||||
validate=validate.Length(min=1, max=100, error=_l('Full name is required.')),
|
||||
)
|
||||
phone = fields.String(
|
||||
validate=validate_phone,
|
||||
@@ -230,7 +231,7 @@ class RegisterSchema(StripMixin):
|
||||
ValidationError: If passwords do not match.
|
||||
"""
|
||||
if data.get('password') != data.get('confirm_password'):
|
||||
raise ValidationError('Passwords do not match.', field_name='confirm_password')
|
||||
raise ValidationError(_l('Passwords do not match.'), field_name='confirm_password')
|
||||
|
||||
|
||||
class CreateUserSchema(StripMixin):
|
||||
@@ -247,7 +248,7 @@ class CreateUserSchema(StripMixin):
|
||||
username = fields.String(
|
||||
required=True,
|
||||
validate=[
|
||||
validate.Length(min=3, max=80, error='Username must be 3-80 characters.'),
|
||||
validate.Length(min=3, max=80, error=_l('Username must be 3-80 characters.')),
|
||||
validate_username,
|
||||
],
|
||||
)
|
||||
@@ -262,13 +263,13 @@ class CreateUserSchema(StripMixin):
|
||||
)
|
||||
full_name = fields.String(
|
||||
required=True,
|
||||
validate=validate.Length(min=1, max=100, error='Full name is required.'),
|
||||
validate=validate.Length(min=1, max=100, error=_l('Full name is required.')),
|
||||
)
|
||||
role = fields.String(
|
||||
required=True,
|
||||
validate=validate.OneOf(
|
||||
USER_TYPES,
|
||||
error='Invalid role selected.'
|
||||
error=_l('Invalid role selected.')
|
||||
),
|
||||
)
|
||||
phone = fields.String(
|
||||
@@ -295,7 +296,7 @@ class EditUserSchema(StripMixin):
|
||||
"""
|
||||
full_name = fields.String(
|
||||
required=True,
|
||||
validate=validate.Length(min=1, max=100, error='Full name is required.'),
|
||||
validate=validate.Length(min=1, max=100, error=_l('Full name is required.')),
|
||||
)
|
||||
email = fields.Email(
|
||||
required=True,
|
||||
@@ -305,7 +306,7 @@ class EditUserSchema(StripMixin):
|
||||
required=True,
|
||||
validate=validate.OneOf(
|
||||
USER_TYPES,
|
||||
error='Invalid role selected.'
|
||||
error=_l('Invalid role selected.')
|
||||
),
|
||||
)
|
||||
is_active_account = fields.Boolean(load_default=True)
|
||||
@@ -361,7 +362,7 @@ class EditProfileSchema(StripMixin):
|
||||
)
|
||||
full_name = fields.String(
|
||||
required=True,
|
||||
validate=validate.Length(min=1, max=100, error='Full name is required.'),
|
||||
validate=validate.Length(min=1, max=100, error=_l('Full name is required.')),
|
||||
)
|
||||
email = fields.Email(
|
||||
required=True,
|
||||
@@ -405,10 +406,10 @@ class UploadContractSchema(StripMixin):
|
||||
"""
|
||||
player_id = fields.Integer(
|
||||
required=True,
|
||||
validate=validate.Range(min=1, error='Player must be selected.'),
|
||||
validate=validate.Range(min=1, error=_l('Player must be selected.')),
|
||||
)
|
||||
notes = fields.String(
|
||||
validate=validate.Length(max=2000, error='Notes must be 2000 characters or less.'),
|
||||
validate=validate.Length(max=2000, error=_l('Notes must be 2000 characters or less.')),
|
||||
allow_none=True,
|
||||
load_default=None,
|
||||
)
|
||||
@@ -427,25 +428,25 @@ class OneOnOneRequestSchema(StripMixin):
|
||||
required=True,
|
||||
validate=validate.Regexp(
|
||||
r'^\d{4}-\d{2}-\d{2}$',
|
||||
error='Date must be in YYYY-MM-DD format.'
|
||||
error=_l('Date must be in YYYY-MM-DD format.')
|
||||
),
|
||||
)
|
||||
start_time = fields.String(
|
||||
required=True,
|
||||
validate=validate.Regexp(
|
||||
r'^\d{2}:\d{2}$',
|
||||
error='Start time must be in HH:MM format.'
|
||||
error=_l('Start time must be in HH:MM format.')
|
||||
),
|
||||
)
|
||||
end_time = fields.String(
|
||||
required=True,
|
||||
validate=validate.Regexp(
|
||||
r'^\d{2}:\d{2}$',
|
||||
error='End time must be in HH:MM format.'
|
||||
error=_l('End time must be in HH:MM format.')
|
||||
),
|
||||
)
|
||||
points = fields.String(
|
||||
validate=validate.Length(max=2000, error='Points must be 2000 characters or less.'),
|
||||
validate=validate.Length(max=2000, error=_l('Points must be 2000 characters or less.')),
|
||||
allow_none=True,
|
||||
load_default=None,
|
||||
)
|
||||
@@ -462,13 +463,13 @@ class DisponibilityAddSchema(StripMixin):
|
||||
required=True,
|
||||
validate=validate.Range(
|
||||
min=0, max=6,
|
||||
error='Day must be 0 (Monday) to 6 (Sunday).'
|
||||
error=_l('Day must be 0 (Monday) to 6 (Sunday).')
|
||||
),
|
||||
)
|
||||
start_time = fields.String(
|
||||
required=True,
|
||||
validate=validate.Regexp(
|
||||
r'^\d{2}:\d{2}$',
|
||||
error='Start time must be in HH:MM format.'
|
||||
error=_l('Start time must be in HH:MM format.')
|
||||
),
|
||||
)
|
||||
Reference in New Issue
Block a user