diff --git a/discord/observations.go b/discord/observations.go index 00cb456..2dbd2d1 100644 --- a/discord/observations.go +++ b/discord/observations.go @@ -62,7 +62,7 @@ func (s *Session) handleAddGroupCommand(ctx *commandCtx, m *discordgo.MessageCre ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ MessageID: message.InternalServerError, DefaultMessage: message.FallbackMsg(message.InternalServerError, - "{{.Mention}} Internal server error occurred, please try again later."), + "{{.Mention}} An internal server error has occurred, please try again later."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), }, @@ -536,7 +536,7 @@ func (s *Session) handleObserveCommand(ctx *commandCtx, m *discordgo.MessageCrea ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ MessageID: message.InternalServerError, DefaultMessage: message.FallbackMsg(message.InternalServerError, - "{{.Mention}} Internal server error occurred, please try again later."), + "{{.Mention}} An internal server error has occurred, please try again later."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), }, @@ -676,7 +676,7 @@ func (s *Session) handleObservationsCommand(ctx *commandCtx, m *discordgo.Messag ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ MessageID: message.InternalServerError, DefaultMessage: message.FallbackMsg(message.InternalServerError, - "{{.Mention}} Internal server error occurred, please try again later."), + "{{.Mention}} An internal server error has occurred, please try again later."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), }, @@ -709,7 +709,7 @@ func (s *Session) handleObservationsCommand(ctx *commandCtx, m *discordgo.Messag ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ MessageID: message.InternalServerError, DefaultMessage: message.FallbackMsg(message.InternalServerError, - "{{.Mention}} Internal server error occurred, please try again later."), + "{{.Mention}} An internal server error has occurred, please try again later."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), }, @@ -808,7 +808,7 @@ func (s *Session) handleShowEnnobledBarbariansCommand(ctx *commandCtx, m *discor ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ MessageID: message.InternalServerError, DefaultMessage: message.FallbackMsg(message.InternalServerError, - "{{.Mention}} Internal server error occurred, please try again later."), + "{{.Mention}} An internal server error has occurred, please try again later."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), }, @@ -876,7 +876,7 @@ func (s *Session) handleChangeLanguageCommand(ctx *commandCtx, m *discordgo.Mess ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ MessageID: message.InternalServerError, DefaultMessage: message.FallbackMsg(message.InternalServerError, - "{{.Mention}} Internal server error occurred, please try again later."), + "{{.Mention}} An internal server error has occurred, please try again later."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), }, @@ -945,7 +945,7 @@ func (s *Session) handleShowInternalsCommand(ctx *commandCtx, m *discordgo.Messa ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ MessageID: message.InternalServerError, DefaultMessage: message.FallbackMsg(message.InternalServerError, - "{{.Mention}} Internal server error occurred, please try again later."), + "{{.Mention}} An internal server error has occurred, please try again later."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), }, diff --git a/discord/public_commands.go b/discord/public_commands.go index 8b3f7ad..a6331d8 100644 --- a/discord/public_commands.go +++ b/discord/public_commands.go @@ -366,7 +366,7 @@ func (s *Session) handleTribeCommand(ctx *commandCtx, m *discordgo.MessageCreate ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ MessageID: message.ApiDefaultError, DefaultMessage: message.FallbackMsg(message.ApiDefaultError, - "{{.Mention}} There was an error fetching data from the API, please try again later."), + "{{.Mention}} Couldn't fetch data from the API, please try again later."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), }, @@ -404,7 +404,7 @@ func (s *Session) handleTribeCommand(ctx *commandCtx, m *discordgo.MessageCreate s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ MessageID: message.InternalServerError, DefaultMessage: message.FallbackMsg(message.InternalServerError, - "{{.Mention}} Internal server error occurred, please try again later."), + "{{.Mention}} An internal server error has occurred, please try again later."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), }, diff --git a/message/translations/active.en.json b/message/translations/active.en.json index 9b1136f..947d5d0 100644 --- a/message/translations/active.en.json +++ b/message/translations/active.en.json @@ -105,9 +105,9 @@ "cron.conqueredVillages.title": "Conquered villages", "cron.checkEnnoblements.msgLine": "{{.NewOwner}} [{{.NewOwnerTribe}}] has conquered {{.Village}} (Old owner: {{.OldOwner}} [{{.OldOwnerTribe}}])", - "api.defaultError": "{{.Mention}} There was an error fetching data from the API, please try again later.", + "api.defaultError": "{{.Mention}} Couldn't fetch data from the API, please try again later.", "pagination.labelDisplayedPage": "Page: {{.Page}} of {{.MaxPage}}", - "internalServerError": "{{.Mention}} Internal server error occurred, please try again later." + "internalServerError": "{{.Mention}} An internal server error has occurred, please try again later." }