kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-03 20:55:05 +00:00
Code Issues Projects Releases Wiki Activity

Simplified translations [skip ci]

Browse Source
This commit is contained in:
James Cole
2015-05-09 22:42:45 +02:00
parent ec9aacbcae
commit 5737224c40
21 changed files with 93 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Providers/FireflyServiceProvider.php
View File

@@ -10,6 +10,7 @@ use FireflyIII\Support\Preferences;
use FireflyIII\Support\Steam;
use FireflyIII\Support\Twig\Budget;
use FireflyIII\Support\Twig\General;
use FireflyIII\Support\Twig\Translation;
use FireflyIII\Support\Twig\Journal;
use FireflyIII\Support\Twig\PiggyBank;
use FireflyIII\Validation\FireflyValidator;
@@ -42,6 +43,7 @@ class FireflyServiceProvider extends ServiceProvider
Twig::addExtension(new General);
Twig::addExtension(new Journal);
Twig::addExtension(new Budget);
Twig::addExtension(new Translation);
}
public function register()

42
app/Support/Twig/Translation.php Normal file
View File

@@ -0,0 +1,42 @@
<?php
namespace FireflyIII\Support\Twig;
use FireflyIII\Models\LimitRepetition;
use Twig_Extension;
use Twig_SimpleFilter;
/**
* Class Budget
*
* @package FireflyIII\Support\Twig
*/
class Translation extends Twig_Extension
{
/**
* @return array
*/
public function getFilters()
{
$filters = [];
$filters[] = new Twig_SimpleFilter(
'_', function ($name) {
return trans('firefly.'.$name);
}, ['is_safe' => ['html']]
);
return $filters;
}
/**
* {@inheritDoc}
*/
public function getName()
{
return 'FireflyIII\Support\Twig\Translation';
}
}

4
resources/lang/en/firefly.php
View File

@@ -6,5 +6,7 @@ return [
'pleaseHold' => 'Please hold...',
'mandatoryFields' => 'Mandatory fields',
'optionalFields' => 'Optional fields',
'options' => 'Options'
'options' => 'Options',
'something' => 'Something!'
];

6
resources/twig/accounts/create.twig
View File

@@ -9,7 +9,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa {{ subTitleIcon }}"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa {{ subTitleIcon }}"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.text('name') }}
@@ -22,7 +22,7 @@
{% if what == 'asset' %}
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-smile-o"></i> {{ trans('firefly.optionalFields') }}
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
</div>
<div class="panel-body">
@@ -37,7 +37,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('create','account') }}

6
resources/twig/accounts/edit.twig
View File

@@ -9,7 +9,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa {{ subTitleIcon }}"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa {{ subTitleIcon }}"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.text('name') }}
@@ -20,7 +20,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-smile-o"></i> {{ trans('firefly.optionalFields') }}
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
</div>
<div class="panel-body">
{% if account.accounttype.type == 'Default account' or account.accounttype.type == 'Asset account' %}
@@ -50,7 +50,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('update','account') }}

6
resources/twig/bills/create.twig
View File

@@ -7,7 +7,7 @@
<div class="col-lg-6 col-md-12 col-sm-6">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-exclamation-circle"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-exclamation-circle"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.text('name') }}
@@ -23,7 +23,7 @@
<div class="col-lg-6 col-md-12 col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-smile-o"></i> {{ trans('firefly.optionalFields') }}
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.integer('skip',0) }}
@@ -35,7 +35,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('create','bill') }}

6
resources/twig/bills/edit.twig
View File

@@ -9,7 +9,7 @@
<div class="col-lg-6 col-md-12 col-sm-6">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-exclamation-circle"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-exclamation-circle"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.text('name') }}
@@ -26,7 +26,7 @@
<div class="col-lg-6 col-md-12 col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-smile-o"></i> {{ trans('firefly.optionalFields') }}
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.integer('skip') }}
@@ -37,7 +37,7 @@
</div>
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('update','bill') }}

4
resources/twig/budgets/create.twig
View File

@@ -6,7 +6,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-exclamation"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-exclamation"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.text('name') }}
@@ -17,7 +17,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('create','budget') }}

4
resources/twig/budgets/edit.twig
View File

@@ -13,7 +13,7 @@
<div class="col-lg-6 col-md-12 col-sm-6">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-fw fa-exclamation"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-fw fa-exclamation"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.checkbox('active') }}
@@ -26,7 +26,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('update','budget') }}

4
resources/twig/categories/create.twig
View File

