diff --git a/resources/lang/en/firefly.php b/resources/lang/en/firefly.php new file mode 100644 index 0000000000..fba918f94d --- /dev/null +++ b/resources/lang/en/firefly.php @@ -0,0 +1,10 @@ + 'Welcome to Firefly!', + 'mainTitle' => 'What\'s playing?', + 'close' => 'Clone', + 'pleaseHold' => 'Please hold...', + 'mandatoryFields' => 'Mandatory fields', + 'optionalFields' => 'Optional fields', + 'options' => 'Options' +]; \ No newline at end of file diff --git a/resources/twig/accounts/create.twig b/resources/twig/accounts/create.twig index 0314aa8892..4e50f1dfbb 100644 --- a/resources/twig/accounts/create.twig +++ b/resources/twig/accounts/create.twig @@ -9,7 +9,7 @@
- Mandatory fields + {{ trans('firefly.mandatoryFields') }}
{{ ExpandedForm.text('name') }} @@ -22,7 +22,7 @@ {% if what == 'asset' %}
- Optional fields + {{ trans('firefly.optionalFields') }}
@@ -34,11 +34,10 @@
{% endif %} - - +
- Options + {{ trans('firefly.options') }}
{{ ExpandedForm.optionsList('create','account') }} diff --git a/resources/twig/accounts/edit.twig b/resources/twig/accounts/edit.twig index 19968766f8..0bfe9e258b 100644 --- a/resources/twig/accounts/edit.twig +++ b/resources/twig/accounts/edit.twig @@ -9,7 +9,7 @@
- Mandatory fields + {{ trans('firefly.mandatoryFields') }}
{{ ExpandedForm.text('name') }} @@ -20,7 +20,7 @@
- Optional fields + {{ trans('firefly.optionalFields') }}
{% if account.accounttype.type == 'Default account' or account.accounttype.type == 'Asset account' %} @@ -50,7 +50,7 @@
- Options + {{ trans('firefly.options') }}
{{ ExpandedForm.optionsList('update','account') }} diff --git a/resources/twig/bills/create.twig b/resources/twig/bills/create.twig index f7719b3214..cd6938771b 100644 --- a/resources/twig/bills/create.twig +++ b/resources/twig/bills/create.twig @@ -5,10 +5,9 @@
-
- Mandatory fields + {{ trans('firefly.mandatoryFields') }}
{{ ExpandedForm.text('name') }} @@ -22,10 +21,9 @@
-
- Optional fields + {{ trans('firefly.optionalFields') }}
{{ ExpandedForm.integer('skip',0) }} @@ -37,7 +35,7 @@
- Options + {{ trans('firefly.options') }}
{{ ExpandedForm.optionsList('create','bill') }} diff --git a/resources/twig/bills/edit.twig b/resources/twig/bills/edit.twig index 5fd7e02a0e..9eb5f05892 100644 --- a/resources/twig/bills/edit.twig +++ b/resources/twig/bills/edit.twig @@ -9,7 +9,7 @@
- Mandatory fields + {{ trans('firefly.mandatoryFields') }}
{{ ExpandedForm.text('name') }} @@ -26,7 +26,7 @@
- Optional fields + {{ trans('firefly.optionalFields') }}
{{ ExpandedForm.integer('skip') }} @@ -37,7 +37,7 @@
- Options + {{ trans('firefly.options') }}
{{ ExpandedForm.optionsList('update','bill') }} diff --git a/resources/twig/budgets/create.twig b/resources/twig/budgets/create.twig index fc4d4a5429..ee5c2b338e 100644 --- a/resources/twig/budgets/create.twig +++ b/resources/twig/budgets/create.twig @@ -6,7 +6,7 @@
- Mandatory fields + {{ trans('firefly.mandatoryFields') }}
{{ ExpandedForm.text('name') }} @@ -17,7 +17,7 @@
- Options + {{ trans('firefly.options') }}
{{ ExpandedForm.optionsList('create','budget') }} diff --git a/resources/twig/budgets/edit.twig b/resources/twig/budgets/edit.twig index edb967500f..cdb62233b9 100644 --- a/resources/twig/budgets/edit.twig +++ b/resources/twig/budgets/edit.twig @@ -13,7 +13,7 @@
- Mandatory fields + {{ trans('firefly.mandatoryFields') }}
{{ ExpandedForm.checkbox('active') }} @@ -26,7 +26,7 @@
- Options + {{ trans('firefly.options') }}
{{ ExpandedForm.optionsList('update','budget') }} diff --git a/resources/twig/categories/create.twig b/resources/twig/categories/create.twig index 90ea9c57a5..3ae6089566 100644 --- a/resources/twig/categories/create.twig +++ b/resources/twig/categories/create.twig @@ -7,7 +7,7 @@
- Mandatory fields + {{ trans('firefly.mandatoryFields') }}
{{ ExpandedForm.text('name') }} @@ -20,7 +20,7 @@
- Options + {{ trans('firefly.options') }}
{{ ExpandedForm.optionsList('create','category') }} diff --git a/resources/twig/categories/edit.twig b/resources/twig/categories/edit.twig index b35cfbe9ff..5c1f623685 100644 --- a/resources/twig/categories/edit.twig +++ b/resources/twig/categories/edit.twig @@ -7,7 +7,7 @@
- Mandatory fields + {{ trans('firefly.mandatoryFields') }}
{{ ExpandedForm.text('name') }} @@ -21,7 +21,7 @@
- Options + {{ trans('firefly.options') }}
{{ ExpandedForm.optionsList('update','category') }} diff --git a/resources/twig/currency/create.twig b/resources/twig/currency/create.twig index 810826f79a..01cc6c131e 100644 --- a/resources/twig/currency/create.twig +++ b/resources/twig/currency/create.twig @@ -6,7 +6,7 @@
- Mandatory fields + {{ trans('firefly.mandatoryFields') }}
{{ ExpandedForm.text('name',null,{'maxlength' : 48}) }} @@ -22,7 +22,7 @@
- Options + {{ trans('firefly.options') }}
{{ ExpandedForm.optionsList('create','currency') }} diff --git a/resources/twig/currency/edit.twig b/resources/twig/currency/edit.twig index 11b33708df..dc4720d1f6 100644 --- a/resources/twig/currency/edit.twig +++ b/resources/twig/currency/edit.twig @@ -8,7 +8,7 @@
- Mandatory fields + {{ trans('firefly.mandatoryFields') }}
{{ ExpandedForm.text('name',null,{'maxlength' : 48}) }} @@ -23,7 +23,7 @@
- Options + {{ trans('firefly.options') }}
{{ ExpandedForm.optionsList('update','currency') }} diff --git a/resources/twig/index.twig b/resources/twig/index.twig index 990aa88fdc..24097c2b09 100644 --- a/resources/twig/index.twig +++ b/resources/twig/index.twig @@ -5,7 +5,7 @@ {% if count == 0 %}
-

