Merge pull request #980 from opengisch/QF-4457-fix-validaror-help-text

Fix username form field help texts

docker-app/qfieldcloud/core/migrations/0077_alter_user_username.py

@@ -0,0 +1,38 @@
+# Generated by Django 3.2.25 on 2024-07-10 14:25
+
+import django.core.validators
+from django.db import migrations, models
+import qfieldcloud.core.validators
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("core", "0076_project_restrict_project_modification"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="user",
+            name="username",
+            field=models.CharField(
+                error_messages={"unique": "A user with that username already exists."},
+                help_text="Between 3 and 150 characters. Letters, digits, underscores '_' or hyphens '-' only. Must begin with a letter.",
+                max_length=150,
+                unique=True,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        "^[-a-zA-Z0-9_]+$",
+                        "Only letters, numbers, underscores '_' or hyphens '-' are allowed.",
+                    ),
+                    django.core.validators.RegexValidator(
+                        "^[a-zA-Z].*$", "Must begin with a letter."
+                    ),
+                    django.core.validators.RegexValidator(
+                        "^.{3,}$", "Must be at least 3 characters long."
+                    ),
+                    qfieldcloud.core.validators.reserved_words_validator,
+                ],
+                verbose_name="username",
+            ),
+        ),
+    ]

docker-app/qfieldcloud/core/models.py

@@ -227,17 +227,15 @@ class Type(models.IntegerChoices):
         max_length=150,
         unique=True,
         help_text=_(
-            "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only."
+            "Between 3 and 150 characters. Letters, digits, underscores '_' or hyphens '-' only. Must begin with a letter."
         ),
         validators=[
             RegexValidator(
                 r"^[-a-zA-Z0-9_]+$",
-                "Only letters, numbers, underscores or hyphens are allowed.",
-            ),
-            RegexValidator(r"^[a-zA-Z].*$", _("The name must begin with a letter.")),
-            RegexValidator(
-                r"^.{3,}$", _("The name must be at least 3 characters long.")
+                "Only letters, numbers, underscores '_' or hyphens '-' are allowed.",
             ),
+            RegexValidator(r"^[a-zA-Z].*$", _("Must begin with a letter.")),
+            RegexValidator(r"^.{3,}$", _("Must be at least 3 characters long.")),
             validators.reserved_words_validator,
         ],
         error_messages={