Merge pull request #253 from gtim/fix-typos

Fix some typos

roomdb/sqlite/auth_fallback.go

@@ -220,7 +220,7 @@ func (af AuthFallback) CreateResetToken(ctx context.Context, createdByMember, fo
 	return base64.URLEncoding.EncodeToString(tokenBytes), nil
 }
 
-// since reset tokens are marked as inavalid so that the code can't be generated twice,
+// since reset tokens are marked as invalid so that the code can't be generated twice,
 // they need to be deleted periodically.
 func deleteConsumedResetTokens(tx boil.ContextExecutor) error {
 	_, err := models.FallbackResetTokens(qm.Where("active = false")).DeleteAll(context.Background(), tx)

roomdb/sqlite/invites.go

@@ -155,7 +155,7 @@ func (i Invites) Consume(ctx context.Context, token string, newMember refs.FeedR
 	return inv, nil
 }
 
-// since invites are marked as inavalid so that the code can't be generated twice,
+// since invites are marked as invalid so that the code can't be generated twice,
 // they need to be deleted periodically.
 func deleteConsumedInvites(tx boil.ContextExecutor) error {
 	_, err := models.Invites(qm.Where("active = false")).DeleteAll(context.Background(), tx)

web/errors/errhandler.go

@@ -27,7 +27,7 @@ func NewErrorHandler(locHelper *i18n.Helper, flashes *FlashHelper) *ErrorHandler
 	}
 }
 
-// SetRenderer needs to update the rendere later since we need to pass ErrorHandler into render.New (ie. befor we get the pointer for r)
+// SetRenderer needs to update the renderer later since we need to pass ErrorHandler into render.New (i.e. before we get the pointer for r)
 func (eh *ErrorHandler) SetRenderer(r *render.Renderer) {
 	eh.render = r
 }

web/i18n/defaults/active.en.toml

@@ -68,7 +68,7 @@ AuthFallbackInstruct = "This method is an acceptable fallback, if you have a use
 AuthFallbackNewPassword="New Password"
 AuthFallbackRepeatPassword="Repeat Password"
 AuthFallbackPasswordChangeFormTitle = "Change Password"
-AuthFallbackPasswordChangeWelcome = "Here you can change your fallback password. Please make sure it's longer then 10 characters. Via the repition we make sure that you don't accidentally mistype it. Additionally we use the lookup from <a href='https://haveibeenpwned.com'>haveibeenpwned.com</a> to make sure you don't accidentally use a weak password."
+AuthFallbackPasswordChangeWelcome = "Here you can change your fallback password. Please make sure it's longer then 10 characters. Via the repetition we make sure that you don't accidentally mistype it. Additionally we use the lookup from <a href='https://haveibeenpwned.com'>haveibeenpwned.com</a> to make sure you don't accidentally use a weak password."
 AuthFallbackPasswordUpdated = "The password was updated. You can now use it to sign in."
 AdminMemberPasswordResetLinkCreatedTitle = "Password reset token created"
 AdminMemberPasswordResetLinkCreatedInstruct = "The reset token was created. Please send it to the member via some means (like E-Mail or another suitable side-channel). When they open it, they will be able to choose a new password for themselves."
@@ -150,7 +150,7 @@ AdminAliasesRevokeConfirmWelcome = "Are you sure you want to revoke this alias?"
 ##################
 
 AdminInvitesTitle = "Invites"
-AdminInvitesWelcome = "Create invite tokens for people who are not yet members of this room. On this page you can also see previously created invites that are still not unclaimed by new members."
+AdminInvitesWelcome = "Create invite tokens for people who are not yet members of this room. On this page you can also see previously created invites that are still unclaimed by new members."
 AdminInvitesCreate = "Create new invite"
 AdminInvitesCreatedAtColumn = "Created at"
 AdminInvitesCreatorColumn = "Created by"