Fixed alt text checking when the alt-text is artificially empty (with…

… two doublequotes).
City-of-Helsinki · Nov 15, 2022 · 9fe3c25 · 9fe3c25
1 parent e2e03c1
commit 9fe3c25
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 16 deletions.
diff --git a/hdbt_admin.theme b/hdbt_admin.theme
@@ -393,8 +393,9 @@ function hdbt_admin_preprocess_media(&$variables) {
     }
 
     if ($variables['media']->hasTranslation($current_language)) {
-      $variables['alt_text'] = $variables['media']
+      $alt = $variables['media']
         ->getTranslation($current_language)->field_media_image->alt;
+      $variables['alt_text'] = $alt !== '""' ? $alt : FALSE;
     }
   }
 }
diff --git a/templates/entity/media--media-library.html.twig b/templates/entity/media--media-library.html.twig
@@ -50,17 +50,15 @@
     <div{{ metadata_attributes.addClass('media-library-item__attributes') }}>
       <div class="media-library-item__name">{{ name }}</div>
 
-      {% if alt_text %}
-        <div class="media-library-item__alt">
+      <div class="media-library-item__alt">
+        {% if alt_text %}
           {{ 'Alt'|t({}, {'context': 'Alt text in media library'}) }}:
           <span>{{ alt_text }}</span>
-        </div>
-      {% else %}
-        <div class="media-library-item__alt">
+        {% else %}
           {{ 'Alt'|t({}, {'context': 'Alt text in media library'}) }}:
           <span>"" ({{ 'Empty'|t({}, {'context': 'Empty alt text in media library'}) }})</span>
-        </div>
-      {% endif %}
+        {% endif %}
+      </div>
     </div>
   {% endif %}
 </article>
diff --git a/translations/fi.po b/translations/fi.po
@@ -5,10 +5,6 @@ msgctxt "Accent color"
 msgid "Accent"
 msgstr "Korosteväri"
 
-msgctxt "Alt text in media library"
-msgid "Alt text"
-msgstr "Alt-teksti"
-
 msgctxt "Empty alt text in media library"
 msgid "Empty"
 msgstr "Tyhjä"

diff --git a/translations/sv.po b/translations/sv.po
@@ -1,10 +1,6 @@
 msgid ""
 msgstr ""
 
-msgctxt "Alt text in media library"
-msgid "Alt text"
-msgstr "Alt text"
-
 msgctxt "Empty alt text in media library"
 msgid "Empty"
 msgstr "Tom"