Improve the support of Narrator with parenthesis (#368)

* Modify how we manage Narrator with parenthesis and refactor right parenthesis

* Optimization

* remove extra spaces

* take feedback into account

src/CalcManager/CEngine/scicomm.cpp

@@ -390,7 +390,7 @@ void CCalcEngine::ProcessCommandWorker(OpCode wParam)
         cleared for CENTR */
         if (nullptr != m_pCalcDisplay)
         {
-            m_pCalcDisplay->SetParenDisplayText(L"");
+            m_pCalcDisplay->SetParenthesisNumber(0);
             m_pCalcDisplay->SetExpressionDisplay(make_shared<CalculatorVector<pair<wstring, int>>>(), make_shared<CalculatorVector<shared_ptr<IExpressionCommand>>>());
         }
 
@@ -594,7 +594,7 @@ void CCalcEngine::ProcessCommandWorker(OpCode wParam)
         // Set the "(=xx" indicator.
         if (nullptr != m_pCalcDisplay)
         {
-            m_pCalcDisplay->SetParenDisplayText(m_openParenCount ? to_wstring(m_openParenCount) : L"");
+            m_pCalcDisplay->SetParenthesisNumber(m_openParenCount >= 0 ? static_cast<unsigned int>(m_openParenCount) : 0);
         }
 
         if (!m_bError)

src/CalcManager/CalculatorManager.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #include "pch.h"
@@ -111,9 +111,9 @@ namespace CalculationManager
     /// Callback from the engine
     /// </summary>
     /// <param name="parenthesisCount">string containing the parenthesis count</param>
-    void CalculatorManager::SetParenDisplayText(const wstring& parenthesisCount)
+    void CalculatorManager::SetParenthesisNumber(_In_ unsigned int parenthesisCount)
     {
-        m_displayCallback->SetParenDisplayText(parenthesisCount);
+        m_displayCallback->SetParenthesisNumber(parenthesisCount);
     }
 
     /// <summary>

src/CalcManager/CalculatorManager.h

@@ -94,7 +94,7 @@ namespace CalculationManager
         void SetExpressionDisplay(_Inout_ std::shared_ptr<CalculatorVector<std::pair<std::wstring, int>>> const &tokens, _Inout_ std::shared_ptr<CalculatorVector<std::shared_ptr<IExpressionCommand>>> const &commands) override;
         void SetMemorizedNumbers(_In_ const std::vector<std::wstring>& memorizedNumbers) override;
         void OnHistoryItemAdded(_In_ unsigned int addedItemIndex) override;
-        void SetParenDisplayText(const std::wstring& parenthesisCount) override;
+        void SetParenthesisNumber(_In_ unsigned int parenthesisCount) override;
         void OnNoRightParenAdded() override;
         void DisplayPasteError();
         void MaxDigitsReached() override;

src/CalcManager/Header Files/ICalcDisplay.h

@@ -12,7 +12,7 @@ public:
     virtual void SetPrimaryDisplay(const std::wstring& pszText, bool isError) = 0;
     virtual void SetIsInError(bool isInError) = 0;
     virtual void SetExpressionDisplay(_Inout_ std::shared_ptr<CalculatorVector<std::pair<std::wstring, int>>> const &tokens, _Inout_ std::shared_ptr<CalculatorVector<std::shared_ptr<IExpressionCommand>>> const &commands) = 0;
-    virtual void SetParenDisplayText(const std::wstring& pszText) = 0;
+    virtual void SetParenthesisNumber(_In_ unsigned int count) = 0;
     virtual void OnNoRightParenAdded() = 0;
     virtual void MaxDigitsReached() = 0; // not an error but still need to inform UI layer.
     virtual void BinaryOperatorReceived() = 0;

src/CalcViewModel/Common/Automation/NarratorNotifier.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 // Implementation of the NarratorNotifier class.

src/CalcViewModel/Common/CalculatorDisplay.cpp

@@ -36,7 +36,7 @@ void CalculatorDisplay::SetPrimaryDisplay(_In_ const wstring& displayStringValue
     }
 }
 
