From: Siebrand Mazeland Date: Tue, 28 Sep 2010 21:21:09 +0000 (+0200) Subject: * i18n/L10n and translator documentation updates. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b03ece26eb1589c5200094f4d87455ca46db780b;p=quix0rs-gnu-social.git * i18n/L10n and translator documentation updates. * whitespace and indentation updates --- diff --git a/classes/Avatar.php b/classes/Avatar.php index dbe2cd8138..6edc817685 100644 --- a/classes/Avatar.php +++ b/classes/Avatar.php @@ -42,8 +42,9 @@ class Avatar extends Memcached_DataObject 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) { if ($size) { diff --git a/classes/Consumer.php b/classes/Consumer.php index ce399f2783..c1090b85a3 100644 --- a/classes/Consumer.php +++ b/classes/Consumer.php @@ -65,5 +65,4 @@ class Consumer extends Memcached_DataObject $nonce->consumer_key = $this->consumer_key; $nonce->delete(); } - } diff --git a/classes/Conversation.php b/classes/Conversation.php index f540004ef3..aab55723f6 100755 --- a/classes/Conversation.php +++ b/classes/Conversation.php @@ -74,6 +74,4 @@ class Conversation extends Memcached_DataObject return $conv; } - } - diff --git a/classes/Fave.php b/classes/Fave.php index f21f1b5297..059b339cd2 100644 --- a/classes/Fave.php +++ b/classes/Fave.php @@ -144,8 +144,11 @@ class Fave extends Memcached_DataObject common_date_iso8601($this->modified)); $act->time = strtotime($this->modified); + // TRANS: Activity title when marking a notice as favorite. $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(), $notice->uri); diff --git a/classes/File.php b/classes/File.php index 407fd32114..d457968b5e 100644 --- a/classes/File.php +++ b/classes/File.php @@ -29,7 +29,6 @@ require_once INSTALLDIR.'/classes/File_to_post.php'; /** * Table Definition for file */ - class File extends Memcached_DataObject { ###START_AUTOCODE diff --git a/classes/File_oembed.php b/classes/File_oembed.php index 041b447404..4813d5dda5 100644 --- a/classes/File_oembed.php +++ b/classes/File_oembed.php @@ -131,4 +131,3 @@ class File_oembed extends Memcached_DataObject } } } - diff --git a/classes/File_redirection.php b/classes/File_redirection.php index 51b8be3b06..68fed77e8b 100644 --- a/classes/File_redirection.php +++ b/classes/File_redirection.php @@ -281,4 +281,3 @@ class File_redirection extends Memcached_DataObject $file_redir->insert(); } } - diff --git a/classes/File_thumbnail.php b/classes/File_thumbnail.php index f8b70356c7..edae8ac21a 100644 --- a/classes/File_thumbnail.php +++ b/classes/File_thumbnail.php @@ -57,4 +57,3 @@ class File_thumbnail extends Memcached_DataObject $tn->insert(); } } - diff --git a/classes/File_to_post.php b/classes/File_to_post.php index 72a42b0880..530921adcb 100644 --- a/classes/File_to_post.php +++ b/classes/File_to_post.php @@ -67,4 +67,3 @@ class File_to_post extends Memcached_DataObject return Memcached_DataObject::pkeyGet('File_to_post', $kv); } } - diff --git a/classes/Foreign_link.php b/classes/Foreign_link.php index e47b2e3096..60db51595e 100644 --- a/classes/Foreign_link.php +++ b/classes/Foreign_link.php @@ -44,7 +44,6 @@ class Foreign_link extends Memcached_DataObject $result = $flink->find(true); return empty($result) ? null : $flink; - } static function getByForeignID($foreign_id, $service) @@ -129,5 +128,4 @@ class Foreign_link extends Memcached_DataObject return false; } } - } diff --git a/classes/Foreign_service.php b/classes/Foreign_service.php index ef614dbd6e..dd74fd2ca6 100644 --- a/classes/Foreign_service.php +++ b/classes/Foreign_service.php @@ -4,7 +4,7 @@ */ require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; -class Foreign_service extends Memcached_DataObject +class Foreign_service extends Memcached_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ @@ -12,7 +12,7 @@ class Foreign_service extends Memcached_DataObject public $__table = 'foreign_service'; // table name public $id; // int(4) primary_key not_null public $name; // varchar(32) unique_key not_null - public $description; // varchar(255) + public $description; // varchar(255) public $created; // datetime() not_null public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP diff --git a/classes/Foreign_subscription.php b/classes/Foreign_subscription.php index d508606218..ec2631238e 100644 --- a/classes/Foreign_subscription.php +++ b/classes/Foreign_subscription.php @@ -4,7 +4,7 @@ */ require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; -class Foreign_subscription extends Memcached_DataObject +class Foreign_subscription extends Memcached_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ diff --git a/classes/Foreign_user.php b/classes/Foreign_user.php index e98a16064a..8e6e0b33e0 100644 --- a/classes/Foreign_user.php +++ b/classes/Foreign_user.php @@ -83,5 +83,4 @@ class Foreign_user extends Memcached_DataObject } return $result; } - } diff --git a/classes/Group_block.php b/classes/Group_block.php index 9f4d592956..ffc57a496e 100644 --- a/classes/Group_block.php +++ b/classes/Group_block.php @@ -111,5 +111,4 @@ class Group_block extends Memcached_DataObject return true; } - } diff --git a/classes/Group_inbox.php b/classes/Group_inbox.php index 2a0787e387..8f5c65e594 100644 --- a/classes/Group_inbox.php +++ b/classes/Group_inbox.php @@ -1,8 +1,8 @@ profile_id); 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; @@ -82,7 +84,9 @@ class Group_member extends Memcached_DataObject $group = User_group::staticGet('id', $this->group_id); 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; @@ -105,6 +109,7 @@ class Group_member extends Memcached_DataObject $act->objects[] = ActivityObject::fromGroup($group); $act->time = strtotime($this->created); + // TRANS: Activity title. $act->title = _("Join"); // TRANS: Success message for subscribe to group attempt through OStatus. diff --git a/classes/Inbox.php b/classes/Inbox.php index 430419ba5e..a1ab6215fd 100644 --- a/classes/Inbox.php +++ b/classes/Inbox.php @@ -55,7 +55,6 @@ class Inbox extends Memcached_DataObject /** * Create a new inbox from existing Notice_inbox stuff */ - static function initialize($user_id) { $inbox = Inbox::fromNoticeInbox($user_id); @@ -115,10 +114,10 @@ class Inbox extends Memcached_DataObject */ static function insertNotice($user_id, $notice_id) { - // Going straight to the DB rather than trusting our caching - // during an update. Note: not using DB_DataObject::staticGet, - // which is unsafe to use directly (in-process caching causes - // memory leaks, which accumulate in queue processes). + // Going straight to the DB rather than trusting our caching + // during an update. Note: not using DB_DataObject::staticGet, + // which is unsafe to use directly (in-process caching causes + // memory leaks, which accumulate in queue processes). $inbox = new Inbox(); if (!$inbox->get('user_id', $user_id)) { $inbox = Inbox::initialize($user_id); diff --git a/classes/Invitation.php b/classes/Invitation.php index 8a36fd8df1..0e87c1629c 100644 --- a/classes/Invitation.php +++ b/classes/Invitation.php @@ -4,7 +4,7 @@ */ require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; -class Invitation extends Memcached_DataObject +class Invitation extends Memcached_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index 0f1ed04892..ccfd886a1d 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -189,11 +189,11 @@ class Memcached_DataObject extends Safe_DataObject str_replace("\n", " ", $e->getTraceAsString())); return false; } else { - $keys = $this->_allCacheKeys(); + $keys = $this->_allCacheKeys(); - foreach ($keys as $key) { - $c->set($key, $this); - } + foreach ($keys as $key) { + $c->set($key, $this); + } } } @@ -637,4 +637,3 @@ class Memcached_DataObject extends Safe_DataObject return $vstr; } } - diff --git a/classes/Message.php b/classes/Message.php index fa0c5b3181..353dc01f99 100644 --- a/classes/Message.php +++ b/classes/Message.php @@ -38,7 +38,6 @@ class Message extends Memcached_DataObject } static function saveNew($from, $to, $content, $source) { - $sender = Profile::staticGet('id', $from); if (!$sender->hasRight(Right::NEWMESSAGE)) { diff --git a/classes/Nonce.php b/classes/Nonce.php index 2f8ab00b5d..93191bd409 100644 --- a/classes/Nonce.php +++ b/classes/Nonce.php @@ -36,5 +36,4 @@ class Nonce extends Memcached_DataObject { return array('consumer_key,token' => 'token:consumer_key,token'); } - } diff --git a/classes/Notice.php b/classes/Notice.php index 4f23e35007..79626f8898 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -745,6 +745,7 @@ class Notice extends Memcached_DataObject 1, 1 ); + if ($conversation->N > 0) { return true; } @@ -1305,13 +1306,10 @@ class Notice extends Memcached_DataObject } if (Event::handle('StartActivitySource', array(&$this, &$xs))) { - if ($source) { - $atom_feed = $profile->getAtomFeed(); if (!empty($atom_feed)) { - $xs->elementStart('source'); // XXX: we should store the actual feed ID @@ -1899,7 +1897,6 @@ class Notice extends Memcached_DataObject $options = array(); if (!empty($location_id) && !empty($location_ns)) { - $options['location_id'] = $location_id; $options['location_ns'] = $location_ns; @@ -1911,7 +1908,6 @@ class Notice extends Memcached_DataObject } } else if (!empty($lat) && !empty($lon)) { - $options['lat'] = $lat; $options['lon'] = $lon; @@ -1922,7 +1918,6 @@ class Notice extends Memcached_DataObject $options['location_ns'] = $location->location_ns; } } else if (!empty($profile)) { - if (isset($profile->lat) && isset($profile->lon)) { $options['lat'] = $profile->lat; $options['lon'] = $profile->lon; diff --git a/classes/Notice_source.php b/classes/Notice_source.php index e7568bbca2..43893ebe18 100644 --- a/classes/Notice_source.php +++ b/classes/Notice_source.php @@ -4,7 +4,7 @@ */ require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; -class Notice_source extends Memcached_DataObject +class Notice_source extends Memcached_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ diff --git a/classes/Oauth_application.php b/classes/Oauth_application.php index 748b642200..e81706104e 100644 --- a/classes/Oauth_application.php +++ b/classes/Oauth_application.php @@ -110,7 +110,6 @@ class Oauth_application extends Memcached_DataObject * * @return void */ - function uploadLogo() { if ($_FILES['app_icon']['error'] == @@ -153,5 +152,4 @@ class Oauth_application extends Memcached_DataObject $oauser->application_id = $this->id; $oauser->delete(); } - } diff --git a/classes/Oauth_application_user.php b/classes/Oauth_application_user.php index 57986281f9..3d4238d640 100644 --- a/classes/Oauth_application_user.php +++ b/classes/Oauth_application_user.php @@ -40,5 +40,4 @@ class Oauth_application_user extends Memcached_DataObject return empty($result) ? null : $oau; } - }