Skip to content

Commit

Permalink
Twig 'date' filter changed to 'bb_date' where necessary fixes #223
Browse files Browse the repository at this point in the history
  • Loading branch information
4Giedrius committed Jan 12, 2015
1 parent fa80be7 commit f80e2ed
Show file tree
Hide file tree
Showing 32 changed files with 37 additions and 37 deletions.
4 changes: 2 additions & 2 deletions src/bb-modules/Invoice/html_email/mod_invoice_created.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@
</tr>
<tr>
<td>{% trans 'Created at' %}:</td>
<td>{{ info.created_at|date }}</td>
<td>{{ info.created_at|bb_date }}</td>
</tr>
<tr>
<td>{% trans 'Updated at' %}:</td>
<td>{{ info.updated_at|date }}</td>
<td>{{ info.updated_at|bb_date }}</td>
</tr>
<tr>
<td>{% trans 'Expires at' %}:</td>
<td>{{ info.expires_at|date }}</td>
<td>{{ info.expires_at|bb_date }}</td>
</tr>
<tr>
<td>{% trans 'Valid IPs' %}:</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<td>
{% trans 'Last ping' %}
</td>
<td>{{ service.pinged_at|date }} ({{ service.pinged_at|timeago }} ago)</td>
<td>{{ service.pinged_at|bb_date }} ({{ service.pinged_at|timeago }} ago)</td>
</tr>

</tbody>
Expand Down

0 comments on commit f80e2ed

Please sign in to comment.