Changeset 3297

Show
Ignore:
Timestamp:
07/30/07 19:49:18 (1 year ago)
Author:
paul
Message:

Turns out, default language and encoding are indeed necessary. I've set Dabo's default to 'en' and 'utf-8', instead of trying to determine it from system settings, and definitely steering clear of modifying what sys.getdefaultencoding() returns. A developer can either call dApp.setLanguage(), or locale.setlocale() before importing dabo. Nate, I'd be interested to know if this fixes the trouble you've been having.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/dabo/dLocalize.py

    r3292 r3297  
    1 # -*- coding: utf-8 -*- 
     1# -*- coding: utf-8 -*- 
     2 
     3import sys 
     4import locale 
    25import os 
    36import gettext 
    4 import locale 
    57import warnings 
    68import dabo 
     9 
     10 
     11_defaultLanguage, _defaultEncoding = locale.getlocale() 
     12 
     13if _defaultLanguage is None: 
     14    _defaultLanguage = "en" 
     15 
     16if _defaultEncoding is None: 
     17    _defaultEncoding = "utf-8" 
    718 
    819_domains = {} 
    920 
    1021_languageAliases = {"english": "en", 
    11         "spanish": "es", "espanol": "es", "español": "es", 
    12         "french": "fr", "francais": "fr", "français": "fr",  
     22        "spanish": "es", "espanol": "es", "español": "es", 
     23        "french": "fr", "francais": "fr", "français": "fr",  
    1324        "german": "de", "deutsch": "de", 
    1425        "italian": "it", "italiano": "it",  
    15         "portuguese": "pt", "portuguése": "pt", 
     26        "portuguese": "pt", "portuguése": "pt", 
    1627        "russian": "ru"} 
    1728 
     
    2334  different domain that the user's application set up. 
    2435    """ 
    25     global _domains 
     36    global _domains, _defaultLanguage, _defaultEncoding 
    2637 
    2738    if localedir is None: 
     
    3142    _domains[domain] = localedir 
    3243    gettext.install(domain, localedir, unicode=unicode_mo) 
    33     #setLanguage()  ## worked on Linux, not Mac. Not needed, anyway. 
     44    setLanguage(_defaultLanguage, _defaultEncoding) 
    3445 
    3546