Changed (almost) all responses to make them use the new system instead of raw strings

- Fixed many invalid string keys
This commit is contained in:
Kwoth
2021-07-30 22:42:10 +02:00
parent 4484732f5d
commit 919bedeae6
80 changed files with 883 additions and 859 deletions

View File

@@ -146,11 +146,11 @@ namespace NadekoBot.Modules.Permissions
}
if (action == AddRemove.Add)
await ReplyConfirmLocalizedAsync("blacklisted", Format.Code(type.ToString()),
Format.Code(id.ToString())).ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.blacklisted(Format.Code(type.ToString()),
Format.Code(id.ToString())));
else
await ReplyConfirmLocalizedAsync("unblacklisted", Format.Code(type.ToString()),
Format.Code(id.ToString())).ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.unblacklisted(Format.Code(type.ToString()),
Format.Code(id.ToString())));
}
}
}

View File

@@ -42,7 +42,7 @@ namespace NadekoBot.Modules.Permissions
var channel = (ITextChannel)ctx.Channel;
if (secs < 0 || secs > 3600)
{
await ReplyErrorLocalizedAsync("invalid_second_param_between", 0, 3600).ConfigureAwait(false);
await ReplyErrorLocalizedAsync(strs.invalid_second_param_between(0, 3600));
return;
}
@@ -72,14 +72,13 @@ namespace NadekoBot.Modules.Permissions
{
var activeCds = ActiveCooldowns.GetOrAdd(channel.Guild.Id, new ConcurrentHashSet<ActiveCooldown>());
activeCds.RemoveWhere(ac => ac.Command == name);
await ReplyConfirmLocalizedAsync("cmdcd_cleared",
Format.Bold(name)).ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.cmdcd_cleared(Format.Bold(name)));
}
else
{
await ReplyConfirmLocalizedAsync("cmdcd_add",
await ReplyConfirmLocalizedAsync(strs.cmdcd_add(
Format.Bold(name),
Format.Bold(secs.ToString())).ConfigureAwait(false);
Format.Bold(secs.ToString())));
}
}
@@ -91,7 +90,7 @@ namespace NadekoBot.Modules.Permissions
var localSet = CommandCooldowns.GetOrAdd(channel.Guild.Id, new ConcurrentHashSet<CommandCooldown>());
if (!localSet.Any())
await ReplyConfirmLocalizedAsync("cmdcd_none").ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.cmdcd_none).ConfigureAwait(false);
else
await channel.SendTableAsync("", localSet.Select(c => c.CommandName + ": " + c.Seconds + GetText(strs.sec)), s => $"{s,-30}", 2).ConfigureAwait(false);
}

View File

