Skip to content
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

UHF-9067: Add term changes hardcoded unit searches #541

Merged
merged 4 commits into from
Jan 16, 2024
+98 −69
Merged

UHF-9067: Add term changes hardcoded unit searches #541

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f438e8
UHF-9067: Add changes to daycare, high school, vocational school, pla…
teroelonen Jan 9, 2024
4605ff7
UHF-9067: Update the empty text for custom unit search paragraph to m…
teroelonen Jan 11, 2024
c8397ed
UHF-9067: Changed the search button term on vocational school search
teroelonen Jan 12, 2024
d5c741d
UHF-9067: Merge branch 'dev' of github.com:City-of-Helsinki/drupal-he…
teroelonen Jan 16, 2024
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
7 changes: 3 additions & 4 deletions ...s/custom/hdbt_subtheme/templates/views/views-view--after-school-activity-search.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,9 @@

<div class="unit-search__results">
{% if total_rows %}
<span class="unit-search__count-container">
<span class="unit-search__count">{{ total_rows }}</span>
{% trans with {'context': 'After-school activity search count'}%}location{% plural total_rows %}locations{% endtrans %}
</span>
<h3 class="unit-search__count-container">
{{ total_rows }} {% trans with {'context': 'After-school activity search count'}%}activity location{% plural total_rows %}activity locations{% endtrans %}
</h3>
{% endif %}

{% if header %}
Expand Down
7 changes: 3 additions & 4 deletions public/themes/custom/hdbt_subtheme/templates/views/views-view--daycare-search.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,9 @@
{{ attachment_before }}

<div class="unit-search__results" data-id-number="{{ dom_id }}">
<span class="unit-search__count-container">
<span class="unit-search__count">{{ total_rows }}</span>
{% trans with {'context': 'Daycare search count'}%}location{% plural total_rows %}locations{% endtrans %}
</span>
<h3 class="unit-search__count-container">
{{ total_rows }} {% trans with {'context': 'Daycare search count'}%}daycare centre{% plural total_rows %}daycare centres{% endtrans %}
hyrsky marked this conversation as resolved.
Show resolved Hide resolved
</h3>

{% if header %}
{{ header }}
Expand Down
11 changes: 5 additions & 6 deletions public/themes/custom/hdbt_subtheme/templates/views/views-view--high-school-search.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,9 @@

<div class="unit-search__results" data-drupal-selector="tabbed-content" data-id-number="{{ dom_id }}">
<div class="unit-search__result-actions">
<span class="unit-search__count-container">
<span class="unit-search__count">{{ total_rows }}</span>
{% trans with {'context': 'High school search count'}%}general upper secondary school{% plural total_rows %}general upper secondary schools{% endtrans %}
</span>
<h3 class="unit-search__count-container">
{{ total_rows }} {% trans with {'context': 'High school search count'}%}general upper secondary school{% plural total_rows %}general upper secondary schools{% endtrans %}
</h3>
<div class="tabs tabs--unit-search"
role="tablist"
aria-label="{{ 'Toggle between list and map view'|t({}, {'context': 'Tab-list of unit-search'}) }}">
Expand All @@ -72,13 +71,13 @@
id="tab-1--{{ dom_id }}"
role="tab"
aria-selected="false"
aria-controls="tab-1__content--{{ dom_id }}">{{ 'Show results as a list'|t }}</button>
aria-controls="tab-1__content--{{ dom_id }}">{{ 'View as a list'|t }}</button>
<button class="tab tab--map"
data-drupal-selector="tab-2--{{ dom_id }}"
id="tab-2--{{ dom_id }}"
role="tab"
aria-selected="false"
aria-controls="tab-2__content--{{ dom_id }}">{{ 'Show results on a map'|t }}</button>
aria-controls="tab-2__content--{{ dom_id }}">{{ 'View in a map'|t }}</button>
</div>
</div>
<div class="tab__content"
Expand Down
7 changes: 3 additions & 4 deletions public/themes/custom/hdbt_subtheme/templates/views/views-view--playground-search.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,9 @@

