kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-20 11:19:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix #3287

Browse Source
This commit is contained in:
James Cole
2020-04-22 09:28:20 +02:00
parent b5eafa1910
commit 8fed6b6657
3 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/DebugController.php
View File

@@ -126,7 +126,6 @@ class DebugController extends Controller
$phpOs = str_replace($search, $replace, PHP_OS); $phpOs = str_replace($search, $replace, PHP_OS);
$interface = PHP_SAPI; $interface = PHP_SAPI;
$now = Carbon::now()->format('Y-m-d H:i:s e'); $now = Carbon::now()->format('Y-m-d H:i:s e');
$extensions = implode(', ', get_loaded_extensions());
$drivers = implode(', ', DB::availableDrivers()); $drivers = implode(', ', DB::availableDrivers());
$currentDriver = DB::getDriverName(); $currentDriver = DB::getDriverName();
$userAgent = $request->header('user-agent'); $userAgent = $request->header('user-agent');
@@ -143,7 +142,7 @@ class DebugController extends Controller
// set languages, see what happens: // set languages, see what happens:
$original = setlocale(LC_ALL, 0); $original = setlocale(LC_ALL, 0);
$localeAttempts = []; $localeAttempts = [];
$parts = explode(',', (string) trans('config.locale')); $parts = app('steam')->getLocaleArray(app('steam')->getLocale());
foreach ($parts as $code) { foreach ($parts as $code) {
$code = trim($code); $code = trim($code);
$localeAttempts[$code] = var_export(setlocale(LC_ALL, $code), true); $localeAttempts[$code] = var_export(setlocale(LC_ALL, $code), true);
@@ -178,7 +177,6 @@ class DebugController extends Controller
'debug', 'debug',
compact( compact(
'phpVersion', 'phpVersion',
'extensions',
'localeAttempts', 'localeAttempts',
'appEnv', 'appEnv',
'appDebug', 'appDebug',

1
app/Support/Steam.php
View File

@@ -617,7 +617,6 @@ class Steam
*/ */
public function getLocaleArray(string $locale): array { public function getLocaleArray(string $locale): array {
return [ return [
sprintf('%s', $locale),
sprintf('%s.utf8', $locale), sprintf('%s.utf8', $locale),
sprintf('%s.UTF-8', $locale), sprintf('%s.UTF-8', $locale),
]; ];

1
resources/views/v1/debug.twig
View File

@@ -41,7 +41,6 @@ Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION
| Login provider | {{ loginProvider }} | | Login provider | {{ loginProvider }} |
| Trusted proxies (.env) | {{ trustedProxies }} | | Trusted proxies (.env) | {{ trustedProxies }} |
| User agent | {{ userAgent }} | | User agent | {{ userAgent }} |
| Loaded extensions | {{ extensions }} |
</textarea> </textarea>
<p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;color:#a00;"> <p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;color:#a00;">