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

Make Translations easier to get

Browse source
This commit is contained in:
Runebaas 2017-11-16 00:51:36 +01:00
parent 7584b09d35
commit f0ba7bb9fc
No known key found for this signature in database
GPG key ID: 2677AF508D0300D6
4 changed files with 78 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Geekbot.net/Commands/Admin.cs
View file

@ -5,7 +5,6 @@ using Discord;
using Discord.Commands;
using Discord.WebSocket;
using Geekbot.net.Lib;
using Serilog;
using StackExchange.Redis;
namespace Geekbot.net.Commands
@ -121,7 +120,8 @@ namespace Geekbot.net.Commands
var success = _translation.SetLanguage(Context.Guild.Id, language);
if (success)
{
await ReplyAsync(_translation.GetString(Context.Guild.Id, "LanguageChanger", "Confirm"));
var trans = _translation.GetDict(Context);
await ReplyAsync(trans["Confirm"]);
return;
}
await ReplyAsync(
@ -132,5 +132,21 @@ namespace Geekbot.net.Commands
_errorHandler.HandleCommandException(e, Context);
}
}
[Command("lang", RunMode = RunMode.Async)]
[Remarks(CommandCategories.Admin)]
[Summary("Change the bots language")]
public async Task getLanguage()
{
try
{
var trans = _translation.GetDict(Context);
await ReplyAsync(trans["GetLanguage"]);
}
catch (Exception e)
{
_errorHandler.HandleCommandException(e, Context);
}
}
}
}

63
Geekbot.net/Lib/TranslationHandler.cs
View file

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Discord.Commands;
using Discord.WebSocket;
using Serilog;
using StackExchange.Redis;
@ -14,7 +15,7 @@ namespace Geekbot.net.Lib
private readonly IDatabase _redis;
private Dictionary<string, Dictionary<string, Dictionary<string, string>>> _translations;
private Dictionary<ulong, string> _serverLanguages;
public List<string> _supportedLanguages;
private List<string> _supportedLanguages;
public TranslationHandler(IReadOnlyCollection<SocketGuild> clientGuilds, IDatabase redis, ILogger logger)
{
@ -22,7 +23,6 @@ namespace Geekbot.net.Lib
_redis = redis;
_logger.Information("[Geekbot] Loading Translations");
LoadTranslations();
CheckSupportedLanguages();
LoadServerLanguages(clientGuilds);
}
@ -30,24 +30,40 @@ namespace Geekbot.net.Lib
{
try
{
var translations = File.ReadAllText(Path.GetFullPath("./Storage/Translations.json"));
_translations =
Utf8Json.JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, Dictionary<string, string>>>>(
translations);
}
catch (Exception e)
var translationFile = File.ReadAllText(Path.GetFullPath("./Storage/Translations.json"));
var rawTranslations = Utf8Json.JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, Dictionary<string, string>>>>(translationFile);
var sortedPerLanguage = new Dictionary<string, Dictionary<string, Dictionary<string, string>>>();
foreach (var command in rawTranslations)
{
_logger.Fatal(e, "Failed to load Translations");
Environment.Exit(110);
foreach (var str in command.Value)
{
foreach (var lang in str.Value)
{
if (!sortedPerLanguage.ContainsKey(lang.Key))
{
var commandDict = new Dictionary<string, Dictionary<string, string>>();
var strDict = new Dictionary<string, string>();
strDict.Add(str.Key, lang.Value);
commandDict.Add(command.Key, strDict);
sortedPerLanguage.Add(lang.Key, commandDict);
}
if (!sortedPerLanguage[lang.Key].ContainsKey(command.Key))
{
var strDict = new Dictionary<string, string>();
strDict.Add(str.Key, lang.Value);
sortedPerLanguage[lang.Key].Add(command.Key, strDict);
}
if (!sortedPerLanguage[lang.Key][command.Key].ContainsKey(str.Key))
{
sortedPerLanguage[lang.Key][command.Key].Add(str.Key, lang.Value);
}
}
}
}
_translations = sortedPerLanguage;
private void CheckSupportedLanguages()
{
try
{
_supportedLanguages = new List<string>();
foreach (var lang in _translations.First().Value.First().Value)
foreach (var lang in sortedPerLanguage)
{
_supportedLanguages.Add(lang.Key);
}
@ -78,7 +94,7 @@ namespace Geekbot.net.Lib
public string GetString(ulong guildId, string command, string stringName)
{
var translation = _translations[command][stringName][_serverLanguages[guildId]];
var translation = _translations[_serverLanguages[guildId]][command][stringName];
if (!string.IsNullOrWhiteSpace(translation)) return translation;
translation = _translations[command][stringName]["EN"];
if (string.IsNullOrWhiteSpace(translation))
@ -88,6 +104,20 @@ namespace Geekbot.net.Lib
return translation;
}
public Dictionary<string, string> GetDict(ICommandContext context)
{
try
{
var command = context.Message.Content.Split(' ').First().TrimStart('!').ToLower();
return _translations[_serverLanguages[context.Guild.Id]][command];
}
catch (Exception e)
{
_logger.Error(e, "lol nope");
return new Dictionary<string, string>();
}
}
public bool SetLanguage(ulong guildId, string language)
{
try
@ -113,6 +143,7 @@ namespace Geekbot.net.Lib
public interface ITranslationHandler
{
string GetString(ulong guildId, string command, string stringName);
Dictionary<string, string> GetDict(ICommandContext context);
bool SetLanguage(ulong guildId, string language);
List<string> GetSupportedLanguages();
}

1
Geekbot.net/Program.cs
View file

@ -248,6 +248,7 @@ namespace Geekbot.net
case LogSeverity.Critical:
case LogSeverity.Error:
case LogSeverity.Warning:
if (logMessage.Contains("VOICE_STATE_UPDATE")) break;
logger.Error(message.Exception, logMessage);
break;
default:

10
Geekbot.net/Storage/Translations.json
View file

@ -1,8 +1,12 @@
{
"LanguageChanger": {
"Confirm": {
"admin": {
"NewLanguageSet": {
"EN": "I will in english from now on",
"CHDE": "I werd ab jetzt in schwiizerdüütsch antworte, äuuä"
"CHDE": "I werd ab jetzt uf schwiizerdüütsch antworte, äuuä"
},
"GetLanguage": {
"EN": "I'm talking english",
"CHDE": "I red schwiizerdüütsch"
}
}
}