From 8cd7470316492a27f13bfb877c4a35055eaf5c2b Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Wed, 6 Nov 2019 10:43:59 +0300
Subject: [PATCH] added localization

---
 .../Controllers/ErrorController.cs                     | 10 ++++++++--
 .../Volo.Abp.UI/Localization/Resources/AbpUi/en.json   |  1 +
 .../Volo.Abp.UI/Localization/Resources/AbpUi/tr.json   |  1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Controllers/ErrorController.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Controllers/ErrorController.cs
index ded8f2d352..517e871635 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Controllers/ErrorController.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Controllers/ErrorController.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
+using Localization.Resources.AbpUi;
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 using Volo.Abp.AspNetCore.ExceptionHandling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Error;
@@ -12,14 +14,18 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Controllers
     {
         private readonly IExceptionToErrorInfoConverter _errorInfoConverter;
         private readonly IHttpExceptionStatusCodeFinder _statusCodeFinder;
+        private readonly IStringLocalizer<AbpUiResource> _localizer;
         private readonly AbpErrorPageOptions _abpErrorPageOptions;
 
         public ErrorController(
             IExceptionToErrorInfoConverter exceptionToErrorInfoConverter,
-            IHttpExceptionStatusCodeFinder httpExceptionStatusCodeFinder, IOptions<AbpErrorPageOptions> abpErrorPageOptions)
+            IHttpExceptionStatusCodeFinder httpExceptionStatusCodeFinder,
+            IOptions<AbpErrorPageOptions> abpErrorPageOptions,
+            IStringLocalizer<AbpUiResource> localizer)
         {
             _errorInfoConverter = exceptionToErrorInfoConverter;
             _statusCodeFinder = httpExceptionStatusCodeFinder;
+            _localizer = localizer;
             _abpErrorPageOptions = abpErrorPageOptions.Value;
         }
 
@@ -29,7 +35,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Controllers
 
             var exception = exHandlerFeature != null
                 ? exHandlerFeature.Error
-                : new Exception("Unhandled exception!"); //TODO: Localize?
+                : new Exception(_localizer["UnhandledException"]);
 
             var errorInfo = _errorInfoConverter.Convert(exception);
 
diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json
index 9dee3c9b69..c56acf4342 100644
--- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json
+++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json
@@ -47,6 +47,7 @@
     "ChangePassword": "Change password",
     "PersonalInfo": "My profile",
     "AreYouSureYouWantToCancelEditingWarningMessage": "You have unsaved changes.",
+    "UnhandledException": "Unhandled exception!",
     "401Message": "Unauthorized",
     "403Message": "Forbidden",
     "404Message": "Page not found",
diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json
index 169ff854f4..62c4339a7f 100644
--- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json
+++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json
@@ -47,6 +47,7 @@
     "ChangePassword": "Şifre değiştir",
     "PersonalInfo": "Profilim",
     "AreYouSureYouWantToCancelEditingWarningMessage": "Kaydedilmemiş değişiklikler var.",
+    "UnhandledException": "Yakalanmamış hata!",
     "401Message": "Yetkisiz",
     "403Message": "Yasak",
     "404Message": "Sayfa bulunamadı",