diff options
author | Evan Prodromou <evan@status.net> | 2010-09-22 10:45:34 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-09-22 10:45:34 -0400 |
commit | b5cfcba4712809cb17eabba299ce5ff04f4d7d70 (patch) | |
tree | 38235bafd6ddf194e484b97321c0c341bea9de38 /plugins/RegisterThrottle/RegisterThrottlePlugin.php | |
parent | 91a186251047127ad7f1238f47ff761d9127627c (diff) | |
parent | f0105893b0b78ff88d08cc2417773ad8a44dc2fa (diff) |
Merge branch '0.9.x' into activityexport
Conflicts:
plugins/OStatus/OStatusPlugin.php
Diffstat (limited to 'plugins/RegisterThrottle/RegisterThrottlePlugin.php')
-rw-r--r-- | plugins/RegisterThrottle/RegisterThrottlePlugin.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/plugins/RegisterThrottle/RegisterThrottlePlugin.php b/plugins/RegisterThrottle/RegisterThrottlePlugin.php index 05709b780..b6e9a9026 100644 --- a/plugins/RegisterThrottle/RegisterThrottlePlugin.php +++ b/plugins/RegisterThrottle/RegisterThrottlePlugin.php @@ -113,7 +113,6 @@ class RegisterThrottlePlugin extends Plugin * @return boolean hook value * */ - function onStartRegistrationTry($action) { $ipaddress = $this->_getIpAddress(); @@ -134,7 +133,7 @@ class RegisterThrottlePlugin extends Plugin $now = time(); $this->debug("Comparing {$regtime} to {$now}"); 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.")); } } } @@ -197,7 +196,7 @@ class RegisterThrottlePlugin extends Plugin 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:RegisterThrottle', 'description' => - _m('Throttles excessive registration from a single IP.')); + _m('Throttles excessive registration from a single IP address.')); return true; } |