From 6f83fd8effa94c610db098e7a5f3a22894d4e8ee Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 7 Oct 2022 10:01:45 +0200
Subject: [PATCH] interfaces: tweak device name validation messages

---
 src/opnsense/mvc/app/models/OPNsense/Interfaces/Vlan.php | 6 +++---
 src/opnsense/mvc/app/models/OPNsense/Interfaces/Vlan.xml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Interfaces/Vlan.php b/src/opnsense/mvc/app/models/OPNsense/Interfaces/Vlan.php
index 242873d3b..b22851c75 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Interfaces/Vlan.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Interfaces/Vlan.php
@@ -53,15 +53,15 @@ class Vlan extends BaseModel
                             break;
                         } elseif (!(strpos((string)$node, (string)$prefix) === 0)) {
                             $messages->appendMessage(new Message(
-                                sprintf(gettext("Device name does not match type (e.g. %s0XXX)."), (string)$prefix),
+                                sprintf(gettext('The device name prefix "%s" is required.'), (string)$prefix),
                                 $key
                             ));
                         } elseif (!preg_match("/^{$prefix}0([0-9\.]){1,10}$/", (string)$node)) {
                             $messages->appendMessage(new Message(
                                 sprintf(
                                     gettext(
-                                        "A maximum of 15 characters is allowed starting with %s0 combined with " .
-                                        "numeric characters and dots[.], e.g. (%s.1.104)"
+                                        'Only a maximum of 15 characters is allowed starting with "%s0" combined with ' .
+                                        'numeric characters and dots, e.g. "%s0.1.104".'
                                     ),
                                     $prefix,
                                     $prefix
diff --git a/src/opnsense/mvc/app/models/OPNsense/Interfaces/Vlan.xml b/src/opnsense/mvc/app/models/OPNsense/Interfaces/Vlan.xml
index 47c23efec..28661af88 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Interfaces/Vlan.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Interfaces/Vlan.xml
@@ -20,7 +20,7 @@
                 <Required>Y</Required>
                 <Constraints>
                     <check001>
-                        <ValidationMessage>Tag should be unique for this interface</ValidationMessage>
+                        <ValidationMessage>Tag for this device must be unique.</ValidationMessage>
                         <type>UniqueConstraint</type>
                         <addFields>
                             <field1>if</field1>
@@ -49,7 +49,7 @@
               <Required>Y</Required>
               <Constraints>
                 <check001>
-                    <ValidationMessage>The interface name should be unique.</ValidationMessage>
+                    <ValidationMessage>The device name must be unique.</ValidationMessage>
                     <type>UniqueConstraint</type>
                 </check001>
               </Constraints>