fixed encoding problems

2 files changed, 38 insertions, 50 deletions

diff --git a/lessons/es/alphabet.csv b/lessons/es/alphabet.csv
index 4dced1d..690f314 100644
--- a/lessons/es/alphabet.csv
+++ b/lessons/es/alphabet.csv
@@ -4,33 +4,31 @@
 # These words represent Nivel 1 in Spanish,,,,,,
 # Use () for highlighted letter in phrase.,,,,,,
 # letter, phrase, RGB color, color name, vowel or consonant, sound file,
-A, (a)ve, #FFFFFF, ave.png, ave.ogg, a.ogg
-B, (b)urro, #2080A0, burro.png, burro.ogg, b.ogg
-C, (c)onejo, #FFC040, conejo.png, conejo.ogg, c.ogg
-D, (d)a(d)o, #20C060, dado.png, dado.ogg, d.ogg
-E, (e)l(e)fant(e), #70A9CE, elefante.png, elefante.ogg, e.ogg
-F, (f)lor, #C160D2, flor.png, flor.ogg, f.ogg
-G, (g)ato, #A0A0A0, gato.png, gato.ogg, g.ogg
-H, (h)elado, #FFFFFF, helado.png, helado.ogg, h.ogg
-I, (i)gles(i)a, #DE1C23, iglesia.png, iglesia.ogg, i.ogg
-J, (j)irafa, #C93C7E, jirafa.png, jirafa.ogg, j.ogg
-K, (k)ilo, #FFC040, kilo.png, kilo.ogg, k.ogg
-L, (l)oro, #00A0FF, loro.png, loro.ogg, l.ogg
-M, (m)esa, #C72020, mesa.png, mesa.ogg, m.ogg
-N, (n)ube, #7A6BBD, nube.png, nube.ogg, n.ogg
-Ñ, (ñ)andú, #80C040/#C93C7E, nandu.png, nandu.ogg, ny.ogg
-O, (o)s(o), #A4221E, oso.png, oso.ogg, o.ogg
-P, (p)ato, #A4221E, pato.png, pato.ogg, p.ogg
-Q, (q)ueso, #FFC040, queso.png, queso.ogg, q.ogg
-R, (r)atón, #F08020, raton.png, raton.ogg, r.ogg
-S, (s)apo, #7EC93C, sapo.png, sapo.ogg, s.ogg
-T, (t)aza, #EE3C8E, taza.png, taza.ogg, t.ogg
-U, (u)va, #00A000, uva.png, uva.ogg, u.ogg
-V, (v)aca, #2080A0, vaca.png, vaca.ogg, v.ogg
-W, (w)aterpolo, #808080, waterpolo.png, waterpolo.ogg, w.ogg
-X, (x)ilófono, #7EC93C, xilofono.png, xilofono.ogg, x.ogg
-Y, (y)ate, #BA6C71, yate.png, yate.ogg, y.ogg
-# Y, Paragua(y), #DE1C23, paraguay.png, paraguay.ogg, y.ogg
-Z, (z)apato, #7EC93C, zapato.png, zapato.ogg, z.ogg
-# RR, pe(rr)o, #F08020, perro.png, perro.ogg, rr.ogg
-# LL, (ll)ama, #C93C7E, llama.png, llama.ogg, ll.ogg
+a, (a)ve, #FFFFFF, ave.png, ave.ogg, a.ogg
+b, (b)urro, #2080A0, burro.png, burro.ogg, b.ogg
+c, (c)onejo, #FFC040, conejo.png, conejo.ogg, c.ogg
+d, (d)a(d)o, #20C060, dado.png, dado.ogg, d.ogg
+e, (e)l(e)fant(e), #70A9CE, elefante.png, elefante.ogg, e.ogg
+f, (f)lor, #C160D2, flor.png, flor.ogg, f.ogg
+g, (g)ato, #A0A0A0, gato.png, gato.ogg, g.ogg
+h, (h)elado, #FFFFFF, helado.png, helado.ogg, h.ogg
+i, (i)gles(i)a, #DE1C23, iglesia.png, iglesia.ogg, i.ogg
+j, (j)irafa, #C93C7E, jirafa.png, jirafa.ogg, j.ogg
+k, (k)ilo, #FFC040, kilo.png, kilo.ogg, k.ogg
+l, (l)oro, #00A0FF, loro.png, loro.ogg, l.ogg
+m, (m)esa, #C72020, mesa.png, mesa.ogg, m.ogg
+n, (n)ube, #7A6BBD, nube.png, nube.ogg, n.ogg
+ñ, (ñ)andú, #80C040/#C93C7E, nandu.png, nandu.ogg, ny.ogg
+o, (o)s(o), #A4221E, oso.png, oso.ogg, o.ogg
+p, (p)ato, #A4221E, pato.png, pato.ogg, p.ogg
+q, (q)ueso, #FFC040, queso.png, queso.ogg, q.ogg
+r, (r)atón, #F08020, raton.png, raton.ogg, r.ogg
+s, (s)apo, #7EC93C, sapo.png, sapo.ogg, s.ogg
+t, (t)aza, #EE3C8E, taza.png, taza.ogg, t.ogg
+u, (u)va, #00A000, uva.png, uva.ogg, u.ogg
+v, (v)aca, #2080A0, vaca.png, vaca.ogg, v.ogg
+w, (w)aterpolo, #808080, waterpolo.png, waterpolo.ogg, w.ogg
+x, (x)ilófono, #7EC93C, xilofono.png, xilofono.ogg, x.ogg
+y, (y)ate, #BA6C71, yate.png, yate.ogg, y.ogg
+z, (z)apato, #7EC93C, zapato.png, zapato.ogg, z.ogg
+
diff --git a/page.py b/page.py
index cbc5398..13e4622 100644
--- a/page.py
+++ b/page.py
@@ -11,9 +11,9 @@
 # License along with this library; if not, write to the
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
+
 from gi.repository import Gtk, Gdk, GObject, GdkPixbuf
 import os