-void CalculatorDisplay::SetParenDisplayText(_In_ const std::wstring& parenthesisCount)
+void CalculatorDisplay::SetParenthesisNumber(_In_ unsigned int parenthesisCount)
 {
     if (m_callbackReference != nullptr)
     {

src/CalcViewModel/Common/CalculatorDisplay.h

@@ -21,7 +21,7 @@ namespace CalculatorApp
         void SetExpressionDisplay(_Inout_ std::shared_ptr<CalculatorVector<std::pair<std::wstring, int>>> const &tokens, _Inout_ std::shared_ptr<CalculatorVector<std::shared_ptr<IExpressionCommand>>> const &commands) override;
         void SetMemorizedNumbers(_In_ const std::vector<std::wstring>& memorizedNumbers) override;
         void OnHistoryItemAdded(_In_ unsigned int addedItemIndex) override;
-        void SetParenDisplayText(_In_ const std::wstring& parenthesisCount) override;
+        void SetParenthesisNumber(_In_ unsigned int parenthesisCount) override;
         void OnNoRightParenAdded() override;
         void MaxDigitsReached() override;
         void BinaryOperatorReceived() override;

src/CalcViewModel/StandardCalculatorViewModel.cpp

@@ -48,7 +48,6 @@ namespace CalculatorResourceKeys
     StringReference DecButton(L"Format_DecButtonValue");
     StringReference OctButton(L"Format_OctButtonValue");
     StringReference BinButton(L"Format_BinButtonValue");
-    StringReference LeftParenthesisAutomationFormat(L"Format_OpenParenthesisAutomationNamePrefix");
     StringReference OpenParenthesisCountAutomationFormat(L"Format_OpenParenthesisCountAutomationNamePrefix");
     StringReference NoParenthesisAdded(L"NoRightParenthesisAdded_Announcement");
     StringReference MaxDigitsReachedFormat(L"Format_MaxDigitsReached");
@@ -80,8 +79,8 @@ StandardCalculatorViewModel::StandardCalculatorViewModel() :
     m_isBinaryBitFlippingEnabled(false),
     m_CurrentRadixType(RADIX_TYPE::DEC_RADIX),
     m_CurrentAngleType(NumbersAndOperatorsEnum::Degree),
-    m_OpenParenthesisCount(L""),
     m_Announcement(nullptr),
+    m_OpenParenthesisCount(0),
     m_feedbackForButtonPress(nullptr),
     m_isRtlLanguage(false),
     m_localizedMaxDigitsReachedAutomationFormat(nullptr),
@@ -102,7 +101,6 @@ StandardCalculatorViewModel::StandardCalculatorViewModel() :
     m_localizedDecimalAutomationFormat = AppResourceProvider::GetInstance().GetResourceString(CalculatorResourceKeys::DecButton);
     m_localizedOctalAutomationFormat = AppResourceProvider::GetInstance().GetResourceString(CalculatorResourceKeys::OctButton);
     m_localizedBinaryAutomationFormat = AppResourceProvider::GetInstance().GetResourceString(CalculatorResourceKeys::BinButton);
-    m_leftParenthesisAutomationFormat = AppResourceProvider::GetInstance().GetResourceString(CalculatorResourceKeys::LeftParenthesisAutomationFormat);
 
     // Initialize the Automation Name
     CalculationResultAutomationName = GetLocalizedStringFormat(m_localizedCalculationResultAutomationFormat, m_DisplayValue);
@@ -216,19 +214,23 @@ void StandardCalculatorViewModel::DisplayPasteError()
     m_standardCalculatorManager.DisplayPasteError();
 }
 
-void StandardCalculatorViewModel::SetParenthesisCount(_In_ const wstring& parenthesisCount)
+void StandardCalculatorViewModel::SetParenthesisCount(_In_ unsigned int parenthesisCount)
 {
+    if (m_OpenParenthesisCount == parenthesisCount)
+    {
+        return;
+    }
+
+    OpenParenthesisCount = parenthesisCount;
     if (IsProgrammer || IsScientific)
     {
-        OpenParenthesisCount = ref new String(parenthesisCount.c_str());
+        SetOpenParenthesisCountNarratorAnnouncement();
-        RaisePropertyChanged("LeftParenthesisAutomationName");
     }
 }
 
 void StandardCalculatorViewModel::SetOpenParenthesisCountNarratorAnnouncement()
 {
-    String^ parenthesisCount = ((m_OpenParenthesisCount == nullptr) ? "0" : m_OpenParenthesisCount);
+    wstring localizedParenthesisCount = to_wstring(m_OpenParenthesisCount).c_str();
-    wstring localizedParenthesisCount = parenthesisCount->Data();
     LocalizationSettings::GetInstance().LocalizeDisplayValue(&localizedParenthesisCount);
 
     String^ announcement = LocalizationStringUtil::GetLocalizedNarratorAnnouncement(
@@ -281,15 +283,6 @@ void StandardCalculatorViewModel::DisableButtons(CommandType selectedExpressionC
     }
 }
 
-String ^ StandardCalculatorViewModel::GetLeftParenthesisAutomationName()
-{
-    String^ parenthesisCount = ((m_OpenParenthesisCount == nullptr) ? "0" : m_OpenParenthesisCount);
-    wstring localizedParenthesisCount = std::wstring(parenthesisCount->Data());
-    LocalizationSettings::GetInstance().LocalizeDisplayValue(&localizedParenthesisCount);
-
-    return GetLocalizedStringFormat(m_leftParenthesisAutomationFormat, ref new String(localizedParenthesisCount.c_str()));
-}
-
 void StandardCalculatorViewModel::SetExpressionDisplay(_Inout_ shared_ptr<CalculatorVector<pair<wstring, int>>> const &tokens, _Inout_ shared_ptr<CalculatorVector <shared_ptr<IExpressionCommand>>> const &commands)
 {
     m_tokens = tokens;
@@ -1422,29 +1415,29 @@ void StandardCalculatorViewModel::SaveEditedCommand(_In_ unsigned int tokenPosit
 
         switch (nOpCode)
         {
-        case static_cast<int>(Command::CommandASIN) :
+            case static_cast<int>(Command::CommandASIN) :
-            updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandSIN), true, angleType);
+                updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandSIN), true, angleType);
-            break;
+                break;
-        case static_cast<int>(Command::CommandACOS) :
+            case static_cast<int>(Command::CommandACOS) :
-            updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandCOS), true, angleType);
+                updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandCOS), true, angleType);
-            break;
+                break;
-        case static_cast<int>(Command::CommandATAN) :
+            case static_cast<int>(Command::CommandATAN) :
-            updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandTAN), true, angleType);
+                updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandTAN), true, angleType);
-            break;
+                break;
-        case static_cast<int>(Command::CommandASINH) :
+            case static_cast<int>(Command::CommandASINH) :
-            updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandSINH), true, angleType);
+                updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandSINH), true, angleType);
-            break;
+                break;
-        case static_cast<int>(Command::CommandACOSH) :
+            case static_cast<int>(Command::CommandACOSH) :
-            updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandCOSH), true, angleType);
+                updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandCOSH), true, angleType);
-            break;
+                break;
-        case static_cast<int>(Command::CommandATANH) :
+            case static_cast<int>(Command::CommandATANH) :
-            updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandTANH), true, angleType);
+                updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandTANH), true, angleType);
-            break;
+                break;
-        case static_cast<int>(Command::CommandPOWE) :
+            case static_cast<int>(Command::CommandPOWE) :
-            updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandLN), true, angleType);
+                updatedToken = CCalcEngine::OpCodeToUnaryString(static_cast<int>(Command::CommandLN), true, angleType);
-            break;
+                break;
-        default:
+            default:
-            updatedToken = CCalcEngine::OpCodeToUnaryString(nOpCode, false, angleType);
+                updatedToken = CCalcEngine::OpCodeToUnaryString(nOpCode, false, angleType);
         }
         if ((token.first.length() > 0) && (token.first[token.first.length() - 1] == L'('))
         {

src/CalcViewModel/StandardCalculatorViewModel.h

@@ -75,12 +75,12 @@ namespace CalculatorApp
             OBSERVABLE_PROPERTY_RW(bool, IsDwordEnabled);
             OBSERVABLE_PROPERTY_RW(bool, IsWordEnabled);
             OBSERVABLE_PROPERTY_RW(bool, IsByteEnabled);
-            OBSERVABLE_NAMED_PROPERTY_RW(Platform::String^, OpenParenthesisCount);
             OBSERVABLE_PROPERTY_RW(int, CurrentRadixType);
             OBSERVABLE_PROPERTY_RW(bool, AreTokensUpdated);
             OBSERVABLE_PROPERTY_RW(bool, AreHistoryShortcutsEnabled);
             OBSERVABLE_PROPERTY_RW(bool, AreProgrammerRadixOperatorsEnabled);
             OBSERVABLE_PROPERTY_RW(CalculatorApp::Common::Automation::NarratorAnnouncement^, Announcement);
+            OBSERVABLE_PROPERTY_R(unsigned int, OpenParenthesisCount);
 
             COMMAND_FOR_METHOD(CopyCommand, StandardCalculatorViewModel::OnCopyCommand);
             COMMAND_FOR_METHOD(PasteCommand, StandardCalculatorViewModel::OnPasteCommand);
@@ -255,14 +255,6 @@ namespace CalculatorApp
                 void set(bool value) { m_completeTextSelection = value; }
             }
 
