diff --git a/discord/observations.go b/discord/observations.go index 3cb1eb2..6487859 100644 --- a/discord/observations.go +++ b/discord/observations.go @@ -165,19 +165,20 @@ func (s *Session) handleGroupsCommand(ctx commandCtx, m *discordgo.MessageCreate if msg == "" { msg = ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "groups.noGroupsAdded", - DefaultMessage: message.FallbackMsg("groups.noGroupsAdded", "No groups added"), + MessageID: message.GroupsNoGroupsAdded, + DefaultMessage: message.FallbackMsg(message.GroupsNoGroupsAdded, + "On this server hasn't been added any groups."), }) } s.SendEmbed(m.ChannelID, NewEmbed(). SetTitle(ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "groups.title", - DefaultMessage: message.FallbackMsg("groups.title", "Group list"), + MessageID: message.GroupsTitle, + DefaultMessage: message.FallbackMsg(message.GroupsTitle, "Group list"), })). AddField(ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "groups.fieldTitle", - DefaultMessage: message.FallbackMsg("groups.fieldTitle", "Index | ID | Conquer | Loss | Barbarian | Internal"), + MessageID: message.GroupsFieldTitle, + DefaultMessage: message.FallbackMsg(message.GroupsFieldTitle, "Index | ID | Conquer | Loss | Barbarian | Internal"), }), msg). MessageEmbed) } @@ -194,8 +195,8 @@ func (s *Session) handleConqueredVillagesCommand(ctx commandCtx, m *discordgo.Me } else if argsLength < 1 { s.SendMessage(m.ChannelID, m.Author.Mention()+" "+ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "help.conqueredvillages", - DefaultMessage: message.FallbackMsg("help.conqueredvillages", + MessageID: message.HelpConqueredVillages, + DefaultMessage: message.FallbackMsg(message.HelpConqueredVillages, "**{{.Command}}** [group id from {{.GroupsCommand}}] - changes the channel on which notifications about conquered village will show. **IMPORTANT!** Run this command on the channel you want to display these notifications."), TemplateData: map[string]interface{}{ "Command": ConqueredVillagesCommand.WithPrefix(s.cfg.CommandPrefix), diff --git a/message/ids.go b/message/ids.go index e8b2e03..71aba26 100644 --- a/message/ids.go +++ b/message/ids.go @@ -49,4 +49,8 @@ const ( DeleteGroupInvalidID = "deleteGroup.invalidID" DeleteGroupSuccess = "deleteGroup.success" + + GroupsNoGroupsAdded = "groups.noGroupsAdded" + GroupsTitle = "groups.title" + GroupsFieldTitle = "groups.fieldTitle" ) diff --git a/message/translations/active.en.json b/message/translations/active.en.json index efd6f8e..20f66b9 100644 --- a/message/translations/active.en.json +++ b/message/translations/active.en.json @@ -43,7 +43,7 @@ "deleteGroup.invalidID": "{{.Mention}} The group ID must be a number greater than 0.", "deleteGroup.success": "{{.Mention}} The group has been deleted.", - "groups.noGroupsAdded": "No groups added.", + "groups.noGroupsAdded": "On this server hasn't been added any groups.", "groups.title": "Group list", "groups.fieldTitle": "Index | ID | Conquer | Loss | Barbarian | Internal", @@ -103,7 +103,7 @@ "cron.lostVillages.title": "Lost villages", "cron.conqueredVillages.title": "Conquered villages", - "cron.checkEnnoblements.msgLine": "{{.NewOwner}} [{{.NewOwnerTribe}}] conquered {{.Village}} (Old owner: {{.OldOwner}} [{{.OldOwnerTribe}}])", + "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.",