@@ -32,7 +32,7 @@ namespace NadekoBot.Modules.Permissions
public async Task FwClear()
{
_service.ClearFilteredWords(ctx.Guild.Id);
await ReplyConfirmLocalizedAsync("fw_cleared").ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.fw_cleared).ConfigureAwait(false);
}
[NadekoCommand, Aliases]
@@ -52,12 +52,12 @@ namespace NadekoBot.Modules.Permissions
if (enabled)
{
_service.InviteFilteringServers.Add(channel.Guild.Id);
await ReplyConfirmLocalizedAsync("invite_filter_server_on").ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.invite_filter_server_on).ConfigureAwait(false);
}
else
{
_service.InviteFilteringServers.TryRemove(channel.Guild.Id);
await ReplyConfirmLocalizedAsync("invite_filter_server_off").ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.invite_filter_server_off).ConfigureAwait(false);
}
}
@@ -91,12 +91,12 @@ namespace NadekoBot.Modules.Permissions
if (removed is null)
{
_service.InviteFilteringChannels.Add(channel.Id);
await ReplyConfirmLocalizedAsync("invite_filter_channel_on").ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.invite_filter_channel_on).ConfigureAwait(false);
}
else
{
_service.InviteFilteringChannels.TryRemove(channel.Id);
await ReplyConfirmLocalizedAsync("invite_filter_channel_off").ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.invite_filter_channel_off).ConfigureAwait(false);
}
}
@@ -117,12 +117,12 @@ namespace NadekoBot.Modules.Permissions
if (enabled)
{
_service.LinkFilteringServers.Add(channel.Guild.Id);
await ReplyConfirmLocalizedAsync("link_filter_server_on").ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.link_filter_server_on).ConfigureAwait(false);
}
else
{
_service.LinkFilteringServers.TryRemove(channel.Guild.Id);
await ReplyConfirmLocalizedAsync("link_filter_server_off").ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.link_filter_server_off).ConfigureAwait(false);
}
}
@@ -156,12 +156,12 @@ namespace NadekoBot.Modules.Permissions
if (removed is null)
{
_service.LinkFilteringChannels.Add(channel.Id);
await ReplyConfirmLocalizedAsync("link_filter_channel_on").ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.link_filter_channel_on).ConfigureAwait(false);
}
else
{
_service.LinkFilteringChannels.TryRemove(channel.Id);
await ReplyConfirmLocalizedAsync("link_filter_channel_off").ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.link_filter_channel_off).ConfigureAwait(false);
}
}
@@ -182,12 +182,12 @@ namespace NadekoBot.Modules.Permissions
if (enabled)
{
_service.WordFilteringServers.Add(channel.Guild.Id);
await ReplyConfirmLocalizedAsync("word_filter_server_on").ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.word_filter_server_on).ConfigureAwait(false);
}
else
{
_service.WordFilteringServers.TryRemove(channel.Guild.Id);
await ReplyConfirmLocalizedAsync("word_filter_server_off").ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.word_filter_server_off).ConfigureAwait(false);
}
}
@@ -221,12 +221,12 @@ namespace NadekoBot.Modules.Permissions
if (removed is null)
{
_service.WordFilteringChannels.Add(channel.Id);
await ReplyConfirmLocalizedAsync("word_filter_channel_on").ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.word_filter_channel_on).ConfigureAwait(false);
}
else
{
_service.WordFilteringChannels.TryRemove(channel.Id);
await ReplyConfirmLocalizedAsync("word_filter_channel_off").ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.word_filter_channel_off).ConfigureAwait(false);
}
}
@@ -263,12 +263,12 @@ namespace NadekoBot.Modules.Permissions
if (removed is null)
{
filteredWords.Add(word);
await ReplyConfirmLocalizedAsync("filter_word_add", Format.Code(word)).ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.filter_word_add(Format.Code(word))).ConfigureAwait(false);
}
else
{
filteredWords.TryRemove(word);
await ReplyConfirmLocalizedAsync("filter_word_remove", Format.Code(word)).ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.filter_word_remove(Format.Code(word))).ConfigureAwait(false);
}
}

View File

@@ -32,7 +32,7 @@ namespace NadekoBot.Modules.Permissions
var blockedCommands = _service.BlockedCommands;
if (!blockedModule.Any() && !blockedCommands.Any())
{
await ReplyErrorLocalizedAsync("lgp_none").ConfigureAwait(false);
await ReplyErrorLocalizedAsync(strs.lgp_none).ConfigureAwait(false);
return;
}
@@ -61,11 +61,11 @@ namespace NadekoBot.Modules.Permissions
if (added)
{
await ReplyConfirmLocalizedAsync("gmod_add", Format.Bold(module.Name)).ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.gmod_add(Format.Bold(module.Name))).ConfigureAwait(false);
return;
}
await ReplyConfirmLocalizedAsync("gmod_remove", Format.Bold(module.Name)).ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.gmod_remove(Format.Bold(module.Name))).ConfigureAwait(false);
}
[NadekoCommand, Aliases]
@@ -77,11 +77,11 @@ namespace NadekoBot.Modules.Permissions
if (added)
{
await ReplyConfirmLocalizedAsync("gcmd_add", Format.Bold(cmd.Name)).ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.gcmd_add(Format.Bold(cmd.Name))).ConfigureAwait(false);
return;
}
await ReplyConfirmLocalizedAsync("gcmd_remove", Format.Bold(cmd.Name)).ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.gcmd_remove(Format.Bold(cmd.Name))).ConfigureAwait(false);
}
}
}

View File

@@ -40,11 +40,11 @@ namespace NadekoBot.Modules.Permissions
}
if (action.Value)
{
await ReplyConfirmLocalizedAsync("verbose_true").ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.verbose_true).ConfigureAwait(false);
}
else
{
await ReplyConfirmLocalizedAsync("verbose_false").ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.verbose_false).ConfigureAwait(false);
}
}
@@ -63,11 +63,11 @@ namespace NadekoBot.Modules.Permissions
if (!ulong.TryParse(cache.PermRole, out var roleId) ||
(role = ((SocketGuild)ctx.Guild).GetRole(roleId)) is null)
{
await ReplyConfirmLocalizedAsync("permrole_not_set", Format.Bold(cache.PermRole)).ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.permrole_not_set).ConfigureAwait(false);
}
else
{
await ReplyConfirmLocalizedAsync("permrole", Format.Bold(role.ToString())).ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.permrole(Format.Bold(role.ToString()))).ConfigureAwait(false);
}
return;
}
@@ -80,7 +80,7 @@ namespace NadekoBot.Modules.Permissions
_service.UpdateCache(config);
}
await ReplyConfirmLocalizedAsync("permrole_changed", Format.Bold(role.Name)).ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.permrole_changed(Format.Bold(role.Name))).ConfigureAwait(false);
}
public enum Reset { Reset };
@@ -99,7 +99,7 @@ namespace NadekoBot.Modules.Permissions
_service.UpdateCache(config);
}
await ReplyConfirmLocalizedAsync("permrole_reset").ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.permrole_reset).ConfigureAwait(false);
}
[NadekoCommand, Aliases]
@@ -157,13 +157,14 @@ namespace NadekoBot.Modules.Permissions
await uow.SaveChangesAsync();
_service.UpdateCache(config);
}
await ReplyConfirmLocalizedAsync("removed",
await ReplyConfirmLocalizedAsync(strs.removed(
index + 1,
Format.Code(p.GetCommand(Prefix, (SocketGuild)ctx.Guild))).ConfigureAwait(false);
Format.Code(p.GetCommand(Prefix, (SocketGuild)ctx.Guild))));
}
catch (IndexOutOfRangeException)
{
await ReplyErrorLocalizedAsync("perm_out_of_range").ConfigureAwait(false);
await ReplyErrorLocalizedAsync(strs.perm_out_of_range).ConfigureAwait(false);
}
}
@@ -188,13 +189,13 @@ namespace NadekoBot.Modules.Permissions
if (!fromFound)
{
await ReplyErrorLocalizedAsync("not_found", ++from);
await ReplyErrorLocalizedAsync(strs.perm_not_found(++from));
return;
}
if (!toFound)
{
await ReplyErrorLocalizedAsync("not_found", ++to);
await ReplyErrorLocalizedAsync(strs.perm_not_found(++to));
return;
}
fromPerm = permsCol[from];
@@ -204,18 +205,19 @@ namespace NadekoBot.Modules.Permissions
await uow.SaveChangesAsync();
_service.UpdateCache(config);
}
await ReplyConfirmLocalizedAsync("moved_permission",
Format.Code(fromPerm.GetCommand(Prefix, (SocketGuild)ctx.Guild)),
++from,
++to)
.ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.moved_permission(
Format.Code(fromPerm.GetCommand(Prefix, (SocketGuild)ctx.Guild)),
++from,
++to));
return;
}
catch (Exception e) when (e is ArgumentOutOfRangeException || e is IndexOutOfRangeException)
{
}
}
await ReplyErrorLocalizedAsync("perm_out_of_range").ConfigureAwait(false);
await ReplyErrorLocalizedAsync(strs.perm_out_of_range).ConfigureAwait(false);
}
[NadekoCommand, Aliases]
@@ -234,15 +236,15 @@ namespace NadekoBot.Modules.Permissions
if (action.Value)
{
await ReplyConfirmLocalizedAsync("sx_enable",
await ReplyConfirmLocalizedAsync(strs.sx_enable(
Format.Code(command.Name),
GetText(strs.of_command)).ConfigureAwait(false);
GetText(strs.of_command)));
}
else
{
await ReplyConfirmLocalizedAsync("sx_disable",
await ReplyConfirmLocalizedAsync(strs.sx_disable(
Format.Code(command.Name),
GetText(strs.of_command)).ConfigureAwait(false);
GetText(strs.of_command)));
}
}
@@ -261,15 +263,15 @@ namespace NadekoBot.Modules.Permissions
if (action.Value)
{
await ReplyConfirmLocalizedAsync("sx_enable",
await ReplyConfirmLocalizedAsync(strs.sx_enable(
Format.Code(module.Name),
GetText(strs.of_module)).ConfigureAwait(false);
GetText(strs.of_module)));
}
else
{
await ReplyConfirmLocalizedAsync("sx_disable",
await ReplyConfirmLocalizedAsync(strs.sx_disable(
Format.Code(module.Name),
GetText(strs.of_module)).ConfigureAwait(false);
GetText(strs.of_module)));
}
}
@@ -289,17 +291,17 @@ namespace NadekoBot.Modules.Permissions
if (action.Value)
{
await ReplyConfirmLocalizedAsync("ux_enable",
await ReplyConfirmLocalizedAsync(strs.ux_enable(
Format.Code(command.Name),
GetText(strs.of_command),
Format.Code(user.ToString())).ConfigureAwait(false);
Format.Code(user.ToString())));
}
else
{
await ReplyConfirmLocalizedAsync("ux_disable",
await ReplyConfirmLocalizedAsync(strs.ux_disable(
Format.Code(command.Name),
GetText(strs.of_command),
Format.Code(user.ToString())).ConfigureAwait(false);
Format.Code(user.ToString())));
}
}
@@ -318,17 +320,17 @@ namespace NadekoBot.Modules.Permissions
if (action.Value)
{
await ReplyConfirmLocalizedAsync("ux_enable",
await ReplyConfirmLocalizedAsync(strs.ux_enable(
Format.Code(module.Name),
GetText(strs.of_module),
Format.Code(user.ToString())).ConfigureAwait(false);
Format.Code(user.ToString())));
}
else
{
await ReplyConfirmLocalizedAsync("ux_disable",
await ReplyConfirmLocalizedAsync(strs.ux_disable(
Format.Code(module.Name),
GetText(strs.of_module),
Format.Code(user.ToString())).ConfigureAwait(false);
Format.Code(user.ToString())));
}
}
@@ -351,17 +353,17 @@ namespace NadekoBot.Modules.Permissions
if (action.Value)
{
await ReplyConfirmLocalizedAsync("rx_enable",
await ReplyConfirmLocalizedAsync(strs.rx_enable(
Format.Code(command.Name),
GetText(strs.of_command),
Format.Code(role.Name)).ConfigureAwait(false);
Format.Code(role.Name)));
}
else
{
await ReplyConfirmLocalizedAsync("rx_disable",
await ReplyConfirmLocalizedAsync(strs.rx_disable(
Format.Code(command.Name),
GetText(strs.of_command),
Format.Code(role.Name)).ConfigureAwait(false);
Format.Code(role.Name)));
}
}
@@ -384,17 +386,17 @@ namespace NadekoBot.Modules.Permissions
if (action.Value)
{
await ReplyConfirmLocalizedAsync("rx_enable",
await ReplyConfirmLocalizedAsync(strs.rx_enable(
Format.Code(module.Name),
GetText(strs.of_module),
Format.Code(role.Name)).ConfigureAwait(false);
Format.Code(role.Name)));
}
else
{
await ReplyConfirmLocalizedAsync("rx_disable",
await ReplyConfirmLocalizedAsync(strs.rx_disable(
Format.Code(module.Name),
GetText(strs.of_module),
Format.Code(role.Name)).ConfigureAwait(false);
Format.Code(role.Name)));
}
}
@@ -414,17 +416,17 @@ namespace NadekoBot.Modules.Permissions
if (action.Value)
{
await ReplyConfirmLocalizedAsync("cx_enable",
await ReplyConfirmLocalizedAsync(strs.cx_enable(
Format.Code(command.Name),
GetText(strs.of_command),
Format.Code(chnl.Name)).ConfigureAwait(false);
Format.Code(chnl.Name)));
}
else
{
await ReplyConfirmLocalizedAsync("cx_disable",
await ReplyConfirmLocalizedAsync(strs.cx_disable(
Format.Code(command.Name),
GetText(strs.of_command),
Format.Code(chnl.Name)).ConfigureAwait(false);
Format.Code(chnl.Name)));
}
}
@@ -443,17 +445,17 @@ namespace NadekoBot.Modules.Permissions
if (action.Value)
{
await ReplyConfirmLocalizedAsync("cx_enable",
await ReplyConfirmLocalizedAsync(strs.cx_enable(
Format.Code(module.Name),
GetText(strs.of_module),
Format.Code(chnl.Name)).ConfigureAwait(false);
Format.Code(chnl.Name)));
}
else
{
await ReplyConfirmLocalizedAsync("cx_disable",
await ReplyConfirmLocalizedAsync(strs.cx_disable(
Format.Code(module.Name),
GetText(strs.of_module),
Format.Code(chnl.Name)).ConfigureAwait(false);
Format.Code(chnl.Name)));
}
}
@@ -472,13 +474,13 @@ namespace NadekoBot.Modules.Permissions
if (action.Value)
{
await ReplyConfirmLocalizedAsync("acm_enable",
Format.Code(chnl.Name)).ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.acm_enable(
Format.Code(chnl.Name)));
}
else
{
await ReplyConfirmLocalizedAsync("acm_disable",
Format.Code(chnl.Name)).ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.acm_disable(
Format.Code(chnl.Name)));
}
}
@@ -500,13 +502,13 @@ namespace NadekoBot.Modules.Permissions
if (action.Value)
{
await ReplyConfirmLocalizedAsync("arm_enable",
Format.Code(role.Name)).ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.arm_enable(
Format.Code(role.Name)));
}
else
{
await ReplyConfirmLocalizedAsync("arm_disable",
Format.Code(role.Name)).ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.arm_disable(
Format.Code(role.Name)));
}
}
@@ -525,13 +527,13 @@ namespace NadekoBot.Modules.Permissions
if (action.Value)
{
await ReplyConfirmLocalizedAsync("aum_enable",
Format.Code(user.ToString())).ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.aum_enable(
Format.Code(user.ToString())));
}
else
{
await ReplyConfirmLocalizedAsync("aum_disable",
Format.Code(user.ToString())).ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.aum_disable(
Format.Code(user.ToString())));
}
}
@@ -563,11 +565,11 @@ namespace NadekoBot.Modules.Permissions
if (action.Value)
{
await ReplyConfirmLocalizedAsync("asm_enable").ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.asm_enable).ConfigureAwait(false);
}
else
{
await ReplyConfirmLocalizedAsync("asm_disable").ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.asm_disable).ConfigureAwait(false);
}
}
}

View File

@@ -26,7 +26,7 @@ namespace NadekoBot.Modules.Permissions
public async Task ResetPerms()
{
await _perms.Reset(ctx.Guild.Id).ConfigureAwait(false);
await ReplyConfirmLocalizedAsync("perms_reset").ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.perms_reset).ConfigureAwait(false);
}
[NadekoCommand, Aliases]
@@ -34,7 +34,7 @@ namespace NadekoBot.Modules.Permissions
public async Task ResetGlobalPerms()
{
await _gps.Reset();
await ReplyConfirmLocalizedAsync("global_perms_reset").ConfigureAwait(false);
await ReplyConfirmLocalizedAsync(strs.global_perms_reset).ConfigureAwait(false);
}
}
}