[4.1] accessibility plugin update and fixes

joomla#36948 changed the icons in the accessibility from the google material font (because :privacy :facepalm) to use emojis. At the time this also resolved a bug in the upstream code that prevented the material font working on osx Upstream has now resolved the osx problem. This PR updates to the latest release of the script and introduces the ability to use either emoji or material icons. The default is emoji so there is no visible change etc on upgrade and no need for an update sql
brianteeman · Jun 8, 2022 · 2bb1a09 · 2bb1a09
1 parent 74a99fa
commit 2bb1a09
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/administrator/language/en-GB/plg_system_accessibility.ini b/administrator/language/en-GB/plg_system_accessibility.ini
@@ -8,6 +8,9 @@ PLG_SYSTEM_ACCESSIBILITY_CLOSE="Close"
 PLG_SYSTEM_ACCESSIBILITY_CURSOR="Big Cursor"
 PLG_SYSTEM_ACCESSIBILITY_DECREASE_SPACING="Decrease Text Spacing"
 PLG_SYSTEM_ACCESSIBILITY_DECREASE_TEXT="Decrease Text Size"
+PLG_SYSTEM_ACCESSIBILITY_EMOJIS="Icons"
+PLG_SYSTEM_ACCESSIBILITY_EMOJIS_FALSE="Use Google Material Font"
+PLG_SYSTEM_ACCESSIBILITY_EMOJIS_TRUE="Use Emojis"
 PLG_SYSTEM_ACCESSIBILITY_GREY="Grey Hues"
 PLG_SYSTEM_ACCESSIBILITY_INCREASE_SPACING="Increase Text Spacing"
 PLG_SYSTEM_ACCESSIBILITY_INCREASE_TEXT="Increase Text Size"

diff --git a/package-lock.json b/package-lock.json
diff --git a/plugins/system/accessibility/accessibility.php b/plugins/system/accessibility/accessibility.php
@@ -96,7 +96,7 @@ public function onBeforeCompileHead()
 							'units' => 'px',
 						],
 					],
-					'useEmojis' => true,
+					'useEmojis' => $this->params->get('useEmojis') != "false" ? true : false,
 				],
 				'hotkeys' => [
 					'enabled' => true,

diff --git a/plugins/system/accessibility/accessibility.xml b/plugins/system/accessibility/accessibility.xml
@@ -30,6 +30,16 @@
 					<option value="administrator">PLG_SYSTEM_ACCESSIBILITY_SECTION_ADMIN</option>
 					<option value="both">PLG_SYSTEM_ACCESSIBILITY_SECTION_BOTH</option>
 				</field>
+				<field
+					name="useEmojis"
+					type="list"
+					label="PLG_SYSTEM_ACCESSIBILITY_EMOJIS"
+					default="true"
+					validate="options"
+					>
+					<option value="true">PLG_SYSTEM_ACCESSIBILITY_EMOJIS_TRUE</option>
+					<option value="true">PLG_SYSTEM_ACCESSIBILITY_EMOJIS_FALSE</option>
+				</field>
 			</fieldset>
 		</fields>
 	</config>