Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

Conflicts:
	actions/tagother.php
	lib/subscriberspeopleselftagcloudsection.php
	lib/subscriptionspeopleselftagcloudsection.php

diff --cc actions/profilesettings.php
Simple merge

diff --cc classes/Notice.php
Simple merge

diff --cc classes/User.php
Simple merge

diff --cc classes/statusnet.ini
Simple merge

diff --cc db/core.php
Simple merge

diff --cc lib/action.php
Simple merge

diff --cc lib/command.php
Simple merge

diff --cc lib/personalgroupnav.php
index 28bf8c529fd1091df9f019605febef408f957a4b,d379dcf5281d94885c08d287c5de3969a6067a62..812e7194ef004c7466257609472eb3dfce8d9259
--- 1/lib/personalgroupnav.php
--- 2/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@@ -87,15 -94,15 +94,21 @@@ class PersonalGroupNav extends Men
                                   $mine && $action =='replies', 'nav_timeline_replies');
              $this->out->menuItem(common_local_url('showfavorites', array('nickname' =>
                                                                           $nickname)),
-                                  _('Favorites'),
-                                  sprintf(_('%s\'s favorite notices'), ($user_profile) ? $name : _('User')),
+                                  // TRANS: Menu item in personal group navigation menu.
+                                  _m('MENU','Favorites'),
+                                  // @todo i18n FIXME: Need to make this two messages.
+                                  // TRANS: Menu item title in personal group navigation menu.
+                                  // TRANS: %s is a username.
+                                  sprintf(_('%s\'s favorite notices'),
+                                          // TRANS: Replaces %s in '%s\'s favorite notices'. (Yes, we know we need to fix this.)
+                                          ($user_profile) ? $name : _m('FIXME','User')),
                                   $mine && $action =='showfavorites', 'nav_timeline_favorites');
 +            $this->out->menuItem(common_local_url('peopletagsbyuser', array('nickname' =>
 +                                                                  $nickname)),
 +                             _('People tags'),
 +                             sprintf(_('People tags by %s'), ($user_profile) ? $name : _('User')),
 +                             in_array($action, array('peopletagsbyuser', 'peopletagsforuser')),
 +                             'nav_timeline_peopletags');
  
              $cur = common_current_user();
  

