GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

* update punctuation for translator documentation.

Browse Source 
* remove superfluous whitespace.
This commit is contained in:
Siebrand Mazeland 2011-01-30 18:48:09 +01:00
parent e6e402cefd
commit c29a938895
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lib/action.php
View File

@ -300,11 +300,11 @@ class Action extends HTMLOutputter // lawsuit
* events and appending to the array. Try to avoid adding strings that won't be used, as * events and appending to the array. Try to avoid adding strings that won't be used, as
* they'll be added to HTML output. * they'll be added to HTML output.
*/ */
function showScriptMessages() function showScriptMessages()
{ {
$messages = array(); $messages = array();
if (Event::handle('StartScriptMessages', array($this, &$messages))) { if (Event::handle('StartScriptMessages', array($this, &$messages))) {
// Common messages needed for timeline views etc... // Common messages needed for timeline views etc...
@ -312,14 +312,14 @@ class Action extends HTMLOutputter // lawsuit
$messages['showmore_tooltip'] = _m('TOOLTIP', 'Show more'); $messages['showmore_tooltip'] = _m('TOOLTIP', 'Show more');
$messages = array_merge($messages, $this->getScriptMessages()); $messages = array_merge($messages, $this->getScriptMessages());
Event::handle('EndScriptMessages', array($this, &$messages)); Event::handle('EndScriptMessages', array($this, &$messages));
} }
if (!empty($messages)) { if (!empty($messages)) {
$this->inlineScript('SN.messages=' . json_encode($messages)); $this->inlineScript('SN.messages=' . json_encode($messages));
} }
return $messages; return $messages;
} }
@ -533,33 +533,33 @@ class Action extends HTMLOutputter // lawsuit
$this->elementStart('ul', array('class' => 'nav')); $this->elementStart('ul', array('class' => 'nav'));
if (Event::handle('StartPrimaryNav', array($this))) { if (Event::handle('StartPrimaryNav', array($this))) {
if ($user) { if ($user) {
// TRANS: Tooltip for main menu option "Personal" // TRANS: Tooltip for main menu option "Personal".
$tooltip = _m('TOOLTIP', 'Personal profile and friends timeline'); $tooltip = _m('TOOLTIP', 'Personal profile and friends timeline');
$this->menuItem(common_local_url('all', array('nickname' => $user->nickname)), $this->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
// TRANS: Main menu option when logged in for access to personal profile and friends timeline // TRANS: Main menu option when logged in for access to personal profile and friends timeline.
_m('MENU', 'Personal'), $tooltip, false, 'nav_home'); _m('MENU', 'Personal'), $tooltip, false, 'nav_home');
// TRANS: Tooltip for main menu option "Account" // TRANS: Tooltip for main menu option "Account".
$tooltip = _m('TOOLTIP', 'Change your email, avatar, password, profile'); $tooltip = _m('TOOLTIP', 'Change your email, avatar, password, profile');
$this->menuItem(common_local_url('profilesettings'), $this->menuItem(common_local_url('profilesettings'),
// TRANS: Main menu option when logged in for access to user settings // TRANS: Main menu option when logged in for access to user settings.
_('Account'), $tooltip, false, 'nav_account'); _('Account'), $tooltip, false, 'nav_account');
// TRANS: Tooltip for main menu option "Services" // TRANS: Tooltip for main menu option "Services".
$tooltip = _m('TOOLTIP', 'Connect to services'); $tooltip = _m('TOOLTIP', 'Connect to services');
$this->menuItem(common_local_url('oauthconnectionssettings'), $this->menuItem(common_local_url('oauthconnectionssettings'),
// TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services // TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
_('Connect'), $tooltip, false, 'nav_connect'); _('Connect'), $tooltip, false, 'nav_connect');
if ($user->hasRight(Right::CONFIGURESITE)) { if ($user->hasRight(Right::CONFIGURESITE)) {
// TRANS: Tooltip for menu option "Admin" // TRANS: Tooltip for menu option "Admin".
$tooltip = _m('TOOLTIP', 'Change site configuration'); $tooltip = _m('TOOLTIP', 'Change site configuration');
$this->menuItem(common_local_url('siteadminpanel'), $this->menuItem(common_local_url('siteadminpanel'),
// TRANS: Main menu option when logged in and site admin for access to site configuration // TRANS: Main menu option when logged in and site admin for access to site configuration.
_m('MENU', 'Admin'), $tooltip, false, 'nav_admin'); _m('MENU', 'Admin'), $tooltip, false, 'nav_admin');
} }
if (common_config('invite', 'enabled')) { if (common_config('invite', 'enabled')) {
// TRANS: Tooltip for main menu option "Invite" // TRANS: Tooltip for main menu option "Invite".
$tooltip = _m('TOOLTIP', 'Invite friends and colleagues to join you on %s'); $tooltip = _m('TOOLTIP', 'Invite friends and colleagues to join you on %s');
$this->menuItem(common_local_url('invite'), $this->menuItem(common_local_url('invite'),
// TRANS: Main menu option when logged in and invitations are allowed for inviting new users // TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
_m('MENU', 'Invite'), _m('MENU', 'Invite'),
sprintf($tooltip, sprintf($tooltip,
common_config('site', 'name')), common_config('site', 'name')),
@ -568,33 +568,33 @@ class Action extends HTMLOutputter // lawsuit
// TRANS: Tooltip for main menu option "Logout" // TRANS: Tooltip for main menu option "Logout"
$tooltip = _m('TOOLTIP', 'Logout from the site'); $tooltip = _m('TOOLTIP', 'Logout from the site');
$this->menuItem(common_local_url('logout'), $this->menuItem(common_local_url('logout'),
// TRANS: Main menu option when logged in to log out the current user // TRANS: Main menu option when logged in to log out the current user.
_m('MENU', 'Logout'), $tooltip, false, 'nav_logout'); _m('MENU', 'Logout'), $tooltip, false, 'nav_logout');
} }
else { else {
if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) { if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) {
// TRANS: Tooltip for main menu option "Register" // TRANS: Tooltip for main menu option "Register".
$tooltip = _m('TOOLTIP', 'Create an account'); $tooltip = _m('TOOLTIP', 'Create an account');
$this->menuItem(common_local_url('register'), $this->menuItem(common_local_url('register'),
// TRANS: Main menu option when not logged in to register a new account // TRANS: Main menu option when not logged in to register a new account.
_m('MENU', 'Register'), $tooltip, false, 'nav_register'); _m('MENU', 'Register'), $tooltip, false, 'nav_register');
} }
// TRANS: Tooltip for main menu option "Login" // TRANS: Tooltip for main menu option "Login".
$tooltip = _m('TOOLTIP', 'Login to the site'); $tooltip = _m('TOOLTIP', 'Login to the site');
$this->menuItem(common_local_url('login'), $this->menuItem(common_local_url('login'),
// TRANS: Main menu option when not logged in to log in // TRANS: Main menu option when not logged in to log in.
_m('MENU', 'Login'), $tooltip, false, 'nav_login'); _m('MENU', 'Login'), $tooltip, false, 'nav_login');
} }
// TRANS: Tooltip for main menu option "Help" // TRANS: Tooltip for main menu option "Help".
$tooltip = _m('TOOLTIP', 'Help me!'); $tooltip = _m('TOOLTIP', 'Help me!');
$this->menuItem(common_local_url('doc', array('title' => 'help')), $this->menuItem(common_local_url('doc', array('title' => 'help')),
// TRANS: Main menu option for help on the StatusNet site // TRANS: Main menu option for help on the StatusNet site.
_m('MENU', 'Help'), $tooltip, false, 'nav_help'); _m('MENU', 'Help'), $tooltip, false, 'nav_help');
if ($user || !common_config('site', 'private')) { if ($user || !common_config('site', 'private')) {
// TRANS: Tooltip for main menu option "Search" // TRANS: Tooltip for main menu option "Search".
$tooltip = _m('TOOLTIP', 'Search for people or text'); $tooltip = _m('TOOLTIP', 'Search for people or text');
$this->menuItem(common_local_url('peoplesearch'), $this->menuItem(common_local_url('peoplesearch'),
// TRANS: Main menu option when logged in or when the StatusNet instance is not private // TRANS: Main menu option when logged in or when the StatusNet instance is not private.
_m('MENU', 'Search'), $tooltip, false, 'nav_search'); _m('MENU', 'Search'), $tooltip, false, 'nav_search');
} }
Event::handle('EndPrimaryNav', array($this)); Event::handle('EndPrimaryNav', array($this));