-            property Platform::String^ LeftParenthesisAutomationName
-            {
-                Platform::String^ get()
-                {
-                    return GetLeftParenthesisAutomationName();
-                }
-            }
-
         internal:
             void OnPaste(Platform::String^ pastedString, CalculatorApp::Common::ViewMode mode);
             void OnCopyCommand(Platform::Object^ parameter);
@@ -283,7 +275,7 @@ namespace CalculatorApp
             void SetTokens(_Inout_ std::shared_ptr<CalculatorVector<std::pair<std::wstring, int>>> const &tokens);
             void SetExpressionDisplay(_Inout_ std::shared_ptr<CalculatorVector<std::pair<std::wstring, int>>> const &tokens, _Inout_ std::shared_ptr<CalculatorVector<std::shared_ptr<IExpressionCommand>>> const &commands);
             void SetHistoryExpressionDisplay(_Inout_ std::shared_ptr<CalculatorVector<std::pair<std::wstring, int>>> const &tokens, _Inout_ std::shared_ptr<CalculatorVector <std::shared_ptr<IExpressionCommand>>> const &commands);
-            void SetParenthesisCount(_In_ const std::wstring& parenthesisCount);
+            void SetParenthesisCount(_In_ unsigned int parenthesisCount);
             void SetOpenParenthesisCountNarratorAnnouncement();
             void OnNoRightParenAdded();
             void SetNoParenAddedNarratorAnnouncement();