diff --cc lib/publicgroupnav.php
index 16916ca6bb0e6702bc92ce3f8ac1b5e25eb4a703,dabba5f0138b7b4012357739db0314d47261eed4..6f7b7febc35a1b5d858b8b089989eb6701d12263
--- 1/lib/publicgroupnav.php
--- 2/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@@ -61,21 -59,25 +59,29 @@@ class PublicGroupNav extends Men
          $this->action->elementStart('ul', array('class' => 'nav'));
  
          if (Event::handle('StartPublicGroupNav', array($this))) {
-             $this->out->menuItem(common_local_url('public'), _('Public'),
+             // TRANS: Menu item in search group navigation panel.
+             $this->out->menuItem(common_local_url('public'), _m('MENU','Public'),
+                 // TRANS: Menu item title in search group navigation panel.
                  _('Public timeline'), $action_name == 'public', 'nav_timeline_public');
  
-             $this->out->menuItem(common_local_url('groups'), _('Groups'),
+             // TRANS: Menu item in search group navigation panel.
+             $this->out->menuItem(common_local_url('groups'), _m('MENU','Groups'),
+                 // TRANS: Menu item title in search group navigation panel.
                  _('User groups'), $action_name == 'groups', 'nav_groups');
  
-             $this->out->menuItem(common_local_url('publictagcloud'), _('Recent tags'),
+             // TRANS: Menu item in search group navigation panel.
+             $this->out->menuItem(common_local_url('publictagcloud'), _m('MENU','Recent tags'),
+                 // TRANS: Menu item title in search group navigation panel.
                  _('Recent tags'), $action_name == 'publictagcloud', 'nav_recent-tags');
  
 +            $this->out->menuItem(common_local_url('publicpeopletagcloud'), _('People tags'),
 +                _('People tags'), in_array($action_name, array('publicpeopletagcloud',
 +                                    'peopletag', 'selftag')), 'nav_people-tags');
 +
              if (count(common_config('nickname', 'featured')) > 0) {
-                 $this->out->menuItem(common_local_url('featured'), _('Featured'),
+                 // TRANS: Menu item in search group navigation panel.
+                 $this->out->menuItem(common_local_url('featured'), _m('MENU','Featured'),
+                     // TRANS: Menu item title in search group navigation panel.
                      _('Featured users'), $action_name == 'featured', 'nav_featured');
              }
  

diff --cc lib/subgroupnav.php
Simple merge

diff --cc lib/subscriberspeopleselftagcloudsection.php
index b4ada901c006e96425243a1027ccfcec38d6a860,47b94227e855860f24d672be464f20ed570f594a..ddbf389868361b7148a9c9ca776d16aaf26ad4ea
--- 1/lib/subscriberspeopleselftagcloudsection.php
--- 2/lib/subscriberspeopleselftagcloudsection.php
+++ b/lib/subscriberspeopleselftagcloudsection.php
@@@ -50,13 -50,7 +50,9 @@@ class SubscribersPeopleSelfTagCloudSect
  
      function query() {
  //        return 'select tag, count(tag) as weight from subscription left join profile_tag on tagger = subscriber where subscribed=%d and subscribed != subscriber and tagger = tagged group by tag order by weight desc';
 -        return 'select tag, count(tag) as weight from subscription left join profile_tag on tagger = subscriber where subscribed=%d and subscribed != subscriber and tagger = tagged and tag is not null group by tag order by weight desc';
 +
- 
 +        return 'select profile_tag.tag, count(profile_tag.tag) as weight from subscription left join (profile_tag, profile_list) on  profile_list.tag =  profile_tag.tag and profile_list.tagger =  profile_tag.tagger and profile_tag.tagger = subscriber where subscribed=%d and subscribed != subscriber and profile_tag.tagger = tagged and profile_list.private = false and profile_tag.tag is not null group by profile_tag.tag order by weight desc';
 +
  //        return 'select tag, count(tag) as weight from subscription left join profile_tag on tagger = subscribed where subscriber=%d and subscribed != subscriber and tagger = tagged and tag is not null group by tag order by weight desc';
- 
- 
      }
  }
- 

diff --cc lib/subscriberspeopletagcloudsection.php
index 65c4a4f066e07911b6447ca6faa4a536fe5f8e40,93cf4aa5dfede2327cdf01b54c77a375d7eefed4..c3602a6b46d49336580a926c3b2a9493d26c2107
--- 1/lib/subscriberspeopletagcloudsection.php
--- 2/lib/subscriberspeopletagcloudsection.php
+++ b/lib/subscriberspeopletagcloudsection.php
@@@ -55,7 -55,6 +55,6 @@@ class SubscribersPeopleTagCloudSection 
  
      function query() {
  //        return 'select tag, count(tag) as weight from subscription left join profile_tag on subscriber=tagged and subscribed=tagger where subscribed=%d and subscriber != subscribed group by tag order by weight desc';
 -        return 'select tag, count(tag) as weight from subscription left join profile_tag on subscriber=tagged and subscribed=tagger where subscribed=%d and subscriber != subscribed and tag is not null group by tag order by weight desc';
 +        return 'select profile_tag.tag, count(profile_tag.tag) as weight from subscription left join (profile_tag, profile_list) on subscriber=profile_tag.tagged and subscribed=profile_tag.tagger and profile_tag.tagger = profile_list.tagger and profile_tag.tag = profile_list.tag where subscribed=%d and subscriber != subscribed and profile_list.private = false and profile_tag.tag is not null group by profile_tag.tag order by weight desc';
      }
  }
- 

diff --cc lib/subscriptionspeopleselftagcloudsection.php
index cb87ae04400cbd67a83f8fc9660065bfc2336c7c,134b5c4456f306da090e78cf77fa1d237fd8a353..7334234fc6cafd28c54ce150f0a94a0afd001ff2
--- 1/lib/subscriptionspeopleselftagcloudsection.php
--- 2/lib/subscriptionspeopleselftagcloudsection.php
+++ b/lib/subscriptionspeopleselftagcloudsection.php
@@@ -50,11 -50,7 +50,9 @@@ class SubscriptionsPeopleSelfTagCloudSe
  
      function query() {
  //        return 'select tag, count(tag) as weight from subscription left join profile_tag on tagger = subscriber where subscribed=%d and subscriber != subscribed and tagger = tagged group by tag order by weight desc';
 -        return 'select tag, count(tag) as weight from subscription left join profile_tag on tagger = subscribed where subscriber=%d and subscribed != subscriber and tagger = tagged and tag is not null group by tag order by weight desc';
 +
- 
- 
 +        return 'select profile_tag.tag, count(profile_tag.tag) as weight from subscription left join (profile_tag, profile_list) on profile_tag.tagger = subscribed and profile_tag.tag = profile_list.tag and profile_tag.tagger = profile_tag.tagger where subscriber=%d and subscribed != subscriber and profile_tag.tagger = profile_tag.tagged and profile_list.private = false and profile_tag.tag is not null group by profile_tag.tag order by weight desc';
 +
  //        return 'select tag, count(tag) as weight from subscription left join profile_tag on tagger = subscriber where subscribed=%d and subscribed != subscriber and tagger = tagged and tag is not null group by tag order by weight desc';
      }
  }

diff --cc lib/subscriptionspeopletagcloudsection.php
index 1a42bf90bec4212934ffc32caaf3e4e023d19a24,6b888894ef3bf85166e8020156fba7068af626d8..e1016404c1c7a8319f22d888a08881f81642abc2
--- 1/lib/subscriptionspeopletagcloudsection.php
--- 2/lib/subscriptionspeopletagcloudsection.php
+++ b/lib/subscriptionspeopletagcloudsection.php
@@@ -55,7 -55,6 +55,6 @@@ class SubscriptionsPeopleTagCloudSectio
  
      function query() {
  //        return 'select tag, count(tag) as weight from subscription left join profile_tag on subscriber=tagger and subscribed=tagged where subscriber=%d and subscriber != subscribed group by tag order by weight desc';
 -        return 'select tag, count(tag) as weight from subscription left join profile_tag on subscriber=tagger and subscribed=tagged where subscriber=%d and subscriber != subscribed and tag is not null group by tag order by weight desc';
 +        return 'select profile_tag.tag, count(profile_tag.tag) as weight from subscription left join (profile_tag, profile_list) on subscriber=profile_tag.tagger and subscribed=tagged and profile_tag.tag = profile_list.tag and profile_tag.tagger = profile_list.tagger where subscriber=%d and subscriber != subscribed and profile_list.private = false and profile_tag.tag is not null group by profile_tag.tag order by weight desc';
      }
  }
- 

diff --cc plugins/OStatus/actions/usersalmon.php
Simple merge