wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* i18n/L10n and translator documentation updates.

Browse Source 
* whitespace and indentation updates
This commit is contained in:
Siebrand Mazeland 2010-09-28 23:21:09 +02:00
parent a8d0c04870
commit b03ece26eb
25 changed files with 29 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
classes/Avatar.php
View File

@ -42,8 +42,9 @@ class Avatar extends Memcached_DataObject
return Memcached_DataObject::pkeyGet('Avatar', $kv); return Memcached_DataObject::pkeyGet('Avatar', $kv);
} }
// where should the avatar go for this user? /**
* Where should the avatar go for this user?
*/
static function filename($id, $extension, $size=null, $extra=null) static function filename($id, $extension, $size=null, $extra=null)
{ {
if ($size) { if ($size) {

1
classes/Consumer.php
View File

@ -65,5 +65,4 @@ class Consumer extends Memcached_DataObject
$nonce->consumer_key = $this->consumer_key; $nonce->consumer_key = $this->consumer_key;
$nonce->delete(); $nonce->delete();
} }
} }

2
classes/Conversation.php
View File

@ -74,6 +74,4 @@ class Conversation extends Memcached_DataObject
return $conv; return $conv;
} }
} }

5
classes/Fave.php
View File

@ -144,8 +144,11 @@ class Fave extends Memcached_DataObject
common_date_iso8601($this->modified)); common_date_iso8601($this->modified));
$act->time = strtotime($this->modified); $act->time = strtotime($this->modified);
// TRANS: Activity title when marking a notice as favorite.
$act->title = _("Favor"); $act->title = _("Favor");
$act->content = sprintf(_("%s marked notice %s as a favorite."), // TRANS: Ntofication given when a user marks a notice as favorite.
// TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
$act->content = sprintf(_("%1$s marked notice %2$s as a favorite."),
$profile->getBestName(), $profile->getBestName(),
$notice->uri); $notice->uri);

1
classes/File.php
View File

@ -29,7 +29,6 @@ require_once INSTALLDIR.'/classes/File_to_post.php';
/** /**
* Table Definition for file * Table Definition for file
*/ */
class File extends Memcached_DataObject class File extends Memcached_DataObject
{ {
###START_AUTOCODE ###START_AUTOCODE

1
classes/File_oembed.php
View File

@ -131,4 +131,3 @@ class File_oembed extends Memcached_DataObject
} }
} }
} }

1
classes/File_redirection.php
View File

@ -281,4 +281,3 @@ class File_redirection extends Memcached_DataObject
$file_redir->insert(); $file_redir->insert();
} }
} }

1
classes/File_thumbnail.php
View File

@ -57,4 +57,3 @@ class File_thumbnail extends Memcached_DataObject
$tn->insert(); $tn->insert();
} }
} }

1
classes/File_to_post.php
View File

@ -67,4 +67,3 @@ class File_to_post extends Memcached_DataObject
return Memcached_DataObject::pkeyGet('File_to_post', $kv); return Memcached_DataObject::pkeyGet('File_to_post', $kv);
} }
} }

2
classes/Foreign_link.php
View File

@ -44,7 +44,6 @@ class Foreign_link extends Memcached_DataObject
$result = $flink->find(true); $result = $flink->find(true);
return empty($result) ? null : $flink; return empty($result) ? null : $flink;
} }
static function getByForeignID($foreign_id, $service) static function getByForeignID($foreign_id, $service)
@ -129,5 +128,4 @@ class Foreign_link extends Memcached_DataObject
return false; return false;
} }
} }
} }

1
classes/Foreign_user.php
View File

@ -83,5 +83,4 @@ class Foreign_user extends Memcached_DataObject
} }
return $result; return $result;
} }
} }

1
classes/Group_block.php
View File

@ -111,5 +111,4 @@ class Group_block extends Memcached_DataObject
return true; return true;
} }
} }

2
classes/Group_inbox.php
View File

