feat: bug fixes and general improvements

Author: ReneSchwarzer

src/WebExpress.WebApp/Assets/js/i18n/de.js

@@ -1,12 +1,7 @@
 /**
  * German translation for WebExpress
  */
-var webexpress = webexpress || {}
-webexpress.webui = {}
-webexpress.webui.i18n_data = webexpress.webui.i18n_data || {};
+webexpress.webui.I18N.register("de", "webexpress.webapp", {
+    "form.edit_row": "Eintrag bearbeiten"
 
-webexpress.webui.i18n_data["de"] = {
-    "webexpress.webapp": {
-        "form.edit_row": "Eintrag bearbeiten"
-    }
-}
+});

src/WebExpress.WebApp/Assets/js/i18n/en.js

@@ -1,12 +1,6 @@
 /**
  * English translations for WebExpress
  */
-var webexpress = webexpress || {}
-webexpress.webui = {}
-webexpress.webui.i18n_data = webexpress.webui.i18n_data || {};
-
-webexpress.webui.i18n_data["en"] = {
-    "webexpress.webapp": {
-        "form.edit_row": "Edit Row"
-    }
-}
+webexpress.webui.I18N.register("en", "webexpress.webapp", {
+    "form.edit_row": "Edit Row"
+});

src/WebExpress.WebApp/WebPage/VisualTreeWebApp.cs

@@ -90,14 +90,15 @@ public VisualTreeWebApp(IComponentHub componentHub, IPageContext pageContext)
             AddCssLink(RouteEndpoint.Combine(baseUri, "css/webexpress.webapp.table.css"));
             AddCssLink(RouteEndpoint.Combine(baseUri, "css/webexpress.webapp.taskprogressbar.css"));
             AddCssLink(Theme?.ThemeStyle.ToString() ?? RouteEndpoint.Combine(baseUri, "css/webexpress.webapp.theme.css"));
-            AddHeaderLanguageLink(RouteEndpoint.Combine(baseUri, "js/i18n/en.js"));
-            AddHeaderLanguageLink(RouteEndpoint.Combine(baseUri, "js/i18n/de.js"));
+
             AddHeaderScriptLink(RouteEndpoint.Combine(baseUri, "js/webexpress.webapp.js"));
             AddHeaderScriptLink(RouteEndpoint.Combine(baseUri, "js/webexpress.webapp.popupnotification.js"));
-            AddHeaderScriptLink(RouteEndpoint.Combine(baseUri, "assets/js/webexpress.webapp.selection.js"));
+            AddHeaderScriptLink(RouteEndpoint.Combine(baseUri, "js/webexpress.webapp.selection.js"));
             AddHeaderScriptLink(RouteEndpoint.Combine(baseUri, "js/webexpress.webapp.modalform.js"));
             AddHeaderScriptLink(RouteEndpoint.Combine(baseUri, "js/webexpress.webapp.table.js"));
             AddHeaderScriptLink(RouteEndpoint.Combine(baseUri, "js/webexpress.webapp.taskprogressbar.js"));
+            AddHeaderScriptLink(RouteEndpoint.Combine(baseUri, "js/i18n/en.js"));
+            AddHeaderScriptLink(RouteEndpoint.Combine(baseUri, "js/i18n/de.js"));
         }
 
         /// <summary>
@@ -117,8 +118,7 @@ public override IHtmlNode Render(IVisualTreeContext context)
             html.Head.Meta = Meta;
             html.Head.Scripts = HeaderScripts;
             html.Head.CssLinks = CssLinks.Where(x => x != null).Select(x => x.ToString());
-            html.Head.ScriptLinks = HeaderLanguageLinks?.Where(x => x != null).Select(x => x.ToString())
-                 .Union(HeaderScriptLinks?.Where(x => x != null).Select(x => x.ToString()));
+            html.Head.ScriptLinks = HeaderScriptLinks?.Where(x => x != null).Select(x => x.ToString());
 
             // header
             Header.AppTitle.Text = html.Head.Title;