- {{ 'invoice.total'|trans }}
+ {{ 'invoice.total'|trans({}, 'messages', language) }}
{{ model.calculator.total|money(model.calculator.currency) }}
@@ -134,11 +135,11 @@
diff --git a/templates/invoice/renderer/freelancer.html.twig b/templates/invoice/renderer/freelancer.html.twig
index 743c6f74..2f7a0ba1 100644
--- a/templates/invoice/renderer/freelancer.html.twig
+++ b/templates/invoice/renderer/freelancer.html.twig
@@ -1,9 +1,9 @@
{% import "macros/widgets.html.twig" as widgets %}
-
{% extends 'invoice/layout.html.twig' %}
+{% set language = model.template.language|default(app.request.locale) %}
+{% set isDecimal = model.template.decimalDuration|default(false) %}
{% block invoice %}
-
- {{ 'invoice.to'|trans }}
+ {{ 'invoice.to'|trans({}, 'messages', language) }}
{{ model.customer.company|default(model.customer.name) }}
- {{ model.template.title|default('timesheet'|trans({}, 'invoice-renderer')) }}
-
- {{ 'label.invoice_salutation'|trans|nl2br }}
-
+ {{ model.template.title }}
- {{ 'label.description'|trans }}
- {{ 'label.unit_price'|trans }}
- {{ 'label.amount'|trans }}
- {{ 'label.total_rate'|trans }}
+ {{ 'label.description'|trans({}, 'messages', language) }}
+ {{ 'label.unit_price'|trans({}, 'messages', language) }}
+ {{ 'label.amount'|trans({}, 'messages', language) }}
+ {{ 'label.total_rate'|trans({}, 'messages', language) }}
{% for entry in model.calculator.entries %}
- {% set duration = entry.duration|duration %}
+ {% set duration = entry.duration|duration(isDecimal) %}
{% if entry.fixedRate is not null %}
{% set rate = entry.fixedRate %}
{% set duration = entry.amount|amount %}
@@ -95,15 +92,15 @@
- {{ 'invoice.subtotal'|trans }}
+ {{ 'invoice.subtotal'|trans({}, 'messages', language) }}
{{ model.calculator.subtotal|money(model.calculator.currency) }}
- {{ 'invoice.tax'|trans }} ({{ model.calculator.vat }}%)
+ {{ 'invoice.tax'|trans({}, 'messages', language) }} ({{ model.calculator.vat }}%)
{{ model.calculator.tax|money(model.calculator.currency) }}
- {{ 'invoice.total'|trans }}
+ {{ 'invoice.total'|trans({}, 'messages', language) }}
{{ model.calculator.total|money(model.calculator.currency) }}
@@ -119,7 +116,7 @@
- {{ 'label.address'|trans }}
+ {{ 'label.address'|trans({}, 'messages', language) }}
{{ model.template.company }}
- {{ 'label.invoice_bank_account'|trans }}
+ {{ 'label.invoice_bank_account'|trans({}, 'messages', language) }}
{{ model.template.paymentDetails|nl2br }}
@@ -136,7 +133,7 @@
- {{ 'label.contact'|trans }}
+ {{ 'label.contact'|trans({}, 'messages', language) }}
{{ model.template.contact|nl2br }}
@@ -146,5 +143,4 @@
-
{% endblock %}
\ No newline at end of file
diff --git a/templates/invoice/renderer/timesheet.html.twig b/templates/invoice/renderer/timesheet.html.twig
index 2c9359e1..411cba21 100644
--- a/templates/invoice/renderer/timesheet.html.twig
+++ b/templates/invoice/renderer/timesheet.html.twig
@@ -1,11 +1,13 @@
{% import "macros/widgets.html.twig" as widgets %}
{% extends 'invoice/layout.html.twig' %}
+{% set language = model.template.language|default(app.request.locale) %}
+{% set isDecimal = model.template.decimalDuration|default(false) %}
{% block invoice %}
@@ -14,7 +16,7 @@
- {{ 'invoice.from'|trans }}
+ {{ 'invoice.from'|trans({}, 'messages', language) }}
{% if model.query.user is not empty %}
{{ widgets.username(model.query.user) }}
@@ -24,17 +26,17 @@
- {{ 'label.date'|trans }}
+ {{ 'label.date'|trans({}, 'messages', language) }}
{% if model.query.begin|date('m') != model.query.end|date('m') or model.query.begin|date('Y') != model.query.end|date('Y') %}
{{ model.query.begin|date_short }} - {{ model.query.end|date_short }}
{% else %}
- {{ model.query.end|month_name|trans }} {{ model.query.end|date('Y') }}
+ {{ model.query.end|month_name|trans({}, 'messages', language) }} {{ model.query.end|date('Y') }}
{% endif %}
- {{ 'label.customer'|trans }}
+ {{ 'label.customer'|trans({}, 'messages', language) }}
{% if model.customer.number is not empty %}[{{ model.customer.number }}]{% endif %}
{{ model.customer.name }}{% if model.customer.contact is not empty %} / {{ model.customer.contact }}{% endif %}
@@ -42,7 +44,7 @@
{% if model.query.project is not empty and model.query.project.orderNumber is not empty %}
- {{ 'label.orderNumber'|trans }}
+ {{ 'label.orderNumber'|trans({}, 'messages', language) }}
{{ model.query.project.orderNumber }}
@@ -57,12 +59,12 @@
- {{ 'label.date'|trans }}
+ {{ 'label.date'|trans({}, 'messages', language) }}
{% if model.query.user is empty %}
- {{ 'label.user'|trans }}
+ {{ 'label.user'|trans({}, 'messages', language) }}
{% endif %}
- {{ 'label.activity'|trans }}
- {{ 'label.hours'|trans }}
+ {{ 'label.activity'|trans({}, 'messages', language) }}
+ {{ 'label.hours'|trans({}, 'messages', language) }}
@@ -79,7 +81,7 @@
{% if entry.activity is not null %}{{ entry.activity.name }} / {% endif %}{{ entry.project.name }}
{% endif %}
- {{ entry.duration|duration }}
+ {{ entry.duration|duration(isDecimal) }}
{% endfor %}
@@ -89,8 +91,8 @@
{% if model.query.user is empty %}
{{ 'invoice.total_working_time'|trans }}
- {{ model.calculator.timeWorked|duration }}
+ {{ 'invoice.total_working_time'|trans({}, 'messages', language) }}
+ {{ model.calculator.timeWorked|duration(isDecimal) }}
@@ -100,7 +102,7 @@
{% if model.template.paymentTerms is not empty %}
-
{{ 'label.payment_terms'|trans }}
+
{{ 'label.payment_terms'|trans({}, 'messages', language) }}
{{ model.template.paymentTerms|trim|nl2br }}
@@ -111,10 +113,10 @@
- {{ 'invoice.signature_user'|trans }}
+ {{ 'invoice.signature_user'|trans({}, 'messages', language) }}
- {{ 'invoice.signature_customer'|trans }}
+ {{ 'invoice.signature_customer'|trans({}, 'messages', language) }}
diff --git a/templates/invoice/template_edit.html.twig b/templates/invoice/template_edit.html.twig
index 0096ea98..b075b17e 100644
--- a/templates/invoice/template_edit.html.twig
+++ b/templates/invoice/template_edit.html.twig
@@ -46,10 +46,22 @@
{{ form_row(form.vat) }}
-
- {{ form_row(form.renderer) }}
- {{ form_row(form.calculator) }}
- {{ form_row(form.numberGenerator) }}
+
+
+ {{ form_row(form.renderer) }}
+
+
+ {{ form_row(form.language) }}
+
+
+
+ {{ form_row(form.calculator) }}
+
+
+ {{ form_row(form.numberGenerator) }}
+
+
200204-customer_with_special_name ', $content);
$this->assertStringContainsString('', $content);
diff --git a/tests/Invoice/Renderer/XlsxRendererTest.php b/tests/Invoice/Renderer/XlsxRendererTest.php
index c7a1ae53..0bb57b95 100644
--- a/tests/Invoice/Renderer/XlsxRendererTest.php
+++ b/tests/Invoice/Renderer/XlsxRendererTest.php
@@ -58,7 +58,7 @@ class XlsxRendererTest extends TestCase
$file = $response->getFile();
$this->assertEquals('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', $response->headers->get('Content-Type'));
- $this->assertEquals('attachment; filename=spreadsheet.xlsx', $response->headers->get('Content-Disposition'));
+ $this->assertEquals('attachment; filename=200204-customer_with_special_name.xlsx', $response->headers->get('Content-Disposition'));
$this->assertTrue(file_exists($file->getRealPath()));
diff --git a/tests/Twig/ExtensionsTest.php b/tests/Twig/ExtensionsTest.php
index a4408d70..96dffe69 100644
--- a/tests/Twig/ExtensionsTest.php
+++ b/tests/Twig/ExtensionsTest.php
@@ -216,11 +216,11 @@ class ExtensionsTest extends TestCase
$sut = $this->getSut($this->localeEn);
$this->assertEquals('02:37 h', $sut->duration($record->getDuration()));
- $this->assertEquals('02:37:17 h', $sut->duration($record->getDuration(), '%h:%m:%s h'));
+ $this->assertEquals('2.62', $sut->duration($record->getDuration(), true));
// test Timesheet object
$this->assertEquals('02:37 h', $sut->duration($record));
- $this->assertEquals('02:37:17', $sut->duration($record, '%h:%m:%s'));
+ $this->assertEquals('2.62', $sut->duration($record, true));
// test extended format
$sut = $this->getSut($this->localeFake, 'XX');
@@ -237,6 +237,7 @@ class ExtensionsTest extends TestCase
$sut = $this->getSut($this->localeEn, 'en');
$this->assertEquals('00:00 h', $sut->duration(null));
+ $this->assertEquals('0', $sut->duration(null, true));
}
public function testDurationDecimal()
diff --git a/translations/messages.ar.xlf b/translations/messages.ar.xlf
index 94d8d1f6..e5c23646 100755
--- a/translations/messages.ar.xlf
+++ b/translations/messages.ar.xlf
@@ -653,14 +653,6 @@
label.invoice_bank_account
حساب البنك
-
- label.invoice_salutation
-
- السيدات والسادة،
-
- أشكرك على طلبك ورسوم خدماتي:
-
-
diff --git a/translations/messages.hu.xlf b/translations/messages.hu.xlf
index b2a73c68..f8839d96 100644
--- a/translations/messages.hu.xlf
+++ b/translations/messages.hu.xlf
@@ -804,14 +804,6 @@
label.invoice_bank_account
Bankszámlaszám
-
- label.invoice_salutation
-
- Tisztelt Hölgyem/Uram!
-
- Köszönöm megbízását, alább találja a szolgáltatásaim árát részletezve:
-
-