Commit 58c29edd authored by ZeMKI's avatar ZeMKI
Browse files

Bugfix translations

parent bbda9d38
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
"type": "project", "type": "project",
"require": { "require": {
"php": "7.4.*", "php": "7.4.*",
"alessandrobelli/lingua": "^1.0",
"arietimmerman/laravel-url-shortener": "dev-master",
"barryvdh/laravel-dompdf": "^0.8.4", "barryvdh/laravel-dompdf": "^0.8.4",
"fideloper/proxy": "^4.2", "fideloper/proxy": "^4.2",
"guzzlehttp/guzzle": "^6.3", "guzzlehttp/guzzle": "^6.3",
...@@ -23,7 +21,9 @@ ...@@ -23,7 +21,9 @@
"maatwebsite/excel": "^3.1", "maatwebsite/excel": "^3.1",
"parsedown/laravel": "^1.2", "parsedown/laravel": "^1.2",
"spatie/laravel-webhook-server": "^1.9.1", "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": { "require-dev": {
"barryvdh/laravel-debugbar": "^3.0", "barryvdh/laravel-debugbar": "^3.0",
......
...@@ -4,21 +4,15 @@ ...@@ -4,21 +4,15 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "93ac4200686648957f81aa3334932d75", "content-hash": "42e8aadaac66d18682813f66b0b94fd6",
"packages": [ "packages": [
{ {
"name": "alessandrobelli/lingua", "name": "alessandrobelli/lingua",
"version": "1.0", "version": "dev-main",
"source": {
"type": "git",
"url": "https://github.com/alessandrobelli/Lingua.git",
"reference": "93f2342163e6aa585cc3a618a64961aa144b71e4"
},
"dist": { "dist": {
"type": "zip", "type": "path",
"url": "https://api.github.com/repos/alessandrobelli/Lingua/zipball/93f2342163e6aa585cc3a618a64961aa144b71e4", "url": "../lingua",
"reference": "93f2342163e6aa585cc3a618a64961aa144b71e4", "reference": "f089910c6e5d382694a86b5ec4ef69d1e9ab84fa"
"shasum": ""
}, },
"require": { "require": {
"illuminate/console": "^6.0|^7.0|^8.0", "illuminate/console": "^6.0|^7.0|^8.0",
...@@ -62,7 +56,25 @@ ...@@ -62,7 +56,25 @@
"alessandrobelli\\Lingua\\": "src" "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": [ "license": [
"MIT" "MIT"
], ],
...@@ -80,11 +92,9 @@ ...@@ -80,11 +92,9 @@
"alessandrobelli", "alessandrobelli",
"lingua" "lingua"
], ],
"support": { "transport-options": {
"issues": "https://github.com/alessandrobelli/Lingua/issues", "relative": true
"source": "https://github.com/alessandrobelli/Lingua/tree/1.0" }
},
"time": "2020-10-15T16:20:38+00:00"
}, },
{ {
"name": "arietimmerman/laravel-url-shortener", "name": "arietimmerman/laravel-url-shortener",
...@@ -1729,16 +1739,16 @@ ...@@ -1729,16 +1739,16 @@
}, },
{ {
"name": "livewire/livewire", "name": "livewire/livewire",
"version": "v2.2.9", "version": "v2.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/livewire/livewire.git", "url": "https://github.com/livewire/livewire.git",
"reference": "c01b331e7fcbccdffd63e49ce86c05a50fcb68ea" "reference": "0674d4cb8e598ce67df00fb95472c73e668b1416"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/livewire/livewire/zipball/c01b331e7fcbccdffd63e49ce86c05a50fcb68ea", "url": "https://api.github.com/repos/livewire/livewire/zipball/0674d4cb8e598ce67df00fb95472c73e668b1416",
"reference": "c01b331e7fcbccdffd63e49ce86c05a50fcb68ea", "reference": "0674d4cb8e598ce67df00fb95472c73e668b1416",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1769,6 +1779,9 @@ ...@@ -1769,6 +1779,9 @@
} }
}, },
"autoload": { "autoload": {
"files": [
"src/helpers.php"
],
"psr-4": { "psr-4": {
"Livewire\\": "src/" "Livewire\\": "src/"
} }
...@@ -1786,7 +1799,7 @@ ...@@ -1786,7 +1799,7 @@
"description": "A front-end framework for Laravel.", "description": "A front-end framework for Laravel.",
"support": { "support": {
"issues": "https://github.com/livewire/livewire/issues", "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": [ "funding": [
{ {
...@@ -1794,7 +1807,7 @@ ...@@ -1794,7 +1807,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2020-09-30T16:19:54+00:00" "time": "2020-10-15T17:49:47+00:00"
}, },
{ {
"name": "maatwebsite/excel", "name": "maatwebsite/excel",
...@@ -2479,20 +2492,20 @@ ...@@ -2479,20 +2492,20 @@
}, },
{ {
"name": "paragonie/random_compat", "name": "paragonie/random_compat",
"version": "v9.99.99", "version": "v9.99.100",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/paragonie/random_compat.git", "url": "https://github.com/paragonie/random_compat.git",
"reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95" "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95", "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a",
"reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95", "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7" "php": ">= 7"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "4.*|5.*", "phpunit/phpunit": "4.*|5.*",
...@@ -2525,7 +2538,7 @@ ...@@ -2525,7 +2538,7 @@
"issues": "https://github.com/paragonie/random_compat/issues", "issues": "https://github.com/paragonie/random_compat/issues",
"source": "https://github.com/paragonie/random_compat" "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", "name": "parsedown/laravel",
...@@ -7529,25 +7542,25 @@ ...@@ -7529,25 +7542,25 @@
}, },
{ {
"name": "facade/ignition-contracts", "name": "facade/ignition-contracts",
"version": "1.0.1", "version": "1.0.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/facade/ignition-contracts.git", "url": "https://github.com/facade/ignition-contracts.git",
"reference": "aeab1ce8b68b188a43e81758e750151ad7da796b" "reference": "3c921a1cdba35b68a7f0ccffc6dffc1995b18267"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/facade/ignition-contracts/zipball/aeab1ce8b68b188a43e81758e750151ad7da796b", "url": "https://api.github.com/repos/facade/ignition-contracts/zipball/3c921a1cdba35b68a7f0ccffc6dffc1995b18267",
"reference": "aeab1ce8b68b188a43e81758e750151ad7da796b", "reference": "3c921a1cdba35b68a7f0ccffc6dffc1995b18267",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1" "php": "^7.3|^8.0"
}, },
"require-dev": { "require-dev": {
"friendsofphp/php-cs-fixer": "^2.14", "friendsofphp/php-cs-fixer": "^v2.15.8",
"phpunit/phpunit": "^7.5|^8.0", "phpunit/phpunit": "^9.3.11",
"vimeo/psalm": "^3.12" "vimeo/psalm": "^3.17.1"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
...@@ -7576,9 +7589,9 @@ ...@@ -7576,9 +7589,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/facade/ignition-contracts/issues", "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", "name": "filp/whoops",
...@@ -11329,7 +11342,8 @@ ...@@ -11329,7 +11342,8 @@
"aliases": [], "aliases": [],
"minimum-stability": "dev", "minimum-stability": "dev",
"stability-flags": { "stability-flags": {
"arietimmerman/laravel-url-shortener": 20 "arietimmerman/laravel-url-shortener": 20,
"alessandrobelli/lingua": 20
}, },
"prefer-stable": true, "prefer-stable": true,
"prefer-lowest": false, "prefer-lowest": false,
......
...@@ -21,8 +21,14 @@ ...@@ -21,8 +21,14 @@
<script> <script>
window.trans = []; window.trans = [];
window.trans = <?php window.trans = <?php
$json_file = File::get(resource_path() . "/lang/" . App::getLocale() . '.json'); if(File::exists(resource_path() . "/lang/" . App::getLocale() . '.json'))
echo json_decode(json_encode($json_file, true));; {
$json_file = File::get(resource_path() . "/lang/" . App::getLocale() . '.json');
echo json_decode(json_encode($json_file, true));
}
else{
echo "[]";
}
?>; ?>;
</script> </script>
......
...@@ -20,8 +20,14 @@ ...@@ -20,8 +20,14 @@
<script> <script>
window.trans = []; window.trans = [];
window.trans = <?php window.trans = <?php
$json_file = File::get(resource_path() . "/lang/" . App::getLocale() . '.json'); if(File::exists(resource_path() . "/lang/" . App::getLocale() . '.json'))
echo json_decode(json_encode($json_file, true));; {
$json_file = File::get(resource_path() . "/lang/" . App::getLocale() . '.json');
echo json_decode(json_encode($json_file, true));
}
else{
echo "[]";
}
?>; ?>;
</script> </script>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment