Skip to content

Commit ce17705

Browse files
authored
Merge pull request #2138 from projectblacklight/responsive-sort-and-per-page-labels
Add a new i18n key for the sort/per page labels that include HTML …
2 parents 8ca262f + 0ad267a commit ce17705

File tree

12 files changed

+42
-22
lines changed

12 files changed

+42
-22
lines changed

app/views/catalog/_per_page_widget.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<span class="sr-only"><%= t('blacklight.search.per_page.title') %></span>
33
<div id="per_page-dropdown" class="per-page-dropdown btn-group">
44
<button type="button" class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
5-
<%= t(:'blacklight.search.per_page.button_label', :count => current_per_page) %> <span class="caret"></span>
5+
<%= t(:'blacklight.search.per_page.button_label_html', :count => current_per_page) %> <span class="caret"></span>
66
</button>
77
<div class="dropdown-menu dropdown-menu-right" role="menu">
88
<%- per_page_options_for_select.each do |(label, count)| %>

app/views/catalog/_sort_widget.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<% if show_sort_and_per_page? and active_sort_fields.many? %>
22
<div id="sort-dropdown" class="sort-dropdown btn-group">
33
<button type="button" class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
4-
<%= t('blacklight.search.sort.label', :field =>sort_field_label(current_sort_field.key)) %> <span class="caret"></span>
4+
<%= t('blacklight.search.sort.label_html', :field =>sort_field_label(current_sort_field.key)) %> <span class="caret"></span>
55
</button>
66

77
<div class="dropdown-menu" role="menu">

config/locales/blacklight.de.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,13 @@ de:
143143
invalid_solr_id: "Entschuldigung, Sie haben einen nicht vorhandenen Datensatz angefordert."
144144
per_page:
145145
label: '%{count}<span class="sr-only"> pro Seite</span>'
146-
button_label: '%{count} pro Seite'
146+
button_label: '%{count} pro Seite' # TODO: Remove during major release
147+
button_label_html: '%{count}<span class="d-none d-sm-inline"> pro Seite</span>'
147148
title: 'Anzahl der Ergebnisse, die pro Seite angezeigt werden'
148149
submit: 'Aktualisieren'
149150
sort:
150-
label: 'Ordnen nach %{field}'
151+
label: 'Ordnen nach %{field}' # TODO: Remove during major release
152+
label_html: 'Ordnen<span class="d-none d-sm-inline"> nach %{field}</span>'
151153
submit: 'Ergebnisse ordnen'
152154
form:
153155
search_field:

config/locales/blacklight.en.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,13 @@ en:
143143
invalid_solr_id: "Sorry, you have requested a record that doesn't exist."
144144
per_page:
145145
label: '%{count}<span class="sr-only"> per page</span>'
146-
button_label: '%{count} per page'
146+
button_label: '%{count} per page' # TODO: Remove during major release
147+
button_label_html: '%{count}<span class="d-none d-sm-inline"> per page</span>'
147148
title: 'Number of results to display per page'
148149
submit: 'Update'
149150
sort:
150-
label: 'Sort by %{field}'
151+
label: 'Sort by %{field}' # TODO: Remove during major release
152+
label_html: 'Sort<span class="d-none d-sm-inline"> by %{field}</span>'
151153
submit: 'sort results'
152154
form:
153155
search_field:

config/locales/blacklight.es.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,13 @@ es:
143143
invalid_solr_id: "Lo sentimos, usted ha solicitado un registro que no existe."
144144
per_page:
145145
label: '%{count}<span class="sr-only"> por página</span>'
146-
button_label: '%{count} por página'
146+
button_label: '%{count} por página' # TODO: Remove during major release
147+
button_label_html: '%{count}<span class="d-none d-sm-inline"> por página</span>'
147148
title: 'El número de resultados a mostrar por página'
148149
submit: 'Actualización'
149150
sort:
150-
label: 'Ordenar por %{field}'
151+
label: 'Ordenar por %{field}' # TODO: Remove during major release
152+
label_html: 'Ordenar<span class="d-none d-sm-inline"> por %{field}</span>'
151153
submit: 'Resultados de ordenación'
152154
form:
153155
search_field:

