From c9e9a4255d20ea73218c2dce0f48e3d7281f138a Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 4 Oct 2016 23:15:57 +0200 Subject: [PATCH] Changed some strings --- .../Modules/Utility/Commands/QuoteCommands.cs | 4 +- .../Resources/CommandStrings.Designer.cs | 138 ++---------------- src/NadekoBot/Resources/CommandStrings.resx | 66 ++------- src/NadekoBot/project.json | 2 +- 4 files changed, 33 insertions(+), 177 deletions(-) diff --git a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs index 4995703e..83f48972 100644 --- a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs @@ -16,7 +16,7 @@ namespace NadekoBot.Modules.Utility { [LocalizedCommand, LocalizedRemarks, LocalizedSummary, LocalizedAlias] [RequireContext(ContextType.Guild)] - public async Task ShowQuote(IUserMessage umsg, string keyword) + public async Task ShowQuote(IUserMessage umsg, [Remainder] string keyword) { var channel = (ITextChannel)umsg.Channel; @@ -65,7 +65,7 @@ namespace NadekoBot.Modules.Utility [LocalizedCommand, LocalizedRemarks, LocalizedSummary, LocalizedAlias] [RequireContext(ContextType.Guild)] - public async Task DeleteQuote(IUserMessage umsg, string keyword) + public async Task DeleteQuote(IUserMessage umsg, [Remainder] string keyword) { var channel = (ITextChannel)umsg.Channel; diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index a5bad982..13886cc4 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -87,7 +87,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Add a custom reaction. Guide here: <https://github.com/Kwoth/NadekoBot/wiki/Custom-Reactions> **Bot Owner Only!**. + /// Looks up a localized string similar to Add a custom reaction. Guide here: <https://github.com/Kwoth/NadekoBot/wiki/Custom-Reactions>. /// public static string addcustreact_desc { get { @@ -114,7 +114,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Adds a specified string to the list of playing strings to rotate. Supported placeholders: %servers%, %users%, %playing%, %queued%, %trivia% **Bot Owner Only!**. + /// Looks up a localized string similar to Adds a specified string to the list of playing strings to rotate. Supported placeholders: %servers%, %users%, %playing%, %queued%. /// public static string addplaying_desc { get { @@ -141,7 +141,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Adds a new quote with the specified name (single word) and message (no limit).. + /// Looks up a localized string similar to Adds a new quote with the specified name and message (no limit).. /// public static string addquote_desc { get { @@ -150,7 +150,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to `.. abc My message`. + /// Looks up a localized string similar to `.. abc sayhi Hi`. /// public static string addquote_summary { get { @@ -168,34 +168,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sets permissions for all commands from a certain module at the channel level.. - /// - public static string allchnlcmds_desc { - get { - return ResourceManager.GetString("allchnlcmds_desc", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to `;acc "module name" [enable/disable] SomeChannel`. - /// - public static string allchnlcmds_summary { - get { - return ResourceManager.GetString("allchnlcmds_summary", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to allchnlcmds acc. - /// - public static string allchnlcmds_text { - get { - return ResourceManager.GetString("allchnlcmds_text", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Sets permissions for all modules at the channel level.. + /// Looks up a localized string similar to Enable or disable all modules in a specified channel.. /// public static string allchnlmdls_desc { get { @@ -204,7 +177,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to `;acm [enable/disable] SomeChannel`. + /// Looks up a localized string similar to `;acm enable #SomeChannel`. /// public static string allchnlmdls_summary { get { @@ -240,7 +213,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to allcmdcooldowns. + /// Looks up a localized string similar to allcmdcooldowns acmdcds. /// public static string allcmdcooldowns_text { get { @@ -249,34 +222,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sets permissions for all commands from a certain module at the role level.. - /// - public static string allrolecmds_desc { - get { - return ResourceManager.GetString("allrolecmds_desc", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to `;arc "module name" [enable/disable] MyRole`. - /// - public static string allrolecmds_summary { - get { - return ResourceManager.GetString("allrolecmds_summary", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to allrolecmds acmdcds. - /// - public static string allrolecmds_text { - get { - return ResourceManager.GetString("allrolecmds_text", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Sets permissions for all modules at the role level.. + /// Looks up a localized string similar to Enable or disable all modules for a specific role.. /// public static string allrolemdls_desc { get { @@ -303,34 +249,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sets permissions for all commands from a certain module at the server level.. - /// - public static string allsrvrcmds_desc { - get { - return ResourceManager.GetString("allsrvrcmds_desc", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to `;asc "module name" [enable/disable]`. - /// - public static string allsrvrcmds_summary { - get { - return ResourceManager.GetString("allsrvrcmds_summary", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to allsrvrcmds asc. - /// - public static string allsrvrcmds_text { - get { - return ResourceManager.GetString("allsrvrcmds_text", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Sets permissions for all modules at the server level.. + /// Looks up a localized string similar to Enable or disable all modules for your server.. /// public static string allsrvrmdls_desc { get { @@ -357,34 +276,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sets permission for all commands from a module for a specific user.. - /// - public static string allusrcmds_desc { - get { - return ResourceManager.GetString("allusrcmds_desc", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to `;auc Searches disable @Someone`. - /// - public static string allusrcmds_summary { - get { - return ResourceManager.GetString("allusrcmds_summary", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to allusrcmds auc. - /// - public static string allusrcmds_text { - get { - return ResourceManager.GetString("allusrcmds_text", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Sets permission for all modules for a specific user.. + /// Looks up a localized string similar to Enable or disable all modules for a specific user.. /// public static string allusrmdls_desc { get { @@ -420,7 +312,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to `~aq aquarion evol`. + /// Looks up a localized string similar to `~ani aquarion evol`. /// public static string ani_summary { get { @@ -438,7 +330,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sends a message to all servers' general channel bot is connected to.**Bot Owner Only!**. + /// Looks up a localized string similar to Sends a message to all servers' general channel bot is connected to.. /// public static string announce_desc { get { @@ -465,7 +357,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Adds a role, or list of roles separated by whitespace(use quotations for multiword roles) to the list of self-assignable roles. **Needs Manage Roles Permissions.**. + /// Looks up a localized string similar to Adds a role, or list of roles separated by whitespace(use quotations for multiword roles) to the list of self-assignable roles.. /// public static string asar_desc { get { @@ -519,7 +411,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Automaticaly assigns a specified role to every user who joins the server. **Needs Manage Roles Permissions.**. + /// Looks up a localized string similar to Automaticaly assigns a specified role to every user who joins the server. . /// public static string autoassignrole_desc { get { @@ -627,7 +519,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Bans a user by id or name with an optional message. **Needs Ban Permissions.**. + /// Looks up a localized string similar to Bans a user by id or name with an optional message.. /// public static string ban_desc { get { diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 8a376095..b6fc2550 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -301,7 +301,7 @@ addplaying adpl - Adds a specified string to the list of playing strings to rotate. Supported placeholders: %servers%, %users%, %playing%, %queued%, %trivia% **Bot Owner Only!** + Adds a specified string to the list of playing strings to rotate. Supported placeholders: %servers%, %users%, %playing%, %queued% `.adpl` @@ -382,7 +382,7 @@ asar - Adds a role, or list of roles separated by whitespace(use quotations for multiword roles) to the list of self-assignable roles. **Needs Manage Roles Permissions.** + Adds a role, or list of roles separated by whitespace(use quotations for multiword roles) to the list of self-assignable roles. `.asar Gamer` @@ -436,7 +436,7 @@ addcustreact acr - Add a custom reaction. Guide here: <https://github.com/Kwoth/NadekoBot/wiki/Custom-Reactions> **Bot Owner Only!** + Add a custom reaction. Guide here: <https://github.com/Kwoth/NadekoBot/wiki/Custom-Reactions> `.acr "hello" Hi there %user%` @@ -481,7 +481,7 @@ autoassignrole aar - Automaticaly assigns a specified role to every user who joins the server. **Needs Manage Roles Permissions.** + Automaticaly assigns a specified role to every user who joins the server. `.aar` to disable, `.aar Role Name` to enable @@ -589,7 +589,7 @@ ban b - Bans a user by id or name with an optional message. **Needs Ban Permissions.** + Bans a user by id or name with an optional message. `.b "@some Guy" Your behaviour is toxic.` @@ -805,7 +805,7 @@ announce - Sends a message to all servers' general channel bot is connected to.**Bot Owner Only!** + Sends a message to all servers' general channel bot is connected to. `.announce Useless spam` @@ -1174,56 +1174,29 @@ allsrvrmdls asm - Sets permissions for all modules at the server level. + Enable or disable all modules for your server. `;asm [enable/disable]` - - allsrvrcmds asc - - - Sets permissions for all commands from a certain module at the server level. - - - `;asc "module name" [enable/disable]` - allchnlmdls acm - Sets permissions for all modules at the channel level. + Enable or disable all modules in a specified channel. - `;acm [enable/disable] SomeChannel` - - - allchnlcmds acc - - - Sets permissions for all commands from a certain module at the channel level. - - - `;acc "module name" [enable/disable] SomeChannel` + `;acm enable #SomeChannel` allrolemdls arm - Sets permissions for all modules at the role level. + Enable or disable all modules for a specific role. `;arm [enable/disable] MyRole` - - allrolecmds acmdcds - - - Sets permissions for all commands from a certain module at the role level. - - - `;arc "module name" [enable/disable] MyRole` - ubl @@ -1279,7 +1252,7 @@ `;cmdcd "some cmd" 5` - allcmdcooldowns + allcmdcooldowns acmdcds Shows a list of all commands and their respective cooldowns. @@ -1291,10 +1264,10 @@ . - Adds a new quote with the specified name (single word) and message (no limit). + Adds a new quote with the specified name and message (no limit). - `.. abc My message` + `.. abc sayhi Hi` .. @@ -2131,7 +2104,7 @@ Queries anilist for an anime and shows the first result. - `~aq aquarion evol` + `~ani aquarion evol` imdb @@ -2646,17 +2619,8 @@ listperms lp - - Sets permission for all commands from a module for a specific user. - - - `;auc Searches disable @Someone` - - - allusrcmds auc - - Sets permission for all modules for a specific user. + Enable or disable all modules for a specific user. `;aum enable @someone` diff --git a/src/NadekoBot/project.json b/src/NadekoBot/project.json index 9ae6cbdd..c3a8b3b9 100644 --- a/src/NadekoBot/project.json +++ b/src/NadekoBot/project.json @@ -7,7 +7,7 @@ "emitEntryPoint": true, "allowUnsafe": true, "compile": { - "exclude": [ "_Models", "_Classes", "_Modules" ], + "exclude": [ ], }, "copyToOutput": { "include": [ "data" ],