[gcompris] Revert "gcompris music, use the official note notation"

[Bruno Coudoin <bcoudoin src gnome org>]

commit ecf32795435a993008eb52aa8697902e1203efdc
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Sat Oct 6 15:25:31 2012 +0200

    Revert "gcompris music, use the official note notation"
    
    This reverts commit 240c5ebf046b10d32a618c9949af79ad0df1f467.
    
    Not all of our supported platform have the utf8 symbols for
    the sharp and flat symbol. Better stick to an ascii form.

 src/piano_composition-activity/gcomprismusic.py    |   10 +++++-----
 .../piano_composition.py                           |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/piano_composition-activity/gcomprismusic.py b/src/piano_composition-activity/gcomprismusic.py
index a2d5a07..9f5ecec 100644
--- a/src/piano_composition-activity/gcomprismusic.py
+++ b/src/piano_composition-activity/gcomprismusic.py
@@ -66,10 +66,10 @@ NOTE_COLOR_SCHEME = {1:'#FF0000',
 WHITE_KEY_NOTATION = {1:_('C'), 2:_('D'), 3:_('E'), 4:_('F'), 5:_('G'), 6:_('A'), 7:_('B'), 8:_('C')}
 # this is the English musical notation system
 # translators insert the name of the notes in your language
-SHARP_NOTATION = {-1:_('Câ'), -2:_('Dâ'), -3:_('Fâ'), -4:_('Gâ'), -5:_('Aâ')}
+SHARP_NOTATION = {-1:_('C#'), -2:_('D#'), -3:_('F#'), -4:_('G#'), -5:_('A#')}
 # this is the English musical notation system
 # translators insert the name of the notes in your language
-FLAT_NOTATION = {-1:_('Dâ'), -2:_('Eâ'), -3:_('Gâ'), -4:_('Aâ'), -5:_('Bâ')}
+FLAT_NOTATION = {-1:_('Db'), -2:_('Eb'), -3:_('Gb'), -4:_('Ab'), -5:_('Bb')}
 '''
 Translators: note that you must write the translated note name matching the
 given note name in the English notation
@@ -105,7 +105,7 @@ def getIDFromKeyName(keyName):
     1
     >>> getIDFromKeyName('D#')
     -2
-    >>> getIDFromKeyName('Eâ')
+    >>> getIDFromKeyName('Eb')
     -2
     '''
     for x, y in WHITE_KEY_NOTATION.items():
@@ -609,9 +609,9 @@ class Staff():
             else:
                 print 'ERROR: unable to parse note', exp
                 return
-            if 'â' in n:
+            if '#' in n:
                 note.sharpNotation = True
-            if 'â' in n:
+            if 'b' in n:
                 note.sharpNotation = False
             self.drawNote(note)
 
diff --git a/src/piano_composition-activity/piano_composition.py b/src/piano_composition-activity/piano_composition.py
index 0153b8e..7b13cb4 100644
--- a/src/piano_composition-activity/piano_composition.py
+++ b/src/piano_composition-activity/piano_composition.py
@@ -127,10 +127,10 @@ class Gcompris_piano_composition:
             clefText = _("Click on the note symbols to write different length notes")
             keyboardText = _("Notes can be many types, such as quarter notes, half notes, and whole notes")
         elif level == 4:
-            clefText = _("Sharp notes have a â sign")
+            clefText = _("Sharp notes have a # sign")
             keyboardText = _("The black keys are sharp and flat keys")
         elif level == 5:
-            clefText = _("Flat notes have a â sign")
+            clefText = _("Flat notes have a b sign")
             keyboardText = _("Each black key has two names, one with a flat and one with a sharp")
         elif level == 6:
             clefText = _("Now you can load melodies from around the world")