[orca] Move some technical-content symbols to mathsymbols.py and remove duplicates



commit 517bcccbe9d5f3a4d05f5ba7b985589954594821
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Mon Mar 23 14:38:57 2015 -0400

    Move some technical-content symbols to mathsymbols.py and remove duplicates
    
    Because there are far more symbols than we can ask translators to translate,
    we have fallback code so that we at least speak something for the symbols
    which we think are unlikely to be encountered, and likely to not be presented
    by espeak. This range-based code was stomping on a few symbols which were
    actually localized. Moving them to mathsymbols.py will stop the stomping.
    Also removed some duplicates.

 src/orca/chnames.py     |   79 -----------------------------------------------
 src/orca/mathsymbols.py |   32 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 80 deletions(-)
---
diff --git a/src/orca/chnames.py b/src/orca/chnames.py
index 729313d..57df0e1 100644
--- a/src/orca/chnames.py
+++ b/src/orca/chnames.py
@@ -638,71 +638,6 @@ chnames['\u20ac'] = _("euro")
 #
 chnames['\u2122'] = _("trademark")
 
-# Translators: this is the spoken word for the character '←' (U+2190)
-#
-chnames['\u2190'] = _("left arrow")
-
-# Translators: this is the spoken word for the character '→' (U+2192)
-#
-chnames['\u2192'] = _("right arrow")
-
-# Translators: this is the spoken word for the character '≈' (U+2248)
-#
-chnames['\u2248'] = _("almost equal to")
-
-# Translators: this is the spoken word for the character '≠' (U+2260)
-#
-chnames['\u2260'] = _("not equal to")
-
-# Translators: this is the spoken word for the character '≤' (U+2264)
-#
-chnames['\u2264'] = _("less than or equal to")
-
-# Translators: this is the spoken word for the character '≥' (U+2265)
-#
-chnames['\u2265'] = _("greater than or equal to")
-
-# Translators: this is the spoken word for the character '√' (U+221a)
-#
-chnames['\u221a'] = _("square root")
-
-# Translators: this is the spoken word for the character '∛' (U+221b)
-#
-chnames['\u221b'] = _("cube root")
-
-# Translators: this is the spoken word for the character '∞' (U+221e)
-#
-chnames['\u221e'] = _("infinity")
-
-# Translators: this is the spoken word for the character '■' (U+25a0)
-# It can be used as a bullet in a list.
-#
-chnames['\u25a0'] = _("black square")
-
-# Translators: this is the spoken word for the character '□' (U+25a1)
-# It can be used as a bullet in a list.
-#
-chnames['\u25a1'] = _("white square")
-
-# Translators: this is the spoken word for the character '◆' (U+25c6)
-# It can be used as a bullet in a list.
-#
-chnames['\u25c6'] = _("black diamond")
-
-# Translators: this is the spoken word for the character '○' (U+25cb)
-# It can be used as a bullet in a list.
-#
-chnames['\u25cb'] = _("white circle")
-
-# Translators: this is the spoken word for the character '●' (U+25cf)
-# It can be used as a bullet in a list.
-#
-chnames['\u25cf'] = _("black circle")
-
-# Translators: this is the spoken word for the character '◦' (U+25e6)
-#
-chnames['\u25e6'] = _("white bullet")
-
 # Translators: this is the spoken word for the character '✓' (U+2713)
 # It can be used as a bullet in a list.
 #
@@ -722,13 +657,6 @@ chnames['\u2714'] = _("heavy check mark")
 #
 chnames['\u2717'] = _("x-shaped bullet")
 
-# Translators: this is the spoken word for the character '➔' (U+2794)
-# This symbol is included here because it can be used as a bullet in 
-# an OOo list. The goal is to inform the user of the appearance of 
-# the bullet without too much verbiage, hence simply "right-pointing arrow".
-#
-chnames['\u2794'] = _("right-pointing arrow")
-
 # Translators: this is the spoken word for the character '⁰' (U+2070)
 #
 chnames['\u2070'] = _("superscript 0")
@@ -841,13 +769,6 @@ chnames['\u208d'] = _("subscript left paren")
 #
 chnames['\u208e'] = _("subscript right paren")
 
-# Translators: this is the spoken word for the character '➢' (U+27a2)
-# This symbol is included here because it can be used as a bullet in an 
-# OOo list. The goal is to inform the user of the appearance of the bullet 
-# without too much verbiage, hence simply "right-pointing arrowhead".
-#
-chnames['\u27a2'] = _("right-pointing arrowhead")
-
 # Translators:  StarOffice/OOo includes private-use unicode character U+E00A 
 # as a bullet which looks like the black square: ■ (U+25A0).  Therefore, 
 # please use the same translation for this character.
diff --git a/src/orca/mathsymbols.py b/src/orca/mathsymbols.py
index 730dde2..0a2e08b 100644
--- a/src/orca/mathsymbols.py
+++ b/src/orca/mathsymbols.py
@@ -28,7 +28,7 @@ __license__   = "LGPL"
 import re
 import unicodedata
 
-from .orca_i18n import C_
+from .orca_i18n import _, C_
 
 fallbackOnUnicodeData = True
 
@@ -1248,6 +1248,18 @@ MONOSPACE = C_('math symbol', 'monospace %s')
 # at http://www.unicode.org/charts/PDF/U1D400.pdf.
 DOTLESS = C_('math symbol', 'dotless %s')
 
+# Translators: this is the spoken representation for the character '←' (U+2190)
+_arrows['\u2190'] = _("left arrow")
+
+# Translators: this is the spoken representation for the character '→' (U+2192)
+_arrows['\u2192'] = _("right arrow")
+
+# Translators: this is the spoken representation for the character '➔' (U+2794)
+_arrows['\u2794'] = _("right-pointing arrow")
+
+# Translators: this is the spoken representation for the character '➢' (U+27a2)
+_arrows['\u27a2'] = _("right-pointing arrowhead")
+
 # Translators: this is the spoken representation for the character '∀' (U+2200)
 _operators['\u2200'] = C_('math symbol', 'for all')
 
@@ -2016,6 +2028,24 @@ _operators['\u22fe'] = C_('math symbol', 'small contains with overbar')
 # Translators: this is the spoken representation for the character '⋿' (U+22ff)
 _operators['\u22ff'] = C_('math symbol', 'z notation bag membership')
 
+# Translators: this is the spoken representation for the character '■' (U+25a0)
+_shapes['\u25a0'] = _("black square")
+
+# Translators: this is the spoken representation for the character '□' (U+25a1)
+_shapes['\u25a1'] = _("white square")
+
+# Translators: this is the spoken representation for the character '◆' (U+25c6)
+_shapes['\u25c6'] = _("black diamond")
+
+# Translators: this is the spoken representation for the character '○' (U+25cb)
+_shapes['\u25cb'] = _("white circle")
+
+# Translators: this is the spoken representation for the character '●' (U+25cf)
+_shapes['\u25cf'] = _("black circle")
+
+# Translators: this is the spoken representation for the character '◦' (U+25e6)
+_shapes['\u25e6'] = _("white bullet")
+
 _all.update(_alnum)
 _all.update(_arrows)
 _all.update(_operators)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]