From 4f4845c48ffc8211324d84161d2ad01b8168e04a Mon Sep 17 00:00:00 2001
From: Mateusz Plaza <mateuszplaza@ufl.edu>
Date: Thu, 20 Jan 2022 11:14:28 -0500
Subject: [PATCH] Updated function input list and list item names for
 accessibilty purposes

---
 src/Calculator/Resources/en-GB/Resources.resw |  8 ++--
 src/Calculator/Resources/en-US/Resources.resw | 45 +++++++++----------
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/src/Calculator/Resources/en-GB/Resources.resw b/src/Calculator/Resources/en-GB/Resources.resw
index 408fb7f9..6ca47d4d 100644
--- a/src/Calculator/Resources/en-GB/Resources.resw
+++ b/src/Calculator/Resources/en-GB/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -3883,11 +3883,11 @@
     <comment>Select all menu item from the Equation TextBox</comment>
   </data>
   <data name="EquationInputButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Function input list item</value>
+    <value>Function input</value>
     <comment>The automation name for the Equation Input ListView item that is shown when Calculator is in graphing mode.</comment>
   </data>
   <data name="EquationInputList.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Function input list</value>
+    <value>Function input</value>
     <comment>The automation name for the Equation Input ListView that is shown when Calculator is in graphing mode.</comment>
   </data>
   <data name="EquationInputPanel.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
@@ -4166,4 +4166,4 @@
     <value>App theme setting</value>
     <comment>Screen reader prompt for the App theme Setting radio buttons group</comment>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/src/Calculator/Resources/en-US/Resources.resw b/src/Calculator/Resources/en-US/Resources.resw
index 8c55508c..d4bf7270 100644
--- a/src/Calculator/Resources/en-US/Resources.resw
+++ b/src/Calculator/Resources/en-US/Resources.resw
@@ -2708,7 +2708,7 @@
   <data name="PreviewTag.Text" xml:space="preserve">
     <value>Preview</value>
     <comment>Label displayed next to upcoming features</comment>
-  </data>  
+  </data>
   <data name="AboutControlPrivacyStatement.Text" xml:space="preserve">
     <value>Microsoft Privacy Statement</value>
     <comment>Displayed on a link to the Microsoft Privacy Statement on the About panel</comment>
@@ -3839,11 +3839,11 @@
     <value>Automatic best fit</value>
     <comment>Announcement used in Graphing Calculator when graph view button is clicked and automatic best fit is set</comment>
   </data>
-    <data name="GraphViewManualAdjustmentAnnouncement" xml:space="preserve">
+  <data name="GraphViewManualAdjustmentAnnouncement" xml:space="preserve">
     <value>Manual adjustment</value>
     <comment>Announcement used in Graphing Calculator when graph view button is clicked and manual adjustment is set</comment>
   </data>
-    <data name="GridResetAnnouncement" xml:space="preserve">
+  <data name="GridResetAnnouncement" xml:space="preserve">
     <value>Graph view has been reset</value>
     <comment>Announcement used in Graphing Calculator when graph view button is clicked and automatic best fit is set, resetting the graph</comment>
   </data>
@@ -4118,11 +4118,11 @@
     <value>The equation contains logical conditions that are mutually exclusive</value>
     <comment>Error that occurs during graphing when mutually exclusive conditions are used.</comment>
   </data>
-    <data name="OutOfDomain" xml:space="preserve">
+  <data name="OutOfDomain" xml:space="preserve">
     <value>Equation is out of domain</value>
     <comment>Error that occurs during graphing when the equation is out of domain.</comment>
   </data>
-    <data name="GE_NotSupported" xml:space="preserve">
+  <data name="GE_NotSupported" xml:space="preserve">
     <value>Graphing this equation is not supported</value>
     <comment>Error that occurs during graphing when the equation is not supported.</comment>
   </data>
@@ -4165,19 +4165,19 @@
   <data name="InvalidEquationSyntax" xml:space="preserve">
     <value>Invalid expression</value>
     <comment>Error that occurs during graphing when an invalid syntax is used.</comment>
-    </data>
-    <data name="EmptyExpression" xml:space="preserve">
+  </data>
+  <data name="EmptyExpression" xml:space="preserve">
     <value>The expression is empty</value>
     <comment>Error that occurs during graphing when the expression is empty</comment>
   </data>
-    <data name="EqualWithoutEquation" xml:space="preserve">
+  <data name="EqualWithoutEquation" xml:space="preserve">
     <value>Equal was used without an equation</value>
     <comment>Error that occurs during graphing when equal is used without an equation. Ex: sin(x=y)</comment>
   </data>
   <data name="ExpectParenthesisAfterFunctionName" xml:space="preserve">
     <value>Parenthesis missing after function name</value>
     <comment>Error that occurs during graphing when parenthesis are missing after a function.</comment>
