Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop

* 'develop' of https://github.com/firefly-iii/firefly-iii:
  Add missing translations strings in search
This commit is contained in:
James Cole 2017-10-05 07:34:04 +02:00
commit 61eeb84db6
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 3 additions and 2 deletions

View File

@ -133,6 +133,7 @@ return [
// search
'search' => 'Search',
'search_query' => 'Query',
'search_found_transactions' => 'Number of transactions found:',
'general_search_error' => 'An error occured while searching. Please check the log files for more information.',
'search_box' => 'Search',

View File

@ -18,14 +18,14 @@
{# search form #}
<form class="form-horizontal" action="{{ route('search.index') }}" method="get">
<div class="form-group">
<label for="query" class="col-sm-1 control-label">Query</label>
<label for="query" class="col-sm-1 control-label">{{ 'search_query'|_ }}</label>
<div class="col-sm-10">
<input type="text" name="q" id="query" value="{{ fullQuery }}" class="form-control" placeholder="{{ fullQuery }}">
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-1 col-sm-10">
<button type="submit" class="btn btn-default"><i class="fa fa-search"></i> Search</button>
<button type="submit" class="btn btn-default"><i class="fa fa-search"></i> {{ 'search'|_ }}</button>
</div>
</div>
</form>