Merge pull request #10461 from abpframework/EngincanV/bs5

Add lang-utils.js for managing language selection and RTL support (Blazor)

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/main.js → framework/src/Volo.Abp.AspNetCore.Components.Web/wwwroot/libs/abp/js/lang-utils.js

@@ -1,5 +1,8 @@
-(
-    function () {
+var abp = abp || {};
+(function () {
+    abp.utils = abp.utils || {};
+
+    abp.utils.updateHTMLDirAndLangFromLocalStorage = function () {
         var isRtl = JSON.parse(localStorage.getItem("Abp.IsRtl"));
         var htmlTag = document.getElementsByTagName("html")[0];
 
@@ -14,4 +17,6 @@
             }
         }
     }
-)();
+
+    abp.utils.updateHTMLDirAndLangFromLocalStorage();
+})();

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/ComponentsComponentsBundleContributor.cs

@@ -10,6 +10,7 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.Theming
             context.Add("_content/Blazorise/blazorise.js");
             context.Add("_content/Blazorise.Bootstrap5/blazorise.bootstrap5.js");
             context.Add("_content/Volo.Abp.AspNetCore.Components.Web/libs/abp/js/abp.js");
+            context.Add("_content/Volo.Abp.AspNetCore.Components.Web/libs/abp/js/lang-utils.js");
         }
 
         public void AddStyles(BundleContext context)

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html

@@ -8,7 +8,7 @@
     <base href="/" />
 
     <!--ABP:Styles-->
-    <link href="global.css?_v=637701705556752210" rel="stylesheet"/>
+    <link href="global.css?_v=637710195522309763" rel="stylesheet"/>
     <link href="main.css" rel="stylesheet"/>
     <!--/ABP:Styles-->
     <link href="MyCompanyName.MyProjectName.Blazor.styles.css" rel="stylesheet"/>
@@ -23,9 +23,7 @@
     </div>
 
     <!--ABP:Scripts-->
-    <script src="global.js?_v=637701705558615007"></script>
+    <script src="global.js?_v=637710195525117113"></script>
     <!--/ABP:Scripts-->
-
-    <script src="main.js"></script>
 </body>
 </html>

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/wwwroot/index.html

@@ -8,7 +8,7 @@
     <base href="/" />
 
     <!--ABP:Styles-->
-    <link href="global.css?_v=637701706652209746" rel="stylesheet"/>
+    <link href="global.css?_v=637710196152037820" rel="stylesheet"/>
     <link href="main.css" rel="stylesheet"/>
     <!--/ABP:Styles-->
 </head>
@@ -22,9 +22,7 @@
     </div>
 
     <!--ABP:Scripts-->
-    <script src="global.js?_v=637701706654165281"></script>
+    <script src="global.js?_v=637710196154808376"></script>
     <!--/ABP:Scripts-->
-
-    <script src="main.js"></script>
 </body>
 </html>

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/wwwroot/main.js

@@ -1,17 +0,0 @@
-(
-    function () {
-        var isRtl = JSON.parse(localStorage.getItem("Abp.IsRtl"));
-        var htmlTag = document.getElementsByTagName("html")[0];
-
-        if (htmlTag) {
-            var selectedLanguage = localStorage.getItem("Abp.SelectedLanguage");
-            if (selectedLanguage) {
-                htmlTag.setAttribute("lang", selectedLanguage);
-            }
-
-            if (isRtl) {
-                htmlTag.setAttribute("dir", "rtl");
-            }
-        }
-    }
-)();