@ -1,8 +1,8 @@
<?php <?php
/** /**
* Table Definition for group_inbox * Table Definition for group_inbox
*/ */
class Group_inbox extends Memcached_DataObject class Group_inbox extends Memcached_DataObject
{ {
###START_AUTOCODE ###START_AUTOCODE

9
classes/Group_member.php
View File

@ -71,7 +71,9 @@ class Group_member extends Memcached_DataObject
$member = Profile::staticGet('id', $this->profile_id); $member = Profile::staticGet('id', $this->profile_id);
if (empty($member)) { if (empty($member)) {
throw new Exception("Profile ID {$this->profile_id} invalid."); // TRANS: Exception thrown providing an invalid profile ID.
// TRANS: %s is the invalid profile ID.
throw new Exception(sprintf(_("Profile ID %s is invalid."),$this->profile_id));
} }
return $member; return $member;
@ -82,7 +84,9 @@ class Group_member extends Memcached_DataObject
$group = User_group::staticGet('id', $this->group_id); $group = User_group::staticGet('id', $this->group_id);
if (empty($group)) { if (empty($group)) {
throw new Exception("Group ID {$this->group_id} invalid."); // TRANS: Exception thrown providing an invalid group ID.
// TRANS: %s is the invalid group ID.
throw new Exception(sprintf(_("Group ID %s is invalid."),$this->group_id));
} }
return $group; return $group;
@ -105,6 +109,7 @@ class Group_member extends Memcached_DataObject
$act->objects[] = ActivityObject::fromGroup($group); $act->objects[] = ActivityObject::fromGroup($group);
$act->time = strtotime($this->created); $act->time = strtotime($this->created);
// TRANS: Activity title.
$act->title = _("Join"); $act->title = _("Join");
// TRANS: Success message for subscribe to group attempt through OStatus. // TRANS: Success message for subscribe to group attempt through OStatus.

9
classes/Inbox.php
View File

@ -55,7 +55,6 @@ class Inbox extends Memcached_DataObject
/** /**
* Create a new inbox from existing Notice_inbox stuff * Create a new inbox from existing Notice_inbox stuff
*/ */
static function initialize($user_id) static function initialize($user_id)
{ {
$inbox = Inbox::fromNoticeInbox($user_id); $inbox = Inbox::fromNoticeInbox($user_id);
@ -115,10 +114,10 @@ class Inbox extends Memcached_DataObject
*/ */
static function insertNotice($user_id, $notice_id) static function insertNotice($user_id, $notice_id)
{ {
// Going straight to the DB rather than trusting our caching // Going straight to the DB rather than trusting our caching
// during an update. Note: not using DB_DataObject::staticGet, // during an update. Note: not using DB_DataObject::staticGet,
// which is unsafe to use directly (in-process caching causes // which is unsafe to use directly (in-process caching causes
// memory leaks, which accumulate in queue processes). // memory leaks, which accumulate in queue processes).
$inbox = new Inbox(); $inbox = new Inbox();
if (!$inbox->get('user_id', $user_id)) { if (!$inbox->get('user_id', $user_id)) {
$inbox = Inbox::initialize($user_id); $inbox = Inbox::initialize($user_id);

9
classes/Memcached_DataObject.php
View File

@ -189,11 +189,11 @@ class Memcached_DataObject extends Safe_DataObject
str_replace("\n", " ", $e->getTraceAsString())); str_replace("\n", " ", $e->getTraceAsString()));
return false; return false;
} else { } else {
$keys = $this->_allCacheKeys(); $keys = $this->_allCacheKeys();
foreach ($keys as $key) { foreach ($keys as $key) {
$c->set($key, $this); $c->set($key, $this);
} }
} }
} }
@ -637,4 +637,3 @@ class Memcached_DataObject extends Safe_DataObject
return $vstr; return $vstr;
} }
} }

1
classes/Message.php
View File

@ -38,7 +38,6 @@ class Message extends Memcached_DataObject
} }
static function saveNew($from, $to, $content, $source) { static function saveNew($from, $to, $content, $source) {
$sender = Profile::staticGet('id', $from); $sender = Profile::staticGet('id', $from);
if (!$sender->hasRight(Right::NEWMESSAGE)) { if (!$sender->hasRight(Right::NEWMESSAGE)) {

1
classes/Nonce.php
View File

@ -36,5 +36,4 @@ class Nonce extends Memcached_DataObject
{ {
return array('consumer_key,token' => 'token:consumer_key,token'); return array('consumer_key,token' => 'token:consumer_key,token');
} }
} }

7
classes/Notice.php
View File

@ -745,6 +745,7 @@ class Notice extends Memcached_DataObject
1, 1,
1 1
); );
if ($conversation->N > 0) { if ($conversation->N > 0) {
return true; return true;
} }
@ -1305,13 +1306,10 @@ class Notice extends Memcached_DataObject
} }
if (Event::handle('StartActivitySource', array(&$this, &$xs))) { if (Event::handle('StartActivitySource', array(&$this, &$xs))) {
if ($source) { if ($source) {
$atom_feed = $profile->getAtomFeed(); $atom_feed = $profile->getAtomFeed();
if (!empty($atom_feed)) { if (!empty($atom_feed)) {
$xs->elementStart('source'); $xs->elementStart('source');
// XXX: we should store the actual feed ID // XXX: we should store the actual feed ID
@ -1899,7 +1897,6 @@ class Notice extends Memcached_DataObject
$options = array(); $options = array();
if (!empty($location_id) && !empty($location_ns)) { if (!empty($location_id) && !empty($location_ns)) {
$options['location_id'] = $location_id; $options['location_id'] = $location_id;
$options['location_ns'] = $location_ns; $options['location_ns'] = $location_ns;
@ -1911,7 +1908,6 @@ class Notice extends Memcached_DataObject
} }
} else if (!empty($lat) && !empty($lon)) { } else if (!empty($lat) && !empty($lon)) {
$options['lat'] = $lat; $options['lat'] = $lat;
$options['lon'] = $lon; $options['lon'] = $lon;
@ -1922,7 +1918,6 @@ class Notice extends Memcached_DataObject
$options['location_ns'] = $location->location_ns; $options['location_ns'] = $location->location_ns;
} }
} else if (!empty($profile)) { } else if (!empty($profile)) {
if (isset($profile->lat) && isset($profile->lon)) { if (isset($profile->lat) && isset($profile->lon)) {
$options['lat'] = $profile->lat; $options['lat'] = $profile->lat;
$options['lon'] = $profile->lon; $options['lon'] = $profile->lon;

2
classes/Oauth_application.php
View File

@ -110,7 +110,6 @@ class Oauth_application extends Memcached_DataObject
* *
* @return void * @return void
*/ */
function uploadLogo() function uploadLogo()
{ {
if ($_FILES['app_icon']['error'] == if ($_FILES['app_icon']['error'] ==
@ -153,5 +152,4 @@ class Oauth_application extends Memcached_DataObject
$oauser->application_id = $this->id; $oauser->application_id = $this->id;
$oauser->delete(); $oauser->delete();
} }
} }

1
classes/Oauth_application_user.php
View File

@ -40,5 +40,4 @@ class Oauth_application_user extends Memcached_DataObject
return empty($result) ? null : $oau; return empty($result) ? null : $oau;
} }
} }