Changeset 3261

Timestamp:

07/18/07 17:13:33 (1 year ago)

Author:

ed

Message:

Re-wrote dLocalize to simplify the way it works. I'm actually able to get newly displayed strings to update, although things such as the menu bar and existing forms will not be affected.

Added the setLanguage() method to dApp. This will allow apps to change the language that their application's localized strings appear in.

Updated dApp to work with the new interactive web update settings.

Files:

• trunk/dabo/dApp.py (modified) (5 diffs)
• trunk/dabo/dLocalize.py (modified) (1 diff)

trunk/dabo/dApp.py

@@ -355 +355 @@
-        return ret
-
-
-
+
+
+
+
+
+
+
-        ret = False
-        prf = self._frameworkPrefs
-        val = prf.getValue
+        runCheck = False
-        now = datetime.datetime.now()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        prf.setValue("last_check", now)
-        return ret
@@ -413 +418 @@
-                except StandardError, e:
-                    dabo.errorLog.write(_("Cannot update file: '%s'. Error: %s") % (fpth, e))
-
-
-
-
+
+
+
+
+
-        interval is expected to be in minutes between checks.
-        """
-        prf = self._frameworkPrefs
-auto
+web
-        if auto:
-            if interval is None:
@@ -426 +432 @@
-                interval = 0
-            prf.setValue("update_interval", interval)
+    
+    
+    def getWebUpdateInfo(self):
+        """Returns a 2-tuple that reflects the current settings for web updates.
+        The first position is a boolean that reflects whether auto-checking is turned
+        on; the second is the update frequency in minutes.
+        """
+        return (self._frameworkPrefs.web_update, self._frameworkPrefs.update_interval)
-        
-        
@@ -682 +696 @@
-                self.dbConnectionDefs[k] = ci
-                self.dbConnectionNameToFiles[k] = connFile
-
+
+
+
+
+
+
+
+
+
+
-    def showCommandWindow(self, context=None):
-        """Shows a command window with a full Python interpreter.
@@ -764 +787 @@
-        
-
+    def onWebUpdatePrefs(self, evt):
+        self.uiApp.onWebUpdatePrefs(evt)
+        
+        
-    def onHelpAbout(self, evt):
-        about = self.AboutFormClass

trunk/dabo/dLocalize.py

@@ -1 +1 @@
-# -*- coding: utf-8 -*-
-
+
+
+
+
-import dabo
-from dabo.__version__ import version
-
-__domain = "dabo"
-__localedir = "locale"
-
-__translation(domain, version=None, dirs=[]
-""" Try to find """
-dirs = [os.path.join(d, __localedir) for d in dirs]
-dirs.append(None) # tell to search in system dirs also
-domains = [domain
-version and domains.insert(0, "-".join([domain, version]))
+getLanguages(
+# Probably need to add more
+langs = gettext.find("dabo", daboLocaleDir, languages=_trans.keys(), all=True)
+langPat = re.compile(".+/locale/([a-z]{2})/LC_MESSAGES.+")
+ret = [langPat.sub(r"\1", lang) for lang in langs
+return ret
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-            try:
-
-
+
+
+
+
+
+
-                pass
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-# set default Dabo translation. File is searched under cwd()/locale/$LANG/LC_MESSAGES
-# and in system default places.
-__trans = __translation(__domain, version["version"], ["."]) or gettext.NullTranslations()
-
-__app_initialized = False
-
-def __add_apptrans():
-    global __trans
-    try:
-        app = dabo.dAppRef
-    except AttributeError:
-        app = None
-    if app:
-        appname, appver = [app.getAppInfo(k) for k in ("appName", "appVersion")]
-        if appname:
-            appname = appname.lower()
-            apptrans = __translation(appname, appver, [app.HomeDirectory])
-            if apptrans:
-                apptrans.add_fallback(__trans)
-                __trans = apptrans
-                __app_initialized = True
-
-def _(s):
-    """ Default localization service. Translation is based on default
-    gettext interface. Translation is returned in Unicode.
-
-    Messages are searched first in application translations and in Dabo ones after.
-    
-    Translation files are searched in
-    application.HomeDirectory/locale and system default locale
-    directories accoding to gettext conventions(files must be
-    placed under ${LANG}/LC_MESSAGES subdirectory. File basename must
-    be appName or appName-appVersion in lower case.
-    
-    Default appName is "dabo".
-    """
-    # application initialized, try to install messages
-    if not __app_initialized:
-        __add_apptrans()
-    
-    app = dabo.dAppRef
-    if isinstance(s, str) and app is not None:
-        ss = app.str2Unicode(s)
-    else:
-        ss = s
-
-    return __trans.ugettext(ss)
-
-    
-def n_(s):
-    """ Use it if you want to tell translation service about string
-    but don't want to translate it inplace.
-    """
-
+
+
-
+
+daboLocaleDir = os.path.join(os.path.split(dabo.__file__)[0], "locale")
+_trans = {"en": None, "fr": None, "es": None, "pt": None, "ru": None}
+defLang, defCharset = locale.getlocale()
+if defLang is None:
+    defLang = "en"
+else:
+    defLang = defLang[:2]
+if defCharset is None:
+    defCharset = "ISO8859-1"
+setLanguage()