@@ -354,7 +346,6 @@ namespace CalculatorApp
             bool m_isLastOperationHistoryLoad;
             Platform::String^ m_selectedExpressionLastData;
             Common::DisplayExpressionToken^ m_selectedExpressionToken;
-            Platform::String^ m_leftParenthesisAutomationFormat;
 
             Platform::String^ LocalizeDisplayValue(_In_ std::wstring const &displayValue, _In_ bool isError);
             Platform::String^ CalculateNarratorDisplayValue(_In_ std::wstring const &displayValue, _In_ Platform::String^ localizedDisplayValue, _In_ bool isError);
@@ -364,7 +355,6 @@ namespace CalculatorApp
 
             CalculationManager::Command ConvertToOperatorsEnum(NumbersAndOperatorsEnum operation);
             void DisableButtons(CalculationManager::CommandType selectedExpressionCommandType);
-            Platform::String^ GetLeftParenthesisAutomationName();
 
             Platform::String^ m_feedbackForButtonPress;
             void OnButtonPressed(Platform::Object^ parameter);

src/Calculator/Resources/am-ET/Resources.resw

@@ -901,10 +901,7 @@
     <value>የግራ ቅንፍ</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>የግራ ቅንፍ፣ የክፍት ቅንፍ ቁጥር %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>የቀኝ ቅንፍ</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/ar-SA/Resources.resw

@@ -901,10 +901,7 @@
     <value>أقواس يسرى</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>القوس الأيسر، عدد الأقواس المفتوحة %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>أقواس يمنى</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/az-Latn-AZ/Resources.resw

@@ -901,10 +901,7 @@
     <value>Sol mötərizə</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Sol mötərizə, açıq mötərizənin sayı %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Sağ mötərizə</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/be-BY/Resources.resw

@@ -901,10 +901,7 @@
     <value>Левая дужка</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Левая дужка, пачатак адліку дужак (%1)</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Правая дужка</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/bg-BG/Resources.resw

@@ -901,10 +901,7 @@
     <value>Лява скоба</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Лява скоба, брой на отваряща скоба %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Дясна скоба</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/ca-ES/Resources.resw

@@ -901,10 +901,7 @@
     <value>Parèntesi d'obertura</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Parèntesi d'obertura, recompte de parèntesis d'obertura %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Parèntesi de tancament</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/cs-CZ/Resources.resw

@@ -901,10 +901,7 @@
     <value>Levá závorka</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Levá závorka, počet otevřených závorek %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Pravá závorka</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/da-DK/Resources.resw

@@ -901,10 +901,7 @@
     <value>Venstreparentes</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Venstre parentes, åben parentes antal %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Højreparentes</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/de-DE/Resources.resw

@@ -901,10 +901,7 @@
     <value>Öffnende Klammer</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Runde Klammer links, Anzahl der öffnenden Klammern: %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Schließende Klammer</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/el-GR/Resources.resw

@@ -901,10 +901,7 @@
     <value>Αριστερή παρένθεση</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Αριστερή παρένθεση, πλήθος ανοιχτών παρενθέσεων %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Δεξιά παρένθεση</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/en-GB/Resources.resw

@@ -901,10 +901,7 @@
     <value>Left parenthesis</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Left parenthesis, open parenthesis count %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Right parenthesis</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/es-ES/Resources.resw

@@ -901,10 +901,7 @@
     <value>Paréntesis de apertura</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Paréntesis de apertura, número de paréntesis abiertos %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Paréntesis de cierre</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/es-MX/Resources.resw

@@ -901,10 +901,7 @@
     <value>Paréntesis de apertura</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Abrir paréntesis, recuento de paréntesis abiertos %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Paréntesis de cierre</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/et-EE/Resources.resw

@@ -901,10 +901,7 @@
     <value>Vasaksulg</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Vasaksulg, avavate sulgude arv %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Paremsulg</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/eu-ES/Resources.resw

@@ -901,10 +901,7 @@
     <value>Ezkerreko parentesia</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Ezkerreko parentesia, ireki %1. parentesia</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Eskuineko parentesia</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/fa-IR/Resources.resw

@@ -901,10 +901,7 @@
     <value>پرانتز سمت چپ</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>پرانتز چپ، تعداد پرانتزهای باز %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>پرانتز سمت راست</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/fi-FI/Resources.resw

@@ -901,10 +901,7 @@
     <value>Vasen sulje</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Vasen sulje, avaavien sulkeiden määrä %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Oikea sulje</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/fil-PH/Resources.resw

@@ -901,10 +901,7 @@
     <value>Kaliwang parenthesis</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Bilang ng kaliwang panaklong, pambukas na panaklong %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Kanang parenthesis</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/fr-CA/Resources.resw

