TMS-933: Modaal accessibility fixes

devgeniem · Oct 6, 2023 · a50a76a · a50a76a
1 parent 5c3eb42
commit a50a76a
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 140 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+- TMS-933: Modaal accessibility fixes
+
 ## [1.50.0] - 2023-10-04
 
 - TMS-978: Add has-line-height-normal class

diff --git a/assets/scripts/image.js b/assets/scripts/image.js
@@ -22,8 +22,8 @@ export default class Image {
             type: 'image',
             background_scroll: false,
             after_open: this.disableBackgroundItemFocusing,
-            accessible_title: window.s.modaal.accessible_title || 'Dialog Window - Close (Press escape to close)',
-            close_aria_label: window.s.modaal.close || 'Close (Press escape to close)',
+            accessible_title: window.s.modaal.accessible_title || 'Enlarged image',
+            close_aria_label: window.s.modaal.close || 'Close',
         } );
     }
 

diff --git a/lang/fi.mo b/lang/fi.mo
diff --git a/lang/fi.po b/lang/fi.po
@@ -1,16 +1,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: TMS Theme Base\n"
-"POT-Creation-Date: 2023-09-03 19:27+0300\n"
-"PO-Revision-Date: 2023-09-03 19:27+0300\n"
+"POT-Creation-Date: 2023-10-05 22:19+0300\n"
+"PO-Revision-Date: 2023-10-05 22:19+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.3.2\n"
+"X-Generator: Poedit 3.4\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-Flags-xgettext: --add-comments=translators:\n"
 "X-Poedit-WPHeader: style.css\n"
@@ -285,34 +285,30 @@ msgstr "Hinta"
 msgid "Organizer"
 msgstr "Järjestäjä"
 
-#: lib/Eventz.php:118
+#: lib/Eventz.php:117
 msgid "Area"
 msgstr ""
 
-#: lib/Eventz.php:120
+#: lib/Eventz.php:119
 msgid "Target"
 msgstr ""
 
-#: lib/Eventz.php:122
+#: lib/Eventz.php:121
 msgid "Tags"
 msgstr ""
 
-#: lib/Eventz.php:126
+#: lib/Eventz.php:125
 msgid "Links"
 msgstr "Linkit"
 
-#: lib/Eventz.php:269
+#: lib/Eventz.php:268
 msgid "Additional information"
 msgstr "Lisätiedot"
 
-#: lib/Eventz.php:286
+#: lib/Eventz.php:285
 msgid "Free"
 msgstr "Maksuton"
 
-#: lib/Eventz.php:318
-msgid "Additional info"
-msgstr "Lisätiedot"
-
 #: lib/Formatters/CountdownFormatter.php:80 models/strings.php:224
 msgctxt "theme-frontend"
 msgid "Days"
@@ -395,32 +391,32 @@ msgctxt "theme CPT"
 msgid "Site settings"
 msgstr "Sivuston asetukset"
 
-#: lib/Roles.php:373
+#: lib/Roles.php:394
 msgctxt "wp-geniem-roles"
 msgid "Super Administrator"
 msgstr ""
 
-#: lib/Roles.php:470
+#: lib/Roles.php:491
 msgctxt "wp-geniem-roles"
 msgid "Administrator"
 msgstr ""
 
-#: lib/Roles.php:525
+#: lib/Roles.php:547
 msgctxt "wp-geniem-roles"
 msgid "Site Manager"
 msgstr ""
 
-#: lib/Roles.php:577
+#: lib/Roles.php:600
 msgctxt "wp-geniem-roles"
 msgid "Author"
 msgstr ""
 
-#: lib/Roles.php:645
+#: lib/Roles.php:668
 msgctxt "wp-geniem-roles"
 msgid "Contributor"
 msgstr ""
 
-#: lib/Roles.php:665
+#: lib/Roles.php:688
 msgctxt "wp-geniem-roles"
 msgid "Subscriber"
 msgstr ""
@@ -682,7 +678,7 @@ msgid "Search from site"
 msgstr "Hae sivustolta"
 
 #: models/strings.php:55 models/strings.php:81 models/strings.php:140
