gnue/common/src/dbdrivers mysql/DBdriver.py msa...

[Arturas Kriukovas]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Arturas Kriukovas <address@hidden>      02/05/06 12:19:55

Modified files:
        common/src/dbdrivers/mysql: DBdriver.py 
        common/src/dbdrivers/msado: DBdriver.py 
        common/src/dbdrivers/mxodbc: DBdriver.py 
        common/src/dbdrivers/odbc: DBdriver.py 
        common/src/dbdrivers/oracle: DBdriver.py 

Log message:
        i18n changes.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/mysql/DBdriver.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/msado/DBdriver.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/mxodbc/DBdriver.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/odbc/DBdriver.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/oracle/DBdriver.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text

Patches:
Index: gnue/common/src/dbdrivers/msado/DBdriver.py
diff -c gnue/common/src/dbdrivers/msado/DBdriver.py:1.3 
gnue/common/src/dbdrivers/msado/DBdriver.py:1.4
*** gnue/common/src/dbdrivers/msado/DBdriver.py:1.3     Wed Apr 17 15:09:17 2002
--- gnue/common/src/dbdrivers/msado/DBdriver.py Mon May  6 12:19:55 2002
***************
*** 43,49 ****
    import win32com.client, pywintypes
  except ImportError, message:
    raise GConnections.AdapterNotInstalled, \
!          "Driver not installed: ADO [win32all COMM drivers]\n\n[%s" % message
  
  
  
--- 43,49 ----
    import win32com.client, pywintypes
  except ImportError, message:
    raise GConnections.AdapterNotInstalled, \
!          _("Driver not installed: ADO [win32all COMM drivers]\n\n[%s") % 
message
  
  
  
***************
*** 218,228 ****
            element._children[i] = self.__conditionToSQL(element._children[i])
          if len(element._children) < self.conditionElements[otype][0]: 
            raise GConditions.ConditionError, \
!             'Condition element "%s" expects at least %s arguments; found %s' 
% \
                  (otype, self.conditionElements[otype][0], 
len(element._children))
          if len(element._children) > self.conditionElements[otype][1]: 
            raise GConditions.ConditionError, \
!             'Condition element "%s" expects at most %s arguments; found %s' % 
\
                  (otype, self.conditionElements[otype][0], 
len(element._children))
          if self.conditionElements[otype][3] == None: 
            return self.conditionElements[otype][2] % tuple(element._children)
--- 218,228 ----
            element._children[i] = self.__conditionToSQL(element._children[i])
          if len(element._children) < self.conditionElements[otype][0]: 
            raise GConditions.ConditionError, \
!             _('Condition element "%s" expects at least %s arguments; found 
%s') % \
                  (otype, self.conditionElements[otype][0], 
len(element._children))
          if len(element._children) > self.conditionElements[otype][1]: 
            raise GConditions.ConditionError, \
!             _('Condition element "%s" expects at most %s arguments; found 
%s') % \
                  (otype, self.conditionElements[otype][0], 
len(element._children))
          if self.conditionElements[otype][3] == None: 
            return self.conditionElements[otype][2] % tuple(element._children)
***************
*** 231,237 ****
              (string.join(element._children, self.conditionElements[otype][3]))
        else: 
          raise GConditions.ConditionNotSupported, \
!           'Condition clause "%s" is not supported by this db driver.' % otype
  
    # Code necessary to force the connection into transaction mode... 
    # this is usually not necessary (MySQL is one of few DBs that must force)
--- 231,237 ----
              (string.join(element._children, self.conditionElements[otype][3]))
        else: 
          raise GConditions.ConditionNotSupported, \
!           _('Condition clause "%s" is not supported by this db driver.') % 
otype
  
    # Code necessary to force the connection into transaction mode... 
    # this is usually not necessary (MySQL is one of few DBs that must force)
Index: gnue/common/src/dbdrivers/mxodbc/DBdriver.py
diff -c gnue/common/src/dbdrivers/mxodbc/DBdriver.py:1.2 
gnue/common/src/dbdrivers/mxodbc/DBdriver.py:1.3
*** gnue/common/src/dbdrivers/mxodbc/DBdriver.py:1.2    Thu Jan 10 15:59:18 2002
--- gnue/common/src/dbdrivers/mxodbc/DBdriver.py        Mon May  6 12:19:55 2002
***************
*** 49,55 ****
    from mx import ODBC
  except ImportError, message:
    raise GConnections.AdapterNotInstalled, \
!          "Driver not installed: ODBC\nGrab mxODBC from "\
           "http://www.lemburg.com/files/python/mxODBC.html\n\n[%s]"; % message
  
  
--- 49,55 ----
    from mx import ODBC
  except ImportError, message:
    raise GConnections.AdapterNotInstalled, \
!          _("Driver not installed: ODBC\nGrab mxODBC from ")\
           "http://www.lemburg.com/files/python/mxODBC.html\n\n[%s]"; % message
  
  
***************
*** 79,89 ****
        self._DatabaseError = self._backend.DatabaseError
      except ValueError:
        raise GDataObjects.ConnectionError, \
!           'Invalid service string for ODBC driver.\n' +\
!           'Format: service="Backend|DSNString"'
      except ImportError, mesg:
        raise GConnections.AdapterNotInstalled, \