@@ -901,10 +901,7 @@
     <value>Parenthèse gauche</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>%1 parenthèses gauches ouvrantes</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Parenthèse droite</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/fr-FR/Resources.resw

@@ -901,10 +901,7 @@
     <value>Parenthèse gauche</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Parenthèse gauche, nombre de parenthèses ouvertes %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Parenthèse droite</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/gl-ES/Resources.resw

@@ -901,10 +901,7 @@
     <value>Paréntese esquerda</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Paréntese de apertura, total de parénteses abertos %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Paréntese dereita</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/he-IL/Resources.resw

@@ -901,10 +901,7 @@
     <value>סוגר שמאלי</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>סוגריים ימניים, פתח ספירת סוגריים %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>סוגר ימני</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/hi-IN/Resources.resw

@@ -901,10 +901,7 @@
     <value>बायाँ कोष्ठक</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>बायाँ कोष्ठक, खुले कोष्ठक की संख्या %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>दायाँ कोष्ठक</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/hr-HR/Resources.resw

@@ -901,10 +901,7 @@
     <value>Lijeva zagrada</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Lijeva zagrada, broj otvorenih zagrada %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Desna zagrada</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/hu-HU/Resources.resw

@@ -901,10 +901,7 @@
     <value>Nyitó zárójel</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Bal oldali vagy nyitó zárójelek száma: %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Berekesztő zárójel</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/id-ID/Resources.resw

@@ -901,10 +901,7 @@
     <value>Tanda kurung tutup</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Tanda kurung kiri, tanda kurung terbuka berjumlah %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Tanda kurung buka</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/is-IS/Resources.resw

@@ -901,10 +901,7 @@
     <value>Vinstri svigi</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Vinstri svigi, opnir svigar telja %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Hægri svigi</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/it-IT/Resources.resw

@@ -901,10 +901,7 @@
     <value>Parentesi sinistra</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Conteggio parentesi sinistra, parentesi aperta %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Parentesi destra</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/ja-JP/Resources.resw

@@ -901,10 +901,7 @@
     <value>始め丸かっこ</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>左かっこ、開きかっこの数 %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>終わり丸かっこ</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/kk-KZ/Resources.resw

@@ -901,10 +901,7 @@
     <value>Сол жақ жақша</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Сол жақ жақша, ашық жақша саны: %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Оң жақ жақша</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/km-KH/Resources.resw

@@ -901,10 +901,7 @@
     <value>វង់ក្រចកឆ្វេង</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>វង់​ក្រចក​ឆ្វេង បើក​ការ​រាប់​វង់​ក្រចក %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>វង់ក្រចកស្តាំ</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/kn-IN/Resources.resw

@@ -901,10 +901,7 @@
     <value>ಎಡ ಆವರಣ ಚಿಹ್ನೆ</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>ಎಡ ಆವರಣ, ಬಲ ಆವರಣ ಎಣಿಕೆ %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>ಬಲ ಆವರಣ ಚಿಹ್ನೆ</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/ko-KR/Resources.resw

@@ -901,10 +901,7 @@
     <value>여는 괄호</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>왼쪽 괄호 또는 여는 괄호 수 %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>닫는 괄호</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/lo-LA/Resources.resw

@@ -901,10 +901,7 @@
     <value>ວົງເລັບຊ້າຍ</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>&lt;mrk mtype="seg" mid="55"&gt;ວົງເລັບຊ້າຍ, ເປີດຍອດລວມວົງເລັບ %1&lt;/mrk&gt;</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>ວົງເລັບຂວາ</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/lt-LT/Resources.resw

@@ -901,10 +901,7 @@
     <value>Kairysis lenktinis skliaustas</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Kairysis skliaustas, atidarančio skliausto skaičius %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Dešinysis lenktinis skliaustas</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/lv-LV/Resources.resw

@@ -901,10 +901,7 @@
     <value>Kreisās puses apaļā iekava</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Kreisā iekava, atvērto iekavu skaits: %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Labās puses apaļā iekava</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/mk-MK/Resources.resw

@@ -901,10 +901,7 @@
     <value>Лева заграда</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Лева заграда, отворена заграда пресметува %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Десна заграда</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/ml-IN/Resources.resw

@@ -901,10 +901,7 @@
     <value>ഇടത് ആവരണചിഹ്നം</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>ഇടത് പാരന്തെസിസ്, പാരന്തെസിസ് കൗണ്ട് %1 തുറക്കുക</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>വലത് ബ്രാക്കറ്റ്</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/ms-MY/Resources.resw

@@ -901,10 +901,7 @@
     <value>Tanda kurungan kiri</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Tanda kurung kiri, buka kiraan tanda kurung %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Tanda kurungan kanan</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/nb-NO/Resources.resw

@@ -901,10 +901,7 @@
     <value>Venstreparentes</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Venstreparentes, åpen parentes teller %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Høyreparentes</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/nl-NL/Resources.resw

