Skip to content

Remove Agent dependency #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −9
Open

Remove Agent dependency #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
],
"require": {
"php": ">=5.6.4",
"laravel/framework": ">=5.4.0",
"jenssegers/agent": "2.6.*"
"laravel/framework": ">=5.4.0"
},
"autoload": {
"psr-4": {
Expand Down
18 changes: 14 additions & 4 deletions src/Middleware/SetLocale.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Akaunting\Language\Middleware;

use Closure;
use Jenssegers\Agent\Agent;

class SetLocale
{
Expand Down Expand Up @@ -46,9 +45,20 @@ private function setLocale($locale)
public function setDefaultLocale()
{
if (config('language.auto')) {
$languages = (new Agent())->languages();

$this->setLocale(reset($languages));
$http_header_languages = request()->header('Accept-Language');
if ($http_header_languages) {
$languages = [];
foreach (explode(',', $http_header_languages) as $language) {
$parts = explode(';', $language);
$language = strtolower($parts[0]);
$priority = empty($parts[1]) ? 1. : floatval(str_replace('q=', '', $parts[1]));
$languages[$language] = $priority;
}
arsort($languages);
$this->setLocale(reset($languages));
} else {
$this->setLocale(config('app.locale'));
}
} else {
$this->setLocale(config('app.locale'));
}
Expand Down
3 changes: 0 additions & 3 deletions src/Provider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

use Illuminate\Routing\Router;
use Illuminate\Support\ServiceProvider;
use Jenssegers\Agent\AgentServiceProvider;

class Provider extends ServiceProvider
{
Expand All @@ -30,8 +29,6 @@ public function boot(Router $router)

$router->aliasMiddleware('language', config('language.middleware'));

$this->app->register(AgentServiceProvider::class);

$this->app->singleton('language', function ($app) {
return new Language($app);
});
Expand Down