-#: models/strings.php:153 models/strings.php:162
+#: models/strings.php:153 models/strings.php:162 models/strings.php:230
 msgctxt "theme-frontend"
 msgid "Close"
 msgstr "Sulje"
@@ -1103,61 +1099,13 @@ msgstr "Jou"
 
 #: models/strings.php:229
 msgctxt "theme-frontend"
-msgid "Dialog Window - Close (Press escape to close)"
-msgstr "Dialogi-ikkuna - sulje (Sulje painamalla Esc -näppäintä)"
-
-#: models/strings.php:230
-msgctxt "theme-frontend"
-msgid "Close (Press escape to close)"
-msgstr "Sulje (Sulje painamalla Esc -näppäintä)"
+msgid "Enlarged image"
+msgstr "Suurennettu kuva"
 
 #: models/strings.php:243
 msgid "Pagination"
 msgstr "Sivutus"
 
-#: wp-content/mu-plugins/acf-codifier/src/Field/FlexibleContent.php:67
-#: wp-content/mu-plugins/acf-codifier/src/Field/Repeater.php:60
-msgid "Add Row"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/MultisitePostObject.php:24
-msgid "Multisite Post Object"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/MultisiteRelationship.php:24
-msgid "Multisite Relationship"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/MultisiteTaxonomy.php:23
-msgid "Multisite taxonomy"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/Multitaxonomy.php:23
-msgid "Multitaxonomy"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/Multitaxonomy.php:516
-#, php-format
-msgctxt "No terms"
-msgid "No %s"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/PHP.php:18
-msgid "PHP"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/PHP.php:48
-#, fuzzy
-#| msgid "Induction loop"
-msgid "Instructions"
-msgstr "Induktio-silmukka"
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/PHP.php:50
-msgid ""
-"This field can only be used with ACF Codifier. Doesn't do anything if "
-"defined in the admin side."
-msgstr ""
-
 #. Theme Name of the plugin/theme
 msgid "TMS Theme Base"
 msgstr ""
@@ -1174,6 +1122,22 @@ msgstr ""
 msgid "https://geniem.fi"
 msgstr ""
 
+#~ msgid "Additional info"
+#~ msgstr "Lisätiedot"
+
+#~ msgctxt "theme-frontend"
+#~ msgid "Dialog Window - Close (Press escape to close)"
+#~ msgstr "Dialogi-ikkuna - sulje (Sulje painamalla Esc -näppäintä)"
+
+#~ msgctxt "theme-frontend"
+#~ msgid "Close (Press escape to close)"
+#~ msgstr "Sulje (Sulje painamalla Esc -näppäintä)"
+
+#, fuzzy
+#~| msgid "Induction loop"
+#~ msgid "Instructions"
+#~ msgstr "Induktio-silmukka"
+
 #~ msgid "Virtual event"
 #~ msgstr "Verkkotapahtuma"
 

diff --git a/lang/tms-theme-base.pot b/lang/tms-theme-base.pot
@@ -2,15 +2,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: TMS Theme Base\n"
-"POT-Creation-Date: 2023-09-03 19:27+0300\n"
+"POT-Creation-Date: 2023-10-05 22:19+0300\n"
 "PO-Revision-Date: 2022-01-12 10:08+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-"X-Generator: Poedit 3.3.2\n"
+"X-Generator: Poedit 3.4\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-Flags-xgettext: --add-comments=translators:\n"
 "X-Poedit-WPHeader: style.css\n"
@@ -285,34 +285,30 @@ msgstr ""
 msgid "Organizer"
 msgstr ""
 
-#: lib/Eventz.php:118
+#: lib/Eventz.php:117
 msgid "Area"
 msgstr ""
 
-#: lib/Eventz.php:120
+#: lib/Eventz.php:119
 msgid "Target"
 msgstr ""
 
-#: lib/Eventz.php:122
+#: lib/Eventz.php:121
 msgid "Tags"
 msgstr ""
 
-#: lib/Eventz.php:126
+#: lib/Eventz.php:125
 msgid "Links"
 msgstr ""
 
-#: lib/Eventz.php:269
+#: lib/Eventz.php:268
 msgid "Additional information"
 msgstr ""
 
