update en translations | move message ids to constants (command: groups)

This commit is contained in:
Dawid Wysokiński 2020-10-15 05:34:13 +02:00
parent c969049f57
commit 1d2a6d7c0c
3 changed files with 15 additions and 10 deletions

View File

@ -165,19 +165,20 @@ func (s *Session) handleGroupsCommand(ctx commandCtx, m *discordgo.MessageCreate
if msg == "" { if msg == "" {
msg = ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ msg = ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: "groups.noGroupsAdded", MessageID: message.GroupsNoGroupsAdded,
DefaultMessage: message.FallbackMsg("groups.noGroupsAdded", "No groups added"), DefaultMessage: message.FallbackMsg(message.GroupsNoGroupsAdded,
"On this server hasn't been added any groups."),
}) })
} }
s.SendEmbed(m.ChannelID, NewEmbed(). s.SendEmbed(m.ChannelID, NewEmbed().
SetTitle(ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ SetTitle(ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: "groups.title", MessageID: message.GroupsTitle,
DefaultMessage: message.FallbackMsg("groups.title", "Group list"), DefaultMessage: message.FallbackMsg(message.GroupsTitle, "Group list"),
})). })).
AddField(ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ AddField(ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: "groups.fieldTitle", MessageID: message.GroupsFieldTitle,
DefaultMessage: message.FallbackMsg("groups.fieldTitle", "Index | ID | Conquer | Loss | Barbarian | Internal"), DefaultMessage: message.FallbackMsg(message.GroupsFieldTitle, "Index | ID | Conquer | Loss | Barbarian | Internal"),
}), msg). }), msg).
MessageEmbed) MessageEmbed)
} }
@ -194,8 +195,8 @@ func (s *Session) handleConqueredVillagesCommand(ctx commandCtx, m *discordgo.Me
} else if argsLength < 1 { } else if argsLength < 1 {
s.SendMessage(m.ChannelID, s.SendMessage(m.ChannelID,
m.Author.Mention()+" "+ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ m.Author.Mention()+" "+ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: "help.conqueredvillages", MessageID: message.HelpConqueredVillages,
DefaultMessage: message.FallbackMsg("help.conqueredvillages", 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."), "**{{.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{}{ TemplateData: map[string]interface{}{
"Command": ConqueredVillagesCommand.WithPrefix(s.cfg.CommandPrefix), "Command": ConqueredVillagesCommand.WithPrefix(s.cfg.CommandPrefix),

View File

@ -49,4 +49,8 @@ const (
DeleteGroupInvalidID = "deleteGroup.invalidID" DeleteGroupInvalidID = "deleteGroup.invalidID"
DeleteGroupSuccess = "deleteGroup.success" DeleteGroupSuccess = "deleteGroup.success"
GroupsNoGroupsAdded = "groups.noGroupsAdded"
GroupsTitle = "groups.title"
GroupsFieldTitle = "groups.fieldTitle"
) )

View File

@ -43,7 +43,7 @@
"deleteGroup.invalidID": "{{.Mention}} The group ID must be a number greater than 0.", "deleteGroup.invalidID": "{{.Mention}} The group ID must be a number greater than 0.",
"deleteGroup.success": "{{.Mention}} The group has been deleted.", "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.title": "Group list",
"groups.fieldTitle": "Index | ID | Conquer | Loss | Barbarian | Internal", "groups.fieldTitle": "Index | ID | Conquer | Loss | Barbarian | Internal",
@ -103,7 +103,7 @@
"cron.lostVillages.title": "Lost villages", "cron.lostVillages.title": "Lost villages",
"cron.conqueredVillages.title": "Conquered 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.", "api.defaultError": "{{.Mention}} There was an error fetching data from the API, please try again later.",