@@ -901,10 +901,7 @@
     <value>Haakje openen</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Haakje openen, aantal haakjes openen %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Haakje sluiten</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/pl-PL/Resources.resw

@@ -901,10 +901,7 @@
     <value>Lewy nawias</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Lewy nawias, liczba otwartych nawiasów: %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Prawy nawias</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/pt-BR/Resources.resw

@@ -901,10 +901,7 @@
     <value>Parêntese esquerdo</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Parêntese esquerdo, contagem de parêntese de abertura %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Parêntese direito</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/pt-PT/Resources.resw

@@ -901,10 +901,7 @@
     <value>Parêntese à esquerda</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Parêntese à esquerda, abrir contagem de parênteses %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Parêntese à direita</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/ro-RO/Resources.resw

@@ -901,10 +901,7 @@
     <value>Paranteză stânga</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Contor paranteze stânga, paranteze deschise %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Paranteză dreapta</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/ru-RU/Resources.resw

@@ -901,10 +901,7 @@
     <value>Открывающая круглая скобка</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Левая круглая скобка, количество открывающих круглых скобок — %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Закрывающая круглая скобка</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/sk-SK/Resources.resw

@@ -901,10 +901,7 @@
     <value>Ľavá zátvorka</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Ľavá zátvorka, počet ľavých zátvoriek je %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Pravá zátvorka</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/sl-SI/Resources.resw

@@ -901,10 +901,7 @@
     <value>Levi oklepaj</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Levi oklepaj, število oklepajev %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Desni oklepaj</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/sq-AL/Resources.resw

@@ -901,10 +901,7 @@
     <value>Kllapa e majtë</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Kllapa e majtë, numri i kllapave hapëse %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Kllapa e djathtë</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/sr-Latn-RS/Resources.resw

@@ -901,10 +901,7 @@
     <value>Leva zagrada</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Otvorena zagrada, broj otvorenih zagrada %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Desna zagrada</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/sv-SE/Resources.resw

@@ -901,10 +901,7 @@
     <value>Vänster parentes</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Vänster parentes, antal inledande parenteser är %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Höger parentes</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/sw-KE/Resources.resw

@@ -901,10 +901,7 @@
     <value>Mabano ya kushoto</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Mabano ya kushoto, fungua idadi ya mabano %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Mabano ya kulia</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/ta-IN/Resources.resw

@@ -901,10 +901,7 @@
     <value>இடது அடைப்புக்குறி</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>இடது அடைப்புக்குறி, திறப்பு அடைப்புக்குறி கணக்கு %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>வலது அடைப்புக்குறி</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/te-IN/Resources.resw

@@ -901,10 +901,7 @@
     <value>ఎడమ కుండలీకరణం</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>ఎడమ కుండలీకరణం, కుండలీకరణ గణనను %1 తెరవు</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>కుడి కుండలీకరణం</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/th-TH/Resources.resw

@@ -901,10 +901,7 @@
     <value>วงเล็บเปิด</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>วงเล็บเปิด จำนวนวงเล็บเปิด %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>วงเล็บปิด</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/tr-TR/Resources.resw

@@ -901,10 +901,7 @@
     <value>Sol parantez</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Sol parantez, parantez sayımını aç %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Sağ parantez</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/uk-UA/Resources.resw

@@ -901,10 +901,7 @@
     <value>Ліва кругла дужка</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Ліва кругла дужка, кількість відкривних круглих дужок – %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Права кругла дужка</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/uz-Latn-UZ/Resources.resw

@@ -901,10 +901,7 @@
     <value>Chap qavs</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Chap qavs, ochiq qavslar soni - %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>O‘ng qavs</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/vi-VN/Resources.resw

@@ -901,10 +901,7 @@
     <value>Dấu ngoặc đơn trái</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>Ngoặc trái, tính ngoặc mở %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Dấu ngoặc đơn phải</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/zh-CN/Resources.resw

@@ -901,10 +901,7 @@
     <value>左括号</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>左括号，左开式括号计数 %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>右括号</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Resources/zh-TW/Resources.resw

@@ -901,10 +901,7 @@
     <value>左括弧</value>
     <comment>Screen reader prompt for the Calculator "(" button on the scientific operator keypad</comment>
   </data>
-  <data name="Format_OpenParenthesisAutomationNamePrefix" xml:space="preserve">
+  
-    <value>左括弧，左括弧計數 %1</value>
-    <comment>{Locked="%1"} Screen reader prompt for the Calculator "(" button on the scientific operator keypad. %1 is the localized count of open parenthesis, e.g. "2".</comment>
-  </data>
   <data name="closeParenthesisButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>右括弧</value>
     <comment>Screen reader prompt for the Calculator ")" button on the scientific operator keypad</comment>

src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml

