Skip to content

PR for https://github.com/Islandora/advanced_search/issues/68 #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: 2.x
Choose a base branch
from
Open

PR for https://github.com/Islandora/advanced_search/issues/68 #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0411a8
Added translation for configured "Keyword" and sort label
kylehuynh205 Jul 8, 2025
765a659
Added prevention translation for value of parameter "display=" in dis…
kylehuynh205 Jul 8, 2025
3559b90
Update facets-views-ajax.js
kylehuynh205 Jul 15, 2025
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
5 changes: 3 additions & 2 deletions js/facets/facets-views-ajax.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,10 @@
if (url.indexOf("display=") == -1) {
// append items_per_page
$("a.pager__display").each(function( index ) {
var newUrl = url + "&display=" + $(this).find(".display-mode").html().toLowerCase();
var newUrl = url + "&display=" + $(this).attr('type');
$(this).attr("href", newUrl);
});

}
else {
// replace existed display
Expand All @@ -117,7 +118,7 @@
var newParamsUrl = newParams.join('&');
$("a.pager__display").each(function( index ) {

var value = $(this).find(".display-mode").html().toLowerCase();
var value = $(this).attr('type');
$(this).attr("href", url.split("?")[0] + '?' + newParamsUrl + "&display=" + value);
});
}
Expand Down
4 changes: 2 additions & 2 deletions src/Form/AdvancedSearchForm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ protected function fieldOptions(array $fields) {
$options = [];
foreach ($fields as $field) {
$id = $field->getFieldIdentifier();
$options[$id] = $field->getLabel();
$options[$id] = $this->t($field->getLabel());
}
return $options;
}
Expand Down Expand Up @@ -273,7 +273,7 @@ public function buildForm(array $form, FormStateInterface $form_state, View $vie
],
];

$options = (self::getEdismaxSearch() && self::getSearchAllFields()) ? ["all" => $this->t("@label", ["@label" => self::getEdismaxSearchLabel()])] + $this->fieldOptions($fields) : $this->fieldOptions($fields);
$options = (self::getEdismaxSearch() && self::getSearchAllFields()) ? ["all" => $this->t("@label", ["@label" => $this->t(self::getEdismaxSearchLabel())])] + $this->fieldOptions($fields) : $this->fieldOptions($fields);
$term_default_values = $this->defaultTermValues($options);
[$recursive, $term_values] = $this->processInput($form_state, $term_default_values);
$i = 0;
Expand Down
2 changes: 2 additions & 0 deletions src/Plugin/Block/SearchResultsPagerBlock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ protected function buildDisplayLinks(array $query_parameters) {
['pager__link', 'pager__link--is-active', 'pager__display'] :
['pager__link', 'pager__display'],
'aria-label' => $this->t("Display as @link", ["@link" => Markup::create($text)]),
'type' => $display
],
'#wrapper_attributes' => [
'class' => $active ? ['pager__item', 'is-active'] : ['pager__item'],
Expand Down Expand Up @@ -289,6 +290,7 @@ protected function buildSortByForm(array $sort_criteria, array $query_parameters
$id = $sort->options['id'];
// Label should be translated via views already.
$label = $sort->options['expose']['label'];
$label = $this->t($label);
$asc = "{$id}_asc";
$desc = "{$id}_desc";
$options[$asc] = "{$label} ↓";
Expand Down