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.

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-X Select icon library #721

Merged
merged 11 commits into from
Mar 26, 2024
Merged
15 changes: 15 additions & 0 deletions modules/hdbt_admin_tools/hdbt_admin_tools.module
Original file line number Diff line number Diff line change
Expand Up @@ -1136,3 +1136,18 @@ function hdbt_admin_tools_field_widget_complete_form_alter(&$field_widget_comple
);
}
}

/**
* Implements hook_config_ignore_settings_alter().
*/
function hdbt_admin_tools_config_ignore_settings_alter(array &$settings): void {
// Exclude the hdbt_admin_tools.settings configuration translations.
$configuration = 'language.*|hdbt_admin_tools.settings';

if (in_array($configuration, $settings)) {
return;
}

// Add the configuration for the settings to the list of ignored data.
$settings[] = $configuration;
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
{% embed "@hdbt_admin_tools/selection-base-widget.twig" with {
attributes: attributes.addClass('select-icon').setAttribute('placeholder', '- None -'|t ),
} %}{% endembed %}
{{ attach_library('hdbt_admin_tools/select_icon') }}
1 change: 1 addition & 0 deletions modules/helfi_base_content/helfi_base_content.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@ dependencies:
- scheduler:scheduler
- select2:select2
- simple_sitemap:simple_sitemap
- social_media:social_media
- twig_tweak:twig_tweak
- view_unpublished:view_unpublished
4 changes: 2 additions & 2 deletions modules/helfi_base_content/helfi_base_content.install
Original file line number Diff line number Diff line change
Expand Up @@ -301,9 +301,9 @@ function helfi_base_content_update_9007() : void {
}

/**
* UHF-9088: Updated configuration translations for helfi_base_content.
* UHF-9088: Moved social_media settings to helfi_base_content.
*/
function helfi_base_content_update_9009() : void {
function helfi_base_content_update_9010() : void {
\Drupal::service('helfi_platform_config.config_update_helper')
->update('helfi_base_content');
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,25 @@ display:
action_title: Åtgärd
thumbnail__target_id:
label: Miniatyr
separator: ', '
name:
label: Medianamn
separator: ', '
bundle:
label: Typ
separator: ', '
uid:
label: Författare
separator: ', '
status:
settings:
format_custom_false: 'Ej publicerad'
format_custom_true: Publicerad
label: Status
separator: ', '
changed:
label: Uppdaterad
separator: ', '
operations:
label: Funktioner
pager:
Expand Down Expand Up @@ -53,7 +60,6 @@ display:
status:
expose:
label: Sant
description: ''
group_info:
label: 'Status för publicering'
group_items:
Expand All @@ -64,6 +70,10 @@ display:
langcode:
expose:
label: Språk
title: Media
media_page_list:
display_title: Media
display_options:
menu: { }
menu:
title: Media
label: Media
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ display:
action_title: Åtgärd
pager:
options:
tags: { }
expose:
items_per_page_label: 'Inlägg per sida'
items_per_page_options_all_label: '- Alla -'
offset_label: Kompensera
tags:
next: ››
previous: ‹‹
exposed_form:
options:
submit_button: 'Tillämpa filter'
Expand All @@ -37,7 +39,6 @@ display:
status:
expose:
label: 'Status för publicering'
description: ''
group_info:
label: Publicerad
group_items:
Expand All @@ -51,17 +52,16 @@ display:
label: Mediatyp
group_info:
label: Mediatyp
description: ''
langcode:
expose:
label: Språk
title: Media
page:
display_title: Sida
display_options:
fields:
media_bulk_form:
action_title: Åtgärd
name: { }
edit_media:
alter:
text: 'Redigera {{ name }}'
Expand All @@ -72,6 +72,8 @@ display:
text: 'Radera {{ name }}'
alt: 'Radera {{ name }}'
text: Radera
name:
separator: ', '
widget:
display_options:
arguments:
Expand All @@ -87,6 +89,7 @@ display:
label: Rutnät
display_link_table:
label: Tabell
display_title: Widget
widget_table:
display_title: 'Gränssnittskomponent (tabell)'
display_options:
Expand All @@ -112,3 +115,4 @@ display:
label: Rutnät
display_link_table:
label: Tabell
label: 'Media library'
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencies:
module:
- helfi_media_chart
id: helfi_chart
label: Chart
label: 'Chart embed'
description: 'Media type Chart can be used to present interactive charts. Supports Microsoft Power BI.'
source: helfi_chart
queue_thumbnail_downloads: false
Expand Down
4 changes: 1 addition & 3 deletions modules/helfi_media_chart/helfi_media_chart.install
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,7 @@ function helfi_media_chart_install($is_syncing) : void {
/**
* UHF-9088 Updated translations for media chart.
*/
function helfi_media_chart_update_9001(): void {
function helfi_media_chart_update_9002(): void {
\Drupal::service('helfi_platform_config.config_update_helper')
->update('helfi_media_chart');
\Drupal::service('helfi_platform_config.config_update_helper')
->update('helfi_media_map');
}
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public function testMediaType() : void {
'field_helfi_chart_title[0][value]' => 'Test value',
'field_helfi_chart_transcript[0][value]' => '123',
], 'Save');
$this->assertSession()->pageTextContainsOnce('Chart Chart has been created.');
$this->assertSession()->pageTextContainsOnce('Chart embed Chart has been created.');

$medias = \Drupal::entityTypeManager()->getStorage('media')->loadByProperties([
'name' => 'Chart',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ third_party_settings:
crop:
image_field: null
id: remote_video
label: 'Remote video'
label: 'Remote video embed'
description: 'Media type for remote media from external sources.'
source: 'oembed:video'
queue_thumbnail_downloads: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,11 @@ function helfi_media_remote_video_install($is_syncing) : void {

helfi_media_remote_video_grant_permissions();
}

/**
* UHF-9088 Updated translations for media remote video.
*/
function helfi_media_chart_update_9001(): void {
\Drupal::service('helfi_platform_config.config_update_helper')
->update('helfi_media_remote_video');
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ id: paragraph.chart.field_chart_chart
field_name: field_chart_chart
entity_type: paragraph
bundle: chart
label: Chart
label: 'Chart embed'
description: ''
required: false
translatable: false
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
label: Kaavio
label: Kaavioupotus
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
label: 'Avustavan teknologian otsikko'
description: 'Avustavan teknologian käyttäjät tarvitsevat kuvaavan otsikon upotetulle sisällölle.'
label: 'Kuvaus avustavalle teknologialle'
description: 'Kirjoita 1-2 lauseen kuvaus avustavan teknologian käyttäjille.'
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ declare(strict_types=1);
/**
* UHF-9088: Updated configuration translations for helfi_paragraphs_chart.
*/
function helfi_paragraphs_chart_update_9002(): void {
function helfi_paragraphs_chart_update_9003(): void {
\Drupal::service('helfi_platform_config.config_update_helper')
->update('helfi_paragraphs_chart');
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ field_name: field_iframe_title
entity_type: paragraph
bundle: remote_video
label: 'Assistive technology title'
description: 'Users of assistive technology need a descriptive title to know what is in the embedded content. Do not use the prefix "Video: ". It will be added automatically.'
description: 'Users of assistive technology need a descriptive title to know what is in the embedded video. Do not use the prefix "Video: ". It will be added automatically.'
required: true
translatable: true
default_value: { }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ id: paragraph.remote_video.field_remote_video
field_name: field_remote_video
entity_type: paragraph
bundle: remote_video
label: 'Remote video'
label: 'Remote video embed'
description: ''
required: true
translatable: false
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
label: 'Video ulkoisesta palvelusta'
label: 'Videoupotus'
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ declare(strict_types=1);
/**
* UHF-9088: Updated config translations for helfi_paragraphs_remote_video.
*/
function helfi_paragraphs_remote_video_update_9003(): void {
function helfi_paragraphs_remote_video_update_9004(): void {
// Re-import 'helfi_paragraphs_remote_video' configuration.
\Drupal::service('helfi_platform_config.config_update_helper')
->update('helfi_paragraphs_remote_video');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,15 @@ display:
last: 'Viimeinen »'
expose:
offset_label: Offset
items_per_page_label: 'Merkintöjä sivua kohti'
items_per_page_options_all_label: '- Kaikki -'
exposed_form:
options:
submit_button: Suodata
exposed_sorts_label: Järjestä
sort_asc_label: Nouseva
sort_desc_label: Laskeva
reset_button_label: Palauta
empty:
area_text_custom:
content: 'Lukittuja palveluita ei ole.'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,31 @@ display:
expose:
items_per_page_label: 'Merkintöjä sivua kohti'
items_per_page_options_all_label: '- Kaikki -'
offset_label: Offset
fields:
tpr_service_bulk_form:
label: Massapäivitys
action_title: Toiminto
id: { }
name:
label: Nimi
separator: ', '
langcode:
label: Kieli
separator: ', '
content_translation_status:
label: Tila
settings:
format_custom_true: Julkaistu
format_custom_false: Julkaisematon
separator: ', '
content_translation_changed:
label: Päivitetty
separator: ', '
operations:
label: Toimenpiteet
id:
label: ID
separator: ', '
filters:
combine:
expose:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,28 @@ display:
expose:
items_per_page_label: 'Merkintöjä sivua kohti'
items_per_page_options_all_label: '- Kaikki -'
offset_label: Offset
fields:
id: { }
name:
label: Nimi
separator: ', '
langcode:
label: Kieli
separator: ', '
content_translation_status:
label: Tila
settings:
format_custom_true: Julkaistu
format_custom_false: Julkaisematon
separator: ', '
content_translation_changed:
label: Päivitetty
separator: ', '
operations:
label: Toimenpiteet
id:
label: ID
separator: ', '
filters:
combine:
expose:
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
label: Metatags
label: Metataggar
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ display:
items_per_page_label: 'Inlägg per sida'
items_per_page_options_all_label: '- Alla -'
offset_label: Kompensera
tags:
next: ››
previous: ‹‹
exposed_form:
options:
submit_button: Verkställ
Expand All @@ -24,5 +27,16 @@ display:
id:
exception:
title: Alla
fields:
name:
separator: ', '
entity_reference:
display_title: Objektsreferens
display_options:
fields:
name_override:
separator: ', '
id:
separator: ', '
name:
separator: ', '
Loading
Loading