@@ -409,10 +409,10 @@
                                    Style="{StaticResource ParenthesisCalcButtonStyle}"
                                    FontSize="18"
                                    AutomationProperties.AutomationId="openParenthesisButton"
-                                   AutomationProperties.Name="{Binding LeftParenthesisAutomationName}"
                                    ButtonId="OpenParenthesis"
                                    Content="("
-                                   Tag="{x:Bind Model.OpenParenthesisCount, Mode=OneWay}"/>
+                                   GotFocus="OpenParenthesisButton_GotFocus"
+                                   Tag="{x:Bind ParenthesisCountToString(Model.OpenParenthesisCount), Mode=OneWay}"/>
         <controls:CalculatorButton x:Name="closeParenthesisButton"
                                    x:Uid="closeParenthesisButton"
                                    Grid.Row="5"

src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp

@@ -12,8 +12,8 @@
 #include "Converters/BooleanToVisibilityConverter.h"
 #include "Views/NumberPad.xaml.h"
 
+using namespace std;
 using namespace CalculatorApp;
-
 using namespace CalculatorApp::ViewModel;
 using namespace Platform;
 using namespace Windows::UI::Xaml;
@@ -35,12 +35,10 @@ CalculatorProgrammerRadixOperators::CalculatorProgrammerRadixOperators() :
 void CalculatorProgrammerRadixOperators::OnLoaded(Object^, RoutedEventArgs^)
 {
     m_progModeRadixChangeToken = Model->ProgModeRadixChange += ref new ProgModeRadixChangeHandler(this, &CalculatorProgrammerRadixOperators::ProgModeRadixChange);
-    m_propertyChangedToken = Model->PropertyChanged += ref new PropertyChangedEventHandler(this, &CalculatorProgrammerRadixOperators::OnViewModelPropertyChanged);
 }
 void CalculatorProgrammerRadixOperators::OnUnloaded(Object^, RoutedEventArgs^)
 {
     Model->ProgModeRadixChange -= m_progModeRadixChangeToken;
-    Model->PropertyChanged -=  m_propertyChangedToken;
 }
 
 void CalculatorProgrammerRadixOperators::Shift_Clicked(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
@@ -100,10 +98,12 @@ void CalculatorProgrammerRadixOperators::IsErrorVisualState::set(bool value)
     }
 }
 
-void CalculatorProgrammerRadixOperators::OnViewModelPropertyChanged(Object^ sender, PropertyChangedEventArgs^ e)
+String^ CalculatorProgrammerRadixOperators::ParenthesisCountToString(unsigned int count) {
-{
+    return (count == 0) ? ref new String() : ref new String(to_wstring(count).data());
-    if (e->PropertyName == StandardCalculatorViewModel::OpenParenthesisCountPropertyName && closeParenthesisButton->FocusState != ::FocusState::Unfocused)
+}
-    {
+
-        Model->SetOpenParenthesisCountNarratorAnnouncement();
+
-    }
+void CalculatorProgrammerRadixOperators::CalculatorProgrammerRadixOperators::OpenParenthesisButton_GotFocus(Object^ sender, RoutedEventArgs^ e)
+{
+    Model->SetOpenParenthesisCountNarratorAnnouncement();
 }

src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.h

@@ -26,6 +26,7 @@ namespace CalculatorApp
             bool get();
             void set(bool value);
         }
+        Platform::String^ ParenthesisCountToString(unsigned int count);
 
         DEPENDENCY_PROPERTY_OWNER(CalculatorProgrammerRadixOperators);
 
@@ -35,10 +36,9 @@ namespace CalculatorApp
         void OnLoaded(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
         void OnUnloaded(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
         void ProgModeRadixChange();
-        void OnViewModelPropertyChanged(Platform::Object^ sender, Windows::UI::Xaml::Data::PropertyChangedEventArgs ^ e);
 
         bool m_isErrorVisualState;
         Windows::Foundation::EventRegistrationToken m_progModeRadixChangeToken;
-        Windows::Foundation::EventRegistrationToken m_propertyChangedToken;
+        void OpenParenthesisButton_GotFocus(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
     };
 }

src/Calculator/Views/CalculatorScientificOperators.xaml

@@ -11,8 +11,6 @@
              x:Name="ControlRoot"
              d:DesignHeight="400"
              d:DesignWidth="315"
-             Loaded="OnLoaded"
-             Unloaded="OnUnloaded"
              mc:Ignorable="d">
     <UserControl.Resources>
         <converters:BooleanNegationConverter x:Key="BooleanNegationConverter"/>
@@ -729,10 +727,10 @@
                                    Style="{StaticResource ParenthesisCalcButtonStyle}"
                                    FontSize="19"
                                    AutomationProperties.AutomationId="openParenthesisButton"
-                                   AutomationProperties.Name="{Binding LeftParenthesisAutomationName}"
                                    ButtonId="OpenParenthesis"
                                    Content="("
-                                   Tag="{x:Bind Model.OpenParenthesisCount, Mode=OneWay}"/>
+                                   GotFocus="OpenParenthesisButton_GotFocus"
+                                   Tag="{x:Bind ParenthesisCountToString(Model.OpenParenthesisCount), Mode=OneWay}"/>
         <controls:CalculatorButton x:Name="closeParenthesisButton"
                                    x:Uid="closeParenthesisButton"
                                    Grid.Row="8"

src/Calculator/Views/CalculatorScientificOperators.xaml.cpp

@@ -16,6 +16,7 @@ using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
 using namespace CalculatorApp::ViewModel;
 
+using namespace std;
 using namespace Platform;
 using namespace Windows::Foundation;
 using namespace Windows::Foundation::Collections;
@@ -38,15 +39,6 @@ CalculatorScientificOperators::CalculatorScientificOperators()
     Common::KeyboardShortcutManager::ShiftButtonChecked(false);
 }
 
