Bugfix translations

composer.json

@@ -9,8 +9,6 @@
     "type": "project",
     "require": {
         "php": "7.4.*",
-        "alessandrobelli/lingua": "^1.0",
-        "arietimmerman/laravel-url-shortener": "dev-master",
         "barryvdh/laravel-dompdf": "^0.8.4",
         "fideloper/proxy": "^4.2",
         "guzzlehttp/guzzle": "^6.3",
@@ -23,7 +21,9 @@
         "maatwebsite/excel": "^3.1",
         "parsedown/laravel": "^1.2",
         "spatie/laravel-webhook-server": "^1.9.1",
-        "symfony/console": "^5.0"
+        "symfony/console": "^5.0",
+        "arietimmerman/laravel-url-shortener": "dev-master",
+        "alessandrobelli/lingua": "dev-main"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.0",

composer.lock

@@ -4,21 +4,15 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "93ac4200686648957f81aa3334932d75",
+    "content-hash": "42e8aadaac66d18682813f66b0b94fd6",
     "packages": [
         {
             "name": "alessandrobelli/lingua",
-            "version": "1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/alessandrobelli/Lingua.git",
-                "reference": "93f2342163e6aa585cc3a618a64961aa144b71e4"
-            },
+            "version": "dev-main",
             "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/alessandrobelli/Lingua/zipball/93f2342163e6aa585cc3a618a64961aa144b71e4",
-                "reference": "93f2342163e6aa585cc3a618a64961aa144b71e4",
-                "shasum": ""
+                "type": "path",
+                "url": "../lingua",
+                "reference": "f089910c6e5d382694a86b5ec4ef69d1e9ab84fa"
             },
             "require": {
                 "illuminate/console": "^6.0|^7.0|^8.0",
@@ -62,7 +56,25 @@
                     "alessandrobelli\\Lingua\\": "src"
                 }
             },
-            "notification-url": "https://packagist.org/downloads/",
+            "autoload-dev": {
+                "psr-4": {
+                    "alessandrobelli\\Lingua\\Tests\\": "tests"
+                }
+            },
+            "scripts": {
+                "psalm": [
+                    "vendor/bin/psalm"
+                ],
+                "test": [
+                    "vendor/bin/phpunit"
+                ],
+                "test-coverage": [
+                    "vendor/bin/phpunit --coverage-html coverage"
+                ],
+                "format": [
+                    "vendor/bin/php-cs-fixer fix --allow-risky=yes"
+                ]
+            },
             "license": [
                 "MIT"
             ],
@@ -80,11 +92,9 @@
                 "alessandrobelli",
                 "lingua"
             ],
