gnue/common/src GConnections.py GDataObjects.py

[Arturas Kriukovas]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Arturas Kriukovas <address@hidden>      03/01/07 11:02:56

Modified files:
        common/src     : GConnections.py GDataObjects.py 

Log message:
        gettext corrections

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GConnections.py.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GDataObjects.py.diff?tr1=1.63&tr2=1.64&r1=text&r2=text

Patches:
Index: gnue/common/src/GConnections.py
diff -c gnue/common/src/GConnections.py:1.47 
gnue/common/src/GConnections.py:1.48
*** gnue/common/src/GConnections.py:1.47        Wed Jan  1 19:45:41 2003
--- gnue/common/src/GConnections.py     Tue Jan  7 11:02:56 2003
***************
*** 76,91 ****
        try:
          self._parser.readfp(fileHandle)
        except DuplicateSectionError:
!         raise InvalidFormatError, \
!            _('The connections file has duplicate source definitions.\n\nFile: 
%s') \
                % location
        except MissingSectionHeaderError:
!         raise InvalidFormatError, \
!            _('The connections file has no source definitions.\n\nFile: %s') \
                % location
        except:
!         raise InvalidFormatError, \
!            _('The connections file cannot be parsed.\n\nFile: %s') % location
  
      self._openConnections = {}
  
--- 76,91 ----
        try:
          self._parser.readfp(fileHandle)
        except DuplicateSectionError:
!         tmsg =  _('The connections file has duplicate source 
definitions.\n\nFile: %s') \
                % location
+         raise InvalidFormatError, tmsg
        except MissingSectionHeaderError:
!         tmsg = _('The connections file has no source definitions.\n\nFile: 
%s') \
                % location
+         raise InvalidFormatError, tmsg
        except:
!         tmsg =  _('The connections file cannot be parsed.\n\nFile: %s') % 
location
!         raise InvalidFormatError, tmsg
  
      self._openConnections = {}
  
***************
*** 133,141 ****
        except:
          return default
      except KeyError:
!       raise NotFoundError, \
!          _('The connections file does not contain a definition \n       for 
"%s".\n\nFile: %s') \
              % (connection_name, self._location)
  
  
    #
--- 133,141 ----
        except:
          return default
      except KeyError:
!       tmsg = _('The connections file does not contain a definition \n       
for "%s".\n\nFile: %s') \
              % (connection_name, self._location)
+       raise NotFoundError, tmsg
  
  
    #
***************
*** 168,176 ****
      try:
        return copy.deepcopy(self._definitions[connection_name])
      except KeyError:
!       raise NotFoundError, \
!          _('The connections file does not contain a definition \n       for 
"%s".\n\nFile: %s') \
              % (connection_name, self._location)
  
  
    #
--- 168,176 ----
      try:
        return copy.deepcopy(self._definitions[connection_name])
      except KeyError:
!       tmsg = _('The connections file does not contain a definition \n       
for "%s".\n\nFile: %s') \
              % (connection_name, self._location)
+       raise NotFoundError, tmsg
  
  
    #
***************
*** 319,331 ****
              if not attempts:
                # Four times is plenty...
                self._loginHandler.destroyLoginDialog()
!               raise GDataObjects.LoginError, \
!                     _("Unable to log in after 4 attempts.\n\nError: %s") % 
error
  
            except GLoginHandler.UserCanceledLogin:
              # Guess they changed their minds. Treat as a login error.
              self._loginHandler.destroyLoginDialog()
!             raise GDataObjects.LoginError, _("User canceled the login 
request.")
  
    def getAuthenticatedUser(self, connection=None):
      try:
--- 319,332 ----
              if not attempts:
                # Four times is plenty...
                self._loginHandler.destroyLoginDialog()
!               tmsg = _("Unable to log in after 4 attempts.\n\nError: %s") % 
error
!               raise GDataObjects.LoginError, tmsg
  
            except GLoginHandler.UserCanceledLogin:
              # Guess they changed their minds. Treat as a login error.
              self._loginHandler.destroyLoginDialog()
!             tmsg = _("User canceled the login request.") 
!             raise GDataObjects.LoginError, tmsg
  
    def getAuthenticatedUser(self, connection=None):
      try:
***************
*** 347,361 ****
    except ImportError, err:
      GDebug.printMesg(1,'ImportError importing driver %s' % (driver))
      GDebug.printMesg(1,err)
!     raise GDataObjects.ProviderNotSupportedError, \
!        _("No database driver found for provider type '%s'") % driver
  
    try:
      dd = dbdriver.supportedDataObjects[type]()
      GDebug.printMesg (1,'Attaching to %s (%s)' % 
(driver,dd.__class__.__name__))
      return dd
    except KeyError:
!     raise GDataObjects.ObjectTypeNotAvailableError, \
!        _("DB Driver '%s' does not support source type '%s'") % (driver, type)
  
  
--- 348,362 ----
    except ImportError, err:
      GDebug.printMesg(1,'ImportError importing driver %s' % (driver))
      GDebug.printMesg(1,err)
!     tmsg = _("No database driver found for provider type '%s'") % driver
!     raise GDataObjects.ProviderNotSupportedError, tmsg
  
    try:
      dd = dbdriver.supportedDataObjects[type]()
      GDebug.printMesg (1,'Attaching to %s (%s)' % 
(driver,dd.__class__.__name__))
      return dd
    except KeyError:
!     tmsg = _("DB Driver '%s' does not support source type '%s'") % (driver, 
type)
!     raise GDataObjects.ObjectTypeNotAvailableError, tmsg
  
  
Index: gnue/common/src/GDataObjects.py
diff -c gnue/common/src/GDataObjects.py:1.63 
gnue/common/src/GDataObjects.py:1.64
*** gnue/common/src/GDataObjects.py:1.63        Wed Jan  1 19:45:41 2003
--- gnue/common/src/GDataObjects.py     Tue Jan  7 11:02:56 2003
***************
*** 165,172 ****
                                   string.lower(dataObject.detaillink) or "", 
',')
  
      if len(dataObject._masterfields) != len(dataObject._detailfields):
!       raise MasterDetailFieldMismatch, "master=%s; detail=%s" % \
!           (dataObject._masterfields, dataObject._detailfields)
  
      # Make sure "master" fields will be in our future query
      for field in dataObject._masterfields:
--- 165,172 ----
                                   string.lower(dataObject.detaillink) or "", 
',')
  
      if len(dataObject._masterfields) != len(dataObject._detailfields):
!       tmsg = "master=%s; detail=%s" % (dataObject._masterfields, 
dataObject._detailfields
!       raise MasterDetailFieldMismatch, tmsg
  
      # Make sure "master" fields will be in our future query
      for field in dataObject._masterfields:
***************
*** 251,257 ****
  
    # write Schema to Database
    def writeSchema(self,obj,overwrite=0):
!     raise NoWriteSchemaSupport,"This database adapter doesn't have 'schema 
writing' support"
  
    # Called when new record master in master/detail is queried
    def _masterRecordChanged(self, master):
--- 251,258 ----
  
    # write Schema to Database
    def writeSchema(self,obj,overwrite=0):
!     tmsg = _("This database adapter doesn't have 'schema writing' support")
!     raise NoWriteSchemaSupport, tmsg
  
    # Called when new record master in master/detail is queried
    def _masterRecordChanged(self, master):
***************
*** 424,430 ****
    def insertRecord(self):
      if self.isReadOnly():
        # Provide better feedback??
!       raise ReadOnlyError, _("Attempted to insert into a read only 
datasource")
      else:
        GDebug.printMesg(7,'Inserting a blank record')
        self._currentRecord += 1
--- 425,432 ----
    def insertRecord(self):
      if self.isReadOnly():
        # Provide better feedback??
!       tmsg =  _("Attempted to insert into a read only datasource")
!       raise ReadOnlyError, tmsg
      else:
        GDebug.printMesg(7,'Inserting a blank record')
        self._currentRecord += 1
***************
*** 656,662 ****
      # generate an error.
      if self._parent.isFieldBound(field) and self._parent.isReadOnly():
        # Provide better feedback??
!       raise ReadOnlyError, _("Attempted to modify read only field '%s'") % 
field
      else:
        fn = string.lower(field)
        self._fields[fn] = value
--- 658,665 ----
      # generate an error.
      if self._parent.isFieldBound(field) and self._parent.isReadOnly():
        # Provide better feedback??
!       tmsg = _("Attempted to modify read only field '%s'") % field
!       raise ReadOnlyError, tmsg
      else:
        fn = string.lower(field)
        self._fields[fn] = value
***************
*** 694,700 ****
    def delete(self):
      if self._parent.isReadOnly():
        # Provide better feedback??
!       raise ReadOnlyError, _("Attempted to delete from a read only 
datasource")
      else:
        self._deleteFlag = 1
  
--- 697,704 ----
    def delete(self):
      if self._parent.isReadOnly():
        # Provide better feedback??
!       tmsg = _("Attempted to delete from a read only datasource")
!       raise ReadOnlyError, tmsg
      else:
        self._deleteFlag = 1