From 15e43dea3ba33699bdea24c81373f40f764d7334 Mon Sep 17 00:00:00 2001 From: Philippe Pittoli Date: Sun, 31 Mar 2024 21:50:04 +0200 Subject: [PATCH] Change some texts. Again. --- src/App/DisplayErrors.purs | 18 +++++++++--------- src/App/Page/Zone.purs | 10 ++++++---- src/App/Text/Explanations.purs | 8 ++++---- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/App/DisplayErrors.purs b/src/App/DisplayErrors.purs index 32d2ca4..5649716 100644 --- a/src/App/DisplayErrors.purs +++ b/src/App/DisplayErrors.purs @@ -54,17 +54,17 @@ show_error_key_sizes min max show_error_title :: ValidationDNS.Error -> String show_error_title v = case v of ValidationDNS.UNKNOWN -> "Unknown" - ValidationDNS.VEIPv4 _ -> "The IPv4 address is wrong" - ValidationDNS.VEIPv6 _ -> "The IPv6 address is wrong" - ValidationDNS.VEName _ -> "The name (domain label) is wrong" + ValidationDNS.VEIPv4 _ -> "Invalid IPv4 address" + ValidationDNS.VEIPv6 _ -> "Invalid IPv6 address" + ValidationDNS.VEName _ -> "Invalid Name (domain label)" ValidationDNS.VETTL _ _ _ -> "Invalid TTL" - ValidationDNS.VETXT _ -> "The TXT input is wrong" - ValidationDNS.VECNAME _ -> "The CNAME input is wrong" - ValidationDNS.VENS _ -> "The NS input is wrong" - ValidationDNS.VEMX _ -> "The MX target input is wrong" + ValidationDNS.VETXT _ -> "Invalid TXT" + ValidationDNS.VECNAME _ -> "Invalid CNAME" + ValidationDNS.VENS _ -> "Invalid NS Target" + ValidationDNS.VEMX _ -> "Invalid MX Target" ValidationDNS.VEPriority _ _ _ -> "Invalid Priority" - ValidationDNS.VESRV _ -> "The SRV target input is wrong" - ValidationDNS.VEProtocol _ -> "The Protocol input is wrong" + ValidationDNS.VESRV _ -> "Invalid SRV Target" + ValidationDNS.VEProtocol _ -> "Invalid Protocol" ValidationDNS.VEPort _ _ _ -> "Invalid Port" ValidationDNS.VEWeight _ _ _ -> "Invalid Weight" diff --git a/src/App/Page/Zone.purs b/src/App/Page/Zone.purs index c2d2a81..ff1dee5 100644 --- a/src/App/Page/Zone.purs +++ b/src/App/Page/Zone.purs @@ -378,10 +378,12 @@ render state (updateForm Field_TTL) (show state._currentRR.ttl) should_be_disabled - , Bulma.box_input ("target" <> state._currentRR.rrtype) "Target" "198.51.100.5" - (updateForm Field_Target) - state._currentRR.target - should_be_disabled + , case state._currentRR.rrtype of + "AAAA" -> Bulma.box_input ("target" <> state._currentRR.rrtype) "Target" "2001:db8::1" (updateForm Field_Target) state._currentRR.target should_be_disabled + "TXT" -> Bulma.box_input ("target" <> state._currentRR.rrtype) "Your text" "blah blah" (updateForm Field_Target) state._currentRR.target should_be_disabled + "CNAME" -> Bulma.box_input ("target" <> state._currentRR.rrtype) "Target" "www" (updateForm Field_Target) state._currentRR.target should_be_disabled + "NS" -> Bulma.box_input ("target" <> state._currentRR.rrtype) "Target" "ns0.example.com." (updateForm Field_Target) state._currentRR.target should_be_disabled + _ -> Bulma.box_input ("target" <> state._currentRR.rrtype) "Target" "198.51.100.5" (updateForm Field_Target) state._currentRR.target should_be_disabled ] <> case state.rr_modal of UpdateRRModal -> if A.elem state._currentRR.rrtype ["A", "AAAA"] diff --git a/src/App/Text/Explanations.purs b/src/App/Text/Explanations.purs index a32995d..2d67eab 100644 --- a/src/App/Text/Explanations.purs +++ b/src/App/Text/Explanations.purs @@ -118,20 +118,20 @@ spf_default_behavior = [Bulma.p """ srv_introduction :: forall w i. Array (HH.HTML w i) srv_introduction = - [ Bulma.p "The SRV record is a DNS RR for specifying the location of services." + [ Bulma.p "The SRV record is a DNS resource record for specifying the location of services." , HH.p_ [ HH.text "Given a specific " , HH.u_ [HH.text "service name"] , HH.text " (which may be arbitrary) and a " , HH.u_ [HH.text "protocol"] , HH.text " (such as TCP or UDP), you can tell where the server is (address name and port). " , HH.text """ - Both the names of the service and the protocol are used to construct the name of the RR. + Both the names of the service and the protocol are used to construct the name of the resource record. """ ] , HH.p_ [ HH.text "For example, for a service named " , HH.u_ [HH.text "voip"] - , HH.text " and given that this service uses the TCP protocol, you can specify that the target is " + , HH.text " and given that this service uses the TCP protocol, the target " , HH.u_ [HH.text "server1.example.com."] - , HH.text "." + , HH.text " could be specified." ] ]