Merge branch 'master' into landing-page-styles

Conflicts: templates/subscriptions-au.html
guardian · Jan 6, 2015 · 1914c20 · 1914c20
2 parents 4e76d19 + b5731e8
commit 1914c20
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/subscription.py b/subscription.py
@@ -24,9 +24,9 @@ def get(self):
         template = jinja_environment.get_template('subscriptions-us.html')
         self.response.out.write(template.render())
 
-class SubscriptionsAus(webapp2.RequestHandler):
+class SubscriptionsAu(webapp2.RequestHandler):
     def get(self):
-        template = jinja_environment.get_template('subscriptions-aus.html')
+        template = jinja_environment.get_template('subscriptions-au.html')
         self.response.out.write(template.render())
 
 class DigitalPackUK(webapp2.RequestHandler):
@@ -39,16 +39,16 @@ def get(self):
         template = jinja_environment.get_template('digital-pack-us.html')
         self.response.out.write(template.render())
 
-class DigitalPackAus(webapp2.RequestHandler):
+class DigitalPackAu(webapp2.RequestHandler):
     def get(self):
-        template = jinja_environment.get_template('digital-pack-aus.html')
+        template = jinja_environment.get_template('digital-pack-au.html')
         self.response.out.write(template.render())
 
 app = webapp2.WSGIApplication([
     ('/us/digitalpack', DigitalPackUS),
     ('/us', SubscriptionsUS),
-    ('/aus/digitalpack', DigitalPackAus),
-    ('/aus', SubscriptionsAus),
+    ('/au/digitalpack', DigitalPackAu),
+    ('/au', SubscriptionsAu),
     ('/digitalpack', DigitalPackUK),
     ('/', SubscriptionsUK),
     ('/(.*?)', SubscriptionsUK),

diff --git a/templates/digital-pack-aus.html → templates/digital-pack-au.html b/templates/digital-pack-aus.html → templates/digital-pack-au.html
@@ -100,8 +100,8 @@ <h2>Why subscribe</h2>
               <h2>Contact</h2>
 
               <div class="">
-                <p>For help with Guardian and Observer subscription services please call 0330 333 6767.</p>
-                <p>Open 8am to 8pm, Monday to Sunday, freephone number.</p>
+                <p>For help with Guardian and Observer subscription services please call +44 330 333 6767.</p>
+                <p>Open 8am to 8pm GMT, Monday to Sunday.</p>
               </div>
               <div class="">
                 <p>You may also find help in our <a href="http://www.theguardian.com/info/2014/aug/06/guardian-observer-digital-subscriptions-faq">Frequently asked questions</a>.</p>

diff --git a/templates/digital-pack-us.html b/templates/digital-pack-us.html
@@ -100,8 +100,8 @@ <h2>Why subscribe</h2>
               <h2>Contact</h2>
 
               <div class="">
-                <p>For help with Guardian and Observer subscription services please call 0330 333 6767.</p>
-                <p>Open 8am to 8pm, Monday to Sunday, freephone number.</p>
+                <p>For help with Guardian and Observer subscription services please call +44 330 333 6767.</p>
+                <p>Open 8am to 8pm GMT, Monday to Sunday.</p>
               </div>
               <div class="">
                 <p>You may also find help in our <a href="http://www.theguardian.com/info/2014/aug/06/guardian-observer-digital-subscriptions-faq">Frequently asked questions</a>.</p>

diff --git a/templates/subscriptions-aus.html → templates/subscriptions-au.html b/templates/subscriptions-aus.html → templates/subscriptions-au.html
@@ -20,7 +20,7 @@ <h2 class="block__title">Subscribe to the Guardian <span class="break-tablet">di
                 </ul>
             </div>
             <div class="block__footer">
-                <a class="button button--large button--primary" href="/aus/digitalpack">Subscribe now</a>
+                <a class="button button--large button--primary" href="/au/digitalpack">Subscribe now</a>
             </div>
         </div>
         <div class="row__item block block--primary block--weekly">