-#: lib/Eventz.php:286
+#: lib/Eventz.php:285
 msgid "Free"
 msgstr ""
 
-#: lib/Eventz.php:318
-msgid "Additional info"
-msgstr ""
-
 #: lib/Formatters/CountdownFormatter.php:80 models/strings.php:224
 msgctxt "theme-frontend"
 msgid "Days"
@@ -395,32 +391,32 @@ msgctxt "theme CPT"
 msgid "Site settings"
 msgstr ""
 
-#: lib/Roles.php:373
+#: lib/Roles.php:394
 msgctxt "wp-geniem-roles"
 msgid "Super Administrator"
 msgstr ""
 
-#: lib/Roles.php:470
+#: lib/Roles.php:491
 msgctxt "wp-geniem-roles"
 msgid "Administrator"
 msgstr ""
 
-#: lib/Roles.php:525
+#: lib/Roles.php:547
 msgctxt "wp-geniem-roles"
 msgid "Site Manager"
 msgstr ""
 
-#: lib/Roles.php:577
+#: lib/Roles.php:600
 msgctxt "wp-geniem-roles"
 msgid "Author"
 msgstr ""
 
-#: lib/Roles.php:645
+#: lib/Roles.php:668
 msgctxt "wp-geniem-roles"
 msgid "Contributor"
 msgstr ""
 
-#: lib/Roles.php:665
+#: lib/Roles.php:688
 msgctxt "wp-geniem-roles"
 msgid "Subscriber"
 msgstr ""
@@ -673,7 +669,7 @@ msgid "Search from site"
 msgstr ""
 
 #: models/strings.php:55 models/strings.php:81 models/strings.php:140
-#: models/strings.php:153 models/strings.php:162
+#: models/strings.php:153 models/strings.php:162 models/strings.php:230
 msgctxt "theme-frontend"
 msgid "Close"
 msgstr ""
@@ -1092,59 +1088,13 @@ msgstr ""
 
 #: models/strings.php:229
 msgctxt "theme-frontend"
-msgid "Dialog Window - Close (Press escape to close)"
-msgstr ""
-
-#: models/strings.php:230
-msgctxt "theme-frontend"
-msgid "Close (Press escape to close)"
+msgid "Enlarged image"
 msgstr ""
 
 #: models/strings.php:243
 msgid "Pagination"
 msgstr ""
 
-#: wp-content/mu-plugins/acf-codifier/src/Field/FlexibleContent.php:67
-#: wp-content/mu-plugins/acf-codifier/src/Field/Repeater.php:60
-msgid "Add Row"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/MultisitePostObject.php:24
-msgid "Multisite Post Object"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/MultisiteRelationship.php:24
-msgid "Multisite Relationship"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/MultisiteTaxonomy.php:23
-msgid "Multisite taxonomy"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/Multitaxonomy.php:23
-msgid "Multitaxonomy"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/Multitaxonomy.php:516
-#, php-format
-msgctxt "No terms"
-msgid "No %s"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/PHP.php:18
-msgid "PHP"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/PHP.php:48
-msgid "Instructions"
-msgstr ""
-
-#: wp-content/mu-plugins/acf-codifier/src/Fields/PHP.php:50
-msgid ""
-"This field can only be used with ACF Codifier. Doesn't do anything if "
-"defined in the admin side."
-msgstr ""
-
 #. Theme Name of the plugin/theme
 msgid "TMS Theme Base"
 msgstr ""

diff --git a/models/strings.php b/models/strings.php
@@ -226,8 +226,8 @@ public function s() : array {
                 'minutes' => _x( 'Minutes', 'theme-frontend', 'tms-theme-base' ),
             ],
             'modaal'             => [
-                'accessible_title' => _x( 'Dialog Window - Close (Press escape to close)', 'theme-frontend', 'tms-theme-base' ),
-                'close'            => _x( 'Close (Press escape to close)', 'theme-frontend', 'tms-theme-base' ),
+                'accessible_title' => _x( 'Enlarged image', 'theme-frontend', 'tms-theme-base' ),
+                'close'            => _x( 'Close', 'theme-frontend', 'tms-theme-base' ),
             ],
         ];
     }