cphipps/lubelog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #672 from hargata/Hargata/translation.getter

Browse Source 
further hardening.
This commit is contained in:
Hargata Softworks
2024-10-28 09:55:18 -06:00
committed by GitHub
parent 2d9cc3507f cff7845dd4
commit 636cbb3d21
2 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Controllers/HomeController.cs
View File

@@ -312,7 +312,11 @@ namespace CarCareTracker.Controllers
var translationData = await httpClient.GetFromJsonAsync<Dictionary<string, string>>(StaticHelper.GetTranslationDownloadPath(continent, name)) ?? new Dictionary<string, string>();
if (translationData.Any())
{
_translationHelper.SaveTranslation(name, translationData);
var result = _translationHelper.SaveTranslation(name, translationData);
if (!result.Success)
{
return Json(false);
}
}
else
{
@@ -343,8 +347,11 @@ namespace CarCareTracker.Controllers
var translationData = await httpClient.GetFromJsonAsync<Dictionary<string, string>>(StaticHelper.GetTranslationDownloadPath("Asia", translation)) ?? new Dictionary<string, string>();
if (translationData.Any())
{
_translationHelper.SaveTranslation(translation, translationData);
translationsDownloaded++;
var result = _translationHelper.SaveTranslation(translation, translationData);
if (result.Success)
{
translationsDownloaded++;
};
}
}
catch (Exception ex)
@@ -359,8 +366,11 @@ namespace CarCareTracker.Controllers
var translationData = await httpClient.GetFromJsonAsync<Dictionary<string, string>>(StaticHelper.GetTranslationDownloadPath("Africa", translation)) ?? new Dictionary<string, string>();
if (translationData.Any())
{
_translationHelper.SaveTranslation(translation, translationData);
translationsDownloaded++;
var result = _translationHelper.SaveTranslation(translation, translationData);
if (result.Success)
{
translationsDownloaded++;
};
}
}
catch (Exception ex)
@@ -375,8 +385,11 @@ namespace CarCareTracker.Controllers
var translationData = await httpClient.GetFromJsonAsync<Dictionary<string, string>>(StaticHelper.GetTranslationDownloadPath("Europe", translation)) ?? new Dictionary<string, string>();
if (translationData.Any())
{
_translationHelper.SaveTranslation(translation, translationData);
translationsDownloaded++;
var result = _translationHelper.SaveTranslation(translation, translationData);
if (result.Success)
{
translationsDownloaded++;
};
}
}
catch (Exception ex)
@@ -391,8 +404,11 @@ namespace CarCareTracker.Controllers
var translationData = await httpClient.GetFromJsonAsync<Dictionary<string, string>>(StaticHelper.GetTranslationDownloadPath("NorthAmerica", translation)) ?? new Dictionary<string, string>();
if (translationData.Any())
{
_translationHelper.SaveTranslation(translation, translationData);
translationsDownloaded++;
var result = _translationHelper.SaveTranslation(translation, translationData);
if (result.Success)
{
translationsDownloaded++;
};
}
}
catch (Exception ex)
@@ -407,8 +423,11 @@ namespace CarCareTracker.Controllers
var translationData = await httpClient.GetFromJsonAsync<Dictionary<string, string>>(StaticHelper.GetTranslationDownloadPath("SouthAmerica", translation)) ?? new Dictionary<string, string>();
if (translationData.Any())
{
_translationHelper.SaveTranslation(translation, translationData);
translationsDownloaded++;
var result = _translationHelper.SaveTranslation(translation, translationData);
if (result.Success)
{
translationsDownloaded++;
};
}
}
catch (Exception ex)
@@ -423,8 +442,11 @@ namespace CarCareTracker.Controllers
var translationData = await httpClient.GetFromJsonAsync<Dictionary<string, string>>(StaticHelper.GetTranslationDownloadPath("Oceania", translation)) ?? new Dictionary<string, string>();
if (translationData.Any())
{
_translationHelper.SaveTranslation(translation, translationData);
translationsDownloaded++;
var result = _translationHelper.SaveTranslation(translation, translationData);
if (result.Success)
{
translationsDownloaded++;
};
}
}
catch (Exception ex)

8
Helper/TranslationHelper.cs
View File

@@ -127,6 +127,14 @@ namespace CarCareTracker.Helper
{
return new OperationResponse { Success = false, Message = "The translation file name en_US is reserved." };
}
if (string.IsNullOrWhiteSpace(userLanguage))
{
return new OperationResponse { Success = false, Message = "File name is not provided." };
}
if (!translations.Any())
{
return new OperationResponse { Success = false, Message = "Translation has no data." };
}
var translationFilePath = _fileHelper.GetFullFilePath($"/translations/{userLanguage}.json", false);
try
{