* i18n/L10n and translator documentation updates.

* whitespace and indentation updates

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) {

classes/Consumer.php

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

classes/Conversation.php

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

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);
 

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

classes/File_oembed.php

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

classes/File_redirection.php

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

classes/File_thumbnail.php

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

classes/File_to_post.php

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

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;
         }
     }
-
 }

classes/Foreign_user.php

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

classes/Group_block.php

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

classes/Group_inbox.php

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

classes/Group_member.php

@@ -71,7 +71,9 @@ class Group_member extends Memcached_DataObject
         $member = Profile::staticGet('id', $this->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.

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);

classes/Memcached_DataObject.php

@@ -637,4 +637,3 @@ class Memcached_DataObject extends Safe_DataObject
         return $vstr;
     }
 }
-

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)) {

classes/Nonce.php

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

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;

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();
     }
-
 }

classes/Oauth_application_user.php

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