From d275dc36b233a4a62ecf27219c84b7be66d144ac Mon Sep 17 00:00:00 2001 From: Alan Beatty Date: Sat, 18 Dec 2021 11:13:02 +0000 Subject: [PATCH 1/3] Update xpex channel to use the right string --- src/NadekoBot/Modules/Xp/Xp.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Xp/Xp.cs b/src/NadekoBot/Modules/Xp/Xp.cs index dcf851b3f..646a2c286 100644 --- a/src/NadekoBot/Modules/Xp/Xp.cs +++ b/src/NadekoBot/Modules/Xp/Xp.cs @@ -1,4 +1,4 @@ -using Discord; +using Discord; using Discord.Commands; using Discord.WebSocket; using NadekoBot.Common.Attributes; @@ -274,7 +274,7 @@ namespace NadekoBot.Modules.Xp } else { - await ReplyConfirmLocalizedAsync(strs.excluded(Format.Bold(channel.ToString()))); + await ReplyConfirmLocalizedAsync(strs.not_excluded(Format.Bold(channel.ToString()))); } } From 8c66bcb1e1be2b9df1a464f524335a0d52a8c2a2 Mon Sep 17 00:00:00 2001 From: Hokuto Chen Date: Sat, 18 Dec 2021 21:09:16 +0000 Subject: [PATCH 2/3] separated "cd output && cp creds_example.yml creds.yml" --- docs/guides/windows-guide.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/guides/windows-guide.md b/docs/guides/windows-guide.md index 2b5198323..9d95dba54 100644 --- a/docs/guides/windows-guide.md +++ b/docs/guides/windows-guide.md @@ -83,11 +83,12 @@ Open PowerShell (press windows button on your keyboard and type powershell, it s 1. `git clone https://gitlab.com/kwoth/nadekobot -b v3 --depth 1` 2. `cd nadekobot` 3. `dotnet publish -c Release -o output/ src/NadekoBot/` -4. `cd output && cp creds_example.yml creds.yml` -5. Open `creds.yml` with your favorite text editor (Please don't use Notepad or WordPad. You can use Notepad++, VSCode, Atom, Sublime, or something similar) -6. [Enter your bot's token](#creds-guide) -7. Run the bot `dotnet NadekoBot.dll` -8. 🎉 +4. `cd output' +5. 'cp creds_example.yml creds.yml` +6. Open `creds.yml` with your favorite text editor (Please don't use Notepad or WordPad. You can use Notepad++, VSCode, Atom, Sublime, or something similar) +7. [Enter your bot's token](#creds-guide) +8. Run the bot `dotnet NadekoBot.dll` +9. 🎉 ##### Update Instructions From 8e8e349e65b70a8262599a0010936822ae0e07d2 Mon Sep 17 00:00:00 2001 From: Alan Beatty Date: Sat, 18 Dec 2021 21:10:06 +0000 Subject: [PATCH 3/3] Small `.trans` fixes --- src/NadekoBot/Modules/Searches/TranslatorCommands.cs | 2 +- src/NadekoBot/data/strings/commands/commands.en-US.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NadekoBot/Modules/Searches/TranslatorCommands.cs b/src/NadekoBot/Modules/Searches/TranslatorCommands.cs index f8957891d..737a674fe 100644 --- a/src/NadekoBot/Modules/Searches/TranslatorCommands.cs +++ b/src/NadekoBot/Modules/Searches/TranslatorCommands.cs @@ -12,7 +12,7 @@ namespace NadekoBot.Modules.Searches public class TranslateCommands : NadekoSubmodule { [NadekoCommand, Aliases] - public async Task Translate(string from, string to, [Leftover] string text = null) + public async Task Translate(string from, string to, [Leftover] string text) { try { diff --git a/src/NadekoBot/data/strings/commands/commands.en-US.yml b/src/NadekoBot/data/strings/commands/commands.en-US.yml index fbc6b7c1f..ab27fcafb 100644 --- a/src/NadekoBot/data/strings/commands/commands.en-US.yml +++ b/src/NadekoBot/data/strings/commands/commands.en-US.yml @@ -1143,9 +1143,9 @@ butts: args: - "" translate: - desc: "Translates from>to text. From the given language to the destination language." + desc: "Translates text from the given language to the destination language." args: - - "en>fr Hello" + - "en fr Hello" translangs: desc: "Lists the valid languages for translation." args: