forked from GNUsocial/gnu-social
Translator documentation added/updated.
i18n updates. Superfluous whitespace removed.
This commit is contained in:
13
lib/util.php
13
lib/util.php
@@ -318,6 +318,7 @@ function common_set_user($user)
|
||||
if (Event::handle('StartSetUser', array(&$user))) {
|
||||
if (!empty($user)) {
|
||||
if (!$user->hasRight(Right::WEBLOGIN)) {
|
||||
// TRANS: Authorisation exception thrown when a user a not allowed to login.
|
||||
throw new AuthorizationException(_('Not allowed to log in.'));
|
||||
}
|
||||
common_ensure_session();
|
||||
@@ -867,7 +868,7 @@ function common_replace_urls_callback($text, $callback, $arg = null) {
|
||||
* @param callable $callback
|
||||
* @param mixed $arg optional argument to pass on as second param to callback
|
||||
* @return string
|
||||
*
|
||||
*
|
||||
* @access private
|
||||
*/
|
||||
function callback_helper($matches, $callback, $arg=null) {
|
||||
@@ -1335,28 +1336,28 @@ function common_date_string($dt)
|
||||
} else if ($diff < 3300) {
|
||||
$minutes = round($diff/60);
|
||||
// TRANS: Used in notices to indicate when the notice was made compared to now.
|
||||
return sprintf( ngettext('about one minute ago', 'about %d minutes ago', $minutes), $minutes);
|
||||
return sprintf( _m('about one minute ago', 'about %d minutes ago', $minutes), $minutes);
|
||||
} else if ($diff < 5400) {
|
||||
// TRANS: Used in notices to indicate when the notice was made compared to now.
|
||||
return _('about an hour ago');
|
||||
} else if ($diff < 22 * 3600) {
|
||||
$hours = round($diff/3600);
|
||||
// TRANS: Used in notices to indicate when the notice was made compared to now.
|
||||
return sprintf( ngettext('about one hour ago', 'about %d hours ago', $hours), $hours);
|
||||
return sprintf( _m('about one hour ago', 'about %d hours ago', $hours), $hours);
|
||||
} else if ($diff < 37 * 3600) {
|
||||
// TRANS: Used in notices to indicate when the notice was made compared to now.
|
||||
return _('about a day ago');
|
||||
} else if ($diff < 24 * 24 * 3600) {
|
||||
$days = round($diff/(24*3600));
|
||||
// TRANS: Used in notices to indicate when the notice was made compared to now.
|
||||
return sprintf( ngettext('about one day ago', 'about %d days ago', $days), $days);
|
||||
return sprintf( _m('about one day ago', 'about %d days ago', $days), $days);
|
||||
} else if ($diff < 46 * 24 * 3600) {
|
||||
// TRANS: Used in notices to indicate when the notice was made compared to now.
|
||||
return _('about a month ago');
|
||||
} else if ($diff < 330 * 24 * 3600) {
|
||||
$months = round($diff/(30*24*3600));
|
||||
// TRANS: Used in notices to indicate when the notice was made compared to now.
|
||||
return sprintf( ngettext('about one month ago', 'about %d months ago',$months), $months);
|
||||
return sprintf( _m('about one month ago', 'about %d months ago',$months), $months);
|
||||
} else if ($diff < 480 * 24 * 3600) {
|
||||
// TRANS: Used in notices to indicate when the notice was made compared to now.
|
||||
return _('about a year ago');
|
||||
@@ -2075,7 +2076,7 @@ function common_shorten_url($long_url, User $user=null, $force = false)
|
||||
|
||||
$shortenerName = User_urlshortener_prefs::urlShorteningService($user);
|
||||
|
||||
if (Event::handle('StartShortenUrl',
|
||||
if (Event::handle('StartShortenUrl',
|
||||
array($long_url, $shortenerName, &$shortenedUrl))) {
|
||||
if ($shortenerName == 'internal') {
|
||||
$f = File::processNew($long_url);
|
||||
|
Reference in New Issue
Block a user