diff --git a/resources/lang/bg_BG/firefly.php b/resources/lang/bg_BG/firefly.php index 816eb77f29..b44e890778 100644 --- a/resources/lang/bg_BG/firefly.php +++ b/resources/lang/bg_BG/firefly.php @@ -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' => 'виж по-долу', diff --git a/resources/lang/cs_CZ/firefly.php b/resources/lang/cs_CZ/firefly.php index b65c7a3f36..5256dda84c 100644 --- a/resources/lang/cs_CZ/firefly.php +++ b/resources/lang/cs_CZ/firefly.php @@ -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', diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index b09021e64c..066eff8830 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -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', diff --git a/resources/lang/el_GR/firefly.php b/resources/lang/el_GR/firefly.php index a5b1f5a775..219f9b3b61 100644 --- a/resources/lang/el_GR/firefly.php +++ b/resources/lang/el_GR/firefly.php @@ -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' => 'δες παρακάτω', diff --git a/resources/lang/en_GB/firefly.php b/resources/lang/en_GB/firefly.php index c93ca384a3..f028b724b2 100644 --- a/resources/lang/en_GB/firefly.php +++ b/resources/lang/en_GB/firefly.php @@ -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', diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index b1f3dd0f4c..3d37287455 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -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', diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php index 550ab3338a..c860c14928 100644 --- a/resources/lang/es_ES/firefly.php +++ b/resources/lang/es_ES/firefly.php @@ -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', diff --git a/resources/lang/fi_FI/firefly.php b/resources/lang/fi_FI/firefly.php index e1b39c17d1..c9d6daa06d 100644 --- a/resources/lang/fi_FI/firefly.php +++ b/resources/lang/fi_FI/firefly.php @@ -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', diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index 9c0eb7cccf..33a3d16f68 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -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', diff --git a/resources/lang/hu_HU/firefly.php b/resources/lang/hu_HU/firefly.php index f065829612..b6904f0a35 100644 --- a/resources/lang/hu_HU/firefly.php +++ b/resources/lang/hu_HU/firefly.php @@ -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', diff --git a/resources/lang/id_ID/firefly.php b/resources/lang/id_ID/firefly.php index 8d3de1a687..4ed625d364 100644 --- a/resources/lang/id_ID/firefly.php +++ b/resources/lang/id_ID/firefly.php @@ -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', diff --git a/resources/lang/it_IT/firefly.php b/resources/lang/it_IT/firefly.php index 65a7441bd7..72668e9f77 100644 --- a/resources/lang/it_IT/firefly.php +++ b/resources/lang/it_IT/firefly.php @@ -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', diff --git a/resources/lang/nb_NO/firefly.php b/resources/lang/nb_NO/firefly.php index 097100139b..3915463b57 100644 --- a/resources/lang/nb_NO/firefly.php +++ b/resources/lang/nb_NO/firefly.php @@ -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', diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index 514ec982c9..8df62f07eb 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -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', diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php index b38af34f99..59441f4689 100644 --- a/resources/lang/pl_PL/firefly.php +++ b/resources/lang/pl_PL/firefly.php @@ -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', diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php index d893755e42..650d64fa50 100644 --- a/resources/lang/pt_BR/firefly.php +++ b/resources/lang/pt_BR/firefly.php @@ -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', diff --git a/resources/lang/ro_RO/firefly.php b/resources/lang/ro_RO/firefly.php index 070c63ffca..f5d525bdbd 100644 --- a/resources/lang/ro_RO/firefly.php +++ b/resources/lang/ro_RO/firefly.php @@ -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', diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php index 5e5e77f171..6071126f6a 100644 --- a/resources/lang/ru_RU/firefly.php +++ b/resources/lang/ru_RU/firefly.php @@ -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' => 'см. ниже', diff --git a/resources/lang/sv_SE/firefly.php b/resources/lang/sv_SE/firefly.php index 961a57ab6f..2c29d6d390 100644 --- a/resources/lang/sv_SE/firefly.php +++ b/resources/lang/sv_SE/firefly.php @@ -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', diff --git a/resources/lang/tr_TR/firefly.php b/resources/lang/tr_TR/firefly.php index 2c1e8a16e6..6205756b36 100644 --- a/resources/lang/tr_TR/firefly.php +++ b/resources/lang/tr_TR/firefly.php @@ -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', diff --git a/resources/lang/vi_VN/firefly.php b/resources/lang/vi_VN/firefly.php index 3b603d879b..311e9753e5 100644 --- a/resources/lang/vi_VN/firefly.php +++ b/resources/lang/vi_VN/firefly.php @@ -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', diff --git a/resources/lang/zh_CN/firefly.php b/resources/lang/zh_CN/firefly.php index 9644b081cd..7fa6ff5ab7 100644 --- a/resources/lang/zh_CN/firefly.php +++ b/resources/lang/zh_CN/firefly.php @@ -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' => '请在下方查看', diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php index 26694675ca..8542d5f656 100644 --- a/resources/lang/zh_TW/firefly.php +++ b/resources/lang/zh_TW/firefly.php @@ -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', diff --git a/resources/views/v1/budgets/index.twig b/resources/views/v1/budgets/index.twig index 236452ebf2..b296cd689e 100644 --- a/resources/views/v1/budgets/index.twig +++ b/resources/views/v1/budgets/index.twig @@ -261,6 +261,11 @@ {% endif %} {% if budget.budgeted|length > 0 %} {% for budgetLimit in budget.budgeted %} + {% if not budgetLimit.in_range %} + + {{ trans('firefly.budget_limit_not_in_range', {start: budgetLimit.start_date, end: budgetLimit.end_date}) }} +
+ {% endif %}
{{ budgetLimit.currency_symbol }}
- {% if not budgetLimit.in_range %} - - {{ trans('firefly.budget_limit_not_in_range', {start: budgetLimit.start_date, end: budgetLimit.end_date}) }} -
- {% endif %} {% 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 %}