IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix for #2930

Browse Source
This commit is contained in:
James Cole 2019-12-30 15:24:02 +01:00
parent 56700ef984
commit 35649bea5c
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
30 changed files with 82 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/v1/js/app.js vendored
View File

File diff suppressed because one or more lines are too long

3
resources/assets/js/components/transactions/AccountSelect.vue
View File

@ -19,6 +19,9 @@
-->
<template>
<div class="form-group" v-bind:class="{ 'has-error': hasError()}">
<div class="col-sm-12 text-sm">
{{ title }}
</div>
<div class="col-sm-12">
<div class="input-group">
<input

3
resources/assets/js/components/transactions/Amount.vue
View File

@ -20,6 +20,9 @@
<template>
<div class="form-group" v-bind:class="{ 'has-error': hasError()}">
<div class="col-sm-8 col-sm-offset-4 text-sm">
{{ $t('firefly.amount') }}
</div>
<label class="col-sm-4 control-label" ref="cur"></label>
<div class="col-sm-8">
<input type="number" @input="handleInput" ref="amount" :value="value" step="any" class="form-control"

3
resources/assets/js/components/transactions/Budget.vue
View File

@ -23,6 +23,9 @@
<div class="form-group"
v-bind:class="{ 'has-error': hasError()}"
v-if="typeof this.transactionType === 'undefined' || this.transactionType === 'withdrawal' || this.transactionType === 'Withdrawal' || this.transactionType === '' || null === this.transactionType">
<div class="col-sm-12 text-sm">
{{ $t('firefly.budget') }}
</div>
<div class="col-sm-12">
<select name="budget[]" ref="budget" v-model="value" @input="handleInput" class="form-control"
v-if="this.budgets.length > 0">

3
resources/assets/js/components/transactions/Category.vue
View File

@ -20,6 +20,9 @@
<template>
<div class="form-group" v-bind:class="{ 'has-error': hasError()}">
<div class="col-sm-12 text-sm">
{{ $t('firefly.category') }}
</div>
<div class="col-sm-12">
<div class="input-group">
<input

3
resources/assets/js/components/transactions/ForeignAmountSelect.vue
View File

@ -24,6 +24,9 @@
null != this.transactionType && (this.enabledCurrencies.length > 2 && (this.transactionType.toLowerCase() === 'deposit' || this.transactionType.toLowerCase() === 'withdrawal')) ||
this.liability ||
(null != this.transactionType && this.transactionType.toLowerCase() === 'transfer')">
<div class="col-sm-8 col-sm-offset-4 text-sm">
{{ $t('form.foreign_amount') }}
</div>
<div class="col-sm-4">
<select class="form-control" ref="currency_select" name="foreign_currency[]" @input="handleInput">
<option

3
resources/assets/js/components/transactions/GroupDescription.vue
View File

@ -20,6 +20,9 @@
<template>
<div class="form-group" v-bind:class="{ 'has-error': hasError()}">
<div class="col-sm-12 text-sm">
{{ $t('firefly.split_transaction_title') }}
</div>
<div class="col-sm-12">
<input
type="text"

3
resources/assets/js/components/transactions/StandardDate.vue
View File

@ -20,6 +20,9 @@
<template>
<div class="form-group" v-bind:class="{ 'has-error': hasError()}">
<div class="col-sm-12 text-sm">
{{ $t('firefly.date') }}
</div>
<div class="col-sm-12">
<input
type="date"

3
resources/assets/js/components/transactions/Tags.vue
View File

@ -22,6 +22,9 @@
<div class="form-group"
v-bind:class="{ 'has-error': hasError()}"
>
<div class="col-sm-12 text-sm">
{{ $t('firefly.tags') }}
</div>
<div class="col-sm-12">
<vue-tags-input
v-model="tag"

5
resources/assets/js/components/transactions/TransactionDescription.vue
View File

@ -20,12 +20,15 @@
<template>
<div class="form-group" v-bind:class="{ 'has-error': hasError()}">
<div class="col-sm-12 text-sm">
{{ $t('firefly.description') }}
</div>
<div class="col-sm-12">
<input
type="text"
class="form-control"
name="description[]"
title="Description"
:title="$t('firefly.description')"
v-on:keypress="handleEnter"
v-on:submit.prevent
ref="descr"

5
resources/assets/js/locales/cs.json
View File

