daan/geekbot
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Pass full translation dictionary to TranslationGuildContext and decide there whether to use singular or plural

Browse source
This commit is contained in:
runebaas 2019-05-12 01:07:22 +02:00
parent b309f155be
commit 495288b887
No known key found for this signature in database
GPG key ID: 2677AF508D0300D6
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Geekbot.net/Commands/Utils/Choose.cs
View file

@ -27,7 +27,7 @@ namespace Geekbot.net.Commands.Utils
var transContext = await _translation.GetGuildContext(Context); var transContext = await _translation.GetGuildContext(Context);
var choicesArray = choices.Split(';'); var choicesArray = choices.Split(';');
var choice = new Random().Next(choicesArray.Length); var choice = new Random().Next(choicesArray.Length);
await ReplyAsync(transContext.GetString("Choice", choicesArray[choice])); await ReplyAsync(transContext.GetString("Choice", choicesArray[choice].Trim()));
} }
catch (Exception e) catch (Exception e)
{ {

6
Geekbot.net/Lib/Localization/TranslationGuildContext.cs
View file

@ -10,9 +10,9 @@ namespace Geekbot.net.Lib.Localization
{ {
public ITranslationHandler TranslationHandler { get; } public ITranslationHandler TranslationHandler { get; }
public string Language { get; } public string Language { get; }
public Dictionary<string, string> Dict { get; } public Dictionary<string, List<string>> Dict { get; }
public TranslationGuildContext(ITranslationHandler translationHandler, string language, Dictionary<string, string> dict) public TranslationGuildContext(ITranslationHandler translationHandler, string language, Dictionary<string, List<string>> dict)
{ {
TranslationHandler = translationHandler; TranslationHandler = translationHandler;
Language = language; Language = language;
@ -21,7 +21,7 @@ namespace Geekbot.net.Lib.Localization
public string GetString(string stringToFormat, params object[] args) public string GetString(string stringToFormat, params object[] args)
{ {
return string.Format(Dict[stringToFormat] ?? "", args); return string.Format(Dict[stringToFormat].First() ?? "", args);
} }
public string FormatDateTimeAsRemaining(DateTimeOffset dateTime) public string FormatDateTimeAsRemaining(DateTimeOffset dateTime)

7
Geekbot.net/Lib/Localization/TranslationHandler.cs
View file

@ -127,19 +127,18 @@ namespace Geekbot.net.Lib.Localization
return translation; return translation;
} }
private async Task<Dictionary<string, string>> GetDict(ICommandContext context) private async Task<Dictionary<string, List<string>>> GetDict(ICommandContext context)
{ {
try try
{ {
var command = context.Message.Content.Split(' ').First().TrimStart('!').ToLower(); var command = context.Message.Content.Split(' ').First().TrimStart('!').ToLower();
var serverLanguage = await GetServerLanguage(context.Guild?.Id ?? 0); var serverLanguage = await GetServerLanguage(context.Guild?.Id ?? 0);
return _translations[serverLanguage][command] return _translations[serverLanguage][command];
.ToDictionary(dict => dict.Key, dict => dict.Value.First());
} }
catch (Exception e) catch (Exception e)
{ {
_logger.Error(LogSource.Geekbot, "No translations for command found", e); _logger.Error(LogSource.Geekbot, "No translations for command found", e);
return new Dictionary<string, string>(); return new Dictionary<string, List<string>>();
} }
} }