Skip to content
This repository was archived by the owner on Apr 21, 2026. It is now read-only.

Commit a955ee7

Browse files
zainforbjszainforbjs
authored
Merge pull request #98 from paiindustries/fix/content
Fix/content
2 parents 3d9b5f9 + 37be704 commit a955ee7

4 files changed

Lines changed: 40 additions & 41 deletions

File tree

‎app/controllers/admin/AdminController.cfc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -441,10 +441,10 @@ component extends="app.Controllers.Controller" {
441441
var emailparams = {
442442
"name" = user.fullname,
443443
"buttonTitle" = "View Your Post",
444-
"content" = "Thank you for writing a blog post. Your post '#blog.title#' has been published on the Wheels website.",
444+
"content" = "Thank you for contributing to the Wheels.dev community. Your blog post '#blog.title#' has been published and is now live on our platform.",
445445
"URl" = siteurl,
446-
"Footer" = "If you did not write blog post, you can safely ignore this email.",
447-
"footerGreetings" = "Thank you for being a part of Wheels community.",
446+
"Footer" = "If you haven't published a blog post, please disregard this email.",
447+
"footerGreetings" = "Thank you for being part of the Wheels.dev community.",
448448
"isSubscriber" = user.newsletter
449449
};
450450
emailContent = renderView(template="/email", layout=false, returnAs="string", params=emailparams);
@@ -799,10 +799,10 @@ component extends="app.Controllers.Controller" {
799799
var emailparams = {
800800
"name" = user.fullname,
801801
"buttonTitle" = "View Your Comment",
802-
"content" = "Thanks for commenting on our blog post. Your comment is now live on the Wheels site.",
802+
"content" = "Thank you for engaging with our community. Your comment has been published and is now visible on the Wheels.dev platform.",
803803
"URl" = siteurl,
804-
"Footer" = "If you did not write comment, you can safely ignore this email.",
805-
"footerGreetings" = "Thank you for being a part of Wheels community.",
804+
"Footer" = "If you haven't submitted a comment, please disregard this email.",
805+
"footerGreetings" = "Thank you for being part of the Wheels.dev community.",
806806
"isSubscriber" = user.newsletter
807807
};
808808
emailContent = renderView(template="/email", layout=false, returnAs="string", params=emailparams);
@@ -875,10 +875,10 @@ component extends="app.Controllers.Controller" {
875875
var emailparams = {
876876
"name" = user.fullname,
877877
"buttonTitle" = "View Your Post",
878-
"content" = "Thank you for writing a blog post. Your post '#blog.title#' has been rejected.",
878+
"content" = "Thank you for your contribution to the Wheels.dev community. After careful review, we regret to inform you that your blog post '#blog.title#' has not been approved for publication at this time.",
879879
"URl" = "",
880-
"Footer" = "If you did not write blog post, you can safely ignore this email.",
881-
"footerGreetings" = "Thank you for being a part of Wheels community.",
880+
"Footer" = "If you haven't submitted a blog post, please disregard this email.",
881+
"footerGreetings" = "Thank you for being part of the Wheels.dev community.",
882882
"isSubscriber" = user.newsletter
883883
};
884884
emailContent = renderView(template="/email", layout=false, returnAs="string", params=emailparams);

‎app/controllers/web/AuthController.cfc‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ component extends="app.Controllers.Controller" {
5757
);
5858
data = {
5959
"success" = false,
60-
"message" = "Account locked due to too many failed attempts. Please contact an administrator to reset your account."
60+
"message" = "Account locked due to multiple failed login attempts. Please contact our support team to unlock your account."
6161
};
6262
renderWith(data=data, hideDebugInformation=true, status=423, layout='/responseLayout');
6363
return;
@@ -139,7 +139,7 @@ component extends="app.Controllers.Controller" {
139139
// Return JSON error response with 401 status code
140140
data={
141141
"success" = false,
142-
"message" = "Invalid login credentials. " & (remainingAttempts > 0 ? "You have #remainingAttempts# attempt(s) remaining." : "Account will be locked after next failed attempt.")
142+
"message" = "Invalid login credentials. " & (remainingAttempts > 0 ? "You have #remainingAttempts# attempt(s) remaining." : "Your account will be locked after the next failed attempt.")
143143
};
144144
renderWith(data=data, hideDebugInformation=true, status=401, layout='/responseLayout');
145145
return;
@@ -158,7 +158,7 @@ component extends="app.Controllers.Controller" {
158158
// Return a generic JSON error response with 500 status code
159159
data={
160160
"success" = false,
161-
"message" = "An unexpected error occurred during login. Please try again."
161+
"message" = "An unexpected error occurred during the login process. Please try again later."
162162
};
163163
renderWith(data=data, hideDebugInformation=true, status=500, layout='/responseLayout');
164164
return;
@@ -503,16 +503,16 @@ component extends="app.Controllers.Controller" {
503503

504504
// Send verification email
505505
if(sendVerificationEmail(newUser.email, verificationToken)){
506-
message = "Sign Up successfull. Please check your email to verify your account.";
506+
message = "Registration successful. Please check your email to verify your account.";
507507
}else{
508-
message = "Error sending verification email.";
508+
message = "Unable to send verification email. Please try again or contact support.";
509509
}
510510
}else{
511-
message = "Error! user not created.";
511+
message = "Unable to create user account. Please try again or contact support.";
512512
}
513513

514514
} else {
515-
message = "A user with the same email already exists.";
515+
message = "An account with this email address already exists.";
516516
}
517517

518518
} catch (any e) {
@@ -528,11 +528,11 @@ component extends="app.Controllers.Controller" {
528528
verifyUrl = verifyUrl & "?token=" & token;
529529
var emailparams = {
530530
"name" = user.fullname,
531-
"welcomeMessage" = "Welcome to Wheels.dev!",
531+
"welcomeMessage" = "Welcome to the Wheels.dev Community!",
532532
"buttonTitle" = "Verify Your Account",
533-
"content" = "Thank you for signing up. Please click the button below to verify your account and get started.",
533+
"content" = "Thank you for joining the Wheels.dev community. Please click the button below to verify your account and start your journey with us.",
534534
"URl" = verifyUrl,
535-
"Footer" = "If you did not request reset password, you can safely ignore this email.",
535+
"Footer" = "If you haven't created an account, please disregard this email.",
536536
"footerGreetings" = "Thank you for becoming a part of Wheels community."
537537
};
538538
emailContent = renderView(template="/email", layout=false, returnAs="string", params=emailparams);
@@ -654,13 +654,13 @@ component extends="app.Controllers.Controller" {
654654

655655
data = {
656656
"success" = true,
657-
"message" = "Password reset instructions have been sent to your email."
657+
"message" = "Password reset instructions have been sent to your email address."
658658
};
659659
} else {
660660
sendSignUpEmail(params.email);
661661
data = {
662662
"success" = true,
663-
"message" = "Password reset instructions have been sent to your email."
663+
"message" = "Password reset instructions have been sent to your email address."
664664
};
665665
}
666666

@@ -678,7 +678,7 @@ component extends="app.Controllers.Controller" {
678678

679679
data = {
680680
"success" = false,
681-
"message" = "An error occurred while processing your request. Please try again."
681+
"message" = "An error occurred while processing your request. Please try again or contact our support team."
682682
};
683683
renderWith(data=data, hideDebugInformation=true, status=500, layout='/responseLayout');
684684
}
@@ -728,7 +728,7 @@ component extends="app.Controllers.Controller" {
728728
if (!isObject(reset)) {
729729
data = {
730730
"success" = false,
731-
"message" = "Invalid or expired reset token."
731+
"message" = "Invalid or expired reset token. Please request a new password reset link."
732732
};
733733
renderText("#data.message#");
734734
return;
@@ -738,7 +738,7 @@ component extends="app.Controllers.Controller" {
738738
if (params.password != params.confirmPassword) {
739739
data = {
740740
"success" = false,
741-
"message" = "Passwords do not match."
741+
"message" = "The passwords you entered do not match. Please try again."
742742
};
743743
renderText("#data.message#");
744744
return;
@@ -747,7 +747,7 @@ component extends="app.Controllers.Controller" {
747747
if (len(params.password) < 8) {
748748
data = {
749749
"success" = false,
750-
"message" = "Password must be at least 8 characters long."
750+
"message" = "Password must be at least 8 characters long. Please choose a stronger password."
751751
};
752752
renderText("#data.message#");
753753
return;
@@ -761,7 +761,7 @@ component extends="app.Controllers.Controller" {
761761

762762
data = {
763763
"success" = true,
764-
"message" = "Password has been reset successfully. You can now login with your new password.",
764+
"message" = "Your password has been successfully reset. You can now log in with your new password.",
765765
"redirectUrl" = urlFor(action="login")
766766
};
767767
renderText("#data.message#");
@@ -779,7 +779,7 @@ component extends="app.Controllers.Controller" {
779779

780780
data = {
781781
"success" = false,
782-
"message" = "An error occurred while resetting your password. Please try again."
782+
"message" = "An error occurred while resetting your password. Please try again or contact our support team."
783783
};
784784
renderText("#data.message#");
785785
}
@@ -804,10 +804,10 @@ component extends="app.Controllers.Controller" {
804804
var emailparams = {
805805
"name" = name,
806806
"buttonTitle" = "Reset Password",
807-
"content" = "We received a request to reset the password for your account associated with this email address. If you made this request please click the button below to create a new password",
807+
"content" = "We received a request to reset the password for your Wheels.dev account. If you initiated this request, please click the button below to create a new password.",
808808
"URl" = resetUrl,
809-
"Footer" = "If you did not request reset password, you can safely ignore this email.",
810-
"footerGreetings" = "Thank you for being a part of Wheels community."
809+
"Footer" = "If you haven't requested a password reset, please disregard this email.",
810+
"footerGreetings" = "Thank you for being part of the Wheels.dev community."
811811
};
812812
var emailContent = renderView(template="/email", layout=false, returnAs="string", params=emailparams);
813813
cfheader(name="Content-Type" value="text/html; charset=UTF-8");
@@ -860,12 +860,11 @@ component extends="app.Controllers.Controller" {
860860
var signUpUrl = urlFor(action="register", onlyPath=false);
861861
var emailparams = {
862862
"name" = "User",
863-
"buttonTitle" = "Register here",
864-
"content" = "content" = "We noticed you tried to reset your password using this email address, but it looks like there's no account associated with it.
865-
No worries &mdash; it happens! If you're new to Wheels, we would love to have you on board.
866-
<br><br>Click below to create your free account and start building powerful ColdFusion applications with ease.",
863+
"buttonTitle" = "Join Wheels.dev",
864+
"content" = "We noticed you attempted to reset your password using this email address, but no account was found. If you're new to Wheels.dev, we'd love to welcome you to our community!
865+
<br><br>Click below to create your free account and start building powerful web applications with our framework.",
867866
"URl" = signUpUrl,
868-
"Footer" = "If you believe this is a mistake or you already have an account with a different email, feel free to try again or contact our support team for help.<br><br>If you did not request reset password, you can safely ignore this email.",
867+
"Footer" = "If you haven't requested a password reset, please disregard this email.",
869868
"footerGreetings" = ""
870869
};
871870
var emailContent = renderView(template="/email", layout=false, returnAs="string", params=emailparams);

‎app/views/admin/NewsletterController/index.cfm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,20 +150,20 @@
150150
<div class="modal-dialog modal-lg">
151151
<div class="modal-content">
152152
<div class="modal-header">
153-
<h5 class="modal-title">Send Newsletter</h5>
153+
<h5 class="modal-title">Send Newsletter to Subscribers</h5>
154154
<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
155155
</div>
156156
<div class="modal-body">
157157
<form hx-post="/admin/newsletter/send"
158158
hx-target="##newsletterResponse"
159159
hx-swap="innerHTML">
160160
<div class="mb-3">
161-
<label for="subject" class="form-label">Subject</label>
162-
<input type="text" class="form-control" id="subject" name="subject" required>
161+
<label for="subject" class="form-label">Newsletter Subject</label>
162+
<input type="text" class="form-control" id="subject" name="subject" placeholder="Enter newsletter subject" required>
163163
</div>
164164
<div class="mb-3">
165-
<label for="content" class="form-label">Content</label>
166-
<textarea class="form-control" id="content" name="content" rows="10" required></textarea>
165+
<label for="content" class="form-label">Newsletter Content</label>
166+
<textarea class="form-control" id="content" name="content" rows="10" placeholder="Write your newsletter content here..." required></textarea>
167167
</div>
168168
<div id="newsletterResponse"></div>
169169
<div class="text-end">

‎app/views/email.cfm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<a href="https://github.com/wheels-dev/wheels/releases" target="_blank" class="button-download"> Download </a>
117117
</div>
118118
<p style="font-size: 14px;">Happy Reporting,</p>
119-
<h5 style="margin-top: 5px !important; font-size: 14px;">The Team Wheels<h5>
119+
<h5 style="margin-top: 5px !important; font-size: 14px;">The Wheels Team<h5>
120120
<div class="signatureBox">
121121
<p class="signature">&copy;2005-2025 Wheels.Dev. All rights are reserved.<br>Wheels is licensed under the Apache License, Version 3.0.</p>
122122
<cfif structKeyExists(params, "isSubscriber") AND params.isSubscriber eq true>

0 commit comments

Comments
 (0)