-    </data>
+  </data>
   <data name="IncorrectNumParameter" xml:space="preserve">
     <value>A mathematical operation has the incorrect number of parameters</value>
     <comment>Error that occurs during graphing when a function has the wrong number of parameters</comment>
@@ -4234,7 +4234,7 @@
     <value>Cannot use complex numbers in inequalities</value>
     <comment>Error that occurs during graphing when complex numbers are used in inequalities.</comment>
   </data>
-    <data name="equationAnalysisBack.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+  <data name="equationAnalysisBack.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Back to function list</value>
     <comment>This is the tooltip for the back button in the equation analysis page in the graphing calculator</comment>
   </data>
@@ -4294,7 +4294,7 @@
     <value>Hide equation</value>
     <comment>This is the tooltip/automation name shown when visibility is set to visible in the graphing calculator.</comment>
   </data>
-<data name="showEquationButtonAutomationName" xml:space="preserve">
+  <data name="showEquationButtonAutomationName" xml:space="preserve">
     <value>Show equation %1</value>
     <comment>{Locked="%1"}, This is the tooltip/automation name shown when visibility is set to hidden in the graphing calculator. %1 is the equation number.</comment>
   </data>
@@ -4302,7 +4302,6 @@
     <value>Hide equation %1</value>
     <comment>{Locked="%1"}, This is the tooltip/automation name shown when visibility is set to visible in the graphing calculator. %1 is the equation number.</comment>
   </data>
-    
   <data name="disableTracingButtonToolTip" xml:space="preserve">
     <value>Stop tracing</value>
     <comment>This is the tooltip/automation name for the graphing calculator stop tracing button</comment>
@@ -4314,7 +4313,7 @@
   <data name="graphAutomationName" xml:space="preserve">
     <value>Graph viewing window, x-axis bounded by %1 and %2, y-axis bounded by %3 and %4, displaying %5 equations</value>
     <comment>{Locked="%1","%2", "%3", "%4", "%5"}. </comment>
-    </data>
+  </data>
   <data name="sliderOptionsButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Configure slider</value>
     <comment>This is the tooltip text for the slider options button in Graphing Calculator</comment>
@@ -4431,7 +4430,7 @@
     <value>Enter an expression</value>
     <comment>this is the placeholder text used by the textbox to enter an equation</comment>
   </data>
-  <data name="GraphCopyMenuItem.Text">
+  <data name="GraphCopyMenuItem.Text" xml:space="preserve">
     <value>Copy</value>
     <comment>Copy menu item for the graph context menu</comment>
   </data>
@@ -4454,13 +4453,13 @@
   <data name="selectAllEquationMenuItem.Text" xml:space="preserve">
     <value>Select all</value>
     <comment>Select all menu item from the Equation TextBox</comment>
-  </data>    
+  </data>
   <data name="EquationInputButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Function input list item</value>
+    <value>Function input</value>
     <comment>The automation name for the Equation Input ListView item that is shown when Calculator is in graphing mode.</comment>
   </data>
   <data name="EquationInputList.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Function input list</value>
+    <value>Function input</value>
     <comment>The automation name for the Equation Input ListView that is shown when Calculator is in graphing mode.</comment>
   </data>
   <data name="EquationInputPanel.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
@@ -4571,19 +4570,19 @@
     <value>White</value>
     <comment>Name of color in the color picker</comment>
   </data>
-    <data name="equationHighContrastColor1AutomationName" xml:space="preserve">
+  <data name="equationHighContrastColor1AutomationName" xml:space="preserve">
     <value>Color 1</value>
     <comment>Name of color in the color picker</comment>
   </data>
-    <data name="equationHighContrastColor2AutomationName" xml:space="preserve">
+  <data name="equationHighContrastColor2AutomationName" xml:space="preserve">
     <value>Color 2</value>
     <comment>Name of color in the color picker</comment>
   </data>
-    <data name="equationHighContrastColor3AutomationName" xml:space="preserve">
+  <data name="equationHighContrastColor3AutomationName" xml:space="preserve">
     <value>Color 3</value>
     <comment>Name of color in the color picker</comment>
   </data>
-    <data name="equationHighContrastColor4AutomationName" xml:space="preserve">
+  <data name="equationHighContrastColor4AutomationName" xml:space="preserve">
     <value>Color 4</value>
     <comment>Name of color in the color picker</comment>
   </data>
@@ -4647,7 +4646,7 @@
     <value>X</value>
     <comment>Screen reader prompt for the X button on the graphing calculator operator keypad</comment>
   </data>
-    <data name="yButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+  <data name="yButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Y</value>
     <comment>Screen reader prompt for the Y button on the graphing calculator operator keypad</comment>
   </data>
@@ -4739,4 +4738,4 @@
     <value>App theme setting</value>
     <comment>Screen reader prompt for the App theme Setting radio buttons group</comment>
   </data>
-</root>
+</root>
\ No newline at end of file