From f80e2ed5c4bed58953a6fda518adc86502c52849 Mon Sep 17 00:00:00 2001 From: 4Giedrius <4giedrius@gmail.com> Date: Mon, 12 Jan 2015 12:22:24 +0200 Subject: [PATCH] Twig 'date' filter changed to 'bb_date' where necessary fixes #223 --- src/bb-modules/Invoice/html_email/mod_invoice_created.phtml | 4 ++-- .../Invoice/html_email/mod_invoice_due_after.phtml | 2 +- .../Invoice/html_email/mod_invoice_payment_reminder.phtml | 2 +- .../html_admin/mod_serviceboxbillinglicense_manage.phtml | 6 +++--- .../html_email/mod_servicecentovacast_canceled.phtml | 2 +- .../html_email/mod_servicecentovacast_renewed.phtml | 2 +- .../html_email/mod_servicecentovacast_suspended.phtml | 2 +- .../html_email/mod_servicecustom_canceled.phtml | 2 +- .../html_email/mod_servicecustom_renewed.phtml | 2 +- .../html_email/mod_servicecustom_suspended.phtml | 2 +- .../html_email/mod_servicedomain_activated.phtml | 4 ++-- .../html_email/mod_servicedomain_renewed.phtml | 2 +- .../html_email/mod_servicedomain_suspended.phtml | 2 +- .../html_email/mod_servicehosting_activated.phtml | 4 ++-- .../html_email/mod_servicehosting_canceled.phtml | 2 +- .../html_email/mod_servicehosting_renewed.phtml | 2 +- .../html_email/mod_servicehosting_suspended.phtml | 2 +- .../html_email/mod_servicelicense_canceled.phtml | 2 +- .../html_email/mod_servicelicense_renewed.phtml | 2 +- .../html_email/mod_servicelicense_suspended.phtml | 2 +- .../html_email/mod_servicemembership_canceled.phtml | 2 +- .../html_email/mod_servicemembership_renewed.phtml | 2 +- .../html_email/mod_servicemembership_suspended.phtml | 2 +- .../html_email/mod_servicesolusvm_canceled.phtml | 2 +- .../html_email/mod_servicesolusvm_renewed.phtml | 2 +- .../html_email/mod_servicesolusvm_suspended.phtml | 2 +- .../html_email/mod_serviceyouhosting_activated.phtml | 2 +- .../html_email/mod_serviceyouhosting_canceled.phtml | 2 +- .../html_email/mod_serviceyouhosting_renewed.phtml | 2 +- .../html_email/mod_serviceyouhosting_suspended.phtml | 2 +- .../Staff/html_email/mod_staff_client_order.phtml | 2 +- .../admin_default/html/mod_servicelicense_manage.phtml | 2 +- 32 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/bb-modules/Invoice/html_email/mod_invoice_created.phtml b/src/bb-modules/Invoice/html_email/mod_invoice_created.phtml index f958f976f..ee2e583f9 100644 --- a/src/bb-modules/Invoice/html_email/mod_invoice_created.phtml +++ b/src/bb-modules/Invoice/html_email/mod_invoice_created.phtml @@ -3,9 +3,9 @@ {% filter markdown %} Hello {{ c.first_name }} {{ c.last_name }}, -This is to notify that proforma invoice {{ invoice.id }} was generated on {{ invoice.created_at|date }}. +This is to notify that proforma invoice {{ invoice.id }} was generated on {{ invoice.created_at|bb_date }}. Amount Due: {{ invoice.total | money(invoice.currency) }} -Due Date: {{invoice.due_at|date}} +Due Date: {{invoice.due_at|bb_date}} You can view and pay the invoice at: {{'invoice'|link}}/{{invoice.hash}} diff --git a/src/bb-modules/Invoice/html_email/mod_invoice_due_after.phtml b/src/bb-modules/Invoice/html_email/mod_invoice_due_after.phtml index dd8262a29..721e019c3 100644 --- a/src/bb-modules/Invoice/html_email/mod_invoice_due_after.phtml +++ b/src/bb-modules/Invoice/html_email/mod_invoice_due_after.phtml @@ -7,7 +7,7 @@ This is a payment reminder that your proforma invoice **{{ invoice.serie_nr }}** due for {{ days_passed }} days. Amount due: {{ invoice.total | money(invoice.currency) }} -Due Date: {{ invoice.due_at|date }} +Due Date: {{ invoice.due_at|bb_date }} You can view and pay the invoice at: {{'invoice'|link}}/{{invoice.hash}} diff --git a/src/bb-modules/Invoice/html_email/mod_invoice_payment_reminder.phtml b/src/bb-modules/Invoice/html_email/mod_invoice_payment_reminder.phtml index 50dac8036..274a916b3 100644 --- a/src/bb-modules/Invoice/html_email/mod_invoice_payment_reminder.phtml +++ b/src/bb-modules/Invoice/html_email/mod_invoice_payment_reminder.phtml @@ -7,7 +7,7 @@ This is to remind that your proforma invoice **{{ invoice.serie_nr }}** is due in {{ invoice.due_at|daysleft }} days. Amount due: {{ invoice.total | money(invoice.currency) }} -Due Date: {{ invoice.due_at|date }} +Due Date: {{ invoice.due_at|bb_date }} You can view and pay the invoice at: {{'invoice'|link}}/{{invoice.hash}} diff --git a/src/bb-modules/Serviceboxbillinglicense/html_admin/mod_serviceboxbillinglicense_manage.phtml b/src/bb-modules/Serviceboxbillinglicense/html_admin/mod_serviceboxbillinglicense_manage.phtml index 0dfd41960..c1a3605e2 100644 --- a/src/bb-modules/Serviceboxbillinglicense/html_admin/mod_serviceboxbillinglicense_manage.phtml +++ b/src/bb-modules/Serviceboxbillinglicense/html_admin/mod_serviceboxbillinglicense_manage.phtml @@ -37,15 +37,15 @@ {% trans 'Created at' %}: - {{ info.created_at|date }} + {{ info.created_at|bb_date }} {% trans 'Updated at' %}: - {{ info.updated_at|date }} + {{ info.updated_at|bb_date }} {% trans 'Expires at' %}: - {{ info.expires_at|date }} + {{ info.expires_at|bb_date }} {% trans 'Valid IPs' %}: diff --git a/src/bb-modules/Servicecentovacast/html_email/mod_servicecentovacast_canceled.phtml b/src/bb-modules/Servicecentovacast/html_email/mod_servicecentovacast_canceled.phtml index 3c003f9b7..ebd6ab616 100644 --- a/src/bb-modules/Servicecentovacast/html_email/mod_servicecentovacast_canceled.phtml +++ b/src/bb-modules/Servicecentovacast/html_email/mod_servicecentovacast_canceled.phtml @@ -4,7 +4,7 @@ Hello {{ c.first_name }} {{ c.last_name }}, -Your *{{ order.title }}* that was activated on *{{ order.activated_at|date }}* is now canceled +Your *{{ order.title }}* that was activated on *{{ order.activated_at|bb_date }}* is now canceled {% if order.reason %} Reason: **{{ order.reason }}** {% endif %} diff --git a/src/bb-modules/Servicecentovacast/html_email/mod_servicecentovacast_renewed.phtml b/src/bb-modules/Servicecentovacast/html_email/mod_servicecentovacast_renewed.phtml index 5f6077c49..ae9636860 100644 --- a/src/bb-modules/Servicecentovacast/html_email/mod_servicecentovacast_renewed.phtml +++ b/src/bb-modules/Servicecentovacast/html_email/mod_servicecentovacast_renewed.phtml @@ -8,7 +8,7 @@ Your **{{ order.title }}** has been renewed. {% if order.expires_at %} -Next renewal date: {{ order.expires_at|date }} +Next renewal date: {{ order.expires_at|bb_date }} {% endif %} diff --git a/src/bb-modules/Servicecentovacast/html_email/mod_servicecentovacast_suspended.phtml b/src/bb-modules/Servicecentovacast/html_email/mod_servicecentovacast_suspended.phtml index 678c34f1f..1b4b0ec25 100644 --- a/src/bb-modules/Servicecentovacast/html_email/mod_servicecentovacast_suspended.phtml +++ b/src/bb-modules/Servicecentovacast/html_email/mod_servicecentovacast_suspended.phtml @@ -4,7 +4,7 @@ Hello {{ c.first_name }} {{ c.last_name }}, -Your *{{ order.title }}* that was activated on *{{ order.activated_at|date }}* is now suspended +Your *{{ order.title }}* that was activated on *{{ order.activated_at|bb_date }}* is now suspended {% if order.reason %} Reason: **{{ order.reason }}** {% endif %} diff --git a/src/bb-modules/Servicecustom/html_email/mod_servicecustom_canceled.phtml b/src/bb-modules/Servicecustom/html_email/mod_servicecustom_canceled.phtml index 3c003f9b7..ebd6ab616 100644 --- a/src/bb-modules/Servicecustom/html_email/mod_servicecustom_canceled.phtml +++ b/src/bb-modules/Servicecustom/html_email/mod_servicecustom_canceled.phtml @@ -4,7 +4,7 @@ Hello {{ c.first_name }} {{ c.last_name }}, -Your *{{ order.title }}* that was activated on *{{ order.activated_at|date }}* is now canceled +Your *{{ order.title }}* that was activated on *{{ order.activated_at|bb_date }}* is now canceled {% if order.reason %} Reason: **{{ order.reason }}** {% endif %} diff --git a/src/bb-modules/Servicecustom/html_email/mod_servicecustom_renewed.phtml b/src/bb-modules/Servicecustom/html_email/mod_servicecustom_renewed.phtml index 5f6077c49..ae9636860 100644 --- a/src/bb-modules/Servicecustom/html_email/mod_servicecustom_renewed.phtml +++ b/src/bb-modules/Servicecustom/html_email/mod_servicecustom_renewed.phtml @@ -8,7 +8,7 @@ Your **{{ order.title }}** has been renewed. {% if order.expires_at %} -Next renewal date: {{ order.expires_at|date }} +Next renewal date: {{ order.expires_at|bb_date }} {% endif %} diff --git a/src/bb-modules/Servicecustom/html_email/mod_servicecustom_suspended.phtml b/src/bb-modules/Servicecustom/html_email/mod_servicecustom_suspended.phtml index cf789a5e3..69013aa3a 100644 --- a/src/bb-modules/Servicecustom/html_email/mod_servicecustom_suspended.phtml +++ b/src/bb-modules/Servicecustom/html_email/mod_servicecustom_suspended.phtml @@ -4,7 +4,7 @@ Hello {{ c.first_name }} {{ c.last_name }}, -Your *{{ order.title }}* that was activated at *{{ order.activated_at|date }}* is now suspended +Your *{{ order.title }}* that was activated at *{{ order.activated_at|bb_date }}* is now suspended {% if order.reason %} Reason: **{{ order.reason }}** {% endif %} diff --git a/src/bb-modules/Servicedomain/html_email/mod_servicedomain_activated.phtml b/src/bb-modules/Servicedomain/html_email/mod_servicedomain_activated.phtml index d1c2005c2..90aaf42d6 100644 --- a/src/bb-modules/Servicedomain/html_email/mod_servicedomain_activated.phtml +++ b/src/bb-modules/Servicedomain/html_email/mod_servicedomain_activated.phtml @@ -15,9 +15,9 @@ Your website and email will not function until the domain has propagated. Domain: {{ service.domain }} -Registration date: {{order.created_at|date}} +Registration date: {{order.created_at|bb_date}} Registration period: {{service.period}} Year(s) -{% if order.expires_at %}Expires on: {{ order.expires_at|date }} {% endif %} +{% if order.expires_at %}Expires on: {{ order.expires_at|bb_date }} {% endif %} {% if order.period %} Billing period: diff --git a/src/bb-modules/Servicedomain/html_email/mod_servicedomain_renewed.phtml b/src/bb-modules/Servicedomain/html_email/mod_servicedomain_renewed.phtml index 127a03ce0..762c3eefe 100644 --- a/src/bb-modules/Servicedomain/html_email/mod_servicedomain_renewed.phtml +++ b/src/bb-modules/Servicedomain/html_email/mod_servicedomain_renewed.phtml @@ -8,7 +8,7 @@ Your **{{ order.title }}** has been renewed. {% if order.expires_at %} -Next renewal date: {{ order.expires_at|date }} +Next renewal date: {{ order.expires_at|bb_date }} {% endif %} diff --git a/src/bb-modules/Servicedomain/html_email/mod_servicedomain_suspended.phtml b/src/bb-modules/Servicedomain/html_email/mod_servicedomain_suspended.phtml index 16b5b5a62..ff4a03658 100644 --- a/src/bb-modules/Servicedomain/html_email/mod_servicedomain_suspended.phtml +++ b/src/bb-modules/Servicedomain/html_email/mod_servicedomain_suspended.phtml @@ -4,7 +4,7 @@ Hello {{ c.first_name }} {{ c.last_name }}, -Your *{{ order.title }}* that was activated on *{{ order.activated_at|date }}* is now suspended. +Your *{{ order.title }}* that was activated on *{{ order.activated_at|bb_date }}* is now suspended. {% if order.reason %} Reason: **{{ order.reason }}** {% endif %} diff --git a/src/bb-modules/Servicehosting/html_email/mod_servicehosting_activated.phtml b/src/bb-modules/Servicehosting/html_email/mod_servicehosting_activated.phtml index da8be1085..20a36c2af 100644 --- a/src/bb-modules/Servicehosting/html_email/mod_servicehosting_activated.phtml +++ b/src/bb-modules/Servicehosting/html_email/mod_servicehosting_activated.phtml @@ -13,8 +13,8 @@ Your website and email will not function until your domain has propagated. **{{ order.title }}** -Activated: {{ order.activated_at|date }} -{% if order.expires_at %}Expires: {{ order.expires_at|date }} {% endif %} +Activated: {{ order.activated_at|bb_date }} +{% if order.expires_at %}Expires: {{ order.expires_at|bb_date }} {% endif %} {% if order.period %} Billing period: diff --git a/src/bb-modules/Servicehosting/html_email/mod_servicehosting_canceled.phtml b/src/bb-modules/Servicehosting/html_email/mod_servicehosting_canceled.phtml index 9e66a52ba..7c62f69c3 100644 --- a/src/bb-modules/Servicehosting/html_email/mod_servicehosting_canceled.phtml +++ b/src/bb-modules/Servicehosting/html_email/mod_servicehosting_canceled.phtml @@ -4,7 +4,7 @@ Hello {{ c.first_name }} {{ c.last_name }}, -Your *{{ order.title }}* that was issued on *{{ order.activated_at|date }}* is now canceled. +Your *{{ order.title }}* that was issued on *{{ order.activated_at|bb_date }}* is now canceled. {% if order.reason %} Reason: **{{ order.reason }}** {% endif %} diff --git a/src/bb-modules/Servicehosting/html_email/mod_servicehosting_renewed.phtml b/src/bb-modules/Servicehosting/html_email/mod_servicehosting_renewed.phtml index 5f6077c49..ae9636860 100644 --- a/src/bb-modules/Servicehosting/html_email/mod_servicehosting_renewed.phtml +++ b/src/bb-modules/Servicehosting/html_email/mod_servicehosting_renewed.phtml @@ -8,7 +8,7 @@ Your **{{ order.title }}** has been renewed. {% if order.expires_at %} -Next renewal date: {{ order.expires_at|date }} +Next renewal date: {{ order.expires_at|bb_date }} {% endif %} diff --git a/src/bb-modules/Servicehosting/html_email/mod_servicehosting_suspended.phtml b/src/bb-modules/Servicehosting/html_email/mod_servicehosting_suspended.phtml index da3c12f6e..c8247f5e5 100644 --- a/src/bb-modules/Servicehosting/html_email/mod_servicehosting_suspended.phtml +++ b/src/bb-modules/Servicehosting/html_email/mod_servicehosting_suspended.phtml @@ -4,7 +4,7 @@ Hello {{ c.first_name }} {{ c.last_name }}, -Your *{{ order.title }}* that was issued on *{{ order.activated_at|date }}* is now suspended. +Your *{{ order.title }}* that was issued on *{{ order.activated_at|bb_date }}* is now suspended. {% if order.reason %} Reason: **{{ order.reason }}** {% endif %} diff --git a/src/bb-modules/Servicelicense/html_email/mod_servicelicense_canceled.phtml b/src/bb-modules/Servicelicense/html_email/mod_servicelicense_canceled.phtml index b2a821a80..bfd781ccb 100644 --- a/src/bb-modules/Servicelicense/html_email/mod_servicelicense_canceled.phtml +++ b/src/bb-modules/Servicelicense/html_email/mod_servicelicense_canceled.phtml @@ -4,7 +4,7 @@ Hello {{ c.first_name }} {{ c.last_name }}, -Your *{{ order.title }}* that was issued on *{{ order.activated_at|date }}* is now canceled. +Your *{{ order.title }}* that was issued on *{{ order.activated_at|bb_date }}* is now canceled. {% if order.reason %} due to reason: **{{ order.reason }}** {% endif %} diff --git a/src/bb-modules/Servicelicense/html_email/mod_servicelicense_renewed.phtml b/src/bb-modules/Servicelicense/html_email/mod_servicelicense_renewed.phtml index 5f6077c49..ae9636860 100644 --- a/src/bb-modules/Servicelicense/html_email/mod_servicelicense_renewed.phtml +++ b/src/bb-modules/Servicelicense/html_email/mod_servicelicense_renewed.phtml @@ -8,7 +8,7 @@ Your **{{ order.title }}** has been renewed. {% if order.expires_at %} -Next renewal date: {{ order.expires_at|date }} +Next renewal date: {{ order.expires_at|bb_date }} {% endif %} diff --git a/src/bb-modules/Servicelicense/html_email/mod_servicelicense_suspended.phtml b/src/bb-modules/Servicelicense/html_email/mod_servicelicense_suspended.phtml index d80a1c154..70cd4917f 100644 --- a/src/bb-modules/Servicelicense/html_email/mod_servicelicense_suspended.phtml +++ b/src/bb-modules/Servicelicense/html_email/mod_servicelicense_suspended.phtml @@ -4,7 +4,7 @@ Hello {{ c.first_name }} {{ c.last_name }}, -Your *{{ order.title }}* that was issued on *{{ order.activated_at|date }}* is now suspended. +Your *{{ order.title }}* that was issued on *{{ order.activated_at|bb_date }}* is now suspended. {% if order.reason %} due to reason: **{{ order.reason }}** {% endif %} diff --git a/src/bb-modules/Servicemembership/html_email/mod_servicemembership_canceled.phtml b/src/bb-modules/Servicemembership/html_email/mod_servicemembership_canceled.phtml index 15674dad7..4b4959bc4 100644 --- a/src/bb-modules/Servicemembership/html_email/mod_servicemembership_canceled.phtml +++ b/src/bb-modules/Servicemembership/html_email/mod_servicemembership_canceled.phtml @@ -4,7 +4,7 @@ Hello {{ c.first_name }} {{ c.last_name }}, -Your *{{ order.title }}* that was activated on *{{ order.activated_at|date }}* is now canceled. +Your *{{ order.title }}* that was activated on *{{ order.activated_at|bb_date }}* is now canceled. {% if order.reason %} Reason: **{{ order.reason }}** {% endif %} diff --git a/src/bb-modules/Servicemembership/html_email/mod_servicemembership_renewed.phtml b/src/bb-modules/Servicemembership/html_email/mod_servicemembership_renewed.phtml index 5f6077c49..ae9636860 100644 --- a/src/bb-modules/Servicemembership/html_email/mod_servicemembership_renewed.phtml +++ b/src/bb-modules/Servicemembership/html_email/mod_servicemembership_renewed.phtml @@ -8,7 +8,7 @@ Your **{{ order.title }}** has been renewed. {% if order.expires_at %} -Next renewal date: {{ order.expires_at|date }} +Next renewal date: {{ order.expires_at|bb_date }} {% endif %} diff --git a/src/bb-modules/Servicemembership/html_email/mod_servicemembership_suspended.phtml b/src/bb-modules/Servicemembership/html_email/mod_servicemembership_suspended.phtml index c92cbd2bc..1fabd72a5 100644 --- a/src/bb-modules/Servicemembership/html_email/mod_servicemembership_suspended.phtml +++ b/src/bb-modules/Servicemembership/html_email/mod_servicemembership_suspended.phtml @@ -4,7 +4,7 @@ Hello {{ c.first_name }} {{ c.last_name }}, -Your *{{ order.title }}* that was activated on *{{ order.activated_at|date }}* is now suspended. +Your *{{ order.title }}* that was activated on *{{ order.activated_at|bb_date }}* is now suspended. {% if order.reason %} due to reason: **{{ order.reason }}** {% endif %} diff --git a/src/bb-modules/Servicesolusvm/html_email/mod_servicesolusvm_canceled.phtml b/src/bb-modules/Servicesolusvm/html_email/mod_servicesolusvm_canceled.phtml index e6250b495..4ca6c27c1 100644 --- a/src/bb-modules/Servicesolusvm/html_email/mod_servicesolusvm_canceled.phtml +++ b/src/bb-modules/Servicesolusvm/html_email/mod_servicesolusvm_canceled.phtml @@ -4,7 +4,7 @@ Hello {{ c.first_name }} {{ c.last_name }}, -Your *{{ order.title }}* that was activated on *{{ order.activated_at|date }}* is now canceled. +Your *{{ order.title }}* that was activated on *{{ order.activated_at|bb_date }}* is now canceled. {% if order.reason %} Reason: **{{ order.reason }}** {% endif %} diff --git a/src/bb-modules/Servicesolusvm/html_email/mod_servicesolusvm_renewed.phtml b/src/bb-modules/Servicesolusvm/html_email/mod_servicesolusvm_renewed.phtml index 5f6077c49..ae9636860 100644 --- a/src/bb-modules/Servicesolusvm/html_email/mod_servicesolusvm_renewed.phtml +++ b/src/bb-modules/Servicesolusvm/html_email/mod_servicesolusvm_renewed.phtml @@ -8,7 +8,7 @@ Your **{{ order.title }}** has been renewed. {% if order.expires_at %} -Next renewal date: {{ order.expires_at|date }} +Next renewal date: {{ order.expires_at|bb_date }} {% endif %} diff --git a/src/bb-modules/Servicesolusvm/html_email/mod_servicesolusvm_suspended.phtml b/src/bb-modules/Servicesolusvm/html_email/mod_servicesolusvm_suspended.phtml index 16b5b5a62..ff4a03658 100644 --- a/src/bb-modules/Servicesolusvm/html_email/mod_servicesolusvm_suspended.phtml +++ b/src/bb-modules/Servicesolusvm/html_email/mod_servicesolusvm_suspended.phtml @@ -4,7 +4,7 @@ Hello {{ c.first_name }} {{ c.last_name }}, -Your *{{ order.title }}* that was activated on *{{ order.activated_at|date }}* is now suspended. +Your *{{ order.title }}* that was activated on *{{ order.activated_at|bb_date }}* is now suspended. {% if order.reason %} Reason: **{{ order.reason }}** {% endif %} diff --git a/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_activated.phtml b/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_activated.phtml index 925ca7c9f..f3a4636f4 100644 --- a/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_activated.phtml +++ b/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_activated.phtml @@ -11,7 +11,7 @@ Your website and email will not function until your domain has propagated. **{{ order.title }}** -Activated: {{ order.activated_at|date }} +Activated: {{ order.activated_at|bb_date }} {% if order.expires_at %}Expires: {{ order.expires_at | date }} {% endif %} {% if order.total %}Amount: {{ order.total | money(order.currency) }} {% endif %} {% if order.period %} Billing period: {{ order.period | period_title }} {% endif %} diff --git a/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_canceled.phtml b/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_canceled.phtml index f4c4b1b97..8053431ef 100644 --- a/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_canceled.phtml +++ b/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_canceled.phtml @@ -4,7 +4,7 @@ Hello {{ c.first_name }} {{ c.last_name }}, -Your *{{ order.title }}* that was activated at *{{ order.activated_at|date }}* is now canceled. +Your *{{ order.title }}* that was activated at *{{ order.activated_at|bb_date }}* is now canceled. {% if order.reason %} Reason: **{{ order.reason }}** {% endif %} diff --git a/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_renewed.phtml b/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_renewed.phtml index 5f6077c49..ae9636860 100644 --- a/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_renewed.phtml +++ b/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_renewed.phtml @@ -8,7 +8,7 @@ Your **{{ order.title }}** has been renewed. {% if order.expires_at %} -Next renewal date: {{ order.expires_at|date }} +Next renewal date: {{ order.expires_at|bb_date }} {% endif %} diff --git a/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_suspended.phtml b/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_suspended.phtml index c89597654..bce6ca551 100644 --- a/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_suspended.phtml +++ b/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_suspended.phtml @@ -4,7 +4,7 @@ Hello {{ c.first_name }} {{ c.last_name }}, -Your *{{ order.title }}* that was activated at *{{ order.activated_at|date }}* is now suspended. +Your *{{ order.title }}* that was activated at *{{ order.activated_at|bb_date }}* is now suspended. {% if order.reason %} Reason: **{{ order.reason }}** {% endif %} diff --git a/src/bb-modules/Staff/html_email/mod_staff_client_order.phtml b/src/bb-modules/Staff/html_email/mod_staff_client_order.phtml index e36b58c1b..59af9ed37 100644 --- a/src/bb-modules/Staff/html_email/mod_staff_client_order.phtml +++ b/src/bb-modules/Staff/html_email/mod_staff_client_order.phtml @@ -3,7 +3,7 @@ {% filter markdown %} Hi {{ staff.name }}, -Client **{{ order.client.first_name }} {{ order.client.last_name }}** placed a new order for **{{ order.title }}** on {{ order.created_at|date }} +Client **{{ order.client.first_name }} {{ order.client.last_name }}** placed a new order for **{{ order.title }}** on {{ order.created_at|bb_date }} Manage order {{'order/manage'|alink}}/{{order.id}} diff --git a/src/bb-themes/admin_default/html/mod_servicelicense_manage.phtml b/src/bb-themes/admin_default/html/mod_servicelicense_manage.phtml index 3696c2f6e..2b57e59eb 100644 --- a/src/bb-themes/admin_default/html/mod_servicelicense_manage.phtml +++ b/src/bb-themes/admin_default/html/mod_servicelicense_manage.phtml @@ -24,7 +24,7 @@ {% trans 'Last ping' %} - {{ service.pinged_at|date }} ({{ service.pinged_at|timeago }} ago) + {{ service.pinged_at|bb_date }} ({{ service.pinged_at|timeago }} ago)