admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-06-05 19:33:05 +00:00
parent ac3bfb50bf
commit 4e73531145
4 changed files with 52 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
server/AyaNova/biz/TranslationBiz.cs
View File

@@ -164,20 +164,19 @@ namespace AyaNova.Biz
#if (DEBUG)
TrackRequestedKey(param);
#endif
AyContext ct = ServiceProviderProvider.DBContext;
if (!await ct.Translation.AnyAsync(e => e.Id == translationId))
translationId = ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID;
var ret = await ct.TranslationItem.Where(z => z.TranslationId == translationId && param.Contains(z.Key)).AsNoTracking().ToDictionaryAsync(z => z.Key, z => z.Display);
return ret;
using (AyContext ct = ServiceProviderProvider.DBContext)
{
if (!await ct.Translation.AnyAsync(e => e.Id == translationId))
translationId = ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID;
var ret = await ct.TranslationItem.Where(z => z.TranslationId == translationId && param.Contains(z.Key)).AsNoTracking().ToDictionaryAsync(z => z.Key, z => z.Display);
return ret;
}
}
//Get the CJKIndex value for the translation specified
internal static async Task<bool> GetCJKIndexAsync(long translationId, AyContext ct = null)
internal static async Task<bool> GetCJKIndexAsync(long translationId, AyContext ct)
{
if (ct == null)
ct = ServiceProviderProvider.DBContext;
var ret = await ct.Translation.Where(z => z.Id == translationId).AsNoTracking().Select(z => z.CjkIndex).SingleOrDefaultAsync();
return ret;
}
@@ -195,15 +194,15 @@ namespace AyaNova.Biz
#if (DEBUG)
TrackRequestedKey(key);
#endif
AyContext ct = ServiceProviderProvider.DBContext;
return await ct.TranslationItem.Where(z => z.TranslationId == ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID && z.Key == key).Select(z => z.Display).AsNoTracking().FirstOrDefaultAsync();
using (AyContext ct = ServiceProviderProvider.DBContext)
return await ct.TranslationItem.Where(z => z.TranslationId == ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID && z.Key == key).Select(z => z.Display).AsNoTracking().FirstOrDefaultAsync();
}
//Get all stock keys that are valid (used for key coverage reporting)
internal static async Task<List<string>> GetKeyListAsync()
{
AyContext ct = ServiceProviderProvider.DBContext;
return await ct.TranslationItem.Where(z => z.TranslationId == 1).OrderBy(z => z.Key).Select(z => z.Key).AsNoTracking().ToListAsync();
using (AyContext ct = ServiceProviderProvider.DBContext)
return await ct.TranslationItem.Where(z => z.TranslationId == 1).OrderBy(z => z.Key).Select(z => z.Key).AsNoTracking().ToListAsync();
}
@@ -392,15 +391,14 @@ namespace AyaNova.Biz
return v.Id;
}
public static async Task<long> TranslationNameToIdStaticAsync(string translationName, AyContext ct = null)
public static async Task<long> TranslationNameToIdStaticAsync(string translationName)
{
if (ct == null)
using (AyContext ct = ServiceProviderProvider.DBContext)
{
ct = ServiceProviderProvider.DBContext;
var v = await ct.Translation.AsNoTracking().FirstOrDefaultAsync(z => z.Name == translationName);
if (v == null) return ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID;
return v.Id;
}
var v = await ct.Translation.AsNoTracking().FirstOrDefaultAsync(z => z.Name == translationName);
if (v == null) return ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID;
return v.Id;
}
public async Task<bool> TranslationExistsAsync(string translationName)