[orca] Provide shorter names for n-ary operators; don't say "post" in mmultiscripts

[Joanmarie Diggs <joanied src gnome org>]

commit e274f7e3a2ef17f9c19091bfa9950edf1182420b
Author: Frédéric Wang <fred wang free fr>
Date:   Sat Jul 4 14:27:52 2015 -0400

    Provide shorter names for n-ary operators; don't say "post" in mmultiscripts

 src/orca/mathsymbols.py      |   14 +++++++-------
 src/orca/messages.py         |   24 ------------------------
 src/orca/speech_generator.py |    4 ++--
 3 files changed, 9 insertions(+), 33 deletions(-)
---
diff --git a/src/orca/mathsymbols.py b/src/orca/mathsymbols.py
index 5e48a74..c20bec8 100644
--- a/src/orca/mathsymbols.py
+++ b/src/orca/mathsymbols.py
@@ -1321,13 +1321,13 @@ _operators['\u220d'] = C_('math symbol', 'small contains as a member')
 _operators['\u220e'] = C_('math symbol', 'end of proof')
 
 # Translators: this is the spoken representation for the character '∏' (U+220f)
-_operators['\u220f'] = C_('math symbol', 'n-ary product')
+_operators['\u220f'] = C_('math symbol', 'product')
 
 # Translators: this is the spoken representation for the character '∐' (U+2210)
-_operators['\u2210'] = C_('math symbol', 'n-ary coproduct')
+_operators['\u2210'] = C_('math symbol', 'coproduct')
 
 # Translators: this is the spoken representation for the character '∑' (U+2211)
-_operators['\u2211'] = C_('math symbol', 'n-ary summation')
+_operators['\u2211'] = C_('math symbol', 'sum')
 
 # Translators: this is the spoken representation for the character '−' (U+2212)
 _operators['\u2212'] = C_('math symbol', 'minus')
@@ -1852,16 +1852,16 @@ _operators['\u22be'] = C_('math symbol', 'right angle with arc')
 _operators['\u22bf'] = C_('math symbol', 'right triangle')
 
 # Translators: this is the spoken representation for the character '⋀' (U+22c0)
-_operators['\u22c0'] = C_('math symbol', 'n-ary logical and')
+_operators['\u22c0'] = C_('math symbol', 'logical and')
 
 # Translators: this is the spoken representation for the character '⋁' (U+22c1)
-_operators['\u22c1'] = C_('math symbol', 'n-ary logical or')
+_operators['\u22c1'] = C_('math symbol', 'logical or')
 
 # Translators: this is the spoken representation for the character '⋂' (U+22c2)
-_operators['\u22c2'] = C_('math symbol', 'n-ary intersection')
+_operators['\u22c2'] = C_('math symbol', 'intersection')
 
 # Translators: this is the spoken representation for the character '⋃' (U+22c3)
-_operators['\u22c3'] = C_('math symbol', 'n-ary union')
+_operators['\u22c3'] = C_('math symbol', 'union')
 
 # Translators: this is the spoken representation for the character '⋄' (U+22c4)
 _operators['\u22c4'] = C_('math symbol', 'diamond operator')
diff --git a/src/orca/messages.py b/src/orca/messages.py
index 261637c..b1a687b 100644
--- a/src/orca/messages.py
+++ b/src/orca/messages.py
@@ -1249,30 +1249,6 @@ MATH_PRE_SUPERSCRIPT = C_("math script", "pre-superscript")
 # CC YOURSELF TO https://bugzilla.gnome.org/show_bug.cgi?id=751816 TO BE
 # NOTIFIED WHEN STRINGS ARE FINALIZED.
 # Translators: This phrase is spoken to inform the user that what is about to
-# be spoken is subscripted text which follows the base in a mathematical
-# expression. See, for instance, the MathML mmultiscripts element:
-# http://www.w3.org/TR/MathML3/chapter3.html#presm.mmultiscripts
-# https://developer.mozilla.org/en-US/docs/Web/MathML/Element/mmultiscripts
-MATH_POST_SUBSCRIPT = C_("math script", "post-subscript")
-
-# TRANSLATORS: PLEASE NOTE THAT THIS STRING MAY BE CHANGED PRIOR TO THE 3.18
-# RELEASE. IMPLEMENTING SUPPORT FOR SPOKEN MATH IS A CROSS-PLATFORM EFFORT
-# AND CONSENSUS ABOUT EXACT PRESENTATION HAS NOT YET BEEN REACHED. YOU CAN
-# CC YOURSELF TO https://bugzilla.gnome.org/show_bug.cgi?id=751816 TO BE
-# NOTIFIED WHEN STRINGS ARE FINALIZED.
-# Translators: This phrase is spoken to inform the user that what is about to
-# be spoken is superscripted text which follows the base in a mathematical
-# expression. See, for instance, the MathML mmultiscripts element:
-# http://www.w3.org/TR/MathML3/chapter3.html#presm.mmultiscripts
-# https://developer.mozilla.org/en-US/docs/Web/MathML/Element/mmultiscripts
-MATH_POST_SUPERSCRIPT = C_("math script", "post-superscript")
-
-# TRANSLATORS: PLEASE NOTE THAT THIS STRING MAY BE CHANGED PRIOR TO THE 3.18
-# RELEASE. IMPLEMENTING SUPPORT FOR SPOKEN MATH IS A CROSS-PLATFORM EFFORT
-# AND CONSENSUS ABOUT EXACT PRESENTATION HAS NOT YET BEEN REACHED. YOU CAN
-# CC YOURSELF TO https://bugzilla.gnome.org/show_bug.cgi?id=751816 TO BE
-# NOTIFIED WHEN STRINGS ARE FINALIZED.
-# Translators: This phrase is spoken to inform the user that what is about to
 # be spoken is underscripted text in a mathematical expression. Note that the
 # underscript might be simple text or may itself be a mathematical expression,
 # and in this instance we have no additional context through which a more user-
diff --git a/src/orca/speech_generator.py b/src/orca/speech_generator.py
index fe3274b..dbdbef2 100644
--- a/src/orca/speech_generator.py
+++ b/src/orca/speech_generator.py
@@ -2176,9 +2176,9 @@ class SpeechGenerator(generator.Generator):
             if self._script.utilities.isNoneElement(script):
                 continue
             if i % 2:
-                rv = [messages.MATH_POST_SUPERSCRIPT]
+                rv = [messages.MATH_SUPERSCRIPT]
             else:
-                rv = [messages.MATH_POST_SUBSCRIPT]
+                rv = [messages.MATH_SUBSCRIPT]
             rv.extend(self.voice(SYSTEM))
             rv.extend(self._generateScriptScript(script))
             result.append(rv)