forked from GNUsocial/gnu-social
Update translator documentation.
L10n/i18n updates. Whitespace updates.
This commit is contained in:
parent
dc3cdfc0f8
commit
96b9ecaf07
@ -42,7 +42,6 @@ if (!defined('STATUSNET')) {
|
|||||||
*
|
*
|
||||||
* @see DB_DataObject
|
* @see DB_DataObject
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class TagSub extends Managed_DataObject
|
class TagSub extends Managed_DataObject
|
||||||
{
|
{
|
||||||
public $__table = 'tagsub'; // table name
|
public $__table = 'tagsub'; // table name
|
||||||
|
@ -192,7 +192,6 @@ class TagSubPlugin extends Plugin
|
|||||||
*
|
*
|
||||||
* @return boolean hook return
|
* @return boolean hook return
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function onEndSubGroupNav($widget)
|
function onEndSubGroupNav($widget)
|
||||||
{
|
{
|
||||||
$action = $widget->out;
|
$action = $widget->out;
|
||||||
@ -218,11 +217,11 @@ class TagSubPlugin extends Plugin
|
|||||||
|
|
||||||
if (!empty($tags) && count($tags) > 0) {
|
if (!empty($tags) && count($tags) > 0) {
|
||||||
$tagSubMenu = new TagSubMenu($menu->out, $user, $tags);
|
$tagSubMenu = new TagSubMenu($menu->out, $user, $tags);
|
||||||
|
// TRANS: Menu item text for tags submenu.
|
||||||
$menu->submenu(_m('Tags'), $tagSubMenu);
|
$menu->submenu(_m('Tags'), $tagSubMenu);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -46,13 +46,11 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
|
|||||||
*
|
*
|
||||||
* @see UnsubscribeForm
|
* @see UnsubscribeForm
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class TagSubForm extends Form
|
class TagSubForm extends Form
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Name of tag to subscribe to
|
* Name of tag to subscribe to
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var $tag = '';
|
var $tag = '';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -61,7 +59,6 @@ class TagSubForm extends Form
|
|||||||
* @param HTMLOutputter $out output channel
|
* @param HTMLOutputter $out output channel
|
||||||
* @param string $tag name of tag to subscribe to
|
* @param string $tag name of tag to subscribe to
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function __construct($out=null, $tag=null)
|
function __construct($out=null, $tag=null)
|
||||||
{
|
{
|
||||||
parent::__construct($out);
|
parent::__construct($out);
|
||||||
@ -74,38 +71,32 @@ class TagSubForm extends Form
|
|||||||
*
|
*
|
||||||
* @return int ID of the form
|
* @return int ID of the form
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function id()
|
function id()
|
||||||
{
|
{
|
||||||
return 'tag-subscribe-' . $this->tag;
|
return 'tag-subscribe-' . $this->tag;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* class of the form
|
* class of the form
|
||||||
*
|
*
|
||||||
* @return string of the form class
|
* @return string of the form class
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function formClass()
|
function formClass()
|
||||||
{
|
{
|
||||||
// class to match existing styles...
|
// class to match existing styles...
|
||||||
return 'form_user_subscribe ajax';
|
return 'form_user_subscribe ajax';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Action of the form
|
* Action of the form
|
||||||
*
|
*
|
||||||
* @return string URL of the action
|
* @return string URL of the action
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function action()
|
function action()
|
||||||
{
|
{
|
||||||
return common_local_url('tagsub', array('tag' => $this->tag));
|
return common_local_url('tagsub', array('tag' => $this->tag));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Legend of the Form
|
* Legend of the Form
|
||||||
*
|
*
|
||||||
@ -113,6 +104,7 @@ class TagSubForm extends Form
|
|||||||
*/
|
*/
|
||||||
function formLegend()
|
function formLegend()
|
||||||
{
|
{
|
||||||
|
// TRANS: Form legend.
|
||||||
$this->out->element('legend', null, _m('Subscribe to this tag'));
|
$this->out->element('legend', null, _m('Subscribe to this tag'));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -121,7 +113,6 @@ class TagSubForm extends Form
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function formData()
|
function formData()
|
||||||
{
|
{
|
||||||
$this->out->hidden('subscribeto-' . $this->tag,
|
$this->out->hidden('subscribeto-' . $this->tag,
|
||||||
@ -134,9 +125,11 @@ class TagSubForm extends Form
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function formActions()
|
function formActions()
|
||||||
{
|
{
|
||||||
$this->out->submit('submit', _m('BUTTON','Subscribe'), 'submit', null, _m('Subscribe to this tag'));
|
// TRANS: Submit button text to subscribe to a tag.
|
||||||
|
$this->out->submit('submit', _m('BUTTON','Subscribe'),
|
||||||
|
// TRANS: Submit button title to subscribe to a tag.
|
||||||
|
'submit', null, _m('Subscribe to this tag.'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
|
|||||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
|
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
|
||||||
* @link http://status.net/
|
* @link http://status.net/
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class TagSubMenu extends Menu
|
class TagSubMenu extends Menu
|
||||||
{
|
{
|
||||||
protected $user;
|
protected $user;
|
||||||
@ -66,7 +65,8 @@ class TagSubMenu extends Menu
|
|||||||
$this->out->menuItem(common_local_url('tag',
|
$this->out->menuItem(common_local_url('tag',
|
||||||
array('tag' => $tag)),
|
array('tag' => $tag)),
|
||||||
sprintf('#%s', $tag),
|
sprintf('#%s', $tag),
|
||||||
sprintf(_('Notices tagged with %s'), $tag),
|
// TRANS: Menu item title. %s is a tag.
|
||||||
|
sprintf(_('Notices tagged with "%s".'), $tag),
|
||||||
$this->actionName == 'tag' && $this->action->arg('tag') == $tag,
|
$this->actionName == 'tag' && $this->action->arg('tag') == $tag,
|
||||||
'nav_streams_tag_'.$tag);
|
'nav_streams_tag_'.$tag);
|
||||||
}
|
}
|
||||||
@ -74,5 +74,4 @@ class TagSubMenu extends Menu
|
|||||||
|
|
||||||
$this->out->elementEnd('ul');
|
$this->out->elementEnd('ul');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -116,18 +116,18 @@ class TagSubsAction extends GalleryAction
|
|||||||
if ($this->user->id === $current_user->id) {
|
if ($this->user->id === $current_user->id) {
|
||||||
// TRANS: Tag subscription list text when the logged in user has no tag subscriptions.
|
// TRANS: Tag subscription list text when the logged in user has no tag subscriptions.
|
||||||
$message = _m('You are not listening to any hash tags right now. You can push the "Subscribe" button ' .
|
$message = _m('You are not listening to any hash tags right now. You can push the "Subscribe" button ' .
|
||||||
'on any hashtag page to automatically receive any public messages on this site that use that ' .
|
'on any hashtag page to automatically receive any public messages on this site that use that ' .
|
||||||
'tag, even if you are not subscribed to the poster.');
|
'tag, even if you are not subscribed to the poster.');
|
||||||
} else {
|
} else {
|
||||||
// TRANS: Tag subscription list text when looking at the subscriptions for a of a user other
|
// TRANS: Tag subscription list text when looking at the subscriptions for a of a user other
|
||||||
// TRANS: than the logged in user that has no tag subscriptions. %s is the user nickname.
|
// TRANS: than the logged in user that has no tag subscriptions. %s is the user nickname.
|
||||||
$message = sprintf(_m('%s is not listening to any tags.'), $this->user->nickname);
|
$message = sprintf(_m('%s is not following any tags.'), $this->user->nickname);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
|
// TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
|
||||||
// TRANS: as an anonymous user. %s is the user nickname.
|
// TRANS: as an anonymous user. %s is the user nickname.
|
||||||
$message = sprintf(_m('%s is not listening to any tags.'), $this->user->nickname);
|
$message = sprintf(_m('%s is not following any tags.'), $this->user->nickname);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->elementStart('div', 'guide');
|
$this->elementStart('div', 'guide');
|
||||||
@ -165,7 +165,9 @@ class TagSubscriptionsListItem extends SubscriptionListItem
|
|||||||
}
|
}
|
||||||
|
|
||||||
$url = common_local_url('tag', array('tag' => $tag));
|
$url = common_local_url('tag', array('tag' => $tag));
|
||||||
$linkline = sprintf(_m('#<a href="%s">%s</a> since %s'),
|
// TRANS: %1$s is a URL to a tag, %2$s is a tag,
|
||||||
|
// TRANS: %3$s a date string.
|
||||||
|
$linkline = sprintf(_m('#<a href="%1$s">%2$s</a> since %3$s'),
|
||||||
htmlspecialchars($url),
|
htmlspecialchars($url),
|
||||||
htmlspecialchars($tag),
|
htmlspecialchars($tag),
|
||||||
common_date_string($tagsub->created));
|
common_date_string($tagsub->created));
|
||||||
|
@ -46,7 +46,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
|
|||||||
*
|
*
|
||||||
* @see UnsubscribeForm
|
* @see UnsubscribeForm
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class TagUnsubForm extends TagSubForm
|
class TagUnsubForm extends TagSubForm
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
@ -54,38 +53,32 @@ class TagUnsubForm extends TagSubForm
|
|||||||
*
|
*
|
||||||
* @return int ID of the form
|
* @return int ID of the form
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function id()
|
function id()
|
||||||
{
|
{
|
||||||
return 'tag-unsubscribe-' . $this->tag;
|
return 'tag-unsubscribe-' . $this->tag;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* class of the form
|
* class of the form
|
||||||
*
|
*
|
||||||
* @return string of the form class
|
* @return string of the form class
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function formClass()
|
function formClass()
|
||||||
{
|
{
|
||||||
// class to match existing styles...
|
// class to match existing styles...
|
||||||
return 'form_user_unsubscribe ajax';
|
return 'form_user_unsubscribe ajax';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Action of the form
|
* Action of the form
|
||||||
*
|
*
|
||||||
* @return string URL of the action
|
* @return string URL of the action
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function action()
|
function action()
|
||||||
{
|
{
|
||||||
return common_local_url('tagunsub', array('tag' => $this->tag));
|
return common_local_url('tagunsub', array('tag' => $this->tag));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Legend of the Form
|
* Legend of the Form
|
||||||
*
|
*
|
||||||
@ -93,6 +86,7 @@ class TagUnsubForm extends TagSubForm
|
|||||||
*/
|
*/
|
||||||
function formLegend()
|
function formLegend()
|
||||||
{
|
{
|
||||||
|
// TRANS: Form legend.
|
||||||
$this->out->element('legend', null, _m('Unsubscribe from this tag'));
|
$this->out->element('legend', null, _m('Unsubscribe from this tag'));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -101,9 +95,11 @@ class TagUnsubForm extends TagSubForm
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function formActions()
|
function formActions()
|
||||||
{
|
{
|
||||||
$this->out->submit('submit', _m('BUTTON','Unsubscribe'), 'submit', null, _m('Unsubscribe from this tag'));
|
// TRANS: Submit button text to unsubscribe from a tag.
|
||||||
|
$this->out->submit('submit', _m('BUTTON','Unsubscribe'),
|
||||||
|
// TRANS: Submit button title to unsubscribe from a tag.
|
||||||
|
'submit', null, _m('Unsubscribe from this tag.'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user