added localization to window

younginnovations · Jan 11, 2023 · 18b5eb6 · 18b5eb6
1 parent 1080f32
commit 18b5eb6
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 1 deletion.
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,13 +1,22 @@
 {
+<<<<<<< HEAD
 <<<<<<< HEAD
     "/js/app.js": "/js/app.js?id=7e9a87f17fbf18760401c5bab224f685",
 =======
+=======
+>>>>>>> 16be04c6 (added localization to window)
 <<<<<<< HEAD
     "/js/app.js": "/js/app.js?id=bd91445427c42c330ca26e3bf3844260",
 =======
     "/js/app.js": "/js/app.js?id=51a0f0b6dcca721384d97ff5e13bd53b",
 >>>>>>> d3adc314 (Localization process started)
+<<<<<<< HEAD
 >>>>>>> 1c3e09ab (Localization process started)
+=======
+=======
+    "/js/app.js": "/js/app.js?id=365bc6ea9f584b885818b7ae315c71a9",
+>>>>>>> b0121a12 (added localization to window)
+>>>>>>> 16be04c6 (added localization to window)
     "/js/script.js": "/js/script.js?id=67f974d705cdb041f9d42e8c11e824d1",
     "/js/formbuilder.js": "/js/formbuilder.js?id=23e0052da87288dd57b8df6421880767",
     "/manifest.js": "/manifest.js?id=6ec4db78dd752c29bd9956118b1e0467",

diff --git a/resources/assets/js/views/activity/transactions/TransactionDetail.vue b/resources/assets/js/views/activity/transactions/TransactionDetail.vue
@@ -264,6 +264,7 @@ export default defineComponent({
       );
     };
     // const language = global_lang as Translation;
+    const language = window["global_lang"] as Translation;
 
     return {
       activityTitle,
@@ -277,6 +278,7 @@ export default defineComponent({
       isMandatoryIcon,
       showSidebar,
       istopVisible,
+      language,
     };
   },
 });

diff --git a/resources/views/admin/layouts/app.blade.php b/resources/views/admin/layouts/app.blade.php
@@ -42,7 +42,7 @@
 
 <body class="overflow-x-hidden">
 <script>
-    let global_lang = {
+    window.global_lang = {
         'validation_lang': {!! json_encode(trans('validation'), JSON_THROW_ON_ERROR) !!},
     };
 </script>

diff --git a/tsconfig.json b/tsconfig.json
@@ -73,6 +73,7 @@
   "include": ["resources/assets/js/**/*"],
   "exclude": ["node_modules"]
 
+
   // "exclude": [
   //   "resources/assets/js/scripts/*"
   // ]