config/locales/blacklight.fr.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,13 @@ fr:
146146
invalid_solr_id: "Vous avez demandé une notice qui n'existe pas."
147147
per_page:
148148
label: '%{count}<span class="sr-only"> par page</span>'
149-
button_label: '%{count} par page'
149+
button_label: '%{count} par page' # TODO: Remove during major release
150+
button_label_html: '%{count}<span class="d-none d-sm-inline"> par page</span>'
150151
title: 'Nombre de résultats à afficher par page'
151152
submit: 'mettre à jour'
152153
sort:
153-
label: 'Trier par %{field}'
154+
label: 'Trier par %{field}' # TODO: Remove during major release
155+
label_html: 'Trier<span class="d-none d-sm-inline"> par %{field}</span>'
154156
submit: 'trier les résultats'
155157
form:
156158
search_field:

config/locales/blacklight.hu.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,13 @@ hu:
136136
invalid_solr_id: "Elnézést, de az Ön által kért rekord nem létezik."
137137
per_page:
138138
label: '%{count}<span class="sr-only"> oldalanként</span>'
139-
button_label: '%{count} oldalanként'
139+
button_label: '%{count} oldalanként' # TODO: Remove during major release
140+
button_label_html: '%{count}<span class="d-none d-sm-inline"> oldalanként</span>'
140141
title: 'Az eredmények száma oldalanként'
141142
submit: 'Frissítés'
142143
sort:
143-
label: 'Rendezés %{field}'
144+
label: 'Rendezés %{field}' # TODO: Remove during major release
145+
label_html: 'Rendezés<span class="d-none d-sm-inline"> %{field}</span>'
144146
submit: 'Eredmények rendezése'
145147
form:
146148
search_field:

config/locales/blacklight.it.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,13 @@ it:
143143
invalid_solr_id: "Il numero di scheda richiesto non esiste."
144144
per_page:
145145
label: '%{count}<span class="sr-only"> per pagina</span>'
146-
button_label: '%{count} per pagina'
146+
button_label: '%{count} per pagina' # TODO: Remove during major release
147+
button_label_html: '%{count}<span class="d-none d-sm-inline"> per pagina</span>'
147148
title: 'Risultati per pagina'
148149
submit: 'Aggiorna'
149150
sort:
150-
label: 'Ordina per %{field}'
151+
label: 'Ordina per %{field}' # TODO: Remove during major release
152+
label_html: 'Ordina<span class="d-none d-sm-inline"> per %{field}</span>'
151153
submit: 'Ordina i risultati'
152154
form:
153155
search_field:

config/locales/blacklight.nl.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,13 @@ nl:
136136
invalid_solr_id: "Sorry, u vroeg een onbestaande record op."
137137
per_page:
138138
label: '%{count}<span class="sr-only"> per pagina</span>'
139-
button_label: '%{count} per pagina'
139+
button_label: '%{count} per pagina' # TODO: Remove during major release
140+
button_label_html: '%{count}<span class="d-none d-sm-inline"> per pagina</span>'
140141
title: 'Toon aantal zoekresultaten per pagina'
141142
submit: 'Update'
142143
sort:
143-
label: 'Sorteer op %{field}'
144+
label: 'Sorteer op %{field}' # TODO: Remove during major release
145+
label_html: 'Sorteer<span class="d-none d-sm-inline"> op %{field}</span>'
144146
submit: 'sorteer resultaten'
145147
form:
146148
search_field:

config/locales/blacklight.pt-BR.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,13 @@ pt-BR:
144144
invalid_solr_id: "Desculpe, você solicitou um cadastro que não existe."
145145
per_page:
146146
label: '%{count}<span class="hide-text"> por página</span>'
147-
button_label: '%{count} por página'
147+
button_label: '%{count} por página' # TODO: Remove during major release
148+
button_label_html: '%{count}<span class="d-none d-sm-inline"> por página</span>'
148149
title: 'Número de resultados para mostrar por página'
149150
submit: 'Atualizar'
150151
sort:
151-
label: 'Ordenar por %{field}'
152+
label: 'Ordenar por %{field}' # TODO: Remove during major release
153+
label_html: 'Ordenar<span class="d-none d-sm-inline"> por %{field}</span>'
152154
submit: 'ordenar resultados'
153155
form:
154156
search_field:

0 commit comments

Comments
 (0)