-            "support": {
-                "issues": "https://github.com/alessandrobelli/Lingua/issues",
-                "source": "https://github.com/alessandrobelli/Lingua/tree/1.0"
-            },
-            "time": "2020-10-15T16:20:38+00:00"
+            "transport-options": {
+                "relative": true
+            }
         },
         {
             "name": "arietimmerman/laravel-url-shortener",
@@ -1729,16 +1739,16 @@
         },
         {
             "name": "livewire/livewire",
-            "version": "v2.2.9",
+            "version": "v2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/livewire/livewire.git",
-                "reference": "c01b331e7fcbccdffd63e49ce86c05a50fcb68ea"
+                "reference": "0674d4cb8e598ce67df00fb95472c73e668b1416"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/livewire/livewire/zipball/c01b331e7fcbccdffd63e49ce86c05a50fcb68ea",
-                "reference": "c01b331e7fcbccdffd63e49ce86c05a50fcb68ea",
+                "url": "https://api.github.com/repos/livewire/livewire/zipball/0674d4cb8e598ce67df00fb95472c73e668b1416",
+                "reference": "0674d4cb8e598ce67df00fb95472c73e668b1416",
                 "shasum": ""
             },
             "require": {
@@ -1769,6 +1779,9 @@
                 }
             },
             "autoload": {
+                "files": [
+                    "src/helpers.php"
+                ],
                 "psr-4": {
                     "Livewire\\": "src/"
                 }
@@ -1786,7 +1799,7 @@
             "description": "A front-end framework for Laravel.",
             "support": {
                 "issues": "https://github.com/livewire/livewire/issues",
-                "source": "https://github.com/livewire/livewire/tree/v2.2.9"
+                "source": "https://github.com/livewire/livewire/tree/v2.3.0"
             },
             "funding": [
                 {
@@ -1794,7 +1807,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-30T16:19:54+00:00"
+            "time": "2020-10-15T17:49:47+00:00"
         },
         {
             "name": "maatwebsite/excel",
@@ -2479,20 +2492,20 @@
         },
         {
             "name": "paragonie/random_compat",
-            "version": "v9.99.99",
+            "version": "v9.99.100",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
+                "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
-                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a",
+                "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a",
                 "shasum": ""
             },
             "require": {
-                "php": "^7"
+                "php": ">= 7"
             },
             "require-dev": {
                 "phpunit/phpunit": "4.*|5.*",
@@ -2525,7 +2538,7 @@
                 "issues": "https://github.com/paragonie/random_compat/issues",
                 "source": "https://github.com/paragonie/random_compat"
             },
-            "time": "2018-07-02T15:55:56+00:00"
+            "time": "2020-10-15T08:29:30+00:00"
         },
         {
             "name": "parsedown/laravel",
@@ -7529,25 +7542,25 @@
         },
         {
             "name": "facade/ignition-contracts",
-            "version": "1.0.1",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/facade/ignition-contracts.git",
-                "reference": "aeab1ce8b68b188a43e81758e750151ad7da796b"
+                "reference": "3c921a1cdba35b68a7f0ccffc6dffc1995b18267"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/facade/ignition-contracts/zipball/aeab1ce8b68b188a43e81758e750151ad7da796b",
-                "reference": "aeab1ce8b68b188a43e81758e750151ad7da796b",
+                "url": "https://api.github.com/repos/facade/ignition-contracts/zipball/3c921a1cdba35b68a7f0ccffc6dffc1995b18267",
+                "reference": "3c921a1cdba35b68a7f0ccffc6dffc1995b18267",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": "^7.3|^8.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.14",
-                "phpunit/phpunit": "^7.5|^8.0",
-                "vimeo/psalm": "^3.12"
+                "friendsofphp/php-cs-fixer": "^v2.15.8",
+                "phpunit/phpunit": "^9.3.11",
+                "vimeo/psalm": "^3.17.1"
             },
             "type": "library",
             "autoload": {
@@ -7576,9 +7589,9 @@
             ],
             "support": {
                 "issues": "https://github.com/facade/ignition-contracts/issues",
-                "source": "https://github.com/facade/ignition-contracts/tree/1.0.1"
+                "source": "https://github.com/facade/ignition-contracts/tree/1.0.2"
             },
-            "time": "2020-07-14T10:10:28+00:00"
+            "time": "2020-10-16T08:27:54+00:00"
         },
         {
             "name": "filp/whoops",
@@ -11329,7 +11342,8 @@
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
-        "arietimmerman/laravel-url-shortener": 20
+        "arietimmerman/laravel-url-shortener": 20,
+        "alessandrobelli/lingua": 20
     },
     "prefer-stable": true,
     "prefer-lowest": false,

resources/views/layouts/header.blade.php

@@ -21,8 +21,14 @@
     <script>
         window.trans = [];
         window.trans = <?php
-        $json_file = File::get(resource_path() . "/lang/" . App::getLocale() . '.json');
-        echo json_decode(json_encode($json_file, true));;
+        if(File::exists(resource_path() . "/lang/" . App::getLocale() . '.json'))
+        {
+            $json_file = File::get(resource_path() . "/lang/" . App::getLocale() . '.json');
+            echo json_decode(json_encode($json_file, true));
+        }
+        else{
+            echo "[]";
+        }
         ?>;
     </script>
 

resources/views/layouts/lingua/header.blade.php

@@ -20,8 +20,14 @@
     <script>
         window.trans = [];
         window.trans = <?php
-        $json_file = File::get(resource_path() . "/lang/" . App::getLocale() . '.json');
-        echo json_decode(json_encode($json_file, true));;
+            if(File::exists(resource_path() . "/lang/" . App::getLocale() . '.json'))
+                {
+                    $json_file = File::get(resource_path() . "/lang/" . App::getLocale() . '.json');
+                    echo json_decode(json_encode($json_file, true));
+                }
+            else{
+                    echo "[]";
+                }
         ?>;
     </script>