From e28c4689cee5a832c281b0329c9d279e4bbd9d33 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 1 Apr 2009 18:29:10 -0400
Subject: [PATCH 1/2] add sup with arguments

---
 actions/sup.php | 2 +-
 lib/router.php  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/actions/sup.php b/actions/sup.php
index 8ef9207fac..246b3299d3 100644
--- a/actions/sup.php
+++ b/actions/sup.php
@@ -45,7 +45,7 @@ class SupAction extends Action
     function availablePeriods()
     {
         static $periods = array(86400, 43200, 21600, 7200,
-                                3600, 1800,    600, 300, 120,
+                                3600, 1800, 600, 300, 120,
                                 60, 30, 15);
         $available = array();
         foreach ($periods as $period) {
diff --git a/lib/router.php b/lib/router.php
index ae5b5e16bd..6fb2f94872 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -107,6 +107,9 @@ class Router
             $m->connect('main/'.$a, array('action' => $a));
         }
 
+        $m->connect('main/sup/:seconds', array('action' => 'sup'),
+                    array('seconds' => '[0-9]+'));
+
         $m->connect('main/tagother/:id', array('action' => 'tagother'));
 
         // these take a code

From 26194cd1d6dbd7ceb021b8e215e7a7ad7b29116f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 2 Apr 2009 06:10:32 -0400
Subject: [PATCH 2/2] i18n for legend in remote sub form

---
 actions/remotesubscribe.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index 2e721a38b0..0b11748962 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -97,7 +97,7 @@ class RemotesubscribeAction extends Action
                                           'class' => 'form_settings',
                                           'action' => common_local_url('remotesubscribe')));
         $this->elementStart('fieldset');
-        $this->element('legend', 'Subscribe to a remote user');
+        $this->element('legend', _('Subscribe to a remote user'));
         $this->hidden('token', common_session_token());
 
         $this->elementStart('ul', 'form_data');