Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spelling: Various fixes #919

Open
wants to merge 7 commits into
base: Dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Voat.Business/Data/Repository/Repository.cs
Expand Up @@ -3736,7 +3736,7 @@ public IEnumerable<VotedValue> UserVoteStatus(string userName, ContentType type,
return CommandResponse.FromStatus<bool?>(null, Status.Denied, "Subverse is disabled");
}

var set = GetOrCreateSubverseSet(new SubverseSet() { Name = SetType.Front.ToString(), UserName = User.Identity.Name, Type = (int)SetType.Front, Description = "Front Page Subverse Subscriptions" });
var set = GetOrCreateSubverseSet(new SubverseSet() { Name = SetType.Front.ToString(), UserName = User.Identity.Name, Type = (int)SetType.Front, Description = "Frontpage Subverse Subscriptions" });

response = await SetSubverseListChange(set, subverse, action);

Expand Down Expand Up @@ -3983,7 +3983,7 @@ private async Task UpdateSubverseSubscriberCount(DomainReference domainReference
{
//send unban msg
msg.Subject = $"You've been unbanned from v/{subverse} :)";
msg.Message = $"@{User.Identity.Name} has unbanned you from v/{subverseModel.Name}. Play nice. Promise me. Ok, I believe you.";
msg.Message = $"@{User.Identity.Name} has unbanned you from v/{subverseModel.Name}. Play nice. Promise me. OK, I believe you.";
}
SendMessage(msg);
}
Expand Down
4 changes: 2 additions & 2 deletions src/Voat.UI/Controllers/AccountController.cs
Expand Up @@ -274,7 +274,7 @@ public async Task<ActionResult> Register(RegisterViewModel model)
var accountsWithSameIp = UserManager.Users.Count(x => x.LastLoginFromIp == clientIpAddress);
if (accountsWithSameIp >= VoatSettings.Instance.MaxAllowedAccountsFromSingleIP)
{
ModelState.AddModelError(string.Empty, "This device can not be used to create a voat account.");
ModelState.AddModelError(string.Empty, "This device can not be used to create a Voat account.");
return View(model);
}

Expand Down Expand Up @@ -875,7 +875,7 @@ public async Task<ActionResult> ForgotPassword(ForgotPasswordViewModel model)
var response = await EmailSender.Instance.SendEmail(
user.Email,
"Voat Password Reset Request",
$"You have requested to reset your Voat password.<br/><br/>If you did not do this, please ignore this email.<br/><br/>To reset your password please click the following link or copy and paste the url into your browser address bar: <a href=\"{callbackUrl}\">{callbackUrl}</a>");
$"You have requested to reset your Voat password.<br/><br/>If you did not do this, please ignore this email.<br/><br/>To reset your password please click the following link or copy and paste the URL into your browser address bar: <a href=\"{callbackUrl}\">{callbackUrl}</a>");

return RedirectToAction("ForgotPasswordConfirmation", "Account");
}
Expand Down
2 changes: 1 addition & 1 deletion src/Voat.UI/Models/ViewModels/ApiKeyCreateRequest.cs
Expand Up @@ -46,7 +46,7 @@ public class ApiKeyCreateRequest

[Display(Name = "App About Url")]
[StringLength(200)]
[Url(ErrorMessage = "Please enter a valid http, https, or ftp URL.")]
[Url(ErrorMessage = "Please enter a valid HTTP, HTTPS, or FTP URL.")]
public string AboutUrl { get; set; }


Expand Down
2 changes: 1 addition & 1 deletion src/Voat.UI/Views/Account/ResetPasswordConfirmation.cshtml
Expand Up @@ -29,7 +29,7 @@
</hgroup>
<div>
<p>
Your password has been reset. Please @Html.ActionLink("click here to log in", "Login", "Account", routeValues: null, htmlAttributes: new { id = "loginLink" })
Your password has been reset. Please @Html.ActionLink("click here to log in", "Log in", "Account", routeValues: null, htmlAttributes: new { id = "loginLink" })
</p>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Voat.UI/Views/Shared/Components/Sidebar/Chat.cshtml
Expand Up @@ -54,7 +54,7 @@
}
else
{
<a href="#" onclick="mustLogin();" class="login-required">Login to talk</a>
<a href="#" onclick="mustLogin();" class="login-required">Log in to talk</a>
}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Voat.UI/Views/Subverses/AdultContentFiltered.cshtml
Expand Up @@ -35,7 +35,7 @@
<h1>The content of this subverse is Not Safe For Work!</h1>
<h1>Your user preferences are set to hide adult content.</h1>
<p>
<a class="btn-whoaverse" href="/">Take me to the FrontPage</a>
<a class="btn-whoaverse" href="/">Take me to the Frontpage</a>
</p>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion test/Voat.Tests/Command/SubmissionCommandTests.cs
Expand Up @@ -342,7 +342,7 @@ public void LongUrl_Bug()
{
var user = TestHelper.SetPrincipal("TestUser09");

var cmd = new CreateSubmissionCommand(new Domain.Models.UserSubmission() { Subverse = SUBVERSES.Whatever, Title = "Long Url Bug", Url = "http://kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk.com/" }).SetUserContext(user);
var cmd = new CreateSubmissionCommand(new Domain.Models.UserSubmission() { Subverse = SUBVERSES.Whatever, Title = "Long URL Bug", Url = "http://kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk.com/" }).SetUserContext(user);
var r = cmd.Execute().Result;
VoatAssert.IsValid(r, Status.Success);
//Assert.AreNotEqual(0, r.Response.ID);
Expand Down