diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/File.php | 2 | ||||
| -rw-r--r-- | classes/Memcached_DataObject.php | 12 | ||||
| -rw-r--r-- | classes/Notice.php | 4 | ||||
| -rw-r--r-- | classes/Profile.php | 8 | ||||
| -rw-r--r-- | classes/Safe_DataObject.php | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/classes/File.php b/classes/File.php index 18ad82892..407fd3211 100644 --- a/classes/File.php +++ b/classes/File.php @@ -140,7 +140,7 @@ class File extends Memcached_DataObject $redir_data = array(); } else { // TRANS: Server exception thrown when a URL cannot be processed. - throw new ServerException(_("Cannot process URL '$given_url'")); + throw new ServerException(sprintf(_("Cannot process URL '%s'"), $given_url)); } // TODO: max field length if ($redir_url === $given_url || strlen($redir_url) > 255 || !$followRedirects) { 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/Notice.php b/classes/Notice.php index 12467c850..3297c7a59 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1094,8 +1094,8 @@ class Notice extends Memcached_DataObject if (!$id) { common_log_db_error($reply, 'INSERT', __FILE__); // TRANS: Server exception thrown when a reply cannot be saved. - // TRANS: First arg is a notice ID, second ID is the ID of the mentioned user. - throw new ServerException(_("Couldn't save reply for {$this->id}, {$mentioned->id}")); + // TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user. + throw new ServerException(sprintf(_("Could not save reply for %1$d, %2$d."), $this->id, $mentioned->id)); } else { $replied[$mentioned->id] = 1; self::blow('reply:stream:%d', $mentioned->id); diff --git a/classes/Profile.php b/classes/Profile.php index ae6a37602..3b1e54c4d 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -736,8 +736,8 @@ class Profile extends Memcached_DataObject if (empty($role)) { // TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist. - // TRANS: %1$s is the role name, %2$s is the user ID. - throw new Exception(sprintf(_('Cannot revoke role "%s" for user #%2$s; does not exist.'),$name, $this->id)); + // TRANS: %1$s is the role name, %2$s is the user ID (number). + throw new Exception(sprintf(_('Cannot revoke role "%1$s" for user #%2$d; does not exist.'),$name, $this->id)); } $result = $role->delete(); @@ -745,8 +745,8 @@ class Profile extends Memcached_DataObject if (!$result) { common_log_db_error($role, 'DELETE', __FILE__); // TRANS: Exception thrown when trying to revoke a role for a user with a failing database query. - // TRANS: %1$s is the role name, %2$s is the user ID. - throw new Exception(sprintf(_('Cannot revoke role "%1$s" for user #%2$s; database error.'),$name, $this->id)); + // TRANS: %1$s is the role name, %2$s is the user ID (number). + throw new Exception(sprintf(_('Cannot revoke role "%1$s" for user #%2$d; database error.'),$name, $this->id)); } return true; 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; } |