summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiebrand Mazeland <s.mazeland@xs4all.nl>2010-07-30 19:15:07 +0200
committerSiebrand Mazeland <s.mazeland@xs4all.nl>2010-07-30 19:15:07 +0200
commite7534224802f3de009d5d29563070392c376f100 (patch)
tree1de77278f68ae1ae857ef21f927ef76d28275bd9
parent47f19988d1b0e4f64fde8a385d3205c2fd476234 (diff)
* Address i18n related FIXMEs after talk with Brion.
* Tweak message
-rw-r--r--classes/Memcached_DataObject.php12
-rw-r--r--classes/Safe_DataObject.php4
2 files changed, 8 insertions, 8 deletions
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 04cd6c120..7768fe757 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -235,7 +235,7 @@ class Memcached_DataObject extends Safe_DataObject
$pkey[] = $key;
$pval[] = self::valueString($this->$key);
} else {
- // FIXME: i18n?
+ // Low level exception. No need for i18n as discussed with Brion.
throw new Exception("Unknown key type $key => $type for " . $this->tableName());
}
}
@@ -283,7 +283,7 @@ class Memcached_DataObject extends Safe_DataObject
} else if ($type == 'fulltext') {
$search_engine = new MySQLSearch($this, $table);
} else {
- // FIXME: i18n?
+ // Low level exception. No need for i18n as discussed with Brion.
throw new ServerException('Unknown search type: ' . $type);
}
} else {
@@ -530,7 +530,7 @@ class Memcached_DataObject extends Safe_DataObject
if (!$dsn) {
// TRANS: Exception thrown when database name or Data Source Name could not be found.
- throw new Exception(_("No database name / DSN found anywhere"));
+ throw new Exception(_("No database name or DSN found anywhere."));
}
return $dsn;
@@ -580,7 +580,7 @@ class Memcached_DataObject extends Safe_DataObject
if ($message instanceof PEAR_Error) {
$message = $message->getMessage();
}
- // FIXME: i18n?
+ // Low level exception. No need for i18n as discussed with Brion.
throw new ServerException("[$id] DB_DataObject error [$type]: $message");
}
@@ -623,11 +623,11 @@ class Memcached_DataObject extends Safe_DataObject
case 'sql':
case 'datetime':
case 'time':
- // FIXME: i18n?
+ // Low level exception. No need for i18n as discussed with Brion.
throw new ServerException("Unhandled DB_DataObject_Cast type passed as cacheKey value: '$v->type'");
break;
default:
- // FIXME: i18n?
+ // Low level exception. No need for i18n as discussed with Brion.
throw new ServerException("Unknown DB_DataObject_Cast type passed as cacheKey value: '$v->type'");
break;
}
diff --git a/classes/Safe_DataObject.php b/classes/Safe_DataObject.php
index 16d7165d6..f0ea6b136 100644
--- a/classes/Safe_DataObject.php
+++ b/classes/Safe_DataObject.php
@@ -116,7 +116,7 @@ class Safe_DataObject extends DB_DataObject
if ($this->_call($method, $params, $return)) {
return $return;
} else {
- // FIXME: i18n?
+ // Low level exception. No need for i18n as discussed with Brion.
throw new Exception('Call to undefined method ' .
get_class($this) . '::' . $method);
}
@@ -242,7 +242,7 @@ class Safe_DataObject extends DB_DataObject
$this->debug("Cant find database schema: {$this->_database}/{$this->__table} \n".
"in links file data: " . print_r($_DB_DATAOBJECT['INI'],true),"databaseStructure",5);
// we have to die here!! - it causes chaos if we don't (including looping forever!)
- // FIXME: i18n?
+ // Low level exception. No need for i18n as discussed with Brion.
$this->raiseError( "Unable to load schema for database and table (turn debugging up to 5 for full error message)", DB_DATAOBJECT_ERROR_INVALIDARGS, PEAR_ERROR_DIE);
return false;
}