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

[4.2] accessibility plugin update and fixes #2487

Closed
jgerman-bot opened this issue Jun 15, 2022 · 0 comments · Fixed by #2489
Closed

[4.2] accessibility plugin update and fixes #2487

jgerman-bot opened this issue Jun 15, 2022 · 0 comments · Fixed by #2489

Comments

@jgerman-bot
Copy link

New language relevant PR in upstream repo: joomla/joomla-cms#38009 Here are the upstream changes:

Click to expand the diff!
diff --git a/administrator/language/en-GB/plg_system_accessibility.ini b/administrator/language/en-GB/plg_system_accessibility.ini
index 99aa7b2430b1..3f96fc6e19d6 100644
--- 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
index 342d38a86d31..cb30448bcd9a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -87,7 +87,7 @@
       },
       "engines": {
         "node": ">=16",
-        "npm": ">=8.6.0"
+        "npm": ">=8.5.5"
       }
     },
     "node_modules/@babel/code-frame": {
@@ -2162,9 +2162,9 @@
       }
     },
     "node_modules/accessibility": {
-      "version": "3.0.15",
-      "resolved": "https://registry.npmjs.org/accessibility/-/accessibility-3.0.15.tgz",
-      "integrity": "sha512-xRvdco4JcjpWtifYiprUH/WSjJV5rJjkWb0DbKhfR8SqeDZQ44NcXT27/6PhpZu8XXe6RgUkoKwG/fSAXD+6qg=="
+      "version": "3.0.16",
+      "resolved": "https://registry.npmjs.org/accessibility/-/accessibility-3.0.16.tgz",
+      "integrity": "sha512-P4JdzR2k0ILGJJB5J9NSJmXLdC/T/MRC/QdgktI1o4pMo6aymVvC6P7d11sey6Vxcbrp5qj4WItjDgCewgwzCA=="
     },
     "node_modules/acorn": {
       "version": "8.7.0",
@@ -2735,7 +2735,6 @@
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
-        "fsevents": "~2.3.2",
         "glob-parent": "~5.1.2",
         "is-binary-path": "~2.1.0",
         "is-glob": "~4.0.1",
@@ -5214,7 +5213,6 @@
       "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "dev": true,
       "dependencies": {
-        "graceful-fs": "^4.1.6",
         "universalify": "^2.0.0"
       },
       "optionalDependencies": {
@@ -7102,9 +7100,6 @@
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.62.0.tgz",
       "integrity": "sha512-cJEQq2gwB0GWMD3rYImefQTSjrPYaC6s4J9pYqnstVLJ1CHa/aZNVkD4Epuvg4iLeMA4KRiq7UM7awKK6j7jcw==",
       "dev": true,
-      "dependencies": {
-        "fsevents": "~2.3.2"
-      },
       "bin": {
         "rollup": "dist/bin/rollup"
       },
@@ -9936,9 +9931,9 @@
       }
     },
     "accessibility": {
-      "version": "3.0.15",
-      "resolved": "https://registry.npmjs.org/accessibility/-/accessibility-3.0.15.tgz",
-      "integrity": "sha512-xRvdco4JcjpWtifYiprUH/WSjJV5rJjkWb0DbKhfR8SqeDZQ44NcXT27/6PhpZu8XXe6RgUkoKwG/fSAXD+6qg=="
+      "version": "3.0.16",
+      "resolved": "https://registry.npmjs.org/accessibility/-/accessibility-3.0.16.tgz",
+      "integrity": "sha512-P4JdzR2k0ILGJJB5J9NSJmXLdC/T/MRC/QdgktI1o4pMo6aymVvC6P7d11sey6Vxcbrp5qj4WItjDgCewgwzCA=="
     },
     "acorn": {
       "version": "8.7.0",
diff --git a/plugins/system/accessibility/accessibility.php b/plugins/system/accessibility/accessibility.php
index 41401e6d85d4..bddef8179638 100644
--- 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
index 8ff6b42699ca..2df632e26cbc 100644
--- 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="false">PLG_SYSTEM_ACCESSIBILITY_EMOJIS_FALSE</option>
+				</field>
 			</fieldset>
 		</fields>
 	</config>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging a pull request may close this issue.

3 participants