Be more polite.
This commit is contained in:
		
							parent
							
								
									d9fc823886
								
							
						
					
					
						commit
						60552fff1e
					
				
					 5 changed files with 12 additions and 12 deletions
				
			
		| 
						 | 
				
			
			@ -529,7 +529,7 @@ handleAction = case _ of
 | 
			
		|||
            case current_page of
 | 
			
		||||
              Registration -> do
 | 
			
		||||
                let successlog = """
 | 
			
		||||
                    You are now registered. Please verify your email address with the token we sent you.
 | 
			
		||||
                    You are now registered. Please verify your email address with the token we have sent you.
 | 
			
		||||
                """
 | 
			
		||||
                handleAction $ Log $ SuccessLog successlog
 | 
			
		||||
                handleAction $ AddNotif $ GoodNotification successlog
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -293,10 +293,10 @@ handleAction = case _ of
 | 
			
		|||
    H.raise $ UserLogin login
 | 
			
		||||
    case login, pass of
 | 
			
		||||
      "" , _ ->
 | 
			
		||||
        H.raise $ Log $ UnableToSend "Write your login!"
 | 
			
		||||
        H.raise $ Log $ UnableToSend "Please, write your login!"
 | 
			
		||||
 | 
			
		||||
      _ , "" ->
 | 
			
		||||
        H.raise $ Log $ UnableToSend "Write your password!"
 | 
			
		||||
        H.raise $ Log $ UnableToSend "Please, write your password!"
 | 
			
		||||
 | 
			
		||||
      _, _ -> do
 | 
			
		||||
        case L.login login, P.password_on_authentication_page pass of
 | 
			
		||||
| 
						 | 
				
			
			@ -314,7 +314,7 @@ handleAction = case _ of
 | 
			
		|||
        email = passwordRecoveryForm.email
 | 
			
		||||
 | 
			
		||||
    case login, email of
 | 
			
		||||
      "", "" -> H.raise $ Log $ UnableToSend "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 == ""
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -116,10 +116,10 @@ handleAction = case _ of
 | 
			
		|||
 | 
			
		||||
    case login, token of
 | 
			
		||||
      "", _ ->
 | 
			
		||||
        H.raise $ Log $ UnableToSend "Write your login!"
 | 
			
		||||
        H.raise $ Log $ UnableToSend "Please, write your login!"
 | 
			
		||||
 | 
			
		||||
      _, "" ->
 | 
			
		||||
        H.raise $ Log $ UnableToSend "Write your token!"
 | 
			
		||||
        H.raise $ Log $ UnableToSend "Please, write your token!"
 | 
			
		||||
 | 
			
		||||
      _, _ -> do
 | 
			
		||||
        case L.login login, T.token token of
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -158,13 +158,13 @@ handleAction = case _ of
 | 
			
		|||
 | 
			
		||||
    case login, email, pass of
 | 
			
		||||
      "", _, _ ->
 | 
			
		||||
        H.raise $ Log $ UnableToSend "Write your login!"
 | 
			
		||||
        H.raise $ Log $ UnableToSend "Please, write your login!"
 | 
			
		||||
 | 
			
		||||
      _, "", _ ->
 | 
			
		||||
        H.raise $ Log $ UnableToSend "Write your email!"
 | 
			
		||||
        H.raise $ Log $ UnableToSend "Please, write your email!"
 | 
			
		||||
 | 
			
		||||
      _, _, "" ->
 | 
			
		||||
        H.raise $ Log $ UnableToSend "Write your password!"
 | 
			
		||||
        H.raise $ Log $ UnableToSend "Please, write your password!"
 | 
			
		||||
 | 
			
		||||
      _, _, _ -> do
 | 
			
		||||
        case L.login login, E.email email, P.password pass of
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -169,7 +169,7 @@ handleAction = case _ of
 | 
			
		|||
 | 
			
		||||
    { new_email_address } <- H.get
 | 
			
		||||
    case new_email_address of
 | 
			
		||||
      "" -> H.raise $ Log $ UnableToSend "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 "Write your password!"
 | 
			
		||||
      _ , "" -> H.raise $ Log $ UnableToSend "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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue