minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-11 09:48:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

wip strings rework, experimenting, nothing works

Browse Source
This commit is contained in:
Kwoth
2021-07-25 19:25:48 +02:00
parent 70288f7670
commit 9d375dccee
53 changed files with 211 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/NadekoBot/Modules/Games/AcropobiaCommands.cs
View File

@@ -82,8 +82,8 @@ namespace NadekoBot.Modules.Games
{
var embed = _eb.Create().WithOkColor()
.WithTitle(GetText(strs.acrophobia))
.WithDescription(GetText("acro_started", Format.Bold(string.Join(".", game.StartingLetters))))
.WithFooter(GetText("acro_started_footer", game.Opts.SubmissionTime));
.WithDescription(GetText(strs.acro_started, Format.Bold(string.Join(".", game.StartingLetters))))
.WithFooter(GetText(strs.acro_started_footer, game.Opts.SubmissionTime));
return ctx.Channel.EmbedAsync(embed);
}
@@ -92,7 +92,7 @@ namespace NadekoBot.Modules.Games
{
return SendConfirmAsync(
GetText(strs.acrophobia),
GetText("acro_vote_cast", Format.Bold(user)));
GetText(strs.acro_vote_cast, Format.Bold(user)));
}
private async Task Game_OnVotingStarted(AcrophobiaGame game, ImmutableArray<KeyValuePair<AcrophobiaUser, int>> submissions)
@@ -106,7 +106,7 @@ namespace NadekoBot.Modules.Games
{
await ctx.Channel.EmbedAsync(_eb.Create().WithOkColor()
.WithDescription(
GetText("acro_winner_only",
GetText(strs.acro_winner_only,
Format.Bold(submissions.First().Key.UserName)))
.WithFooter(submissions.First().Key.Input))
.ConfigureAwait(false);
@@ -118,7 +118,7 @@ namespace NadekoBot.Modules.Games
var embed = _eb.Create()
.WithOkColor()
.WithTitle(GetText(strs.acrophobia) + " - " + GetText(strs.submissions_closed))
.WithDescription(GetText("acro_nym_was", Format.Bold(string.Join(".", game.StartingLetters)) + "\n" +
.WithDescription(GetText(strs.acro_nym_was, Format.Bold(string.Join(".", game.StartingLetters)) + "\n" +
$@"--
{submissions.Aggregate("", (agg, cur) => agg + $"`{++i}.` **{cur.Key.Input}**\n")}
--"))
@@ -138,7 +138,7 @@ $@"--
var winner = table.First();
var embed = _eb.Create().WithOkColor()
.WithTitle(GetText(strs.acrophobia))
.WithDescription(GetText("acro_winner", Format.Bold(winner.Key.UserName),
.WithDescription(GetText(strs.acro_winner, Format.Bold(winner.Key.UserName),
Format.Bold(winner.Value.ToString())))
.WithFooter(winner.Key.Input);

4
src/NadekoBot/Modules/Games/Common/TicTacToe.cs
View File

@@ -114,10 +114,10 @@ namespace NadekoBot.Modules.Games.Common
if (_phase == Phase.Ended)
embed.WithFooter(GetText(strs.ttt_no_moves));
else
embed.WithFooter(GetText("ttt_users_move", _users[_curUserIndex]));
embed.WithFooter(GetText(strs.ttt_users_move, _users[_curUserIndex]));
}
else
embed.WithFooter(GetText("ttt_has_won", _winner));
embed.WithFooter(GetText(strs.ttt_has_won, _winner));
return embed;
}

6
src/NadekoBot/Modules/Games/Common/Trivia/TriviaGame.cs
View File

@@ -246,7 +246,7 @@ namespace NadekoBot.Modules.Games.Common.Trivia
{
var embedS = _eb.Create().WithOkColor()
.WithTitle(GetText(strs.trivia_game))
.WithDescription(GetText("trivia_win",
.WithDescription(GetText(strs.trivia_win,
guildUser.Mention,
Format.Bold(CurrentQuestion.Answer)));
if (Uri.IsWellFormedUriString(CurrentQuestion.AnswerImageUrl, UriKind.Absolute))
@@ -264,7 +264,7 @@ namespace NadekoBot.Modules.Games.Common.Trivia
}
var embed = _eb.Create().WithOkColor()
.WithTitle(GetText(strs.trivia_game))
.WithDescription(GetText("trivia_guess", guildUser.Mention, Format.Bold(CurrentQuestion.Answer)));
.WithDescription(GetText(strs.trivia_guess, guildUser.Mention, Format.Bold(CurrentQuestion.Answer)));
if (Uri.IsWellFormedUriString(CurrentQuestion.AnswerImageUrl, UriKind.Absolute))
embed.WithImageUrl(CurrentQuestion.AnswerImageUrl);
await Channel.EmbedAsync(embed).ConfigureAwait(false);
@@ -283,7 +283,7 @@ namespace NadekoBot.Modules.Games.Common.Trivia
foreach (var kvp in Users.OrderByDescending(kvp => kvp.Value))
{
sb.AppendLine(GetText("trivia_points", Format.Bold(kvp.Key.ToString()), kvp.Value).SnPl(kvp.Value));
sb.AppendLine(GetText(strs.trivia_points, Format.Bold(kvp.Key.ToString()), kvp.Value).SnPl(kvp.Value));
}
return sb.ToString();

2
src/NadekoBot/Modules/Games/HangmanCommands.cs
View File

@@ -27,7 +27,7 @@ namespace NadekoBot.Modules.Games
[RequireContext(ContextType.Guild)]
public async Task Hangmanlist()
{
await SendConfirmAsync(Format.Code(GetText("hangman_types", Prefix)) + "\n" + string.Join("\n", _service.TermPool.Data.Keys)).ConfigureAwait(false);
await SendConfirmAsync(Format.Code(GetText(strs.hangman_types, Prefix)) + "\n" + string.Join("\n", _service.TermPool.Data.Keys)).ConfigureAwait(false);
}
[NadekoCommand, Aliases]

6
src/NadekoBot/Modules/Games/PollCommands.cs
View File

@@ -43,7 +43,7 @@ namespace NadekoBot.Modules.Games
await ctx.Channel
.EmbedAsync(_eb.Create()
.WithOkColor()
.WithTitle(GetText("poll_created", ctx.User.ToString()))
.WithTitle(GetText(strs.poll_created, ctx.User.ToString()))
.WithDescription(
Format.Bold(poll.Question) + "\n\n" +
string.Join("\n", poll.Answers
@@ -109,14 +109,14 @@ namespace NadekoBot.Modules.Games
for (int i = 0; i < stats.Length; i++)
{
var (Index, votes, Text) = stats[i];
sb.AppendLine(GetText("poll_result",
sb.AppendLine(GetText(strs.poll_result,
Index + 1,
Format.Bold(Text),
Format.Bold(votes.ToString())));
}
return eb.WithDescription(sb.ToString())
.WithFooter(GetText("x_votes_cast", totalVotesCast))
.WithFooter(GetText(strs.x_votes_cast, totalVotesCast))
.WithOkColor();
}
}

2
src/NadekoBot/Modules/Games/Services/ChatterbotService.cs
View File

@@ -122,7 +122,7 @@ namespace NadekoBot.Modules.Games.Services
{
if (pc.Verbose)
{
var returnMsg = _strings.GetText("perm_prevent", guild.Id, index + 1, Format.Bold(pc.Permissions[index].GetCommand(_cmd.GetPrefix(guild), (SocketGuild)guild))); try { await usrMsg.Channel.SendErrorAsync(_eb, returnMsg).ConfigureAwait(false); } catch { }
var returnMsg = _strings.GetText(strs.perm_prevent, guild.Id, index + 1, Format.Bold(pc.Permissions[index].GetCommand(_cmd.GetPrefix(guild), (SocketGuild)guild))); try { await usrMsg.Channel.SendErrorAsync(_eb, returnMsg).ConfigureAwait(false); } catch { }
Log.Information(returnMsg);
}
return true;

2
src/NadekoBot/Modules/Games/Services/PollService.cs
View File

@@ -99,7 +99,7 @@ namespace NadekoBot.Modules.Games.Services
private async Task Pr_OnVoted(IUserMessage msg, IGuildUser usr)
{
var toDelete = await msg.Channel.SendConfirmAsync(_eb, _strs.GetText("poll_voted",
var toDelete = await msg.Channel.SendConfirmAsync(_eb, _strs.GetText(strs.poll_voted,
usr.Guild.Id, Format.Bold(usr.ToString())))
.ConfigureAwait(false);
toDelete.DeleteAfter(5);