This commit is contained in:
James Cole 2020-09-18 16:07:59 +02:00
parent af88e91a48
commit f3eaf1dd4c
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
24 changed files with 28 additions and 30 deletions

View File

@ -908,7 +908,7 @@ return [
'options' => 'Настройки',
// budgets:
'budget_limit_not_in_range' => 'Тази сума се отнася за периода от :start до :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => 'Общ наличен бюджет (между :start и :end)',
'total_available_budget_in_currency' => 'Общ наличен бюджет в :currency',
'see_below' => 'виж по-долу',

View File

@ -908,7 +908,7 @@ return [
'options' => 'Možnosti',
// budgets:
'budget_limit_not_in_range' => 'This amount applies from :start to :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => 'Total available budget (between :start and :end)',
'total_available_budget_in_currency' => 'Celkový rozpočet k dispozici v :currency',
'see_below' => 'viz níže',

View File

@ -908,7 +908,7 @@ return [
'options' => 'Einstellungen',
// budgets:
'budget_limit_not_in_range' => 'Dieser Betrag gilt von :start bis :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => 'Verfügbares Gesamtbudget (zwischen :start und :end)',
'total_available_budget_in_currency' => 'Verfügbares Gesamtbudget in :currency',
'see_below' => 'Siehe unten',

View File

@ -908,7 +908,7 @@ return [
'options' => 'Επιλογές',
// budgets:
'budget_limit_not_in_range' => 'Αυτό το ποσό ισχύει από :start έως :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => 'Συνολικός διαθέσιμος προϋπολογισμός (μεταξύ :start και :end)',
'total_available_budget_in_currency' => 'Συνολικός διαθέσιμος προϋπολογισμός σε :currency',
'see_below' => 'δες παρακάτω',

View File

@ -908,7 +908,7 @@ return [
'options' => 'Options',
// budgets:
'budget_limit_not_in_range' => 'This amount applies from :start to :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => 'Total available budget (between :start and :end)',
'total_available_budget_in_currency' => 'Total available budget in :currency',
'see_below' => 'see below',

View File

@ -908,7 +908,7 @@ return [
'options' => 'Options',
// budgets:
'budget_limit_not_in_range' => 'This amount applies from :start to :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => 'Total available budget (between :start and :end)',
'total_available_budget_in_currency' => 'Total available budget in :currency',
'see_below' => 'see below',

View File

@ -908,7 +908,7 @@ return [
'options' => 'Opciones',
// budgets:
'budget_limit_not_in_range' => 'Esta cantidad se aplica de :start a :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => 'Presupuesto total disponible (entre :start y :end)',
'total_available_budget_in_currency' => 'Presupuesto total disponible en :currency',
'see_below' => 'ver abajo',

View File

@ -908,7 +908,7 @@ return [
'options' => 'Valinnat',
// budgets:
'budget_limit_not_in_range' => 'This amount applies from :start to :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => 'Budjetissa jäljellä (välillä :start ja :end)',
'total_available_budget_in_currency' => 'Budjetissa jäljellä valuutassa :currency',
'see_below' => 'katso alla',

View File

@ -908,7 +908,7 @@ return [
'options' => 'Options',
// budgets:
'budget_limit_not_in_range' => 'Ce montant s\'applique du :start au :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => 'Budget total disponible (entre :start et :end)',
'total_available_budget_in_currency' => 'Budget total disponible en :currency',
'see_below' => 'voir ci-dessous',

View File

@ -908,7 +908,7 @@ return [
'options' => 'Beállítások',
// budgets:
'budget_limit_not_in_range' => 'This amount applies from :start to :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => 'Teljes elérhető költségkeret (:start és :end között)',
'total_available_budget_in_currency' => 'Teljes elérhető költségkeret :currency pénznemben',
'see_below' => 'lásd lentebb',

View File

@ -908,7 +908,7 @@ return [
'options' => 'Pilihan',
// budgets:
'budget_limit_not_in_range' => 'This amount applies from :start to :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => 'Total available budget (between :start and :end)',
'total_available_budget_in_currency' => 'Total available budget in :currency',
'see_below' => 'see below',

View File

@ -908,7 +908,7 @@ return [
'options' => 'Opzioni',
// budgets:
'budget_limit_not_in_range' => 'Questo importo si applica da :start a :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => 'Budget totale disponibile (tra :start e :end)',
'total_available_budget_in_currency' => 'Budget totale disponibile in :currency',
'see_below' => 'vedi sotto',

View File

@ -908,7 +908,7 @@ return [
'options' => 'Alternativer',
// budgets:
'budget_limit_not_in_range' => 'This amount applies from :start to :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => 'Total available budget (between :start and :end)',
'total_available_budget_in_currency' => 'Total available budget in :currency',
'see_below' => 'see below',

View File

@ -908,7 +908,7 @@ return [
'options' => 'Opties',
// budgets:
'budget_limit_not_in_range' => 'Dit bedrag is van toepassing op :start tot :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => 'Totaal beschikbare budget (tussen :start en :end)',
'total_available_budget_in_currency' => 'Totaal beschikbare budget in :currency',
'see_below' => 'zie onder',

View File

@ -908,7 +908,7 @@ return [
'options' => 'Opcje',
// budgets:
'budget_limit_not_in_range' => 'Ta kwota dotyczy okresu od :start do :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => 'Dostępny budżet (pomiędzy :start i :end)',
'total_available_budget_in_currency' => 'Dostępny budżet w :currency',
'see_below' => 'zobacz poniżej',

View File

@ -908,7 +908,7 @@ return [
'options' => 'Opções',
// budgets:
'budget_limit_not_in_range' => 'Esta quantia aplica-se de :start a :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => 'Total de orçamentos disponíveis (entre :start e :end)',
'total_available_budget_in_currency' => 'Orçamentos disponíveis em :currency',
'see_below' => 'veja abaixo',

View File

@ -908,7 +908,7 @@ return [
'options' => 'Opțiuni',
// budgets:
'budget_limit_not_in_range' => 'Această sumă se aplică de la :start la :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => 'Buget total disponibil (între :start și :end)',
'total_available_budget_in_currency' => 'Buget total disponibil în :currency',
'see_below' => 'vezi mai jos',

View File

@ -908,7 +908,7 @@ return [
'options' => 'Параметры',
// budgets:
'budget_limit_not_in_range' => 'Эта сумма действует с :start по :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => 'Общий доступный бюджет (между :start и :end)',
'total_available_budget_in_currency' => 'Всего доступно в бюджете (:currency)',
'see_below' => 'см. ниже',

View File

@ -908,7 +908,7 @@ return [
'options' => 'Alternativ',
// budgets:
'budget_limit_not_in_range' => 'Detta belopp gäller från :start till :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => 'Total tillgänglig budget (mellan :start och :end)',
'total_available_budget_in_currency' => 'Total tillgänglig budget i :currency',
'see_below' => 'se nedan',

View File

@ -909,7 +909,7 @@ return [
'options' => 'Seçenekler',
// budgets:
'budget_limit_not_in_range' => 'This amount applies from :start to :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => 'Total available budget (between :start and :end)',
'total_available_budget_in_currency' => 'Total available budget in :currency',
'see_below' => 'see below',

View File

@ -908,7 +908,7 @@ return [
'options' => 'Tùy chọn',
// budgets:
'budget_limit_not_in_range' => 'Số tiền này áp dụng từ :start đến :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => 'Tổng ngân sách có sẵn (giữa :start và :end)',
'total_available_budget_in_currency' => 'Tổng ngân sách có sẵn bằng: tiền tệ',
'see_below' => 'xem bên dưới',

View File

@ -908,7 +908,7 @@ return [
'options' => '选项',
// budgets:
'budget_limit_not_in_range' => 'This amount applies from :start to :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => '可用预算总额 (:start 和 :end之间)',
'total_available_budget_in_currency' => '可用预算总额 以:currency为单位',
'see_below' => '请在下方查看',

View File

@ -908,7 +908,7 @@ return [
'options' => '選項',
// budgets:
'budget_limit_not_in_range' => 'This amount applies from :start to :end.',
'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
'total_available_budget' => 'Total available budget (between :start and :end)',
'total_available_budget_in_currency' => 'Total available budget in :currency',
'see_below' => 'see below',

View File

@ -261,6 +261,11 @@
{% endif %}
{% if budget.budgeted|length > 0 %}
{% for budgetLimit in budget.budgeted %}
{% if not budgetLimit.in_range %}
<small class="text-muted">
{{ trans('firefly.budget_limit_not_in_range', {start: budgetLimit.start_date, end: budgetLimit.end_date}) }}
</small><br>
{% endif %}
<div class="input-group">
<div class="input-group-addon">{{ budgetLimit.currency_symbol }}</div>
<input class="form-control budget_amount" data-original="{{ budgetLimit.amount }}"
@ -275,11 +280,6 @@
</ul>
</div>
</div>
{% if not budgetLimit.in_range %}
<small class="text-muted">
{{ trans('firefly.budget_limit_not_in_range', {start: budgetLimit.start_date, end: budgetLimit.end_date}) }}
</small><br>
{% endif %}
<span class="text-danger budget_warning" data-id="{{ budget.id }}" data-budgetLimit="{{ budgetLimit.id }}"
style="display:none;"></span>
{% endfor %}
@ -335,8 +335,6 @@
{{ formatAmountBySymbol(budgetLimit.amount, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }}
{% if budgetLimit.in_range %}
({{ formatAmountBySymbol(budgetLimit.amount / activeDaysLeft, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})
{% else %}
X
{% endif %}
</span>
<br/>