Merge branch 'netcore'

Author: renemadsen

eFormAPI/eFormAPI.Web.Integration.Tests/eFormAPI.Web.Integration.Tests.csproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

eFormAPI/eFormAPI.Web.Tests/eFormAPI.Web.Tests.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

eFormAPI/eFormAPI.Web/Abstractions/ILocalizationService.cs

@@ -3,6 +3,7 @@
     public interface ILocalizationService
     {
         string GetString(string key);
+        string GetString(string key, string defaultValue);
         string GetString(string format, params object[] args);
     }
 }

eFormAPI/eFormAPI.Web/Hosting/Helpers/PluginHelper.cs

@@ -44,7 +44,7 @@ public static List<IEformPlugin> GetPlugins()
 #if DEBUG
                 Console.ForegroundColor = ConsoleColor.Red;
                 Console.WriteLine("RUNNING IN DEBUG MODE!");
-                pluginList = Directory.GetFiles(Path.Combine(directory, "netcoreapp2.1"))
+                pluginList = Directory.GetFiles(Path.Combine(directory, "netcoreapp2.2"))
                     .Where(x => x.EndsWith("Pn.dll") && Path.GetFileName(x) != "eFormApi.BasePn.dll")
                     .ToList();
 #else

eFormAPI/eFormAPI.Web/Infrastructure/Database/Entities/MenuItem.cs

@@ -8,6 +8,10 @@ public class MenuItem : BaseEntity
     {
         [StringLength(250)] 
         public string Name { get; set; }
+
+        [StringLength(250)] 
+        public string LocaleName { get; set; }
+
         public string Link { get; set; }
         public string E2EId { get; set; }
 

eFormAPI/eFormAPI.Web/Infrastructure/Seed/SeedItems/MenuItemSeed.cs

@@ -13,6 +13,7 @@ public static ModelBuilder AddDefaultMenu(this ModelBuilder modelBuilder)
                 {
                     Id = 1,
                     Name = "My eForms",
+                    LocaleName = "MyEforms",
                     E2EId = "my-eforms",
                     Link = "/",
                     Position = 0,
@@ -22,6 +23,7 @@ public static ModelBuilder AddDefaultMenu(this ModelBuilder modelBuilder)
                 {
                     Id = 2,
                     Name = "Device Users",
+                    LocaleName = "DeviceUsers",
                     E2EId = "device-users",
                     Link = "/simplesites",
                     Position = 1,
@@ -31,6 +33,7 @@ public static ModelBuilder AddDefaultMenu(this ModelBuilder modelBuilder)
                 {
                     Id = 3,
                     Name = "Advanced",
+                    LocaleName = "Advanced",
                     E2EId = "advanced",
                     Link = "",
                     Position = 2,
@@ -40,6 +43,7 @@ public static ModelBuilder AddDefaultMenu(this ModelBuilder modelBuilder)
                 {
                     Id = 4,
                     Name = "Sites",
+                    LocaleName = "Sites",
                     E2EId = "sites",
                     Link = "/advanced/sites",
                     Position = 0,
@@ -50,6 +54,7 @@ public static ModelBuilder AddDefaultMenu(this ModelBuilder modelBuilder)
                 {
                     Id = 5,
                     Name = "Workers",
+                    LocaleName = "Workers",
                     E2EId = "workers",
                     Link = "/advanced/workers",
                     Position = 1,
@@ -60,6 +65,7 @@ public static ModelBuilder AddDefaultMenu(this ModelBuilder modelBuilder)
                 {
                     Id = 6,
                     Name = "Units",
+                    LocaleName = "Units",
                     E2EId = "units",
                     Link = "/advanced/units",
                     Position = 2,
@@ -69,7 +75,8 @@ public static ModelBuilder AddDefaultMenu(this ModelBuilder modelBuilder)
                 new MenuItem
                 {
                     Id = 7,
-                    Name = "Searchable list",
+                    Name = "SearchableList",
+                    LocaleName = "SearchableList",
                     E2EId = "search",
                     Link = "/advanced/entity-search",
                     Position = 3,
@@ -80,6 +87,7 @@ public static ModelBuilder AddDefaultMenu(this ModelBuilder modelBuilder)
                 {
                     Id = 8,
                     Name = "Selectable list",
+                    LocaleName = "SelectableList",
                     E2EId = "selectable-list",
                     Link = "/advanced/entity-select",
                     Position = 4,
@@ -90,6 +98,7 @@ public static ModelBuilder AddDefaultMenu(this ModelBuilder modelBuilder)
                 {
                     Id = 9,
                     Name = "Application Settings",
+                    LocaleName = "ApplicationSettings",
                     E2EId = "application-settings",
                     Link = "/application-settings",
                     Position = 5,
@@ -110,6 +119,7 @@ public static ModelBuilder AddDefaultMenu(this ModelBuilder modelBuilder)
                 {
                     Id = 11,
                     Name = "User Management",
+                    LocaleName = "UserManagement",
                     E2EId = "user-management-menu",
                     Link = "/account-management/users",
                     Position = 0,
@@ -120,6 +130,7 @@ public static ModelBuilder AddDefaultMenu(this ModelBuilder modelBuilder)
                 {
                     Id = 12,
                     Name = "Settings",
+                    LocaleName = "Settings",
                     E2EId = "settings",
                     Link = "/account-management/settings",
                     Position = 1,
@@ -130,6 +141,7 @@ public static ModelBuilder AddDefaultMenu(this ModelBuilder modelBuilder)
                 {
                     Id = 13,
                     Name = "Security",
+                    LocaleName = "Security",
                     E2EId = "security",
                     Link = "/security",
                     Position = 2,
@@ -140,6 +152,7 @@ public static ModelBuilder AddDefaultMenu(this ModelBuilder modelBuilder)
                 {
                     Id = 14,
                     Name = "Change password",
+                    LocaleName = "ChangePassword",
                     E2EId = "change-password",
                     Link = "/account-management/change-password",
                     Position = 3,
@@ -150,6 +163,7 @@ public static ModelBuilder AddDefaultMenu(this ModelBuilder modelBuilder)
                 {
                     Id = 15,
                     Name = "Logout",
+                    LocaleName = "Logout",
                     E2EId = "sign-out",
                     Link = "/auth/sign-out",
                     Position = 4,