!           'Unable to load the ODBC drivers for %s' % backend
  
      try:
        self._dataConnection = SIG2api.connect( dsn, \
--- 79,89 ----
        self._DatabaseError = self._backend.DatabaseError
      except ValueError:
        raise GDataObjects.ConnectionError, \
!           _('Invalid service string for ODBC driver.\n') +\
!           _('Format: service="Backend|DSNString"')
      except ImportError, mesg:
        raise GConnections.AdapterNotInstalled, \
!           _('Unable to load the ODBC drivers for %s') % backend
  
      try:
        self._dataConnection = SIG2api.connect( dsn, \
Index: gnue/common/src/dbdrivers/mysql/DBdriver.py
diff -c gnue/common/src/dbdrivers/mysql/DBdriver.py:1.13 
gnue/common/src/dbdrivers/mysql/DBdriver.py:1.14
*** gnue/common/src/dbdrivers/mysql/DBdriver.py:1.13    Sat Apr  6 17:12:18 2002
--- gnue/common/src/dbdrivers/mysql/DBdriver.py Mon May  6 12:19:55 2002
***************
*** 41,50 ****
  except ImportError, mesg:
    GDebug.printMesg(1,mesg)
    print "-"*79
!   print "\nCould not load MySQLdb.  For MySQL support, please install \n" \
!       + "mysql-python 0.9.0 or later " \
!       + "from http://sourceforge.net/projects/mysql-python\n";
!   print "Error:  %s" % mesg
    print "-"*79
    sys.exit()
  
--- 41,50 ----
  except ImportError, mesg:
    GDebug.printMesg(1,mesg)
    print "-"*79
!   print _("\nCould not load MySQLdb.  For MySQL support, please install \n") \
!       + _("mysql-python 0.9.0 or later from") \
!       + "http://sourceforge.net/projects/mysql-python\n";
!   print _("Error:  %s") % mesg
    print "-"*79
    sys.exit()
  
Index: gnue/common/src/dbdrivers/odbc/DBdriver.py
diff -c gnue/common/src/dbdrivers/odbc/DBdriver.py:1.15 
gnue/common/src/dbdrivers/odbc/DBdriver.py:1.16
*** gnue/common/src/dbdrivers/odbc/DBdriver.py:1.15     Wed Apr 17 15:09:18 2002
--- gnue/common/src/dbdrivers/odbc/DBdriver.py  Mon May  6 12:19:55 2002
***************
*** 43,49 ****
    import dbi, odbc
  except ImportError, message:
    raise GConnections.AdapterNotInstalled, \
!          "Driver not installed: win32all ODBC driver\n\n[%s" % message
  
  
  
--- 43,49 ----
    import dbi, odbc
  except ImportError, message:
    raise GConnections.AdapterNotInstalled, \
!          _("Driver not installed: win32all ODBC driver\n\n[%s") % message
  
  
  
***************
*** 395,405 ****
            element._children[i] = self.__conditionToSQL(element._children[i])
          if len(element._children) < self.conditionElements[otype][0]: 
            raise GConditions.ConditionError, \
!             'Condition element "%s" expects at least %s arguments; found %s' 
% \
                  (otype, self.conditionElements[otype][0], 
len(element._children))
          if len(element._children) > self.conditionElements[otype][1]: 
            raise GConditions.ConditionError, \
!             'Condition element "%s" expects at most %s arguments; found %s' % 
\
                  (otype, self.conditionElements[otype][0], 
len(element._children))
          if self.conditionElements[otype][3] == None: 
            return self.conditionElements[otype][2] % tuple(element._children)
--- 395,405 ----
            element._children[i] = self.__conditionToSQL(element._children[i])
          if len(element._children) < self.conditionElements[otype][0]: 
            raise GConditions.ConditionError, \
!             _('Condition element "%s" expects at least %s arguments; found 
%s') % \
                  (otype, self.conditionElements[otype][0], 
len(element._children))
          if len(element._children) > self.conditionElements[otype][1]: 
            raise GConditions.ConditionError, \
!             _('Condition element "%s" expects at most %s arguments; found 
%s') % \
                  (otype, self.conditionElements[otype][0], 
len(element._children))
          if self.conditionElements[otype][3] == None: 
            return self.conditionElements[otype][2] % tuple(element._children)
***************
*** 408,414 ****
              (string.join(element._children, self.conditionElements[otype][3]))
        else: 
          raise GConditions.ConditionNotSupported, \
!           'Condition clause "%s" is not supported by this db driver.' % otype
  
    # Code necessary to force the connection into transaction mode... 
    # this is usually not necessary (MySQL is one of few DBs that must force)
--- 408,414 ----
              (string.join(element._children, self.conditionElements[otype][3]))
        else: 
          raise GConditions.ConditionNotSupported, \
!           _('Condition clause "%s" is not supported by this db driver.') % 
otype
  
    # Code necessary to force the connection into transaction mode... 
    # this is usually not necessary (MySQL is one of few DBs that must force)
Index: gnue/common/src/dbdrivers/oracle/DBdriver.py
diff -c gnue/common/src/dbdrivers/oracle/DBdriver.py:1.15 
gnue/common/src/dbdrivers/oracle/DBdriver.py:1.16
*** gnue/common/src/dbdrivers/oracle/DBdriver.py:1.15   Tue Feb 26 19:38:37 2002
--- gnue/common/src/dbdrivers/oracle/DBdriver.py        Mon May  6 12:19:55 2002
***************
*** 45,51 ****
    import DCOracle2 as SIG2api
  except ImportError, message:
    raise GConnections.AdapterNotInstalled, \
!          "Driver not installed: DCOracle2 [%s]" % message
  
  
  
--- 45,51 ----
    import DCOracle2 as SIG2api
  except ImportError, message:
    raise GConnections.AdapterNotInstalled, \
!          _("Driver not installed: DCOracle2 [%s]") % message