* i18n/L10n updates.
* remove superfluous whitespace.
This commit is contained in:
parent
e0952bf56b
commit
500f8e5a87
@ -69,4 +69,3 @@ class FirePHPPlugin extends Plugin
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -46,7 +46,6 @@ if (!defined('STATUSNET')) {
|
|||||||
*
|
*
|
||||||
* @seeAlso Location
|
* @seeAlso Location
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class GeoURLPlugin extends Plugin
|
class GeoURLPlugin extends Plugin
|
||||||
{
|
{
|
||||||
public $ping = 'http://geourl.org/ping/';
|
public $ping = 'http://geourl.org/ping/';
|
||||||
@ -58,7 +57,6 @@ class GeoURLPlugin extends Plugin
|
|||||||
*
|
*
|
||||||
* @return boolean event handler flag
|
* @return boolean event handler flag
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function onEndShowHeadElements($action)
|
function onEndShowHeadElements($action)
|
||||||
{
|
{
|
||||||
$name = $action->trimmed('action');
|
$name = $action->trimmed('action');
|
||||||
@ -94,7 +92,6 @@ class GeoURLPlugin extends Plugin
|
|||||||
*
|
*
|
||||||
* @return boolean event handler flag
|
* @return boolean event handler flag
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function onHandleQueuedNotice(&$notice)
|
function onHandleQueuedNotice(&$notice)
|
||||||
{
|
{
|
||||||
if ($notice->is_local == 1) {
|
if ($notice->is_local == 1) {
|
||||||
|
@ -46,7 +46,6 @@ if (!defined('STATUSNET')) {
|
|||||||
*
|
*
|
||||||
* @seeAlso Location
|
* @seeAlso Location
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class GeonamesPlugin extends Plugin
|
class GeonamesPlugin extends Plugin
|
||||||
{
|
{
|
||||||
const LOCATION_NS = 1;
|
const LOCATION_NS = 1;
|
||||||
@ -71,7 +70,6 @@ class GeonamesPlugin extends Plugin
|
|||||||
*
|
*
|
||||||
* @return boolean whether to continue (results in $location)
|
* @return boolean whether to continue (results in $location)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function onLocationFromName($name, $language, &$location)
|
function onLocationFromName($name, $language, &$location)
|
||||||
{
|
{
|
||||||
$loc = $this->getCache(array('name' => $name,
|
$loc = $this->getCache(array('name' => $name,
|
||||||
@ -129,7 +127,6 @@ class GeonamesPlugin extends Plugin
|
|||||||
*
|
*
|
||||||
* @return boolean whether to continue (results in $location)
|
* @return boolean whether to continue (results in $location)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function onLocationFromId($id, $ns, $language, &$location)
|
function onLocationFromId($id, $ns, $language, &$location)
|
||||||
{
|
{
|
||||||
if ($ns != self::LOCATION_NS) {
|
if ($ns != self::LOCATION_NS) {
|
||||||
@ -198,7 +195,6 @@ class GeonamesPlugin extends Plugin
|
|||||||
*
|
*
|
||||||
* @return boolean whether to continue (results in $location)
|
* @return boolean whether to continue (results in $location)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function onLocationFromLatLon($lat, $lon, $language, &$location)
|
function onLocationFromLatLon($lat, $lon, $language, &$location)
|
||||||
{
|
{
|
||||||
// Make sure they're canonical
|
// Make sure they're canonical
|
||||||
@ -276,7 +272,6 @@ class GeonamesPlugin extends Plugin
|
|||||||
*
|
*
|
||||||
* @return boolean whether to continue
|
* @return boolean whether to continue
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function onLocationNameLanguage($location, $language, &$name)
|
function onLocationNameLanguage($location, $language, &$name)
|
||||||
{
|
{
|
||||||
if ($location->location_ns != self::LOCATION_NS) {
|
if ($location->location_ns != self::LOCATION_NS) {
|
||||||
@ -344,7 +339,6 @@ class GeonamesPlugin extends Plugin
|
|||||||
*
|
*
|
||||||
* @return boolean whether to continue
|
* @return boolean whether to continue
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function onLocationUrl($location, &$url)
|
function onLocationUrl($location, &$url)
|
||||||
{
|
{
|
||||||
if ($location->location_ns != self::LOCATION_NS) {
|
if ($location->location_ns != self::LOCATION_NS) {
|
||||||
@ -368,7 +362,6 @@ class GeonamesPlugin extends Plugin
|
|||||||
*
|
*
|
||||||
* @return boolean whether to continue
|
* @return boolean whether to continue
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function onLocationRdfUrl($location, &$url)
|
function onLocationRdfUrl($location, &$url)
|
||||||
{
|
{
|
||||||
if ($location->location_ns != self::LOCATION_NS) {
|
if ($location->location_ns != self::LOCATION_NS) {
|
||||||
|
@ -132,7 +132,6 @@ class GravatarPlugin extends Plugin
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function gravatar_save()
|
function gravatar_save()
|
||||||
{
|
{
|
||||||
$cur = common_current_user();
|
$cur = common_current_user();
|
||||||
|
@ -44,7 +44,7 @@ class ImapManager extends IoManager
|
|||||||
*/
|
*/
|
||||||
public static function get()
|
public static function get()
|
||||||
{
|
{
|
||||||
throw new Exception('ImapManager should be created using it\'s constructor, not the static get method');
|
throw new Exception(_m('ImapManager should be created using its constructor, not the using the static get method.'));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -60,13 +60,13 @@ class LdapCommon
|
|||||||
$this->ldap_config = $this->get_ldap_config();
|
$this->ldap_config = $this->get_ldap_config();
|
||||||
|
|
||||||
if(!isset($this->host)){
|
if(!isset($this->host)){
|
||||||
throw new Exception("must specify a host");
|
throw new Exception(_m("A host must be specified."));
|
||||||
}
|
}
|
||||||
if(!isset($this->basedn)){
|
if(!isset($this->basedn)){
|
||||||
throw new Exception("must specify a basedn");
|
throw new Exception(_m('"basedn" must be specified.'));
|
||||||
}
|
}
|
||||||
if(!isset($this->attributes['username'])){
|
if(!isset($this->attributes['username'])){
|
||||||
throw new Exception("username attribute must be set.");
|
throw new Exception(_m('The username attribute must be set.'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -254,7 +254,6 @@ class LdapCommon
|
|||||||
* @return string The hashed password.
|
* @return string The hashed password.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function hashPassword( $passwordClear, $encodageType )
|
function hashPassword( $passwordClear, $encodageType )
|
||||||
{
|
{
|
||||||
$encodageType = strtolower( $encodageType );
|
$encodageType = strtolower( $encodageType );
|
||||||
@ -345,7 +344,6 @@ class LdapCommon
|
|||||||
* @param int $length The length of the salt string to generate.
|
* @param int $length The length of the salt string to generate.
|
||||||
* @return string The generated salt string.
|
* @return string The generated salt string.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function randomSalt( $length )
|
function randomSalt( $length )
|
||||||
{
|
{
|
||||||
$possible = '0123456789'.
|
$possible = '0123456789'.
|
||||||
@ -360,10 +358,8 @@ class LdapCommon
|
|||||||
|
|
||||||
return $str;
|
return $str;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class LdapInvalidCredentialsException extends Exception
|
class LdapInvalidCredentialsException extends Exception
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -40,7 +40,7 @@ class LilUrlPlugin extends UrlShortenerPlugin
|
|||||||
function onInitializePlugin(){
|
function onInitializePlugin(){
|
||||||
parent::onInitializePlugin();
|
parent::onInitializePlugin();
|
||||||
if(!isset($this->serviceUrl)){
|
if(!isset($this->serviceUrl)){
|
||||||
throw new Exception("must specify a serviceUrl");
|
throw new Exception(_m('A serviceUrl must be specified.'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -71,4 +71,3 @@ class LilUrlPlugin extends UrlShortenerPlugin
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -49,7 +49,6 @@ define('LINKBACKPLUGIN_VERSION', '0.1');
|
|||||||
*
|
*
|
||||||
* @see Event
|
* @see Event
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class LinkbackPlugin extends Plugin
|
class LinkbackPlugin extends Plugin
|
||||||
{
|
{
|
||||||
var $notice = null;
|
var $notice = null;
|
||||||
@ -154,7 +153,6 @@ class LinkbackPlugin extends Plugin
|
|||||||
// Largely cadged from trackback_cls.php by
|
// Largely cadged from trackback_cls.php by
|
||||||
// Ran Aroussi <ran@blogish.org>, GPL2 or any later version
|
// Ran Aroussi <ran@blogish.org>, GPL2 or any later version
|
||||||
// http://phptrackback.sourceforge.net/
|
// http://phptrackback.sourceforge.net/
|
||||||
|
|
||||||
function getTrackback($text, $url)
|
function getTrackback($text, $url)
|
||||||
{
|
{
|
||||||
if (preg_match_all('/(<rdf:RDF.*?<\/rdf:RDF>)/sm', $text, $match, PREG_SET_ORDER)) {
|
if (preg_match_all('/(<rdf:RDF.*?<\/rdf:RDF>)/sm', $text, $match, PREG_SET_ORDER)) {
|
||||||
|
@ -48,7 +48,6 @@ if (!defined('STATUSNET')) {
|
|||||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||||
* @link http://status.net/
|
* @link http://status.net/
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class MemcachePlugin extends Plugin
|
class MemcachePlugin extends Plugin
|
||||||
{
|
{
|
||||||
static $cacheInitialized = false;
|
static $cacheInitialized = false;
|
||||||
@ -70,7 +69,6 @@ class MemcachePlugin extends Plugin
|
|||||||
*
|
*
|
||||||
* @return boolean flag value
|
* @return boolean flag value
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function onInitializePlugin()
|
function onInitializePlugin()
|
||||||
{
|
{
|
||||||
if (self::$cacheInitialized) {
|
if (self::$cacheInitialized) {
|
||||||
@ -101,7 +99,6 @@ class MemcachePlugin extends Plugin
|
|||||||
*
|
*
|
||||||
* @return boolean hook success
|
* @return boolean hook success
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function onStartCacheGet(&$key, &$value)
|
function onStartCacheGet(&$key, &$value)
|
||||||
{
|
{
|
||||||
$this->_ensureConn();
|
$this->_ensureConn();
|
||||||
@ -121,7 +118,6 @@ class MemcachePlugin extends Plugin
|
|||||||
*
|
*
|
||||||
* @return boolean hook success
|
* @return boolean hook success
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function onStartCacheSet(&$key, &$value, &$flag, &$expiry, &$success)
|
function onStartCacheSet(&$key, &$value, &$flag, &$expiry, &$success)
|
||||||
{
|
{
|
||||||
$this->_ensureConn();
|
$this->_ensureConn();
|
||||||
@ -160,7 +156,6 @@ class MemcachePlugin extends Plugin
|
|||||||
*
|
*
|
||||||
* @return boolean hook success
|
* @return boolean hook success
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function onStartCacheDelete(&$key, &$success)
|
function onStartCacheDelete(&$key, &$success)
|
||||||
{
|
{
|
||||||
$this->_ensureConn();
|
$this->_ensureConn();
|
||||||
@ -194,7 +189,6 @@ class MemcachePlugin extends Plugin
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
|
|
||||||
private function _ensureConn()
|
private function _ensureConn()
|
||||||
{
|
{
|
||||||
if (empty($this->_conn)) {
|
if (empty($this->_conn)) {
|
||||||
@ -253,4 +247,3 @@ class MemcachePlugin extends Plugin
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user