Merge lp:~osomon/elisa/turkish into lp:elisa

[Olivier Tilloy]

This branch fixes most of the issues encountered when running with a Turkish locale (and possibly other "exotic" locales), most notably bug #584161.

The problem is that the Turkish language (and hence the Turkish locale) has different capitalization
rules regarding "i" ("ı" <-> "I" and "i" <-> "İ").

The fix is twofold (two separate commits in the branch):

1) Work around a well-known bug in Python itself, by importing the decimal module before the locale is set.

2) Define and use two helpers to do locale-independent ASCII translations. Those new helpers are unit-tested.

Unmerged revisions

1617. By Olivier Tilloy on 2010-05-24

Define and user two helpers to do ASCII upper/lower case conversions,
independently from the current locale.

1616. By Olivier Tilloy on 2010-05-24

Import decimal early, before locale.setlocale is called.

=== modified file 'elisa-core/elisa/core/launcher.py'
--- elisa-core/elisa/core/launcher.py	2009-11-09 15:44:51 +0000
+++ elisa-core/elisa/core/launcher.py	2010-05-24 15:25:45 +0000
@@ -112,6 +112,12 @@
         sys.path.extend(python_paths)
     
     def main_before_voodoo(self):
+        # Workaround python's broken handling of some locales (like Turkish):
+        # importing the decimal module after locale.setlocale fails, so we
+        # make sure it is imported earlier
+        # (see https://bugs.launchpad.net/moovida/+bug/584161).
+        import decimal
+
         import elisa
         import elisa.core
         import elisa.core.launcher

=== added file 'elisa-core/elisa/core/tests/test_utils_text.py'
--- elisa-core/elisa/core/tests/test_utils_text.py	1970-01-01 00:00:00 +0000
+++ elisa-core/elisa/core/tests/test_utils_text.py	2010-05-24 15:25:45 +0000
@@ -0,0 +1,42 @@
+# Elisa Media Center
+# Copyright (C) 2010 Olivier Tilloy <[e-mail]>
+#
+# This file is licensed under the GPL version 3.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import locale
+
+from twisted.trial.unittest import TestCase
+from elisa.core.utils import text
+
+
+class TestTextUtils(TestCase):
+
+    locales = ('', 'C', 'fr_FR.utf-8', 'tr_TR.utf-8', 'ar_SA.utf-8',
+               'zh_TW.utf-8')
+
+    lower = 'this is not a test!'
+    upper = 'THIS IS NOT A TEST!'
+
+    def test_ascii_translations(self):
+        for loc in self.locales:
+            try:
+                locale.setlocale(locale.LC_ALL, loc)
+            except locale.Error:
+                continue
+            else:
+                self.assertEquals(text.ascii_lower(self.upper), self.lower)
+                self.assertEquals(text.ascii_upper(self.lower), self.upper)
+

=== modified file 'elisa-core/elisa/core/utils/text.py'
--- elisa-core/elisa/core/utils/text.py	2009-05-11 14:06:59 +0000
+++ elisa-core/elisa/core/utils/text.py	2010-05-24 15:25:45 +0000
@@ -20,6 +20,13 @@
 Text utilities.
 """
 
+import string
+
+
+ASCII_LOWER = string.maketrans(string.ascii_uppercase, string.ascii_lowercase)
+ASCII_UPPER = string.maketrans(string.ascii_lowercase, string.ascii_uppercase)
+
+
 def name_to_shortcut(name):
     """
     DOCME
@@ -29,4 +36,19 @@
         if first.isalpha():
             return first.upper()
 
-    return '#'
\ No newline at end of file
+    return '#'
+
+
+def ascii_lower(s):
+    """
+    Translate an ASCII string to lower case in a locale-independent manner.
+    """
+    return s.translate(ASCII_LOWER)
+
+
+def ascii_upper(s):
+    """
+    Translate an ASCII string to upper case in a locale-independent manner.
+    """
+    return s.translate(ASCII_UPPER)
+

=== modified file 'elisa-plugins/elisa/plugins/pigment/widgets/theme.py'
--- elisa-plugins/elisa/plugins/pigment/widgets/theme.py	2009-06-09 07:43:31 +0000
+++ elisa-plugins/elisa/plugins/pigment/widgets/theme.py	2010-05-24 15:25:45 +0000
@@ -17,6 +17,7 @@
 import gobject
 from cPickle import dump, load, UnpicklingError
 from elisa.core.utils import locale_helper
+from elisa.core.utils.text import ascii_upper
 from elisa.core import media_uri
 from elisa.plugins.pigment.widgets import const
 from elisa.plugins.pigment.widgets.style import Style
@@ -381,7 +382,7 @@
 
                 if ':' in rule.selectorText:
                     widget, state = map(str, rule.selectorText.split(':'))
-                    state = getattr(const, state.upper())
+                    state = getattr(const, ascii_upper(str(state)))
                 else:
                     widget, state = str(rule.selectorText), None
 

=== modified file 'elisa-plugins/elisa/plugins/pigment/widgets/widget.py'
--- elisa-plugins/elisa/plugins/pigment/widgets/widget.py	2009-11-17 22:44:25 +0000
+++ elisa-plugins/elisa/plugins/pigment/widgets/widget.py	2010-05-24 15:25:45 +0000
@@ -16,6 +16,7 @@
 
 from elisa.core import log
 from elisa.core.input_event import EventValue
+from elisa.core.utils.text import ascii_upper
 
 import elisa.plugins.pigment.graph
 from elisa.plugins.pigment.graph.group import Group
@@ -388,14 +389,15 @@
 
         module = 'elisa.plugins.pigment.graph'
         if isinstance(widget, Image) and attribute in image_properties:
-                value = '%s.IMAGE_%s' % (module, value.upper())
+                value = '%s.IMAGE_%s' % (module, ascii_upper(str(value)))
         elif isinstance(widget, Text) and attribute in text_properties:
             if attribute == 'alignment':
-                value = '%s.TEXT_ALIGN_%s' % (module, value.upper())
+                value = '%s.TEXT_ALIGN_%s' % (module, ascii_upper(str(value)))
             elif attribute == 'shadow_position':
-                value = '%s.TEXT_%s' % (module, value.upper())
+                value = '%s.TEXT_%s' % (module, ascii_upper(str(value)))
             else:
-                value = '%s.TEXT_%s_%s' % (module, attribute.upper(), value.upper())
+                value = '%s.TEXT_%s_%s' % (module, ascii_upper(str(attribute)),
+                                                   ascii_upper(str(value)))
         else:
             return value