Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1005 from invoiceninja/revert-1004-#1001-Translate-error-template

Browse Source 
Revert "Translate error template"
This commit is contained in:
Hillel Coren 2016-07-21 15:30:39 +03:00 committed by GitHub
commit dc22611d2f
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/lang/en/texts.php
View File

@ -2044,8 +2044,7 @@ $LANG = array(
'payment_error_code' => 'There was an error processing your payment [:code]. Please try again later.', 'payment_error_code' => 'There was an error processing your payment [:code]. Please try again later.',
'standard_fees_apply' => 'Standard fees apply: 2.9% + $0.30 per successful charge.', 'standard_fees_apply' => 'Standard fees apply: 2.9% + $0.30 per successful charge.',
'limit_import_rows' => 'Data needs to be imported in batches of :count rows or less', 'limit_import_rows' => 'Data needs to be imported in batches of :count rows or less',
'error_title' => 'Something went wrong',
'error_contact_text' => 'If you\'d like help please email us at :mailaddress',
); );

22
resources/views/error.blade.php
View File

@ -2,18 +2,18 @@
@section('content') @section('content')
<p>&nbsp;<p> <p>&nbsp;<p>
<p>&nbsp;<p> <p>&nbsp;<p>
<div class="well"> <div class="well">
<div class="container" style="min-height:400px"> <div class="container" style="min-height:400px">
<h3>{{ trans('texts.error_title') }}...</h3> <h3>Something went wrong...</h3>
<h4>{{ $error }}</h4> <h4>{{ $error }}</h4>
<h4>{{ trans('texts.error_contact_text', ['mailaddress' => env('MAIL_USERNAME')]) }}</h4> <h4>If you'd like help please email us at {{ env('MAIL_USERNAME') }}.</h4>
</div> </div>
</div> </div>
<p>&nbsp;<p> <p>&nbsp;<p>
<p>&nbsp;<p> <p>&nbsp;<p>
@stop @stop