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

correct field and add timezone #764

Merged
merged 2 commits into from
Sep 6, 2023
Merged

correct field and add timezone #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4cf531
correct field and add timezone
rpnykanen Aug 31, 2023
9f98435
translation change, plan to hearing
rpnykanen Sep 5, 2023
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
2 changes: 1 addition & 1 deletion templates/content/external-entity--helfi-hearings.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{% endif %}

{% if content.close_at[0]['#context'].value is not empty %}
{% set card_unpublished_on = content.close_at[0]['#context'].value|date('j.n.Y') ~ ' ' ~ 'at'|t({}, {'context': 'Word in between hearing unpublished date and time'}) ~ ' ' ~ node.unpublish_on.value|date('H:i') %}
{% set card_unpublished_on = content.close_at[0]['#context'].value|date('j.n.Y') ~ ' ' ~ 'at'|t({}, {'context': 'Word in between hearing unpublished date and time'}) ~ ' ' ~ content.close_at[0]['#context'].value|date('H:i', 'Europe/Helsinki') %}
{% else %}
{% set card_unpublished_on = '-' %}
{% endif %}
Expand Down
6 changes: 3 additions & 3 deletions templates/paragraphs/paragraph--hearings.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
<section class="hearings__results">
<div class="hearings__count-container">
<span class="hearings__count">{{ hearings_count }}</span>
{% trans with {'context': 'Hearings count'}%}plan open for commenting{% plural hearings_count %}plans open for commenting{% endtrans %}
{% trans with {'context': 'Hearings count'}%}hearing open for commenting{% plural hearings_count %}hearings open for commenting{% endtrans %}
</div>
{{ content.list }}
</section>
{% include '@hdbt/navigation/link-button.html.twig' with {
type: 'primary',
label: 'See all plans'|t({},{'context': 'See all plans link text'}),
label: 'See all hearings'|t({},{'context': 'See all hearings link text'}),
url: 'https://kerrokantasi.hel.fi/hearings/list?lang=' ~ current_langcode,
class: 'hearings__link',
is_external: true,
Expand All @@ -35,7 +35,7 @@
</section>
{% include '@hdbt/navigation/link-button.html.twig' with {
type: 'primary',
label: 'See all already closed plans'|t({},{'context': 'See closed plans link text'}),
label: 'See all already closed hearings'|t({},{'context': 'See closed hearings link text'}),
url: 'https://kerrokantasi.hel.fi/hearings/list?lang=' ~ current_langcode,
class: 'hearings__link',
is_external: true,
Expand Down
20 changes: 10 additions & 10 deletions translations/fi.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,17 +594,17 @@ msgstr "Aktiivisuus"

msgctxt "Hearings count"
msgid "plan open for commenting"
msgid_plural "plans open for commenting"
msgstr[0] "suunnitelma avoinna kommentoitavaksi"
msgstr[1] "suunnitelmaa avoinna kommentoitavaksi"
msgid_plural "hearings open for commenting"
msgstr[0] "kuuleminen avoinna kommentoitavaksi"
msgstr[1] "kuulemiset avoinna kommentoitavaksi"

msgctxt "See all plans link text"
msgid "See all plans"
msgstr "Katso kaikki suunnitelmat"
msgctxt "See all hearings link text"
msgid "See all hearings"
msgstr "Katso kaikki kuulemiset"

msgctxt "See closed plans link text"
msgid "See all already closed plans"
msgstr "Katso jo sulkeutuneet suunnitelmat"
msgctxt "See closed hearings link text"
msgid "See all already closed hearings"
msgstr "Katso jo sulkeutuneet kuulemiset"

msgctxt "Hearing available in languages"
msgid "Hearing only available in English"
Expand Down Expand Up @@ -683,7 +683,7 @@ msgid "Subscribe to RSS feed of news based on your choices"
msgstr "Tilaa uutisten RSS-syöte valintojesi perusteella"

msgid "At the moment there is no open hearings for commenting."
msgstr "Tällä hetkellä ei ole avoimia suunnitelmia kommentoitavaksi."
msgstr "Tällä hetkellä ei ole avoimia kuulemisia kommentoitavaksi."

msgctxt "React search clear selection label"
msgid "Clear @label selection"
Expand Down
14 changes: 7 additions & 7 deletions translations/sv.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,13 +590,13 @@ msgctxt "Label for hearing activity row"
msgid "Activity"
msgstr "Aktivitet"

msgctxt "See all plans link text"
msgid "See all plans"
msgstr "Se alla planer"
msgctxt "See all hearings link text"
msgid "See all hearings"
msgstr "Se alla Hörandet"

msgctxt "See closed plans link text"
msgid "See all already closed plans"
msgstr "Se alla redan stängda planer"
msgctxt "See closed hearings link text"
msgid "See all already closed hearings"
msgstr "Se alla redan stängda Hörandet"

msgctxt "Hearing available in languages"
msgid "Hearing only available in English"
Expand Down Expand Up @@ -675,7 +675,7 @@ msgid "Subscribe to RSS feed of news based on your choices"
msgstr "Prenumerera på RSS-flöde med nyheter baserat på dina val"

msgid "At the moment there is no open hearings for commenting."
msgstr "För närvarande finns det inga öppna planer för kommentarer."
msgstr "För närvarande finns det inga öppna Hörandet för kommentarer."

msgctxt "React search clear selection label"
msgid "Clear @label selection"
Expand Down