From e8c9685b16ad830af1fdec9fa31677aefc471cf3 Mon Sep 17 00:00:00 2001 From: Marc Hibbins Date: Tue, 6 Jan 2015 15:37:41 +0000 Subject: [PATCH 1/2] Rename Australia abbreviation --- subscription.py | 12 ++++++------ .../{digital-pack-aus.html => digital-pack-au.html} | 0 ...{subscriptions-aus.html => subscriptions-au.html} | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) rename templates/{digital-pack-aus.html => digital-pack-au.html} (100%) rename templates/{subscriptions-aus.html => subscriptions-au.html} (98%) diff --git a/subscription.py b/subscription.py index 8775ef6..7885a66 100644 --- 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 b/templates/digital-pack-au.html similarity index 100% rename from templates/digital-pack-aus.html rename to templates/digital-pack-au.html diff --git a/templates/subscriptions-aus.html b/templates/subscriptions-au.html similarity index 98% rename from templates/subscriptions-aus.html rename to templates/subscriptions-au.html index f120415..0efaa40 100644 --- a/templates/subscriptions-aus.html +++ b/templates/subscriptions-au.html @@ -20,7 +20,7 @@

Subscribe to the Guardian di
From b5731e83aa6e7f15e1f592d107f8a632cd32f6e9 Mon Sep 17 00:00:00 2001 From: Marc Hibbins Date: Tue, 6 Jan 2015 17:26:40 +0000 Subject: [PATCH 2/2] Update international digital pack contact details --- templates/digital-pack-au.html | 4 ++-- templates/digital-pack-us.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/digital-pack-au.html b/templates/digital-pack-au.html index b87ded2..882af20 100644 --- a/templates/digital-pack-au.html +++ b/templates/digital-pack-au.html @@ -100,8 +100,8 @@

Why subscribe

Contact

-

For help with Guardian and Observer subscription services please call 0330 333 6767.

-

Open 8am to 8pm, Monday to Sunday, freephone number.

+

For help with Guardian and Observer subscription services please call +44 330 333 6767.

+

Open 8am to 8pm GMT, Monday to Sunday.

You may also find help in our Frequently asked questions.

diff --git a/templates/digital-pack-us.html b/templates/digital-pack-us.html index 09dc0c9..f82b3b5 100644 --- a/templates/digital-pack-us.html +++ b/templates/digital-pack-us.html @@ -100,8 +100,8 @@

Why subscribe

Contact

-

For help with Guardian and Observer subscription services please call 0330 333 6767.

-

Open 8am to 8pm, Monday to Sunday, freephone number.

+

For help with Guardian and Observer subscription services please call +44 330 333 6767.

+

Open 8am to 8pm GMT, Monday to Sunday.

You may also find help in our Frequently asked questions.