Skip to content
This repository was archived by the owner on Jan 25, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public static function explained(IndexerQuery $query)
}

// Build the interpreted query.
return count($parts) ? Text::sprintf('COM_FINDER_QUERY_TOKEN_INTERPRETED', implode(Text::_('COM_FINDER_QUERY_TOKEN_GLUE'), $parts)) : null;
return count($parts) ? implode(Text::_('COM_FINDER_QUERY_TOKEN_GLUE'), $parts) : null;
}

/**
Expand Down
4 changes: 2 additions & 2 deletions components/com_finder/tmpl/search/default_results.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<?php echo Text::sprintf('COM_FINDER_SEARCH_SIMILAR', $link); ?>
<?php elseif ($this->explained && $this->params->get('show_explained_query', 1)) : ?>
<?php // Display the explained search query. ?>
<?php echo $this->explained; ?>
<?php echo Text::sprintf('COM_FINDER_QUERY_TOKEN_INTERPRETED', $this->explained, Text::plural('COM_FINDER_QUERY_RESULTS', $this->total)); ?>
<?php endif; ?>
</div>
<?php endif; ?>
Expand All @@ -50,7 +50,7 @@
<?php endif; ?>
<?php // Display a list of results ?>
<br id="highlighter-start" />
<dl class="search-results list-striped">
<dl id="search-result-list" class="search-results list-striped">
<?php $this->baseUrl = Uri::getInstance()->toString(array('scheme', 'host', 'port')); ?>
<?php foreach ($this->results as $i => $result) : ?>
<?php $this->result = &$result; ?>
Expand Down
5 changes: 4 additions & 1 deletion language/en-GB/com_finder.ini
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,14 @@ COM_FINDER_QUERY_FILTER_BRANCH_VENUE="venue"
COM_FINDER_QUERY_OPERATOR_AND="and"
COM_FINDER_QUERY_OPERATOR_NOT="not"
COM_FINDER_QUERY_OPERATOR_OR="or"
COM_FINDER_QUERY_RESULTS="the following <a href=\"#search-result-list\">%s results were found</a>."
COM_FINDER_QUERY_RESULTS_0="no results were found. <a href=\"#q\">Search again</a>."
COM_FINDER_QUERY_RESULTS_1="the following %s result was found."
COM_FINDER_QUERY_START_DATE="beginning date <span class=\"when\">%s</span> <span class=\"date\">%s</span>"
COM_FINDER_QUERY_TAXONOMY_NODE="with <span class=\"node\">%s</span> as <span class=\"branch\">%s</span> "
COM_FINDER_QUERY_TOKEN_EXCLUDED="<span class=\"term\">%s</span> should be excluded"
COM_FINDER_QUERY_TOKEN_GLUE=", and "
COM_FINDER_QUERY_TOKEN_INTERPRETED="Assuming %s, the following results were found."
COM_FINDER_QUERY_TOKEN_INTERPRETED="Assuming %s, %s"
COM_FINDER_QUERY_TOKEN_OPTIONAL="<span class=\"term\">%s</span> is optional"
COM_FINDER_QUERY_TOKEN_REQUIRED="<span class=\"term\">%s</span> is required"
COM_FINDER_SEARCH_NO_RESULTS_BODY="No search results could be found for query: %s."
Expand Down