-void CalculatorScientificOperators::OnLoaded(Object^, RoutedEventArgs^)
-{
-    m_propertyChangedToken = Model->PropertyChanged += ref new PropertyChangedEventHandler(this, &CalculatorScientificOperators::OnViewModelPropertyChanged);
-}
-void CalculatorScientificOperators::OnUnloaded(Object^, RoutedEventArgs^)
-{
-    Model->PropertyChanged -= m_propertyChangedToken;
-}
-
 void CalculatorScientificOperators::ShortLayout_Completed(_In_ Platform::Object^ /*sender*/, _In_ Platform::Object^ /*e*/)
 {
     IsWideLayout = false;
@@ -107,10 +99,11 @@ void CalculatorScientificOperators::SetOperatorRowVisibility()
     InvRow2->Visibility = invRowVis;
 }
 
-void CalculatorScientificOperators::OnViewModelPropertyChanged(Object^ sender, PropertyChangedEventArgs^ e)
+void CalculatorScientificOperators::OpenParenthesisButton_GotFocus(Object^ sender, RoutedEventArgs^ e)
 {
-    if (e->PropertyName == StandardCalculatorViewModel::OpenParenthesisCountPropertyName && closeParenthesisButton->FocusState != ::FocusState::Unfocused)
+    Model->SetOpenParenthesisCountNarratorAnnouncement();
-    {
+}
-        Model->SetOpenParenthesisCountNarratorAnnouncement();
+
-    }
+String^ CalculatorScientificOperators::ParenthesisCountToString(unsigned int count) {
+    return (count == 0) ? ref new String() : ref new String(to_wstring(count).data());
 }

src/Calculator/Views/CalculatorScientificOperators.xaml.h

@@ -33,7 +33,8 @@ namespace CalculatorApp
         DEPENDENCY_PROPERTY_WITH_DEFAULT(bool, IsWideLayout, false);
 
         bool IsShiftEnabled(bool isWideLayout, bool isErrorState) { return !(isWideLayout || isErrorState); }
-
+        void OpenParenthesisButton_GotFocus(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
+        Platform::String^ ParenthesisCountToString(unsigned int count);
     private:
         void ShortLayout_Completed(_In_ Platform::Object^ sender, _In_ Platform::Object^ e);
         void WideLayout_Completed(_In_ Platform::Object^ sender, _In_ Platform::Object^ e);
@@ -41,10 +42,5 @@ namespace CalculatorApp
         void shiftButton_Check(_In_ Platform::Object^ sender, _In_ Windows::UI::Xaml::RoutedEventArgs^ e);
         void shiftButton_IsEnabledChanged(_In_ Platform::Object^ sender, _In_ Windows::UI::Xaml::DependencyPropertyChangedEventArgs^ e);
         void SetOperatorRowVisibility();
-        void OnViewModelPropertyChanged(Platform::Object^ sender, Windows::UI::Xaml::Data::PropertyChangedEventArgs ^ e);
-        void OnLoaded(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
-        void OnUnloaded(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
-
-        Windows::Foundation::EventRegistrationToken m_propertyChangedToken;
     };
 }

src/Calculator/pch.h

@@ -23,6 +23,7 @@
 #include <locale>
 #include <sal.h>
 #include <sstream>
+#include <string>
 #include <concrt.h>
 #include <regex>
 #include <string>

src/CalculatorUnitTests/CalculatorManagerTest.cpp

@@ -57,7 +57,7 @@ namespace CalculatorManagerTest
             m_memorizedNumberStrings = numbers;
         }
 
-        void SetParenDisplayText(const std::wstring& parenthesisCount) override
+        void SetParenthesisNumber(unsigned int parenthesisCount) override
         {
             m_parenDisplay = parenthesisCount;
         }
@@ -115,7 +115,7 @@ namespace CalculatorManagerTest
     private:
         wstring m_primaryDisplay;
         wstring m_expression;
-        wstring m_parenDisplay;
+        unsigned int m_parenDisplay;
         bool m_isError;
         vector<wstring> m_memorizedNumberStrings;
         int m_maxDigitsCalledCount;