forked from GNUsocial/gnu-social
		
	* update i18n/L10n
* remove superfluous whitespace
This commit is contained in:
		@@ -113,7 +113,6 @@ class RegisterThrottlePlugin extends Plugin
 | 
				
			|||||||
     * @return boolean hook value
 | 
					     * @return boolean hook value
 | 
				
			||||||
     *
 | 
					     *
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
 | 
					 | 
				
			||||||
    function onStartRegistrationTry($action)
 | 
					    function onStartRegistrationTry($action)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        $ipaddress = $this->_getIpAddress();
 | 
					        $ipaddress = $this->_getIpAddress();
 | 
				
			||||||
@@ -134,7 +133,7 @@ class RegisterThrottlePlugin extends Plugin
 | 
				
			|||||||
                $now     = time();
 | 
					                $now     = time();
 | 
				
			||||||
                $this->debug("Comparing {$regtime} to {$now}");
 | 
					                $this->debug("Comparing {$regtime} to {$now}");
 | 
				
			||||||
                if ($now - $regtime < $seconds) {
 | 
					                if ($now - $regtime < $seconds) {
 | 
				
			||||||
                    throw new Exception(_("Too many registrations. Take a break and try again later."));
 | 
					                    throw new Exception(_m("Too many registrations. Take a break and try again later."));
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -42,7 +42,6 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
 | 
				
			|||||||
 * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
 | 
					 * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
 | 
				
			||||||
 * @link     http://status.net/
 | 
					 * @link     http://status.net/
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					 | 
				
			||||||
class Registration_ip extends Memcached_DataObject
 | 
					class Registration_ip extends Memcached_DataObject
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    public $__table = 'registration_ip';     // table name
 | 
					    public $__table = 'registration_ip';     // table name
 | 
				
			||||||
@@ -59,7 +58,6 @@ class Registration_ip extends Memcached_DataObject
 | 
				
			|||||||
     * @return User_greeting_count object found, or null for no hits
 | 
					     * @return User_greeting_count object found, or null for no hits
 | 
				
			||||||
     *
 | 
					     *
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
 | 
					 | 
				
			||||||
    function staticGet($k, $v=null)
 | 
					    function staticGet($k, $v=null)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        return Memcached_DataObject::staticGet('Registration_ip', $k, $v);
 | 
					        return Memcached_DataObject::staticGet('Registration_ip', $k, $v);
 | 
				
			||||||
@@ -70,7 +68,6 @@ class Registration_ip extends Memcached_DataObject
 | 
				
			|||||||
     *
 | 
					     *
 | 
				
			||||||
     * @return array array of column definitions
 | 
					     * @return array array of column definitions
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
 | 
					 | 
				
			||||||
    function table()
 | 
					    function table()
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        return array('user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
 | 
					        return array('user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
 | 
				
			||||||
@@ -86,7 +83,6 @@ class Registration_ip extends Memcached_DataObject
 | 
				
			|||||||
     *
 | 
					     *
 | 
				
			||||||
     * @return array key definitions
 | 
					     * @return array key definitions
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
 | 
					 | 
				
			||||||
    function keys()
 | 
					    function keys()
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        return array('user_id' => 'K');
 | 
					        return array('user_id' => 'K');
 | 
				
			||||||
@@ -100,7 +96,6 @@ class Registration_ip extends Memcached_DataObject
 | 
				
			|||||||
     *
 | 
					     *
 | 
				
			||||||
     * @return array key definitions
 | 
					     * @return array key definitions
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
 | 
					 | 
				
			||||||
    function keyTypes()
 | 
					    function keyTypes()
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        return $this->keys();
 | 
					        return $this->keys();
 | 
				
			||||||
@@ -116,7 +111,6 @@ class Registration_ip extends Memcached_DataObject
 | 
				
			|||||||
     *
 | 
					     *
 | 
				
			||||||
     * @return array magic three-false array that stops auto-incrementing.
 | 
					     * @return array magic three-false array that stops auto-incrementing.
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
 | 
					 | 
				
			||||||
    function sequenceKey()
 | 
					    function sequenceKey()
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        return array(false, false, false);
 | 
					        return array(false, false, false);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user