-import codecs
 from random import uniform
 
 from gettext import gettext as _
@@ -23,11 +23,8 @@ from utils.play_audio import play_audio_from_file
 import logging
 _logger = logging.getLogger('iknowmyabcs-activity')
 
-try:
-    from sugar3.graphics import style
-    GRID_CELL_SIZE = style.GRID_CELL_SIZE
-except ImportError:
-    GRID_CELL_SIZE = 0
+from sugar3.graphics import style
+GRID_CELL_SIZE = style.GRID_CELL_SIZE
 
 from genpieces import generate_card
 from utils.sprites import Sprites, Sprite
@@ -78,7 +75,6 @@ class Page():
         self._grid_x_offset = int(
             (self._width - XDIM * (self._card_width + GUTTER * 2)) / 2)
         self._grid_y_offset = 0
-        # self._scale = self._width / 240.
         self._scale = self._card_width / 80
         self._sprites = Sprites(self._canvas)
         self.current_card = 0
@@ -141,13 +137,13 @@ class Page():
             if type(self._color_data[self.current_card][0]) == type([]):
                 stroke = self._test_for_stroke()
                 top = svg_str_to_pixbuf(generate_card(
-                        string=card[0].lower(),
+                        string=card[0],
                         colors=[self._color_data[self.current_card][0][0],
                                 '#FFFFFF'],
                         scale=self._scale,
                         center=True))
                 bot = svg_str_to_pixbuf(generate_card(
-                        string=card[0].lower(),
+                        string=card[0],
                         colors=[self._color_data[self.current_card][0][1],
                                 '#FFFFFF'],
                         scale=self._scale,
@@ -163,7 +159,7 @@ class Page():
                 stroke = self._test_for_stroke()
                 self._cards.append(Sprite(self._sprites, x, y,
                                           svg_str_to_pixbuf(generate_card(
-                                string=card[0].lower(),
+                                string=card[0],
                                 colors=[self._color_data[self.current_card][0],
                                         '#FFFFFF'],
                                 stroke=stroke,
@@ -280,36 +276,31 @@ class Page():
         self._color_data = []
         self._image_data = []
         self._media_data = []  # (image sound, letter sound)
-        f = codecs.open(path, encoding='utf-8')
+        f = open(path)
         for line in f:
             if len(line) > 0 and line[0] not in '#\n':
                 words = line.split(', ')
                 self._card_data.append([words[0], 
                                         words[1].replace('-', ', ')])
                 if words[2].count('#') > 1:
-                    self._color_data.append(
-                        [words[2].split('/')])
+                    self._color_data.append([words[2].split('/')])
                 else:
-                    self._color_data.append(
-                        [words[2]])
+                    self._color_data.append([words[2]])
                 self._image_data.append(words[3])
                 self._media_data.append((words[4], words[5]))
         f.close()
 
         self._clear_all()
         self._cards = []
-        self._colored_letters_lower = []
-        self._colored_letters_upper = []
 
     def _clear_all(self):
         ''' Hide everything so we can begin a new page. '''
         self._hide_cards()
 
+
 def svg_str_to_pixbuf(svg_string):
     ''' Load pixbuf from SVG string. '''
     pl = GdkPixbuf.PixbufLoader.new_with_type('svg')
-    if type(svg_string) == unicode:
-	svg_string = svg_string.encode('ascii', 'replace')
     pl.write(svg_string)
     pl.close()
     return pl.get_pixbuf()
@@ -318,4 +309,3 @@ def svg_str_to_pixbuf(svg_string):
 def image_file_to_pixbuf(file_path, w, h):
     ''' Load pixbuf from file '''
     return GdkPixbuf.Pixbuf.new_from_file_at_size(file_path, int(w), int(h))
-