<div class="unit-search__results" data-id-number="{{ dom_id }}">
{% if total_rows %}
<span class="unit-search__count-container">
<span class="unit-search__count">{{ total_rows }}</span>
{% trans with {'context': 'Playground search count'}%}location{% plural total_rows %}locations{% endtrans %}
</span>
<h3 class="unit-search__count-container">
{{ total_rows }} {% trans with {'context': 'Playground search count'}%}playground or family house{% plural total_rows %}playgrounds or family houses{% endtrans %}
</h3>
{% endif %}

{% if header %}
Expand Down
7 changes: 3 additions & 4 deletions ...hemes/custom/hdbt_subtheme/templates/views/views-view--vocational-school-search.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,9 @@
{{ attachment_before }}

<div class="unit-search__results" data-id-number="{{ dom_id }}">
<span class="unit-search__count-container">
<span class="unit-search__count">{{ total_rows }}</span>
{% trans with {'context': 'Vocational school search count'}%}unit{% plural total_rows %}units{% endtrans %}
</span>
<h3 class="unit-search__count-container">
{{ total_rows }} {% trans with {'context': 'Vocational school search count'}%}unit{% plural total_rows %}units{% endtrans %}
</h3>

<div class="unit-search__result--list">
{{ rows }}
Expand Down
32 changes: 16 additions & 16 deletions public/themes/custom/hdbt_subtheme/translations/fi.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,32 +23,32 @@ msgid_plural "units"
msgstr[0] "toimipaikka"
msgstr[1] "toimipaikkaa"

msgid "Show results on a map"
msgstr "Näytä tulokset kartalla"
msgid "View in a map"
msgstr "Näytä kartalla"

msgid "Show results as a list"
msgstr "Näytä tulokset listana"
msgid "View as a list"
msgstr "Näytä listana"

msgid "Open large version of the map"
msgstr "Avaa suurempi versio kartasta"

msgctxt "Daycare search count"
msgid "location"
msgid_plural "locations"
msgstr[0] "toimipaikka"
msgstr[1] "toimipaikkaa"
msgid "daycare centre"
msgid_plural "daycare centres"
msgstr[0] "päiväkoti"
msgstr[1] "päiväkotia"

msgctxt "After-school activity search count"
msgid "location"
msgid_plural "locations"
msgstr[0] "toimipaikka"
msgstr[1] "toimipaikkaa"
msgid "activity location"
msgid_plural "activity locations"
msgstr[0] "toimintapaikka"
msgstr[1] "toimintapaikkaa"

msgctxt "Playground search count"
msgid "location"
msgid_plural "locations"
msgstr[0] "toimipaikka"
msgstr[1] "toimipaikkaa"
msgid "playground or family house"
msgid_plural "playgrounds or family houses"
msgstr[0] "leikkipuisto tai perhetalo"
msgstr[1] "leikkipuistoa tai perhetaloa"

msgctxt "Group news archive link"
msgid "All news"
Expand Down
32 changes: 16 additions & 16 deletions public/themes/custom/hdbt_subtheme/translations/sv.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,32 +14,32 @@ msgid_plural "units"
msgstr[0] "enhet"
msgstr[1] "enheter"

msgid "Show results on a map"
msgstr "Visa resultat på en karta"
msgid "View in a map"
msgstr "Visa på kartan"

msgid "Show results as a list"
msgstr "Visa resultat på en lista"
msgid "View as a list"
msgstr "Visa som lista"

msgid "Open large version of the map"
msgstr "Öppna den stora versionen av kartan"

msgctxt "Daycare search count"
msgid "location"
msgid_plural "locations"
msgstr[0] "enhet"
msgstr[1] "enheter"
msgid "daycare centre"
msgid_plural "daycare centres"
msgstr[0] "daghem"
msgstr[1] "daghem"

msgctxt "After-school activity search count"
msgid "location"
msgid_plural "locations"
msgstr[0] "enhet"
msgstr[1] "enheter"
msgid "activity location"
msgid_plural "activity locations"
msgstr[0] "verksamhetsställe"
msgstr[1] "verksamhetsställen"

msgctxt "Playground search count"
msgid "location"
msgid_plural "locations"
msgstr[0] "enhet"
msgstr[1] "enheter"
msgid "playground or family house"
msgid_plural "playgrounds or family houses"
msgstr[0] "lekpark eller familjehus"
msgstr[1] "lekparker eller familjehus"

msgctxt "Group news archive link"
msgid "All news"
Expand Down