Welcome to Firefly III.

+

{{ trans('firefly.welcome') }}

Create a new asset account to get started. diff --git a/resources/twig/layout/default.twig b/resources/twig/layout/default.twig index cfe1190903..2bf12e7cc0 100644 --- a/resources/twig/layout/default.twig +++ b/resources/twig/layout/default.twig @@ -89,15 +89,15 @@

diff --git a/resources/twig/piggy-banks/create.twig b/resources/twig/piggy-banks/create.twig index 3c67f3ad8a..46214c5f2c 100644 --- a/resources/twig/piggy-banks/create.twig +++ b/resources/twig/piggy-banks/create.twig @@ -8,7 +8,7 @@
- Mandatory fields + {{ trans('firefly.mandatoryFields') }}
@@ -20,10 +20,9 @@
-
- Optional fields + {{ trans('firefly.optionalFields') }}
{{ ExpandedForm.date('targetdate') }} @@ -35,7 +34,7 @@
- Options + {{ trans('firefly.options') }}
{{ ExpandedForm.optionsList('create','piggy bank') }} diff --git a/resources/twig/piggy-banks/edit.twig b/resources/twig/piggy-banks/edit.twig index a14bd2112a..db6fa3eafb 100644 --- a/resources/twig/piggy-banks/edit.twig +++ b/resources/twig/piggy-banks/edit.twig @@ -10,7 +10,7 @@
- Mandatory fields + {{ trans('firefly.mandatoryFields') }}
@@ -23,10 +23,9 @@
-
- Optional fields + {{ trans('firefly.optionalFields') }}
{{ ExpandedForm.date('targetdate') }} @@ -38,7 +37,7 @@
- Options + {{ trans('firefly.options') }}
{{ ExpandedForm.optionsList('update','piggy bank') }} diff --git a/resources/twig/tags/create.twig b/resources/twig/tags/create.twig index 7c79e29cb5..36cc5e03d0 100644 --- a/resources/twig/tags/create.twig +++ b/resources/twig/tags/create.twig @@ -7,7 +7,7 @@
- Mandatory fields + {{ trans('firefly.mandatoryFields') }}
{{ ExpandedForm.text('tag') }} @@ -20,7 +20,7 @@
- Optional fields + {{ trans('firefly.optionalFields') }}
{{ ExpandedForm.date('date') }} @@ -32,7 +32,7 @@
- Options + {{ trans('firefly.options') }}
{{ ExpandedForm.optionsList('create','tag') }} diff --git a/resources/twig/tags/edit.twig b/resources/twig/tags/edit.twig index 6ad950374c..2d92e75ba9 100644 --- a/resources/twig/tags/edit.twig +++ b/resources/twig/tags/edit.twig @@ -9,7 +9,7 @@
- Mandatory fields + {{ trans('firefly.mandatoryFields') }}
{{ ExpandedForm.text('tag') }} @@ -22,7 +22,7 @@
- Optional fields + {{ trans('firefly.optionalFields') }}
{{ ExpandedForm.date('date') }} @@ -34,7 +34,7 @@
- Options + {{ trans('firefly.options') }}
{{ ExpandedForm.optionsList('update','tag') }} diff --git a/resources/twig/transactions/create.twig b/resources/twig/transactions/create.twig index 01ef307391..f356aaf7c4 100644 --- a/resources/twig/transactions/create.twig +++ b/resources/twig/transactions/create.twig @@ -6,10 +6,9 @@
-
- Mandatory fields + {{ trans('firefly.mandatoryFields') }}
@@ -46,10 +45,9 @@
-
- Optional fields + {{ trans('firefly.optionalFields') }}
@@ -73,7 +71,7 @@
- Options + {{ trans('firefly.options') }}
{{ ExpandedForm.optionsList('create','transaction') }} diff --git a/resources/twig/transactions/delete.twig b/resources/twig/transactions/delete.twig index b10a9a83a0..1e3a1f5087 100644 --- a/resources/twig/transactions/delete.twig +++ b/resources/twig/transactions/delete.twig @@ -5,7 +5,6 @@
-
Destroy "{{ journal.description }}" diff --git a/resources/twig/transactions/edit.twig b/resources/twig/transactions/edit.twig index 5ac5f371bd..8f8587f42c 100644 --- a/resources/twig/transactions/edit.twig +++ b/resources/twig/transactions/edit.twig @@ -8,10 +8,9 @@
-
- Mandatory fields + {{ trans('firefly.mandatoryFields') }}
@@ -48,10 +47,9 @@
-
- Optional fields + {{ trans('firefly.optionalFields') }}
@@ -76,7 +74,7 @@
- Options + {{ trans('firefly.options') }}
{{ ExpandedForm.optionsList('update','transaction') }}