@ -1,6 +1,6 @@
{
"firefly": {
"welcome_back": "Co hraje?",
"welcome_back": "What's playing?",
"flash_error": "Chyba!",
"flash_success": "\u00dasp\u011b\u0161n\u011b dokon\u010deno!",
"close": "Zav\u0159\u00edt",
@ -31,7 +31,8 @@
"description": "Popis",
"split_transaction_title_help": "If you create a split transaction, there must be a global description for all splits of the transaction.",
"destination_account_reconciliation": "You can't edit the destination account of a reconciliation transaction.",
"source_account_reconciliation": "You can't edit the source account of a reconciliation transaction."
"source_account_reconciliation": "You can't edit the source account of a reconciliation transaction.",
"budget": "Rozpo\u010det"
},
"form": {
"interest_date": "\u00darokov\u00e9 datum",

5
resources/assets/js/locales/de.json
View File

@ -1,6 +1,6 @@
{
"firefly": {
"welcome_back": "Was ist gerade los?",
"welcome_back": "What's playing?",
"flash_error": "Fehler!",
"flash_success": "Geschafft!",
"close": "Schlie\u00dfen",
@ -31,7 +31,8 @@
"description": "Beschreibung",
"split_transaction_title_help": "Wenn Sie eine Splittbuchung anlegen, muss es eine eindeutige Beschreibung f\u00fcr alle Aufteilungen der Buchung geben.",
"destination_account_reconciliation": "Sie k\u00f6nnen das Zielkonto einer Kontenausgleichsbuchung nicht bearbeiten.",
"source_account_reconciliation": "Sie k\u00f6nnen das Quellkonto einer Kontenausgleichsbuchung nicht bearbeiten."
"source_account_reconciliation": "Sie k\u00f6nnen das Quellkonto einer Kontenausgleichsbuchung nicht bearbeiten.",
"budget": "Budget"
},
"form": {
"interest_date": "Zinstermin",

5
resources/assets/js/locales/el.json
View File

@ -1,6 +1,6 @@
{
"firefly": {
"welcome_back": "\u03a4\u03b9 \u03c0\u03b1\u03af\u03b6\u03b5\u03b9;",
"welcome_back": "What's playing?",
"flash_error": "\u03a3\u03c6\u03ac\u03bb\u03bc\u03b1!",
"flash_success": "\u0395\u03c0\u03b9\u03c4\u03c5\u03c7\u03af\u03b1!",
"close": "\u039a\u03bb\u03b5\u03af\u03c3\u03b9\u03bc\u03bf",
@ -31,7 +31,8 @@
"description": "Description",
"split_transaction_title_help": "If you create a split transaction, there must be a global description for all splits of the transaction.",
"destination_account_reconciliation": "You can't edit the destination account of a reconciliation transaction.",
"source_account_reconciliation": "You can't edit the source account of a reconciliation transaction."
"source_account_reconciliation": "You can't edit the source account of a reconciliation transaction.",
"budget": "Budget"
},
"form": {
"interest_date": "\u0397\u03bc\u03b5\u03c1\u03bf\u03bc\u03b7\u03bd\u03af\u03b1 \u03c4\u03bf\u03ba\u03b9\u03c3\u03bc\u03bf\u03cd",

3
resources/assets/js/locales/en.json
View File

@ -31,7 +31,8 @@
"description": "Description",
"split_transaction_title_help": "If you create a split transaction, there must be a global description for all splits of the transaction.",
"destination_account_reconciliation": "You can't edit the destination account of a reconciliation transaction.",
"source_account_reconciliation": "You can't edit the source account of a reconciliation transaction."
"source_account_reconciliation": "You can't edit the source account of a reconciliation transaction.",
"budget": "Budget"
},
"form": {
"interest_date": "Interest date",

3
resources/assets/js/locales/es.json
View File

@ -31,7 +31,8 @@
"description": "Descripci\u00f3n",
"split_transaction_title_help": "Si crea una transacci\u00f3n dividida, debe existir una descripci\u00f3n global para todas las divisiones de la transacci\u00f3n.",
"destination_account_reconciliation": "No puede editar la cuenta de destino de una transacci\u00f3n de reconciliaci\u00f3n.",
"source_account_reconciliation": "No puede editar la cuenta de origen de una transacci\u00f3n de reconciliaci\u00f3n."
"source_account_reconciliation": "No puede editar la cuenta de origen de una transacci\u00f3n de reconciliaci\u00f3n.",
"budget": "Presupuesto"
},
"form": {
"interest_date": "Fecha de inter\u00e9s",

3
resources/assets/js/locales/fr.json
View File

@ -31,7 +31,8 @@
"description": "Description",
"split_transaction_title_help": "Si vous cr\u00e9ez une op\u00e9ration ventil\u00e9e, il doit y avoir une description globale pour chaque fraction de l'op\u00e9ration.",
"destination_account_reconciliation": "Vous ne pouvez pas modifier le compte de destination d'une op\u00e9ration de rapprochement.",
"source_account_reconciliation": "Vous ne pouvez pas modifier le compte source d'une op\u00e9ration de rapprochement."
"source_account_reconciliation": "Vous ne pouvez pas modifier le compte source d'une op\u00e9ration de rapprochement.",
"budget": "Budget"
},
"form": {
"interest_date": "Date de l\u2019int\u00e9r\u00eat",

5
resources/assets/js/locales/hu.json
View File

@ -1,6 +1,6 @@
{
"firefly": {
"welcome_back": "Mi a helyzet?",
"welcome_back": "What's playing?",
"flash_error": "Hiba!",
"flash_success": "Siker!",
"close": "Bez\u00e1r\u00e1s",
@ -31,7 +31,8 @@
"description": "Le\u00edr\u00e1s",
"split_transaction_title_help": "If you create a split transaction, there must be a global description for all splits of the transaction.",
"destination_account_reconciliation": "You can't edit the destination account of a reconciliation transaction.",
"source_account_reconciliation": "You can't edit the source account of a reconciliation transaction."
"source_account_reconciliation": "You can't edit the source account of a reconciliation transaction.",
"budget": "K\u00f6lts\u00e9gkeret"
},
"form": {
"interest_date": "Kamatfizet\u00e9si id\u0151pont",

3
resources/assets/js/locales/id.json
View File

@ -31,7 +31,8 @@
"description": "Deskripsi",
"split_transaction_title_help": "If you create a split transaction, there must be a global description for all splits of the transaction.",
"destination_account_reconciliation": "You can't edit the destination account of a reconciliation transaction.",
"source_account_reconciliation": "You can't edit the source account of a reconciliation transaction."
"source_account_reconciliation": "You can't edit the source account of a reconciliation transaction.",
"budget": "Anggaran"
},
"form": {
"interest_date": "Tanggal bunga",

3
resources/assets/js/locales/it.json
View File

@ -31,7 +31,8 @@
"description": "Descrizione",
"split_transaction_title_help": "Se crei una transazione suddivisa, \u00e8 necessario che ci sia una descrizione globale per tutte le suddivisioni della transazione.",
"destination_account_reconciliation": "Non \u00e8 possibile modificare il conto di destinazione di una transazione di riconciliazione.",
"source_account_reconciliation": "Non puoi modificare il conto di origine di una transazione di riconciliazione."
"source_account_reconciliation": "Non puoi modificare il conto di origine di una transazione di riconciliazione.",
"budget": "Budget"
},
"form": {
"interest_date": "Data interesse",

5
resources/assets/js/locales/nb.json
View File

@ -1,6 +1,6 @@
{
"firefly": {
"welcome_back": "Hvordan g\u00e5r det?",
"welcome_back": "What's playing?",
"flash_error": "Feil!",
"flash_success": "Suksess!",
"close": "Lukk",
@ -31,7 +31,8 @@
"description": "Beskrivelse",
"split_transaction_title_help": "If you create a split transaction, there must be a global description for all splits of the transaction.",
"destination_account_reconciliation": "You can't edit the destination account of a reconciliation transaction.",
"source_account_reconciliation": "You can't edit the source account of a reconciliation transaction."
"source_account_reconciliation": "You can't edit the source account of a reconciliation transaction.",
"budget": "Busjett"
},
"form": {
"interest_date": "Rentedato",

3
resources/assets/js/locales/nl.json
View File

@ -31,7 +31,8 @@
"description": "Omschrijving",
"split_transaction_title_help": "Als je een gesplitste transactie maakt, moet er een algemene beschrijving zijn voor alle splitsingen van de transactie.",
"destination_account_reconciliation": "Je kan de doelrekening van een afstemming niet wijzigen.",
"source_account_reconciliation": "Je kan de bronrekening van een afstemming niet wijzigen."
"source_account_reconciliation": "Je kan de bronrekening van een afstemming niet wijzigen.",
"budget": "Budget"
},
"form": {
"interest_date": "Rentedatum",

3
resources/assets/js/locales/pl.json
View File

@ -31,7 +31,8 @@
"description": "Opis",
"split_transaction_title_help": "Je\u015bli tworzysz podzielon\u0105 transakcj\u0119, musi ona posiada\u0107 globalny opis dla wszystkich podzia\u0142\u00f3w w transakcji.",
"destination_account_reconciliation": "Nie mo\u017cesz edytowa\u0107 konta docelowego transakcji uzgadniania.",
"source_account_reconciliation": "Nie mo\u017cesz edytowa\u0107 konta \u017ar\u00f3d\u0142owego transakcji uzgadniania."
"source_account_reconciliation": "Nie mo\u017cesz edytowa\u0107 konta \u017ar\u00f3d\u0142owego transakcji uzgadniania.",
"budget": "Bud\u017cet"
},
"form": {
"interest_date": "Data odsetek",

5
resources/assets/js/locales/pt-br.json
View File

@ -1,6 +1,6 @@
{
"firefly": {
"welcome_back": "O que est\u00e1 passando?",
"welcome_back": "What's playing?",
"flash_error": "Erro!",
"flash_success": "Sucesso!",
"close": "Fechar",
@ -31,7 +31,8 @@
"description": "Descri\u00e7\u00e3o",
"split_transaction_title_help": "If you create a split transaction, there must be a global description for all splits of the transaction.",
"destination_account_reconciliation": "You can't edit the destination account of a reconciliation transaction.",
"source_account_reconciliation": "You can't edit the source account of a reconciliation transaction."
"source_account_reconciliation": "You can't edit the source account of a reconciliation transaction.",
"budget": "Or\u00e7amento"
},
"form": {
"interest_date": "Data de interesse",

5
resources/assets/js/locales/ro.json
View File

@ -1,6 +1,6 @@
{
"firefly": {
"welcome_back": "Ce se red\u0103?",
"welcome_back": "What's playing?",
"flash_error": "Eroare!",
"flash_success": "Succes!",
"close": "\u00cenchide",
@ -31,7 +31,8 @@
"description": "Descriere",
"split_transaction_title_help": "If you create a split transaction, there must be a global description for all splits of the transaction.",
"destination_account_reconciliation": "You can't edit the destination account of a reconciliation transaction.",
"source_account_reconciliation": "You can't edit the source account of a reconciliation transaction."
"source_account_reconciliation": "You can't edit the source account of a reconciliation transaction.",
"budget": "Buget"
},
"form": {
"interest_date": "Data de interes",

5
resources/assets/js/locales/ru.json
View File

@ -1,6 +1,6 @@
{
"firefly": {
"welcome_back": "\u0427\u0442\u043e \u043f\u0440\u043e\u0438\u0441\u0445\u043e\u0434\u0438\u0442 \u0441 \u043c\u043e\u0438\u043c\u0438 \u0444\u0438\u043d\u0430\u043d\u0441\u0430\u043c\u0438?",
"welcome_back": "What's playing?",
"flash_error": "\u041e\u0448\u0438\u0431\u043a\u0430!",
"flash_success": "\u0423\u0441\u043f\u0435\u0448\u043d\u043e!",
"close": "\u0417\u0430\u043a\u0440\u044b\u0442\u044c",
@ -31,7 +31,8 @@
"description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
"split_transaction_title_help": "\u0415\u0441\u043b\u0438 \u0432\u044b \u0441\u043e\u0437\u0434\u0430\u0451\u0442\u0435 \u0440\u0430\u0437\u0434\u0435\u043b\u0451\u043d\u043d\u0443\u044e \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044e, \u0442\u043e \u0434\u043e\u043b\u0436\u043d\u044b \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u043e\u0431\u0449\u0435\u0435 \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0434\u043b\u044f \u0432\u0441\u0435\u0445 \u0435\u0451 \u0441\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u044e\u0449\u0438\u0445.",
"destination_account_reconciliation": "You can't edit the destination account of a reconciliation transaction.",
"source_account_reconciliation": "You can't edit the source account of a reconciliation transaction."
"source_account_reconciliation": "You can't edit the source account of a reconciliation transaction.",
"budget": "\u0411\u044e\u0434\u0436\u0435\u0442"
},
"form": {
"interest_date": "\u0414\u0430\u0442\u0430 \u0432\u044b\u043f\u043b\u0430\u0442\u044b",

5
resources/assets/js/locales/sv.json
View File

@ -1,6 +1,6 @@
{
"firefly": {
"welcome_back": "Vad h\u00e4nder?",
"welcome_back": "Vad spelas?",
"flash_error": "Fel!",
"flash_success": "Slutf\u00f6rd!",
"close": "St\u00e4ng",
@ -31,7 +31,8 @@
"description": "Beskrivning",
"split_transaction_title_help": "If you create a split transaction, there must be a global description for all splits of the transaction.",
"destination_account_reconciliation": "Du kan inte redigera destinationskontot f\u00f6r en avst\u00e4mningstransaktion.",
"source_account_reconciliation": "Du kan inte redigera k\u00e4llkontot f\u00f6r en avst\u00e4mningstransaktion."
"source_account_reconciliation": "Du kan inte redigera k\u00e4llkontot f\u00f6r en avst\u00e4mningstransaktion.",
"budget": "Budget"
},
"form": {
"interest_date": "R\u00e4ntedatum",

3
resources/assets/js/locales/tr.json
View File

@ -31,7 +31,8 @@
"description": "A\u00e7\u0131klama",
"split_transaction_title_help": "If you create a split transaction, there must be a global description for all splits of the transaction.",
"destination_account_reconciliation": "You can't edit the destination account of a reconciliation transaction.",
"source_account_reconciliation": "You can't edit the source account of a reconciliation transaction."
"source_account_reconciliation": "You can't edit the source account of a reconciliation transaction.",
"budget": "B\u00fct\u00e7e"
},
"form": {
"interest_date": "Faiz tarihi",

3
resources/assets/js/locales/zh-cn.json
View File

@ -31,7 +31,8 @@
"description": "\u63cf\u8ff0",
"split_transaction_title_help": "\u5982\u679c\u60a8\u521b\u5efa\u4e86\u4e00\u4e2a\u5206\u5272\u4ea4\u6613\uff0c\u4ea4\u6613\u7684\u6240\u6709\u5206\u5272\u9879\u90fd\u5fc5\u987b\u6709\u5168\u5c40\u63cf\u8ff0\u3002",
"destination_account_reconciliation": "\u60a8\u4e0d\u80fd\u7f16\u8f91\u5bf9\u8d26\u4ea4\u6613\u7684\u76ee\u6807\u8d26\u6237",
"source_account_reconciliation": "\u60a8\u4e0d\u80fd\u7f16\u8f91\u5bf9\u8d26\u4ea4\u6613\u7684\u6e90\u8d26\u6237"
"source_account_reconciliation": "\u60a8\u4e0d\u80fd\u7f16\u8f91\u5bf9\u8d26\u4ea4\u6613\u7684\u6e90\u8d26\u6237",
"budget": "\u9884\u7b97"
},
"form": {
"interest_date": "\u5229\u7387\u65e5\u671f",

3
resources/assets/js/locales/zh-tw.json
View File

@ -31,7 +31,8 @@
"description": "\u63cf\u8ff0",
"split_transaction_title_help": "If you create a split transaction, there must be a global description for all splits of the transaction.",
"destination_account_reconciliation": "You can't edit the destination account of a reconciliation transaction.",
"source_account_reconciliation": "You can't edit the source account of a reconciliation transaction."
"source_account_reconciliation": "You can't edit the source account of a reconciliation transaction.",
"budget": "\u9810\u7b97"
},
"form": {
"interest_date": "\u5229\u7387\u65e5\u671f",

7
resources/views/v1/tags/index.twig
View File

@ -33,7 +33,12 @@
<input type="checkbox" name="tags[]" value="{{ tagInfo.id }}">
<a style="font-size:{{ tagInfo.size }}px;" class="label label-success"
title="{{ tagInfo.created_at.formatLocalized(monthAndDayFormat) }}"
href="{{ route('tags.show',tagInfo.id) }}"><i class="fa fa-fw fa-tag"></i> {{ tagInfo.tag }}</a>
href="{{ route('tags.show',tagInfo.id) }}">
{% if tagInfo.location %}
<i class="fa fa-fw fa-map-marker"></i>
{% endif %}
<i class="fa fa-fw fa-tag"></i>
{{ tagInfo.tag }}</a>
{% endfor %}
</p>
</div>