From 99aa44cdbaa63c996a59e3d8ae7ef448e5ec33bd Mon Sep 17 00:00:00 2001 From: Kichiyaki Date: Fri, 8 Jan 2021 20:15:11 +0100 Subject: [PATCH] - update translations - [tw!tribe and tw!observe] look for a tribe by tag or id (not just by id) --- discord/discord.go | 1 - discord/observations.go | 50 +++++++++++++++-------------- discord/public_commands.go | 38 ++++++++++++++-------- go.mod | 4 +-- go.sum | 8 ++--- main.go | 4 +-- message/translations/active.en.json | 20 ++++++------ message/translations/active.nl.json | 14 ++++---- message/translations/active.pl.json | 18 +++++------ 9 files changed, 85 insertions(+), 72 deletions(-) diff --git a/discord/discord.go b/discord/discord.go index ea7f8ff..ca0c0bb 100644 --- a/discord/discord.go +++ b/discord/discord.go @@ -216,7 +216,6 @@ func (s *Session) SendEmbed(channelID string, message *discordgo.MessageEmbed) e } message.Fields = fields[i:end] if _, err := s.dg.ChannelMessageSendEmbed(channelID, message); err != nil { - log.Warnln("Couldn't send embed:", err) return err } } diff --git a/discord/observations.go b/discord/observations.go index 0bb1587..ad46c80 100644 --- a/discord/observations.go +++ b/discord/observations.go @@ -4,7 +4,9 @@ import ( "context" "fmt" "strconv" + "strings" + "github.com/tribalwarshelp/golang-sdk/sdk" "github.com/tribalwarshelp/shared/tw" "github.com/bwmarrin/discordgo" @@ -155,7 +157,7 @@ func (s *Session) handleGroupsCommand(ctx *commandCtx, m *discordgo.MessageCreat msg = ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ MessageID: message.GroupsNoGroupsAdded, DefaultMessage: message.FallbackMsg(message.GroupsNoGroupsAdded, - "On this server hasn't been added any groups."), + "No records to display."), }) } @@ -424,7 +426,7 @@ func (s *Session) handleObserveCommand(ctx *commandCtx, m *discordgo.MessageCrea m.Author.Mention()+" "+ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ MessageID: message.HelpObserve, DefaultMessage: message.FallbackMsg(message.HelpObserve, - "**{{.Command}}** [group id from {{.GroupsCommand}}] [server] [tribe id] - command adds a tribe to the observation group."), + "**{{.Command}}** [group id from {{.GroupsCommand}}] [server] [tribe id or tribe tag] - command adds a tribe to the observation group."), TemplateData: map[string]interface{}{ "Command": ObserveCommand.WithPrefix(s.cfg.CommandPrefix), "GroupsCommand": GroupsCommand.WithPrefix(s.cfg.CommandPrefix), @@ -447,13 +449,14 @@ func (s *Session) handleObserveCommand(ctx *commandCtx, m *discordgo.MessageCrea return } serverKey := args[1] - tribeID, err := strconv.Atoi(args[2]) - if err != nil || tribeID <= 0 { + tribeTag := strings.TrimSpace(args[2]) + tribeID, err := strconv.Atoi(tribeTag) + if (err != nil || tribeID <= 0) && tribeTag == "" { s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ MessageID: message.ObserveInvalidTribeID, DefaultMessage: message.FallbackMsg(message.ObserveInvalidTribeID, - "{{.Mention}} The tribe ID must be a number greater than 0."), + "{{.Mention}} The third parameter must be a number greater than 0 or a valid string."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), }, @@ -485,7 +488,18 @@ func (s *Session) handleObserveCommand(ctx *commandCtx, m *discordgo.MessageCrea return } - tribe, err := s.cfg.API.Tribe.Read(server.Key, tribeID) + var tribe *shared_models.Tribe + if tribeID > 0 { + tribe, err = s.cfg.API.Tribe.Read(server.Key, tribeID) + } else { + list := &sdk.TribeList{} + list, err = s.cfg.API.Tribe.Browse(server.Key, 1, 0, []string{}, &shared_models.TribeFilter{ + Tag: []string{tribeTag}, + }) + if list != nil && list.Items != nil && len(list.Items) > 0 { + tribe = list.Items[0] + } + } if err != nil || tribe == nil { s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ @@ -526,23 +540,11 @@ func (s *Session) handleObserveCommand(ctx *commandCtx, m *discordgo.MessageCrea return } - err = s.cfg.ObservationRepository.Store(context.Background(), &models.Observation{ + go s.cfg.ObservationRepository.Store(context.Background(), &models.Observation{ Server: server.Key, - TribeID: tribeID, + TribeID: tribe.ID, GroupID: groupID, }) - if err != nil { - s.SendMessage(m.ChannelID, - ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: message.InternalServerError, - DefaultMessage: message.FallbackMsg(message.InternalServerError, - "{{.Mention}} An internal server error has occurred, please try again later."), - TemplateData: map[string]interface{}{ - "Mention": m.Author.Mention(), - }, - })) - return - } s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ MessageID: message.ObserveSuccess, @@ -738,10 +740,10 @@ func (s *Session) handleObservationsCommand(ctx *commandCtx, m *discordgo.Messag if observation.Tribe != nil { tag = observation.Tribe.Tag } - lv := utils.FindVersionByCode(versionList.Items, tw.VersionCodeFromServerKey(observation.Server)) + version := utils.FindVersionByCode(versionList.Items, tw.VersionCodeFromServerKey(observation.Server)) tribeURL := "" - if lv != nil { - tribeURL = tw.BuildTribeURL(observation.Server, lv.Host, observation.TribeID) + if version != nil { + tribeURL = tw.BuildTribeURL(observation.Server, version.Host, observation.TribeID) } msg.Append(fmt.Sprintf("**%d** | %d - %s - [``%s``](%s)\n", i+1, observation.ID, observation.Server, @@ -753,7 +755,7 @@ func (s *Session) handleObservationsCommand(ctx *commandCtx, m *discordgo.Messag SetTitle(ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ MessageID: message.ObservationsTitle, DefaultMessage: message.FallbackMsg(message.ObservationsTitle, - "Monitored tribes\nIndex | ID - Server - Tribe"), + "Observed tribes\nIndex | ID - Server - Tribe"), })). SetFields(msg.ToMessageEmbedFields()). MessageEmbed) diff --git a/discord/public_commands.go b/discord/public_commands.go index fbcd5dc..4a1a931 100644 --- a/discord/public_commands.go +++ b/discord/public_commands.go @@ -4,6 +4,7 @@ import ( "fmt" "math" "strconv" + "strings" "github.com/tribalwarshelp/dcbot/message" @@ -38,7 +39,7 @@ func (s *Session) handleHelpCommand(ctx *commandCtx, m *discordgo.MessageCreate, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ MessageID: message.HelpTribeTopODA, DefaultMessage: message.FallbackMsg(message.HelpTribeTopODA, - "**{{.Command}}** [server] [page] [id1] [id2] [id3] [n id] - generates a player list from selected tribes ordered by ODA."), + "**{{.Command}}** [server] [page] [tribe id or tribe tag, you can enter more than one] - generates a player list from selected tribes ordered by ODA."), TemplateData: map[string]interface{}{ "Command": TribeCommand.WithPrefix(s.cfg.CommandPrefix) + " " + TopODACommand, }, @@ -46,7 +47,7 @@ func (s *Session) handleHelpCommand(ctx *commandCtx, m *discordgo.MessageCreate, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ MessageID: message.HelpTribeTopODD, DefaultMessage: message.FallbackMsg(message.HelpTribeTopODD, - "**{{.Command}}** [server] [page] [id1] [id2] [id3] [n id] - generates a player list from selected tribes ordered by ODD."), + "**{{.Command}}** [server] [page] [tribe id or tribe tag, you can enter more than one] - generates a player list from selected tribes ordered by ODD."), TemplateData: map[string]interface{}{ "Command": TribeCommand.WithPrefix(s.cfg.CommandPrefix) + " " + TopODDCommand, }, @@ -54,7 +55,7 @@ func (s *Session) handleHelpCommand(ctx *commandCtx, m *discordgo.MessageCreate, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ MessageID: message.HelpTribeTopODS, DefaultMessage: message.FallbackMsg(message.HelpTribeTopODS, - "**{{.Command}}** [server] [page] [id1] [id2] [id3] [n id] - generates a player list from selected tribes ordered by ODS."), + "**{{.Command}}** [server] [page] [tribe id or tribe tag, you can enter more than one] - generates a player list from selected tribes ordered by ODS."), TemplateData: map[string]interface{}{ "Command": TribeCommand.WithPrefix(s.cfg.CommandPrefix) + " " + TopODSCommand, }, @@ -62,7 +63,7 @@ func (s *Session) handleHelpCommand(ctx *commandCtx, m *discordgo.MessageCreate, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ MessageID: message.HelpTribeTopOD, DefaultMessage: message.FallbackMsg(message.HelpTribeTopOD, - "**{{.Command}}** [server] [page] [id1] [id2] [id3] [n id] - generates a player list from selected tribes ordered by OD."), + "**{{.Command}}** [server] [page] [tribe id or tribe tag, you can enter more than one] - generates a player list from selected tribes ordered by OD."), TemplateData: map[string]interface{}{ "Command": TribeCommand.WithPrefix(s.cfg.CommandPrefix) + " " + TopODCommand, }, @@ -70,7 +71,7 @@ func (s *Session) handleHelpCommand(ctx *commandCtx, m *discordgo.MessageCreate, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ MessageID: message.HelpTribeTopPoints, DefaultMessage: message.FallbackMsg(message.HelpTribeTopPoints, - "**{{.Command}}** [server] [page] [id1] [id2] [id3] [n id] - generates a player list from selected tribes ordered by points."), + "**{{.Command}}** [server] [page] [tribe id or tribe tag, you can enter more than one] - generates a player list from selected tribes ordered by points."), TemplateData: map[string]interface{}{ "Command": TribeCommand.WithPrefix(s.cfg.CommandPrefix) + " " + TopPointsCommand, }, @@ -133,7 +134,7 @@ func (s *Session) handleHelpCommand(ctx *commandCtx, m *discordgo.MessageCreate, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ MessageID: message.HelpObserve, DefaultMessage: message.FallbackMsg(message.HelpObserve, - "**{{.Command}}** [group id from {{.GroupsCommand}}] [server] [tribe id] - adds a tribe to the observation group."), + "**{{.Command}}** [group id from {{.GroupsCommand}}] [server] [tribe id or tribe tag] - adds a tribe to the observation group."), TemplateData: map[string]interface{}{ "Command": ObserveCommand.WithPrefix(s.cfg.CommandPrefix), "GroupsCommand": GroupsCommand.WithPrefix(s.cfg.CommandPrefix), @@ -290,17 +291,23 @@ func (s *Session) handleTribeCommand(ctx *commandCtx, m *discordgo.MessageCreate return } ids := []int{} + tags := []string{} for _, arg := range args[3:argsLength] { - id, err := strconv.Atoi(arg) - if err != nil || id <= 0 { + trimmed := strings.TrimSpace(arg) + if trimmed == "" { continue } - ids = append(ids, id) + id, err := strconv.Atoi(trimmed) + if err != nil || id <= 0 { + tags = append(tags, trimmed) + } else { + ids = append(ids, id) + } } - if len(ids) == 0 { + if len(ids) == 0 && len(tags) == 0 { s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ MessageID: message.TribeNoTribeID, - DefaultMessage: message.FallbackMsg(message.TribeNoTribeID, "{{.Mention}} You haven't entered the tribe ID."), + DefaultMessage: message.FallbackMsg(message.TribeNoTribeID, "{{.Mention}} At least one tribe id/tag is required."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), }, @@ -312,8 +319,13 @@ func (s *Session) handleTribeCommand(ctx *commandCtx, m *discordgo.MessageCreate limit := 10 offset := (page - 1) * limit filter := &shared_models.PlayerFilter{ - Exists: &exists, - TribeID: ids, + Exists: &exists, + TribeFilter: &shared_models.TribeFilter{ + Or: &shared_models.TribeFilterOr{ + ID: ids, + Tag: tags, + }, + }, } title := "" sort := "" diff --git a/go.mod b/go.mod index b272505..d587204 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/robfig/cron/v3 v3.0.1 github.com/sirupsen/logrus v1.7.0 - github.com/tribalwarshelp/golang-sdk v0.0.0-20210106163027-e9c3c6bd38aa - github.com/tribalwarshelp/shared v0.0.0-20210106162314-d3488036ca2f + github.com/tribalwarshelp/golang-sdk v0.0.0-20210108172356-5f1e26e4b6a0 + github.com/tribalwarshelp/shared v0.0.0-20210108165451-75051c5e0455 golang.org/x/text v0.3.3 ) diff --git a/go.sum b/go.sum index 760b0fb..17c6c51 100644 --- a/go.sum +++ b/go.sum @@ -102,10 +102,10 @@ github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc h1:9lRDQMhESg+zvGYmW5DyG0UqvY96Bu5QYsTLvCHdrgo= github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc/go.mod h1:bciPuU6GHm1iF1pBvUfxfsH0Wmnc2VbpgvbI9ZWuIRs= -github.com/tribalwarshelp/golang-sdk v0.0.0-20210106163027-e9c3c6bd38aa h1:hsRJ0BXW8MoqJKABqUyMYgO6otG5aXJhsUscD123fMU= -github.com/tribalwarshelp/golang-sdk v0.0.0-20210106163027-e9c3c6bd38aa/go.mod h1:libmpbIplPczm5fRb/GwL/++ydFoSx4/efaFRtDNEeY= -github.com/tribalwarshelp/shared v0.0.0-20210106162314-d3488036ca2f h1:E8ahQd4yo3nB0eJMpL/M0s6iZaWMGmxga14kiqsHcQ4= -github.com/tribalwarshelp/shared v0.0.0-20210106162314-d3488036ca2f/go.mod h1:vtDs7EjEysk4dpFPfu3c4lkICXZYIRV0BrT7rsqG0dw= +github.com/tribalwarshelp/golang-sdk v0.0.0-20210108172356-5f1e26e4b6a0 h1:XBX+8t28cU+mLQtgobO9gHYNbXtLM0+z3vaWhxljViE= +github.com/tribalwarshelp/golang-sdk v0.0.0-20210108172356-5f1e26e4b6a0/go.mod h1:iRlU8TbOw7x81KCOEIdRcGZ0Au3dFjpcla3uMbyhMII= +github.com/tribalwarshelp/shared v0.0.0-20210108165451-75051c5e0455 h1:084v0jO7MXHxl3uh+6vxCBc0WcAATm6rA2SShenbOxI= +github.com/tribalwarshelp/shared v0.0.0-20210108165451-75051c5e0455/go.mod h1:vtDs7EjEysk4dpFPfu3c4lkICXZYIRV0BrT7rsqG0dw= github.com/vmihailenco/bufpool v0.1.11 h1:gOq2WmBrq0i2yW5QJ16ykccQ4wH9UyEsgLm6czKAd94= github.com/vmihailenco/bufpool v0.1.11/go.mod h1:AFf/MOy3l2CFTKbxwt0mp2MwnqjNEs5H/UxrkA5jxTQ= github.com/vmihailenco/msgpack/v4 v4.3.11 h1:Q47CePddpNGNhk4GCnAx9DDtASi2rasatE0cd26cZoE= diff --git a/main.go b/main.go index 83804ac..c8eccc9 100644 --- a/main.go +++ b/main.go @@ -131,9 +131,9 @@ func main() { }) c.Start() defer c.Stop() - logrus.Info("Started cron worker") + logrus.Info("Started the cron scheduler") - logrus.Info("Bot is waiting for your actions!") + logrus.Info("Bot is waiting for actions!") channel := make(chan os.Signal, 1) signal.Notify(channel, os.Interrupt, os.Kill, syscall.SIGTERM, syscall.SIGINT) diff --git a/message/translations/active.en.json b/message/translations/active.en.json index 018d19b..958df20 100644 --- a/message/translations/active.en.json +++ b/message/translations/active.en.json @@ -4,17 +4,17 @@ "help.footer": "", "help.forAllUsers": "For everyone", "help.forAdmins": "For admins", - "help.tribe.topoda": "**{{.Command}}** [server] [page] [id1] [id2] [id3] [n id] - generates a player list from selected tribes ordered by ODA.", - "help.tribe.topodd": "**{{.Command}}** [server] [page] [id1] [id2] [id3] [n id] - generates a player list from selected tribes ordered by ODD.", - "help.tribe.topods": "**{{.Command}}** [server] [page] [id1] [id2] [id3] [n id] - generates a player list from selected tribes ordered by ODS.", - "help.tribe.topod": "**{{.Command}}** [server] [page] [id1] [id2] [id3] [n id] - generates a player list from selected tribes ordered by OD.", - "help.tribe.toppoints": "**{{.Command}}** [server] [page] [id1] [id2] [id3] [n id] - generates a player list from selected tribes ordered by points.", + "help.tribe.topoda": "**{{.Command}}** [server] [page] [tribe id or tribe tag, you can enter more than one] - generates a player list from selected tribes ordered by ODA.", + "help.tribe.topodd": "**{{.Command}}** [server] [page] [tribe id or tribe tag, you can enter more than one] - generates a player list from selected tribes ordered by ODD.", + "help.tribe.topods": "**{{.Command}}** [server] [page] [tribe id or tribe tag, you can enter more than one] - generates a player list from selected tribes ordered by ODS.", + "help.tribe.topod": "**{{.Command}}** [server] [page] [tribe id or tribe tag, you can enter more than one] - generates a player list from selected tribes ordered by OD.", + "help.tribe.toppoints": "**{{.Command}}** [server] [page] [tribe id or tribe tag, you can enter more than one] - generates a player list from selected tribes ordered by points.", "help.author": "**{{.Command}}** - shows how to get in touch with the author.", "help.addgroup": "**{{.Command}}** - adds a new observation group.", "help.groups": "**{{.Command}}** - shows you a list of groups created by this server.", "help.deletegroup": "**{{.Command}}** [group id from {{.GroupsCommand}}] - deletes an observation group.", "help.showennobledbarbs": "**{{.Command}}** [group id from {{.GroupsCommand}}] - enables/disables notifications about ennobling barbarian villages.", - "help.observe": "**{{.Command}}** [group id from {{.GroupsCommand}}] [server] [tribe id] - adds a tribe to the observation group.", + "help.observe": "**{{.Command}}** [group id from {{.GroupsCommand}}] [server] [tribe id or tribe tag] - adds a tribe to the observation group.", "help.observations": "**{{.Command}}** [group id from {{.GroupsCommand}}] - shows a list of monitored tribes added to this group.", "help.deleteobservation": "**{{.Command}}** [group id from {{.GroupsCommand}}] [id from {{.ObservationsCommand}}] - removes a tribe from the observation group.", "help.conqueredvillages": "**{{.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.", @@ -27,7 +27,7 @@ "help.disablecoordstranslation": "**{{.Command}}** - disables coords translation feature.", "tribe.invalidPage": "{{.Mention}} The page must be a number greater than 0.", - "tribe.noTribeID": "{{.Mention}} You haven't entered the tribe ID.", + "tribe.noTribeID": "{{.Mention}} At least one tribe id/tag is required.", "tribe.title.orderedByOD": "Ordered by OD", "tribe.title.orderedByODA": "Ordered by ODA", "tribe.title.orderedByODD": "Ordered by ODD", @@ -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": "On this server hasn't been added any groups.", + "groups.noGroupsAdded": "No records to display.", "groups.title": "Group list", "groups.fieldTitle": "Index | ID | Conquer | Loss | Barbarian | Internal", @@ -64,7 +64,7 @@ "disableLostVillages.success": "{{.Mention}} Notifications about lost villages will no longer show up.", "observe.invalidGroupID": "{{.Mention}} The group ID must be a number greater than 0.", - "observe.invalidTribeID": "{{.Mention}} The tribe ID must be a number greater than 0.", + "observe.invalidTribeID": "{{.Mention}} The third parameter must be a number greater than 0 or a valid string.", "observe.serverIsClosed": "{{.Mention}} Server is closed.", "observe.serverNotFound": "{{.Mention}} Server not found.", "observe.groupNotFound": "{{.Mention}} Group not found.", @@ -79,7 +79,7 @@ "observations.invalidGroupID": "{{.Mention}} The group ID must be a number greater than 0.", "observations.groupNotFound": "{{.Mention}} Group not found.", - "observations.title": "Monitored tribes\nIndex | ID - Server - Tribe", + "observations.title": "Observed tribes\nIndex | ID - Server - Tribe", "showEnnobledBarbs.invalidGroupID": "{{.Mention}} The group ID must be a number greater than 0.", "showEnnobledBarbs.groupNotFound": "{{.Mention}} Group not found.", diff --git a/message/translations/active.nl.json b/message/translations/active.nl.json index fea2b7e..ca33e9e 100644 --- a/message/translations/active.nl.json +++ b/message/translations/active.nl.json @@ -4,17 +4,17 @@ "help.footer": "", "help.forAllUsers": "Voor alle gebruikers", "help.forAdmins": "Voor beheerders", - "help.tribe.topoda": "**{{.Command}}** [server] [page] [id1] [id2] [id3] [n id] - genereert een spelerslijst van de geselecteerde stam gerangschikt op ODA.", - "help.tribe.topodd": "**{{.Command}}** [server] [page] [id1] [id2] [id3] [n id] - genereert een spelerslijst van de geselecteerde stam gerangschikt op ODD.", - "help.tribe.topods": "**{{.Command}}** [server] [page] [id1] [id2] [id3] [n id] - genereert een spelerslijst van de geselecteerde stam gerangschikt op ODS.", - "help.tribe.topod": "**{{.Command}}** [server] [page] [id1] [id2] [id3] [n id] - genereert een spelerslijst van de geselecteerde stam gerangschikt op OD.", - "help.tribe.toppoints": "**{{.Command}}** [server] [page] [id1] [id2] [id3] [n id] - genereert een spelerslijst van de geselecteerde stam gerangschikt op punten.", + "help.tribe.topoda": "**{{.Command}}** [server] [page] [tribe id or tribe tag, you can enter more than one] - genereert een spelerslijst van de geselecteerde stam gerangschikt op ODA.", + "help.tribe.topodd": "**{{.Command}}** [server] [page] [tribe id or tribe tag, you can enter more than one] - genereert een spelerslijst van de geselecteerde stam gerangschikt op ODD.", + "help.tribe.topods": "**{{.Command}}** [server] [page] [tribe id or tribe tag, you can enter more than one] - genereert een spelerslijst van de geselecteerde stam gerangschikt op ODS.", + "help.tribe.topod": "**{{.Command}}** [server] [page] [tribe id or tribe tag, you can enter more than one] - genereert een spelerslijst van de geselecteerde stam gerangschikt op OD.", + "help.tribe.toppoints": "**{{.Command}}** [server] [page] [tribe id or tribe tag, you can enter more than one] - genereert een spelerslijst van de geselecteerde stam gerangschikt op punten.", "help.author": "**{{.Command}}** - laat je zien hoe je in contact komt met de autheur.", "help.addgroup": "**{{.Command}}** - voegt een nieuwe observatiegroep toe.", "help.groups": "**{{.Command}}** - laat een lijst zien van groepen gemaakt door deze server.", "help.deletegroup": "**{{.Command}}** [group id from {{.GroupsCommand}}] - verwijder een observatiegroep.", "help.showennobledbarbs": "**{{.Command}}** [group id from {{.GroupsCommand}}] - zet notificaties aan/uit over geëdelde barbarendorpen.", - "help.observe": "**{{.Command}}** [group id from {{.GroupsCommand}}] [server] [tribe id] - voegt een stam toe aan de observatiegroep.", + "help.observe": "**{{.Command}}** [group id from {{.GroupsCommand}}] [server] [tribe id or tribe tag] - voegt een stam toe aan de observatiegroep.", "help.observations": "**{{.Command}}** [group id from {{.GroupsCommand}}] - laat een lijst zijn van geobserveerde stammen in deze groep.", "help.deleteobservation": "**{{.Command}}** [group id from {{.GroupsCommand}}] [id from {{.ObservationsCommand}}] - verwijderd een stam uit de observatiegroep.", "help.conqueredvillages": "**{{.Command}}** [group id from {{.GroupsCommand}}] - verandert het kanaal waar de notificaties over veroverde dorpen worden weergeven **BELANGRIJK!** voer dit commando uit op het kanaal waar de notificaties moeten worden weergeven.", @@ -79,7 +79,7 @@ "observations.invalidGroupID": "{{.Mention}} de groepID moet een hoger dan 0 zijn.", "observations.groupNotFound": "{{.Mention}} Groep niet gevonden.", - "observations.title": "Monitored tribes\nIndex | ID - Server - Stam", + "observations.title": "Observed tribes\nIndex | ID - Server - Stam", "showEnnobledBarbs.invalidGroupID": "{{.Mention}} de groepID moet een hoger dan 0 zijn.", "showEnnobledBarbs.groupNotFound": "{{.Mention}} Groep niet gevonden.", diff --git a/message/translations/active.pl.json b/message/translations/active.pl.json index 3aa84cc..c51ee29 100644 --- a/message/translations/active.pl.json +++ b/message/translations/active.pl.json @@ -4,17 +4,17 @@ "help.footer": "", "help.forAllUsers": "Dla wszystkich", "help.forAdmins": "Dla adminów", - "help.tribe.topoda": "**{{.Command}}** [serwer] [strona] [id1] [id2] [id3] [n id] - generuje listę graczy z wybranych plemion i sortuje po pokonanych w ataku.", - "help.tribe.topodd": "**{{.Command}}** [serwer] [strona] [id1] [id2] [id3] [n id] - generuje listę graczy z wybranych plemion i sortuje po pokonanych w obronie.", - "help.tribe.topods": "**{{.Command}}** [serwer] [strona] [id1] [id2] [id3] [n id] - generuje listę graczy z wybranych plemion i sortuje po pokonanych jako wspierający.", - "help.tribe.topod": "**{{.Command}}** [serwer] [strona] [id1] [id2] [id3] [n id] - generuje listę graczy z wybranych plemion i sortuje po pokonanych ogólnie.", - "help.tribe.toppoints": "**{{.Command}}** [serwer] [strona] [id1] [id2] [id3] [n id] - Generuje listę graczy z wybranych plemion i sortuje po punktach.", + "help.tribe.topoda": "**{{.Command}}** [serwer] [strona] [id lub skrót plemienia, można podać więcej niż 1] - generuje listę graczy z wybranych plemion i sortuje po pokonanych w ataku.", + "help.tribe.topodd": "**{{.Command}}** [serwer] [strona] [id lub skrót plemienia, można podać więcej niż 1] - generuje listę graczy z wybranych plemion i sortuje po pokonanych w obronie.", + "help.tribe.topods": "**{{.Command}}** [serwer] [strona] [id lub skrót plemienia, można podać więcej niż 1] - generuje listę graczy z wybranych plemion i sortuje po pokonanych jako wspierający.", + "help.tribe.topod": "**{{.Command}}** [serwer] [strona] [id lub skrót plemienia, można podać więcej niż 1] - generuje listę graczy z wybranych plemion i sortuje po pokonanych ogólnie.", + "help.tribe.toppoints": "**{{.Command}}** [serwer] [strona] [id lub skrót plemienia, można podać więcej niż 1] - Generuje listę graczy z wybranych plemion i sortuje po punktach.", "help.author": "**{{.Command}}** - pokazuje możliwe formy kontaktu z autorem.", "help.addgroup": "**{{.Command}}** - dodaje nową grupę obserwacyjną.", "help.groups": "**{{.Command}}** - pokazuje listę grup dodanych przez administrację tego serwera Discord.", "help.deletegroup": "**{{.Command}}** [id grupy z {{.GroupsCommand}}] - usuwa grupę obserwacyjną.", "help.showennobledbarbs": "**{{.Command}}** [id grupy z {{.GroupsCommand}}] - włącza/wyłącza informacje o podbitych wioskach barbarzyńskich.", - "help.observe": "**{{.Command}}** [id grupy z {{.GroupsCommand}}] [serwer] [id plemienia] - dodaje plemię do grupy.", + "help.observe": "**{{.Command}}** [id grupy z {{.GroupsCommand}}] [serwer] [id lub skrót plemienia] - dodaje plemię do grupy.", "help.observations": "**{{.Command}}** [id grupy z {{.GroupsCommand}}] - pokazuje plemiona należące do wybranej grupy.", "help.deleteobservation": "**{{.Command}}** [id grupy z {{.GroupsCommand}}] [id from {{.ObservationsCommand}}] - usuwa plemię z grupy.", "help.conqueredvillages": "**{{.Command}}** [id grupy z {{.GroupsCommand}}] - zmienia kanał na którym będą się pojawiać informację o podbitych wioskach w danej grupie. **WAŻNE!** Wywołaj tę komendę na kanale na którym chcesz dostawać te powiadomienia.", @@ -27,7 +27,7 @@ "help.disablecoordstranslation": "**{{.Command}}** - wyłącz translator koordynat.", "tribe.invalidPage": "{{.Mention}} Strona musi być liczbą większą od 0.", - "tribe.noTribeID": "{{.Mention}} Nie wprowadziłeś ID plemienia.", + "tribe.noTribeID": "{{.Mention}} Nie wprowadziłeś ani jednego ID/tagu plemienia.", "tribe.title.orderedByOD": "Gracze posortowani według pokonanych przeciwników", "tribe.title.orderedByODA": "Gracze posortowani według pokonanych przeciwników jako agresor", "tribe.title.orderedByODD": "Gracze posortowani według pokonanych przeciwników jako obrońca", @@ -43,7 +43,7 @@ "deleteGroup.invalidID": "{{.Mention}} ID grupy musi być liczbą większą od 0.", "deleteGroup.success": "{{.Mention}} Grupa została usunięta.", - "groups.noGroupsAdded": "Brak dodanych grup.", + "groups.noGroupsAdded": "Na tym serwerze nie dodano jeszcze żadnej grupy.", "groups.title": "Lista grup", "groups.fieldTitle": "Index | ID | Podbite | Stracone | Barbarki | Wewnętrzne podboje", @@ -64,7 +64,7 @@ "disableLostVillages.success": "{{.Mention}} Informacje o straconych wioskach nie będą się już pokazywały.", "observe.invalidGroupID": "{{.Mention}} ID grupy musi być liczbą większą od 0.", - "observe.invalidTribeID": "{{.Mention}} ID plemienia musi być liczbą większą od 0.", + "observe.invalidTribeID": "{{.Mention}} Trzeci parametr musi być liczbą większą od 0 lub poprawnym ciągiem znaków.", "observe.serverIsClosed": "{{.Mention}} Sewer jest zamknięty.", "observe.serverNotFound": "{{.Mention}} Serwer nie został znaleziony.", "observe.groupNotFound": "{{.Mention}} Grupa nie została znaleziona.",