@@ -7,7 +7,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-exclamation"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-exclamation"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.text('name') }}
@@ -20,7 +20,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('create','category') }}

4
resources/twig/categories/edit.twig
View File

@@ -7,7 +7,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-exclamation"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-exclamation"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.text('name') }}
@@ -21,7 +21,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('update','category') }}

4
resources/twig/currency/create.twig
View File

@@ -6,7 +6,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa {{ subTitleIcon }}"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa {{ subTitleIcon }}"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.text('name',null,{'maxlength' : 48}) }}
@@ -22,7 +22,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('create','currency') }}

4
resources/twig/currency/edit.twig
View File

@@ -8,7 +8,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa {{ subTitleIcon }}"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa {{ subTitleIcon }}"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.text('name',null,{'maxlength' : 48}) }}
@@ -23,7 +23,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('update','currency') }}

2
resources/twig/index.twig
View File

@@ -5,7 +5,7 @@
{% if count == 0 %}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<p class="lead">{{ trans('firefly.welcome') }}</p>
<p class="lead">{{ 'welcome'|_ }}</p>
<p>
Create a new asset account to get started.

6
resources/twig/layout/default.twig
View File

@@ -89,15 +89,15 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{{ trans('firefly.close') }}</span>
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
</button>
<h4 class="modal-title" id="helpTitle">{{ trans('firefly.pleaseHold') }}</h4>
<h4 class="modal-title" id="helpTitle">{{ 'pleaseHold'|_ }}</h4>
</div>
<div class="modal-body" id="helpBody">
<i class="fa fa-refresh fa-spin"></i>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('firefly.close') }}</button>
<button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
</div>
</div>
</div>

6
resources/twig/piggy-banks/create.twig
View File

@@ -8,7 +8,7 @@
<div class="col-lg-6 col-md-12 col-sm-6">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-fw fa-exclamation"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-fw fa-exclamation"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
@@ -22,7 +22,7 @@
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-smile-o"></i> {{ trans('firefly.optionalFields') }}
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.date('targetdate') }}
@@ -34,7 +34,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('create','piggy bank') }}

6
resources/twig/piggy-banks/edit.twig
View File

@@ -10,7 +10,7 @@
<div class="col-lg-6 col-md-12 col-sm-6">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-fw fa-exclamation"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-fw fa-exclamation"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
@@ -25,7 +25,7 @@
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-smile-o"></i> {{ trans('firefly.optionalFields') }}
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.date('targetdate') }}
@@ -37,7 +37,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('update','piggy bank') }}

6
resources/twig/tags/create.twig
View File

@@ -7,7 +7,7 @@
<div class="col-lg-5 col-md-5 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-tag"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-tag"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.text('tag') }}
@@ -20,7 +20,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-smile-o"></i> {{ trans('firefly.optionalFields') }}
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.date('date') }}
@@ -32,7 +32,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('create','tag') }}

6
resources/twig/tags/edit.twig
View File

@@ -9,7 +9,7 @@
<div class="col-lg-5 col-md-5 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-tag"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-tag"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.text('tag') }}
@@ -22,7 +22,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-smile-o"></i> {{ trans('firefly.optionalFields') }}
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.date('date') }}
@@ -34,7 +34,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('update','tag') }}

6
resources/twig/transactions/create.twig
View File

@@ -8,7 +8,7 @@
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-exclamation-circle"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-exclamation-circle"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
<!-- DESCRIPTION ALWAYS AVAILABLE -->
@@ -47,7 +47,7 @@
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-smile-o"></i> {{ trans('firefly.optionalFields') }}
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
</div>
<div class="panel-body">
<!-- BUDGET ONLY WHEN CREATING A WITHDRAWAL -->
@@ -71,7 +71,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('create','transaction') }}

6
resources/twig/transactions/edit.twig
View File

@@ -10,7 +10,7 @@
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-exclamation-circle"></i> {{ trans('firefly.mandatoryFields') }}
<i class="fa fa-exclamation-circle"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
<!-- ALWAYS AVAILABLE -->
@@ -49,7 +49,7 @@
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-smile-o"></i> {{ trans('firefly.optionalFields') }}
<i class="fa fa-smile-o"></i> {{ 'optionalFields'|_ }}
</div>
<div class="panel-body">
<!-- BUDGET ONLY WHEN CREATING A WITHDRAWAL -->
@@ -74,7 +74,7 @@
<!-- panel for options -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-bolt"></i> {{ trans('firefly.options') }}
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="panel-body">
{{ ExpandedForm.optionsList('update','transaction') }}