Merge pull request #208 from amosproj/fix-email-bugs

fix typos
amosproj · Jan 31, 2023 · c620ade · c620ade
2 parents eb6fe1a + 99f349c
commit c620ade
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/src/deskstar-backend/Deskstar/Helper/EmailHelper.cs b/src/deskstar-backend/Deskstar/Helper/EmailHelper.cs
@@ -20,7 +20,7 @@ public class EmailHelper
   private static string? _emailUsername;
   private static SmtpClient? _smtpClient;
 
-  private const string Footer = "Please note: This is an automatic email notification. Do not reply to this email. If this email contains time infomation, the used timezone is the ISo Norm Timezone.<br/> " +
+  private const string Footer = "Please note: This is an automatic email notification. Do not reply to this email. If this email contains time information, the used timezone is the ISO Norm Timezone.<br/> " +
                                 "<br/> " +
                                 "Regards, <br/> " +
                                 "<br/>" +

diff --git a/src/deskstar-backend/Deskstar/Usecases/BookingUsecases.cs b/src/deskstar-backend/Deskstar/Usecases/BookingUsecases.cs
@@ -110,9 +110,9 @@ public Booking CreateBooking(Guid userId, BookingRequest bookingRequest)
     _context.SaveChanges();
     var body = $"Hello {user.FirstName},</br> " +
                $"you have successfully booked desk {booking.Desk.DeskName}.</br> " +
-               $"Your booked timeslot is from {booking.StartTime} till {booking.EndTime}.</br>" +
+               $"Your booked timeslot is from {booking.StartTime} until {booking.EndTime}.</br>" +
                "Have a great day in the office!</br>";
-    EmailHelper.SendEmail(_logger, user.MailAddress, $"You're booking of desk {booking.Desk.DeskName} is confirmed!", body);
+    EmailHelper.SendEmail(_logger, user.MailAddress, $"Your booking of desk {booking.Desk.DeskName} is confirmed!", body);
     return booking;
   }
 
@@ -149,8 +149,8 @@ public Booking DeleteBooking(Guid userId, Guid bookingId)
 
     var body = $"Hello {user.FirstName},<br/> " +
                $"you have successfully canceled your booking of desk {booking.Desk.DeskName} " +
-               $"form {booking.StartTime} till {booking.EndTime}.<br/>";
-    EmailHelper.SendEmail(_logger, user.MailAddress, $"You're deleition of booking desk {booking.Desk.DeskName} is confirmed!", body);
+               $"from {booking.StartTime} until {booking.EndTime}.<br/>";
+    EmailHelper.SendEmail(_logger, user.MailAddress, $"The deletion of your booking is confirmed!", body);
     return booking;
   }
 
@@ -188,8 +188,8 @@ public Booking UpdateBooking(Guid userId, Guid bookingId, UpdateBookingRequest u
     _context.SaveChanges();
 
     var body = $"Hello {user.FirstName},</br> " +
-               $"you have successfully edit your booking of desk {booking.Desk.DeskName}.</br> " +
-               $"Your new timeslot is from {booking.StartTime} till {booking.EndTime}.</br>" +
+               $"you have successfully edited your booking of desk {booking.Desk.DeskName}.</br> " +
+               $"Your new timeslot is from {booking.StartTime} until {booking.EndTime}.</br>" +
                "Have a great day in the office!</br>";
     EmailHelper.SendEmail(_logger, user.MailAddress, $"Your booking of desk {booking.Desk.DeskName} is confirmed!", body);
     return booking;

diff --git a/src/deskstar-backend/Deskstar/Usecases/ResourceUsecases.cs b/src/deskstar-backend/Deskstar/Usecases/ResourceUsecases.cs
@@ -774,9 +774,9 @@ private void notifybookers(Desk deletedDesk)
     foreach (var booking in bookings)
     {
       var body = $"Hello {booking.User.FirstName},<br/> " +
-                 $"some problems with your booking of desk {booking.Desk.DeskName} between " +
-                 $"{booking.StartTime} till {booking.EndTime} occured.<br/>" +
-                 "The desk was deleted by an admin. Please make sure to book an other desk for your day in office.<br/>";
+                 $"some problems with your booking of desk {booking.Desk.DeskName} from " +
+                 $"{booking.StartTime} until {booking.EndTime} occured.<br/>" +
+                 "The desk was deleted by an admin. Please make sure to book another desk for your day in the office.<br/>";
       EmailHelper.SendEmail(_logger, booking.User.MailAddress, $"A problem with your booking of desk {booking.Desk.DeskName} occured!", body);
     }
   }

diff --git a/src/deskstar-frontend/pages/bookings/index.tsx b/src/deskstar-frontend/pages/bookings/index.tsx
@@ -96,13 +96,13 @@ export default function Bookings({
       <BookingsTable bookings={bookings} onEdit={onEdit} onDelete={onDelete} />
       <ConfirmModal
         title={
-          "Delete booking of desk" +
+          "Delete booking of desk " +
           booking?.deskName +
-          " between " +
+          " from " +
           dayjs(booking?.startTime, {
             utc: true,
           }).format("DD.MM.YYYY HH:mm") +
-          " till " +
+          " untill " +
           dayjs(booking?.endTime, {
             utc: true,
           }).format("DD.MM.YYYY HH:mm") +

diff --git a/src/deskstar-frontend/pages/resources/index.tsx b/src/deskstar-frontend/pages/resources/index.tsx
@@ -596,7 +596,7 @@ const ResourceOverview = ({
           />
           <ConfirmModal
             title={"Delete Desktype " + deskType?.deskTypeName + "?"}
-            description="This be undone!"
+            description="Make sure that all desks of this type are deleted first!"
             text=""
             warn
             buttonText="DELETE"