diff options
author | Zach Copley <zach@status.net> | 2009-11-10 00:43:58 -0800 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2009-11-10 00:43:58 -0800 |
commit | cae06a49ea60cacb926f27b18b88a8a7f801f011 (patch) | |
tree | 4a1a8b448666f1dd7ff1a8395d7ce75ef4933956 /actions/subscriptions.php | |
parent | dbb86f948684cd5a5a49f6881f50082698fd39d1 (diff) | |
parent | 223fee2ad1430e827830265c9fe97f4d025bb060 (diff) |
Merge branch '0.9.x' into finish-account-api
* 0.9.x: (26 commits)
just sent a http 200 for the check-fancy from install.php
Add a new event: CanUserChangeField
shorten flag notification and include a class
Added flag icon for UserFlag plugin
Fixed notice option alignment in IE
add a method to Theme class to list available themes
Updated Realtime plugin to use the util's NoticeReply object
Localisation updates from translatewiki.net (2009-11-08)
Update pot again
Rebuild pot file *without* --join-existing to get rid of the cruft. Not sure why "--join-existing" must be in. Only thing I can think of is manual additions, which I could not find.
Revert "More precise field label"
Remove more contractions
Revert "* [Cc]an't -> [Cc]annot"
Revert "More specifics on 'address'"
* [Cc]an't -> [Cc]annot
Revert "* check usage of 'people' in UI and change it to 'users' or something else in most places"
add utilities for calculating local and installation theme root dirs
Harmonise UI message "No such user."
Restructure theme.php to define a class Theme
entity_action responses look more inactive now
...
Diffstat (limited to 'actions/subscriptions.php')
-rw-r--r-- | actions/subscriptions.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/actions/subscriptions.php b/actions/subscriptions.php index 4f65e9bf1..cc7b38ee4 100644 --- a/actions/subscriptions.php +++ b/actions/subscriptions.php @@ -62,12 +62,12 @@ class SubscriptionsAction extends GalleryAction $user =& common_current_user(); if ($user && ($user->id == $this->profile->id)) { $this->element('p', null, - _('These are the users whose notices '. - 'you have subscribed to.')); + _('These are the people whose notices '. + 'you listen to.')); } else { $this->element('p', null, - sprintf(_('These are the users whose '. - 'notices %s has subscribed to.'), + sprintf(_('These are the people whose '. + 'notices %s listens to.'), $this->profile->nickname)); } } @@ -118,7 +118,7 @@ class SubscriptionsAction extends GalleryAction if (common_logged_in()) { $current_user = common_current_user(); if ($this->user->id === $current_user->id) { - $message = _('You have not subscribed to anyone\'s notices right now. Try subscribing to users you know. Try [user search](%%action.peoplesearch%%), look for members in groups you\'re interested in and in our [featured users](%%action.featured%%). If you are a [Twitter user](%%action.twittersettings%%), you can automatically subscribe to users you already follow there.'); + $message = _('You\'re not listening to anyone\'s notices right now, try subscribing to people you know. Try [people search](%%action.peoplesearch%%), look for members in groups you\'re interested in and in our [featured users](%%action.featured%%). If you\'re a [Twitter user](%%action.twittersettings%%), you can automatically subscribe to people you already follow there.'); } else { $message = sprintf(_('%s is not listening to anyone.'), $this->user->nickname); } |