From dd2074b9b940cee9668329e763fbae8765be8a95 Mon Sep 17 00:00:00 2001 From: Philippe Pittoli Date: Fri, 8 Nov 2024 02:03:30 +0100 Subject: [PATCH] Phrasing. --- src/App/Container.purs | 10 +++++----- src/App/DisplayErrors.purs | 2 +- src/App/Page/Administration.purs | 6 +++--- src/App/Page/Authentication.purs | 6 +++--- src/App/Page/DomainList.purs | 8 ++++---- src/App/Page/Home.purs | 8 ++++---- src/App/Page/MailValidation.purs | 4 ++-- src/App/Page/Registration.purs | 6 +++--- src/App/Page/Setup.purs | 8 ++++---- src/App/WS.purs | 2 +- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/App/Container.purs b/src/App/Container.purs index a89dc17..7ba0f49 100644 --- a/src/App/Container.purs +++ b/src/App/Container.purs @@ -724,12 +724,12 @@ handleAction = case _ of (DNSManager.MkError errmsg) -> do handleAction $ Log $ ErrorLog errmsg.reason (DNSManager.MkErrorUserNotLogged _) -> do - handleAction $ Log $ ErrorLog $ "The user isn't connected!" + handleAction $ Log $ ErrorLog $ "The user isn't connected." handleAction $ Log $ SystemLog $ "Trying to authenticate to fix the problem..." handleAction AuthenticateToDNSManager (DNSManager.MkErrorInvalidToken _) -> do H.modify_ _ { token = Nothing, current_page = Home } - handleAction $ Log $ ErrorLog $ "Invalid token! Try re-authenticate." + handleAction $ Log $ ErrorLog $ "Invalid token. Try re-authenticate." -- TODO: should we disconnect from authd? handleAction $ ToggleAuthenticated Nothing (DNSManager.MkDomainAlreadyExists _) -> do @@ -752,7 +752,7 @@ handleAction = case _ of <> response.domain <> "\". 🥳 You can now manage it (click on its button)." handleAction $ DispatchDNSMessage m (DNSManager.MkRRReadOnly response) -> do - handleAction $ Log $ ErrorLog $ "Trying to modify a read-only resource! " + handleAction $ Log $ ErrorLog $ "Trying to modify a read-only resource. " <> "domain: " <> response.domain <> "resource rrid: " <> show response.rr.rrid m@(DNSManager.MkRRUpdated _) -> do @@ -788,7 +788,7 @@ handleAction = case _ of handleAction $ Log $ SuccessLog "Received orphan domain list." H.tell _admini unit (AdminInterface.GotOrphanDomainList response.domains) (DNSManager.GotKeepAlive _) -> do - -- handleAction $ Log $ SystemLog $ "KeepAlive!" + -- handleAction $ Log $ SystemLog $ "KeepAlive." pure unit pure unit @@ -811,7 +811,7 @@ handleAction = case _ of revert_old_page Authentication, m@(DNSManager.MkLogged _) -> do update_domain_list state m - -- handleAction $ Log $ SystemLog "go to domain list!" + -- handleAction $ Log $ SystemLog "go to domain list." handleAction $ Routing DomainList -- Logged = page just reloaded, but page already changed, no need to do that again. _, m@(DNSManager.MkLogged _) -> do diff --git a/src/App/DisplayErrors.purs b/src/App/DisplayErrors.purs index 5ddce1a..0d38095 100644 --- a/src/App/DisplayErrors.purs +++ b/src/App/DisplayErrors.purs @@ -105,7 +105,7 @@ show_error_domain e = case e of _ -> Bulma.p """ The domain (or label) contains invalid characters. A domain label should start with a letter, - then eventually a series of letters, digits and hyphenations ("-"), + then possibly a series of letters, digits and hyphenations ("-"), and must finish with either a letter or a digit. """ diff --git a/src/App/Page/Administration.purs b/src/App/Page/Administration.purs index 025a3b1..8e8db96 100644 --- a/src/App/Page/Administration.purs +++ b/src/App/Page/Administration.purs @@ -244,9 +244,9 @@ handleAction = case _ of pass = addUserForm.pass case login, email, pass of - "", _, _ -> H.raise $ Log $ UnableToSend "Write the user's login!" - _, "", _ -> H.raise $ Log $ UnableToSend "Write the user's email!" - _, _, "" -> H.raise $ Log $ UnableToSend "Write the user's password!" + "", _, _ -> H.raise $ Log $ UnableToSend "Write the user's login." + _, "", _ -> H.raise $ Log $ UnableToSend "Write the user's email." + _, _, "" -> H.raise $ Log $ UnableToSend "Write the user's password." _, _, _ -> do ab <- H.liftEffect $ AuthD.serialize $ diff --git a/src/App/Page/Authentication.purs b/src/App/Page/Authentication.purs index cf313c9..393dd95 100644 --- a/src/App/Page/Authentication.purs +++ b/src/App/Page/Authentication.purs @@ -299,10 +299,10 @@ handleAction = case _ of H.raise $ UserLogin login case login, pass of "" , _ -> - H.raise $ Log $ UnableToSend "Please, write your login!" + H.raise $ Log $ UnableToSend "Please, write your login." _ , "" -> - H.raise $ Log $ UnableToSend "Please, write your password!" + H.raise $ Log $ UnableToSend "Please, write your password." _, _ -> do case L.login login, P.password_on_authentication_page pass of @@ -320,7 +320,7 @@ handleAction = case _ of email = passwordRecoveryForm.email case login, email of - "", "" -> H.raise $ Log $ UnableToSend "Please, write your login or your email!" + "", "" -> H.raise $ Log $ UnableToSend "Please, write your login or your email." _, _ -> do H.raise $ Log $ SystemLog "password recovery" if email == "" diff --git a/src/App/Page/DomainList.purs b/src/App/Page/DomainList.purs index 501596f..3ad7dc2 100644 --- a/src/App/Page/DomainList.purs +++ b/src/App/Page/DomainList.purs @@ -268,7 +268,7 @@ render { accepted_domains, my_domains, newDomainForm, askDomainTransferForm, del , HH.strong_ [ HH.text "irreversible" ] , HH.text "." , Bulma.notification_warning' """ - In case this domain is shared, it won't be deleted, you'll just remove it from your domains. + In case this domain is shared, it will just be removed from your domains. """ ] @@ -284,7 +284,7 @@ render { accepted_domains, my_domains, newDomainForm, askDomainTransferForm, del owned_domain_row domain = HH.tr_ [ HH.td_ [ Bulma.btn domain.name (EnterDomain domain.name) ] , case domain.transfer_key of - Just key -> HH.td_ [ Bulma.p key ] + Just key -> HH.td_ [ Bulma.p "Token key:", Bulma.p key ] Nothing -> HH.td_ [ Bulma.btn "Transfer" (TransferDomain domain.name) ] , HH.td_ [ Bulma.btn "Share" (ShareDomain domain.name) ] , HH.td_ [ Bulma.alert_btn "Delete" (DeleteDomainModal domain.name) ] @@ -385,7 +385,7 @@ handleAction = case _ of case newDomainForm.new_domain, newDomainForm._errors, new_domain of "", _, _ -> - H.raise $ Log $ UnableToSend "You didn't enter the new domain." + H.raise $ Log $ UnableToSend "Please enter the new domain." _, [], _ -> do message <- H.liftEffect $ DNSManager.serialize @@ -402,7 +402,7 @@ handleAction = case _ of { askDomainTransferForm } <- H.get case askDomainTransferForm.uuid, askDomainTransferForm._errors of "", _ -> - H.raise $ Log $ UnableToSend "You didn't enter the UUID of the transfer." + H.raise $ Log $ UnableToSend "Please enter the UUID of the transfer." uuid, [] -> do message <- H.liftEffect $ DNSManager.serialize diff --git a/src/App/Page/Home.purs b/src/App/Page/Home.purs index 7806b63..c83e7bc 100644 --- a/src/App/Page/Home.purs +++ b/src/App/Page/Home.purs @@ -42,7 +42,7 @@ render :: forall m. State -> H.ComponentHTML Action () m render _ = HH.div_ [ Bulma.hero_danger "THIS IS A BETA RELEASE" - "You can register, login and play a bit with the tool. Feel free to report errors and suggestions!" + "You can register, login and play a bit with the tool. Feel free to report errors and suggestions." , Bulma.section_small [ Bulma.h1 "Welcome to netlib.re" , Bulma.subtitle "Free domain names for the common folks" @@ -68,7 +68,7 @@ render _ = HH.div_ , p "Manage your own DNS zone." ] render_no_expert - = b [ title "No need to be an expert!" + = b [ title "No need to be an expert" , p """ This website will help you through your configuration, as much as we can. """ @@ -85,7 +85,7 @@ render _ = HH.div_ = b [ title "Automatic updates" , p "Update your records with a single, stupidly simple command. For example:" , expl [ Bulma.strong "wget https://netlib.re/token-update/" ] - , p "Every A and AAAA records have tokens for easy updates!" + , p "Every A and AAAA records have tokens for easy updates." ] render_why @@ -106,7 +106,7 @@ render _ = HH.div_ , p "This service helps you manage your domain (a subdomain of netlib.re or codelib.re)." ] render_code - = b [ title "I want to see the code!" + = b [ title "I want to see the code! 🤓​" , p "The project is fully open-source (ISC licence)." , HH.text "There are a few parts:" , HH.ul_ diff --git a/src/App/Page/MailValidation.purs b/src/App/Page/MailValidation.purs index cb6d92b..f6af80f 100644 --- a/src/App/Page/MailValidation.purs +++ b/src/App/Page/MailValidation.purs @@ -116,10 +116,10 @@ handleAction = case _ of case login, token of "", _ -> - H.raise $ Log $ UnableToSend "Please, write your login!" + H.raise $ Log $ UnableToSend "Please, write your login." _, "" -> - H.raise $ Log $ UnableToSend "Please, write your token!" + H.raise $ Log $ UnableToSend "Please, write your token." _, _ -> do case L.login login, T.token token of diff --git a/src/App/Page/Registration.purs b/src/App/Page/Registration.purs index a26370d..cddb199 100644 --- a/src/App/Page/Registration.purs +++ b/src/App/Page/Registration.purs @@ -158,13 +158,13 @@ handleAction = case _ of case login, email, pass of "", _, _ -> - H.raise $ Log $ UnableToSend "Please, write your login!" + H.raise $ Log $ UnableToSend "Please, write your login." _, "", _ -> - H.raise $ Log $ UnableToSend "Please, write your email!" + H.raise $ Log $ UnableToSend "Please, write your email." _, _, "" -> - H.raise $ Log $ UnableToSend "Please, write your password!" + H.raise $ Log $ UnableToSend "Please, write your password." _, _, _ -> do case L.login login, E.email email, P.password pass of diff --git a/src/App/Page/Setup.purs b/src/App/Page/Setup.purs index 0454872..6eeb23b 100644 --- a/src/App/Page/Setup.purs +++ b/src/App/Page/Setup.purs @@ -113,7 +113,7 @@ render { modal, newPasswordForm, new_email_address, emails } = where render_current (Just (Email.Email e)) = [ Bulma.p $ "Current email address: " ] <> [ Bulma.btn_ro (C.is_small <> C.is_warning) e] - render_current Nothing = [ Bulma.p "You do not currently have a validated email address!" ] + render_current Nothing = [ Bulma.p "You do not currently have a validated email address." ] render_pending (Just (Email.Email e)) = [ Bulma.p $ "Pending email address: " ] <> [ Bulma.btn_ro (C.is_small <> C.is_warning) e] @@ -169,7 +169,7 @@ handleAction = case _ of { new_email_address } <- H.get case new_email_address of - "" -> H.raise $ Log $ UnableToSend "Please, write your new email address!" + "" -> H.raise $ Log $ UnableToSend "Please, write your new email address." email_address -> do case E.email email_address of Left errors -> H.raise $ Log $ UnableToSend $ A.fold $ map show_error_email errors @@ -180,8 +180,8 @@ handleAction = case _ of { newPasswordForm } <- H.get case newPasswordForm.password, newPasswordForm.confirmation of - "" , _ -> H.raise $ Log $ UnableToSend "Please, write your password!" - _ , "" -> H.raise $ Log $ UnableToSend "Please, confirm your password!" + "" , _ -> H.raise $ Log $ UnableToSend "Please, write your password." + _ , "" -> H.raise $ Log $ UnableToSend "Please, confirm your password." pass, confirmation -> do if pass == confirmation then case P.password pass of diff --git a/src/App/WS.purs b/src/App/WS.purs index 6ace63f..76ad71d 100644 --- a/src/App/WS.purs +++ b/src/App/WS.purs @@ -177,7 +177,7 @@ handleAction action = do SendMessage array_buffer_to_send -> do case wsInfo.connection of - Nothing -> H.raise $ Log $ UnableToSend $ "Websocket is down!" + Nothing -> H.raise $ Log $ UnableToSend $ "Websocket is down." Just webSocket -> H.liftEffect $ do sendArrayBuffer webSocket array_buffer_to_send