tonyair/silverstripe-fulltextsearch
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-fulltextsearch synced 2024-10-22 14:05:29 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0' into 4

Browse Source
This commit is contained in:
Guy Sartorelli 2023-08-29 10:31:28 +12:00
commit 0f62997e70
No known key found for this signature in database
GPG Key ID: F313E3B9504D496A
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lang/fi.yml
View File

@ -3,12 +3,12 @@ fi:
GO: Hae
SEARCH: Haku
SolrResultsPage:
SearchQuery: 'Hakusanasi oli'
DidYouMean: Tarkoititko
ReadMore: 'Lue lisää'
NoResults: 'Pahoittelut, mutta hakusi ei tuottanut yhtään osumaa.'
Page: Sivu
of: /
ViewPreviousPage: 'Katso edellinen sivu'
ReadMore: 'Lue lisää'
SearchQuery: 'Hakusanasi oli'
'View page number': 'Siirry sivulle'
ViewNextPage: 'Katso seuraava sivu'
ViewPreviousPage: 'Katso edellinen sivu'
of: /

1
src/Solr/Reindex/Handlers/SolrReindexImmediateHandler.php
View File

@ -104,7 +104,6 @@ class SolrReindexImmediateHandler extends SolrReindexBase
// Set timeout from config. Process default is 60 seconds
$process->setTimeout($this->config()->get('process_timeout'));
$process->inheritEnvironmentVariables();
$process->run();
$res = $process->getOutput();