* i18n/L10n and translator documentation updates.
* whitespace and indentation updates
This commit is contained in:
parent
b03ece26eb
commit
9587f9f55b
@ -103,7 +103,6 @@ class Profile extends Memcached_DataObject
|
|||||||
foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) {
|
foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) {
|
||||||
# We don't do a scaled one if original is our scaled size
|
# We don't do a scaled one if original is our scaled size
|
||||||
if (!($avatar->width == $size && $avatar->height == $size)) {
|
if (!($avatar->width == $size && $avatar->height == $size)) {
|
||||||
|
|
||||||
$scaled_filename = $imagefile->resize($size);
|
$scaled_filename = $imagefile->resize($size);
|
||||||
|
|
||||||
//$scaled = DB_DataObject::factory('avatar');
|
//$scaled = DB_DataObject::factory('avatar');
|
||||||
@ -790,13 +789,14 @@ class Profile extends Memcached_DataObject
|
|||||||
* @param $right string Name of the right, usually a constant in class Right
|
* @param $right string Name of the right, usually a constant in class Right
|
||||||
* @return boolean whether the user has the right in question
|
* @return boolean whether the user has the right in question
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function hasRight($right)
|
function hasRight($right)
|
||||||
{
|
{
|
||||||
$result = false;
|
$result = false;
|
||||||
|
|
||||||
if ($this->hasRole(Profile_role::DELETED)) {
|
if ($this->hasRole(Profile_role::DELETED)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Event::handle('UserRightsCheck', array($this, $right, &$result))) {
|
if (Event::handle('UserRightsCheck', array($this, $right, &$result))) {
|
||||||
switch ($right)
|
switch ($right)
|
||||||
{
|
{
|
||||||
|
@ -23,7 +23,6 @@ class Profile_tag extends Memcached_DataObject
|
|||||||
###END_AUTOCODE
|
###END_AUTOCODE
|
||||||
|
|
||||||
static function getTags($tagger, $tagged) {
|
static function getTags($tagger, $tagged) {
|
||||||
|
|
||||||
$tags = array();
|
$tags = array();
|
||||||
|
|
||||||
# XXX: store this in memcached
|
# XXX: store this in memcached
|
||||||
@ -44,7 +43,6 @@ class Profile_tag extends Memcached_DataObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
static function setTags($tagger, $tagged, $newtags) {
|
static function setTags($tagger, $tagged, $newtags) {
|
||||||
|
|
||||||
$newtags = array_unique($newtags);
|
$newtags = array_unique($newtags);
|
||||||
$oldtags = Profile_tag::getTags($tagger, $tagged);
|
$oldtags = Profile_tag::getTags($tagger, $tagged);
|
||||||
|
|
||||||
|
@ -16,11 +16,15 @@ class Remember_me extends Memcached_DataObject
|
|||||||
|
|
||||||
/* Static get */
|
/* Static get */
|
||||||
function staticGet($k,$v=null)
|
function staticGet($k,$v=null)
|
||||||
{ return Memcached_DataObject::staticGet('Remember_me',$k,$v); }
|
{
|
||||||
|
return Memcached_DataObject::staticGet('Remember_me',$k,$v);
|
||||||
|
}
|
||||||
|
|
||||||
/* the code above is auto generated do not remove the tag below */
|
/* the code above is auto generated do not remove the tag below */
|
||||||
###END_AUTOCODE
|
###END_AUTOCODE
|
||||||
|
|
||||||
function sequenceKey()
|
function sequenceKey()
|
||||||
{ return array(false, false); }
|
{
|
||||||
|
return array(false, false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -287,4 +287,3 @@ class Safe_DataObject extends DB_DataObject
|
|||||||
return Safe_DataObject::$iniCache[$key];
|
return Safe_DataObject::$iniCache[$key];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -251,8 +251,11 @@ class Subscription extends Memcached_DataObject
|
|||||||
common_date_iso8601($this->created));
|
common_date_iso8601($this->created));
|
||||||
|
|
||||||
$act->time = strtotime($this->created);
|
$act->time = strtotime($this->created);
|
||||||
|
// TRANS: Activity tile when subscribing to another person.
|
||||||
$act->title = _("Follow");
|
$act->title = _("Follow");
|
||||||
$act->content = sprintf(_("%s is now following %s."),
|
// TRANS: Notification given when one person starts following another.
|
||||||
|
// TRANS: %1$s is the subscriber, %2$s is the subscribed.
|
||||||
|
$act->content = sprintf(_("%1$s is now following %2$s."),
|
||||||
$subscriber->getBestName(),
|
$subscriber->getBestName(),
|
||||||
$subscribed->getBestName());
|
$subscribed->getBestName());
|
||||||
|
|
||||||
|
@ -465,7 +465,6 @@ class User_group extends Memcached_DataObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
static function register($fields) {
|
static function register($fields) {
|
||||||
|
|
||||||
// MAGICALLY put fields into current scope
|
// MAGICALLY put fields into current scope
|
||||||
|
|
||||||
extract($fields);
|
extract($fields);
|
||||||
|
@ -18,7 +18,9 @@ class User_username extends Memcached_DataObject
|
|||||||
|
|
||||||
/* Static get */
|
/* Static get */
|
||||||
function staticGet($k,$v=null)
|
function staticGet($k,$v=null)
|
||||||
{ return Memcached_DataObject::staticGet('User_username',$k,$v); }
|
{
|
||||||
|
return Memcached_DataObject::staticGet('User_username',$k,$v);
|
||||||
|
}
|
||||||
|
|
||||||
/* the code above is auto generated do not remove the tag below */
|
/* the code above is auto generated do not remove the tag below */
|
||||||
###END_AUTOCODE
|
###END_AUTOCODE
|
||||||
@ -37,6 +39,7 @@ class User_username extends Memcached_DataObject
|
|||||||
$user_username->provider_name = $provider_name;
|
$user_username->provider_name = $provider_name;
|
||||||
$user_username->username = $username;
|
$user_username->username = $username;
|
||||||
$user_username->created = DB_DataObject_Cast::dateTime();
|
$user_username->created = DB_DataObject_Cast::dateTime();
|
||||||
|
|
||||||
if($user_username->insert()){
|
if($user_username->insert()){
|
||||||
return $user_username;
|
return $user_username;
|
||||||
}else{
|
}else{
|
||||||
@ -57,5 +60,4 @@ class User_username extends Memcached_DataObject
|
|||||||
function keys() {
|
function keys() {
|
||||||
return array('provider_name' => 'K', 'username' => 'K');
|
return array('provider_name' => 'K', 'username' => 'K');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user