Fix localization and namespaces

Leonid · Leonid · commit a2505f4a1873 · 2018-06-29T22:01:26.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -366,3 +366,7 @@ eFormAPI/eFormAPI/Plugins/
 eFormAPI/EformBase\.Pn/Plugins/EformBase/
 
 eFormAPI/Plugins/Vehicles\.Pn/Vehicles/
+
+eform-client/src/app/plugins/modules/
+
+eFormAPI/Plugins/
diff --git a/eFormAPI/EformBase.Pn/Infrastructure/Helpers/LocaleHelper.cs b/eFormAPI/EformBase.Pn/Infrastructure/Helpers/LocaleHelper.cs
@@ -1,7 +1,7 @@
 ﻿using System.Threading;
 using EformBase.Pn.Properties;
 
-namespace EformBase.Pn.Helpers
+namespace EformBase.Pn.Infrastructure.Helpers
 {
     public static class LocaleHelper
     {
diff --git a/eFormAPI/eFormAPI/Controllers/AccountController.cs b/eFormAPI/eFormAPI/Controllers/AccountController.cs
@@ -11,9 +11,9 @@
 using eFormAPI.Web.Infrastructure.Models.Settings.User;
 using eFormAPI.Web.Infrastructure.Models.User;
 using EformBase.Pn.Consts;
-using EformBase.Pn.Helpers;
 using EformBase.Pn.Infrastructure.Data;
 using EformBase.Pn.Infrastructure.Data.Entities;
+using EformBase.Pn.Infrastructure.Helpers;
 using EformBase.Pn.Infrastructure.Models.API;
 using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.Owin;
diff --git a/eFormAPI/eFormAPI/Controllers/AdminController.cs b/eFormAPI/eFormAPI/Controllers/AdminController.cs
@@ -10,9 +10,9 @@
 using eFormAPI.Web.Infrastructure.Models.Common;
 using eFormAPI.Web.Infrastructure.Models.User;
 using EformBase.Pn.Consts;
-using EformBase.Pn.Helpers;
 using EformBase.Pn.Infrastructure.Data;
 using EformBase.Pn.Infrastructure.Data.Entities;
+using EformBase.Pn.Infrastructure.Helpers;
 using EformBase.Pn.Infrastructure.Models.API;
 using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.Owin;
diff --git a/eFormAPI/eFormAPI/Controllers/AuthController.cs b/eFormAPI/eFormAPI/Controllers/AuthController.cs
@@ -6,7 +6,7 @@
 using eFormAPI.Web.Infrastructure.Helpers;
 using eFormAPI.Web.Infrastructure.Identity;
 using eFormAPI.Web.Infrastructure.Models.Auth;
-using EformBase.Pn.Helpers;
+using EformBase.Pn.Infrastructure.Helpers;
 using EformBase.Pn.Infrastructure.Models.API;
 using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.Owin;
diff --git a/eFormAPI/eFormAPI/Controllers/CasesController.cs b/eFormAPI/eFormAPI/Controllers/CasesController.cs
@@ -6,8 +6,8 @@
 using eFormAPI.Web.Infrastructure.Models.Cases.Response;
 using eFormShared;
 using eFormData;
-using EformBase.Pn.Helpers;
 using EformBase.Pn.Infrastructure;
+using EformBase.Pn.Infrastructure.Helpers;
 using EformBase.Pn.Infrastructure.Models.API;
 
 namespace eFormAPI.Web.Controllers
diff --git a/eFormAPI/eFormAPI/Controllers/EntitySearchController.cs b/eFormAPI/eFormAPI/Controllers/EntitySearchController.cs
@@ -6,8 +6,8 @@
 using eFormAPI.Web.Infrastructure.Models.SearchableList;
 using eFormData;
 using eFormShared;
-using EformBase.Pn.Helpers;
 using EformBase.Pn.Infrastructure;
+using EformBase.Pn.Infrastructure.Helpers;
 using EformBase.Pn.Infrastructure.Models.API;
 
 namespace eFormAPI.Web.Controllers
diff --git a/eFormAPI/eFormAPI/Controllers/EntitySelectController.cs b/eFormAPI/eFormAPI/Controllers/EntitySelectController.cs
@@ -6,8 +6,8 @@
 using eFormAPI.Web.Infrastructure.Models.SelectableList;
 using eFormData;
 using eFormShared;
-using EformBase.Pn.Helpers;
 using EformBase.Pn.Infrastructure;
+using EformBase.Pn.Infrastructure.Helpers;
 using EformBase.Pn.Infrastructure.Models.API;
 
 namespace eFormAPI.Web.Controllers
diff --git a/eFormAPI/eFormAPI/Controllers/ImagesController.cs b/eFormAPI/eFormAPI/Controllers/ImagesController.cs
@@ -5,7 +5,7 @@
 using System.Web;
 using System.Web.Http;
 using EformBase.Pn.Consts;
-using EformBase.Pn.Helpers;
+using EformBase.Pn.Infrastructure.Helpers;
 
 namespace eFormAPI.Web.Controllers
 {
diff --git a/eFormAPI/eFormAPI/Controllers/SettingsController.cs b/eFormAPI/eFormAPI/Controllers/SettingsController.cs
@@ -12,8 +12,8 @@
 using eFormAPI.Web.Migrations;
 using eFormCore;
 using EformBase.Pn.Consts;
-using EformBase.Pn.Helpers;
 using EformBase.Pn.Infrastructure;
+using EformBase.Pn.Infrastructure.Helpers;
 using EformBase.Pn.Infrastructure.Models.API;
 using NLog;
 
diff --git a/eFormAPI/eFormAPI/Controllers/SimpleSitesController.cs b/eFormAPI/eFormAPI/Controllers/SimpleSitesController.cs
@@ -4,8 +4,8 @@
 using eFormAPI.Web.Infrastructure.Models;
 using eFormCore;
 using eFormShared;
-using EformBase.Pn.Helpers;
 using EformBase.Pn.Infrastructure;
+using EformBase.Pn.Infrastructure.Helpers;
 using EformBase.Pn.Infrastructure.Models.API;
 
 namespace eFormAPI.Web.Controllers
diff --git a/eFormAPI/eFormAPI/Controllers/SitesController.cs b/eFormAPI/eFormAPI/Controllers/SitesController.cs
@@ -5,8 +5,8 @@
 using eFormAPI.Web.Infrastructure.Models;
 using eFormCore;
 using eFormShared;
-using EformBase.Pn.Helpers;
 using EformBase.Pn.Infrastructure;
+using EformBase.Pn.Infrastructure.Helpers;
 using EformBase.Pn.Infrastructure.Models.API;
 
 namespace eFormAPI.Web.Controllers
diff --git a/eFormAPI/eFormAPI/Controllers/TagsController.cs b/eFormAPI/eFormAPI/Controllers/TagsController.cs
@@ -3,8 +3,8 @@
 using System.Web.Http;
 using eFormAPI.Web.Infrastructure.Models.Common;
 using eFormAPI.Web.Infrastructure.Models.Tags;
-using EformBase.Pn.Helpers;
 using EformBase.Pn.Infrastructure;
+using EformBase.Pn.Infrastructure.Helpers;
 using EformBase.Pn.Infrastructure.Models.API;
 
 namespace eFormAPI.Web.Controllers
diff --git a/eFormAPI/eFormAPI/Controllers/TemplateColumnsController.cs b/eFormAPI/eFormAPI/Controllers/TemplateColumnsController.cs
@@ -3,8 +3,8 @@
 using System.Linq;
 using System.Web.Http;
 using eFormAPI.Web.Infrastructure.Models.Templates;
-using EformBase.Pn.Helpers;
 using EformBase.Pn.Infrastructure;
+using EformBase.Pn.Infrastructure.Helpers;
 using EformBase.Pn.Infrastructure.Models.API;
 
 namespace eFormAPI.Web.Controllers
diff --git a/eFormAPI/eFormAPI/Controllers/TemplateFilesController.cs b/eFormAPI/eFormAPI/Controllers/TemplateFilesController.cs
@@ -8,8 +8,8 @@
 using System.Web;
 using System.Web.Http;
 using eFormAPI.Web.Infrastructure.Helpers;
-using EformBase.Pn.Helpers;
 using EformBase.Pn.Infrastructure;
+using EformBase.Pn.Infrastructure.Helpers;
 using EformBase.Pn.Infrastructure.Messages;
 using EformBase.Pn.Infrastructure.Models.API;
 
diff --git a/eFormAPI/eFormAPI/Controllers/TemplatesController.cs b/eFormAPI/eFormAPI/Controllers/TemplatesController.cs
@@ -8,8 +8,8 @@
 using eFormAPI.Web.Infrastructure.Models.Templates;
 using eFormCore;
 using eFormShared;
-using EformBase.Pn.Helpers;
 using EformBase.Pn.Infrastructure;
+using EformBase.Pn.Infrastructure.Helpers;
 using EformBase.Pn.Infrastructure.Models.API;
 
 namespace eFormAPI.Web.Controllers
diff --git a/eFormAPI/eFormAPI/Controllers/UnitsController.cs b/eFormAPI/eFormAPI/Controllers/UnitsController.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Web.Http;
 using eFormShared;
-using EformBase.Pn.Helpers;
 using EformBase.Pn.Infrastructure;
+using EformBase.Pn.Infrastructure.Helpers;
 using EformBase.Pn.Infrastructure.Models.API;
 
 namespace eFormAPI.Web.Controllers
diff --git a/eFormAPI/eFormAPI/Controllers/WorkersController.cs b/eFormAPI/eFormAPI/Controllers/WorkersController.cs
@@ -4,8 +4,8 @@
 using eFormAPI.Web.Infrastructure.Models;
 using eFormCore;
 using eFormShared;
-using EformBase.Pn.Helpers;
 using EformBase.Pn.Infrastructure;
+using EformBase.Pn.Infrastructure.Helpers;
 using EformBase.Pn.Infrastructure.Models.API;
 
 namespace eFormAPI.Web.Controllers
diff --git a/eFormAPI/eFormAPI/Infrastructure/Attributes/LocaleMiddleware.cs b/eFormAPI/eFormAPI/Infrastructure/Attributes/LocaleMiddleware.cs
@@ -45,7 +45,7 @@ private static void SetCultureOnThread(string locale)
         {
             var cultureIfo = new CultureInfo(locale);
             Thread.CurrentThread.CurrentCulture = cultureIfo;
-            Thread.CurrentThread.CurrentCulture = cultureIfo;
+            Thread.CurrentThread.CurrentUICulture = cultureIfo;
             CultureInfo.DefaultThreadCurrentCulture = cultureIfo;
             CultureInfo.DefaultThreadCurrentUICulture = cultureIfo;
         }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.Threading;`
`2`	`2`	`using EformBase.Pn.Properties;`
`3`	`3`
`4`		`-namespace EformBase.Pn.Helpers`
	`4`	`+namespace EformBase.Pn.Infrastructure.Helpers`
`5`	`5`	`{`
`6`	`6`	`public static class LocaleHelper`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using System.Web;`
`6`	`6`	`using System.Web.Http;`
`7`	`7`	`using EformBase.Pn.Consts;`
`8`		`-using EformBase.Pn.Helpers;`
	`8`	`+using EformBase.Pn.Infrastructure.Helpers;`
`9`	`9`
`10`	`10`	`namespace eFormAPI.Web.Controllers`
`11`	`11`	`{`