From db148aa45df5b5bfb09faf1d55db7a8281007cdb Mon Sep 17 00:00:00 2001 From: Jeremy Quinton Date: Sun, 2 Sep 2018 18:09:39 +0200 Subject: [PATCH] use trans instead of lang so messages display correctly with html not escaped --- resources/views/Installer/Installer.blade.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/views/Installer/Installer.blade.php b/resources/views/Installer/Installer.blade.php index 3ed585f3..13880b61 100644 --- a/resources/views/Installer/Installer.blade.php +++ b/resources/views/Installer/Installer.blade.php @@ -40,13 +40,13 @@ @endif

@lang("Installer.php_version_check")

- @if (version_compare(phpversion(), '5.5.9', '<')) + @if (version_compare(phpversion(), '7.1.3', '<'))
- @lang("Installer.php_too_low", ["requires"=>"5.5.9", "has"=>phpversion()]) + {!! @trans("Installer.php_too_low", ["requires"=>"7.1.3", "has"=>phpversion()]) !!}
@else
- @lang("Installer.php_enough", ["requires"=>"5.5.9", "has"=>phpversion()]) + {!! @trans("Installer.php_enough", ["requires"=>"7.1.3", "has"=>phpversion()]) !!}
@endif @@ -55,11 +55,11 @@ @if(!File::isWritable($path))
- @lang("Installer.path_not_writable", ["path"=>$path]) + {!! @trans("Installer.path_not_writable", ["path"=>$path]) !!}
@else
- @lang("Installer.path_writable", ["path"=>$path]) + {!! @trans("Installer.path_writable", ["path"=> $path]) !!}
@endif @@ -70,11 +70,11 @@ @if(!extension_loaded($requirement))
- @lang("Installer.requirement_not_met", ["requirement"=>$requirement]) + {!! @trans("Installer.requirement_not_met", ["requirement"=>$requirement]) !!}
@else
- @lang("Installer.requirement_met", ["requirement"=>$requirement]) + {!! @trans("Installer.requirement_met", ["requirement"=>$requirement]) !!}
@endif @@ -86,11 +86,11 @@ @if(!extension_loaded($optional_requirement))
- @lang("Installer.optional_requirement_not_met", ["requirement"=>$optional_requirement]) + {!! @trans("Installer.optional_requirement_not_met", ["requirement"=>$optional_requirement]) !!}
@else
- @lang("Installer.requirement_met", ["requirement"=>$optional_requirement]) + {!! @trans("Installer.requirement_met", ["requirement"=>$optional_requirement]) !!}
@endif