There was a fatal error. Please check the log files in "storage/logs" or use "docker logs -f [container]"
- to see what's going on.
-
-
- 0&&xt(s,!l&&bt(t,"script")),a},cleanData:function(t){for(var e,n,i,o=C.event.special,r=0;void 0!==(n=t[r]);r++)if(G(n)){if(e=n[J.expando]){if(e.events)for(i in e.events)o[i]?C.event.remove(n,i):C.removeEvent(n,i,e.handle);n[J.expando]=void 0}n[K.expando]&&(n[K.expando]=void 0)}}}),C.fn.extend({detach:function(t){return Ft(this,t,!0)},remove:function(t){return Ft(this,t)},text:function(t){return U(this,(function(t){return void 0===t?C.text(this):this.empty().each((function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=t)}))}),null,t,arguments.length)},append:function(){return Mt(this,arguments,(function(t){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Lt(this,t).appendChild(t)}))},prepend:function(){return Mt(this,arguments,(function(t){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var e=Lt(this,t);e.insertBefore(t,e.firstChild)}}))},before:function(){return Mt(this,arguments,(function(t){this.parentNode&&this.parentNode.insertBefore(t,this)}))},after:function(){return Mt(this,arguments,(function(t){this.parentNode&&this.parentNode.insertBefore(t,this.nextSibling)}))},empty:function(){for(var t,e=0;null!=(t=this[e]);e++)1===t.nodeType&&(C.cleanData(bt(t,!1)),t.textContent="");return this},clone:function(t,e){return t=null!=t&&t,e=null==e?t:e,this.map((function(){return C.clone(this,t,e)}))},html:function(t){return U(this,(function(t){var e=this[0]||{},n=0,i=this.length;if(void 0===t&&1===e.nodeType)return e.innerHTML;if("string"==typeof t&&!jt.test(t)&&!yt[(vt.exec(t)||["",""])[1].toLowerCase()]){t=C.htmlPrefilter(t);try{for(;n3,rt.removeChild(t)),a}}))}();var Qt=["Webkit","Moz","ms"],Xt=b.createElement("div").style,Gt={};function Yt(t){var e=C.cssProps[t]||Gt[t];return e||(t in Xt?t:Gt[t]=function(t){for(var e=t[0].toUpperCase()+t.slice(1),n=Qt.length;n--;)if((t=Qt[n]+e)in Xt)return t}(t)||t)}var Jt=/^(none|table(?!-c[ea]).+)/,Kt=/^--/,Zt={position:"absolute",visibility:"hidden",display:"block"},te={letterSpacing:"0",fontWeight:"400"};function ee(t,e,n){var i=it.exec(e);return i?Math.max(0,i[2]-(n||0))+(i[3]||"px"):e}function ne(t,e,n,i,o,r){var s="width"===e?1:0,a=0,l=0;if(n===(i?"border":"content"))return 0;for(;s<4;s+=2)"margin"===n&&(l+=C.css(t,n+ot[s],!0,o)),i?("content"===n&&(l-=C.css(t,"padding"+ot[s],!0,o)),"margin"!==n&&(l-=C.css(t,"border"+ot[s]+"Width",!0,o))):(l+=C.css(t,"padding"+ot[s],!0,o),"padding"!==n?l+=C.css(t,"border"+ot[s]+"Width",!0,o):a+=C.css(t,"border"+ot[s]+"Width",!0,o));return!i&&r>=0&&(l+=Math.max(0,Math.ceil(t["offset"+e[0].toUpperCase()+e.slice(1)]-r-l-a-.5))||0),l}function ie(t,e,n){var i=Bt(t),o=(!v.boxSizingReliable()||n)&&"border-box"===C.css(t,"boxSizing",!1,i),r=o,s=zt(t,e,i),a="offset"+e[0].toUpperCase()+e.slice(1);if(Wt.test(s)){if(!n)return s;s="auto"}return(!v.boxSizingReliable()&&o||!v.reliableTrDimensions()&&D(t,"tr")||"auto"===s||!parseFloat(s)&&"inline"===C.css(t,"display",!1,i))&&t.getClientRects().length&&(o="border-box"===C.css(t,"boxSizing",!1,i),(r=a in t)&&(s=t[a])),(s=parseFloat(s)||0)+ne(t,e,n||(o?"border":"content"),r,i,s)+"px"}function oe(t,e,n,i,o){return new oe.prototype.init(t,e,n,i,o)}C.extend({cssHooks:{opacity:{get:function(t,e){if(e){var n=zt(t,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(t,e,n,i){if(t&&3!==t.nodeType&&8!==t.nodeType&&t.style){var o,r,s,a=X(e),l=Kt.test(e),u=t.style;if(l||(e=Yt(a)),s=C.cssHooks[e]||C.cssHooks[a],void 0===n)return s&&"get"in s&&void 0!==(o=s.get(t,!1,i))?o:u[e];"string"===(r=typeof n)&&(o=it.exec(n))&&o[1]&&(n=ut(t,e,o),r="number"),null!=n&&n==n&&("number"!==r||l||(n+=o&&o[3]||(C.cssNumber[a]?"":"px")),v.clearCloneStyle||""!==n||0!==e.indexOf("background")||(u[e]="inherit"),s&&"set"in s&&void 0===(n=s.set(t,n,i))||(l?u.setProperty(e,n):u[e]=n))}},css:function(t,e,n,i){var o,r,s,a=X(e);return Kt.test(e)||(e=Yt(a)),(s=C.cssHooks[e]||C.cssHooks[a])&&"get"in s&&(o=s.get(t,!0,n)),void 0===o&&(o=zt(t,e,i)),"normal"===o&&e in te&&(o=te[e]),""===n||n?(r=parseFloat(o),!0===n||isFinite(r)?r||0:o):o}}),C.each(["height","width"],(function(t,e){C.cssHooks[e]={get:function(t,n,i){if(n)return!Jt.test(C.css(t,"display"))||t.getClientRects().length&&t.getBoundingClientRect().width?ie(t,e,i):_t(t,Zt,(function(){return ie(t,e,i)}))},set:function(t,n,i){var o,r=Bt(t),s=!v.scrollboxSize()&&"absolute"===r.position,a=(s||i)&&"border-box"===C.css(t,"boxSizing",!1,r),l=i?ne(t,e,i,a,r):0;return a&&s&&(l-=Math.ceil(t["offset"+e[0].toUpperCase()+e.slice(1)]-parseFloat(r[e])-ne(t,e,"border",!1,r)-.5)),l&&(o=it.exec(n))&&"px"!==(o[3]||"px")&&(t.style[e]=n,n=C.css(t,e)),ee(0,n,l)}}})),C.cssHooks.marginLeft=Vt(v.reliableMarginLeft,(function(t,e){if(e)return(parseFloat(zt(t,"marginLeft"))||t.getBoundingClientRect().left-_t(t,{marginLeft:0},(function(){return t.getBoundingClientRect().left})))+"px"})),C.each({margin:"",padding:"",border:"Width"},(function(t,e){C.cssHooks[t+e]={expand:function(n){for(var i=0,o={},r="string"==typeof n?n.split(" "):[n];i<4;i++)o[t+ot[i]+e]=r[i]||r[i-2]||r[0];return o}},"margin"!==t&&(C.cssHooks[t+e].set=ee)})),C.fn.extend({css:function(t,e){return U(this,(function(t,e,n){var i,o,r={},s=0;if(Array.isArray(e)){for(i=Bt(t),o=e.length;s
- You have not created any OAuth clients.
+ {{ $t('firefly.profile_oauth_no_clients') }}
Whoops! Something went wrong! {{ $t('firefly.profile_whoops') }} {{ $t('firefly.profile_something_wrong') }} Whoops! Something went wrong! {{ $t('firefly.profile_whoops') }} {{ $t('firefly.profile_something_wrong') }}
- You have not created any personal access tokens.
+ {{ $t('firefly.profile_no_personal_access_token') }}
Whoops! Something went wrong! {{ $t('firefly.profile_whoops') }} {{ $t('firefly.profile_something_wrong') }}
- {{ 'two_factor_lost_intro'|_ }}
-
+ {{ 'two_factor_lost_intro'|_ }}
+
- {% if ruleGroup.rules|length > 0 %}
- {{ Lang.choice('form.also_delete_rules', ruleGroup.rules|length, {count: ruleGroup.rules|length}) }}
- {% endif %}
-
+ {{ trans_choice('form.also_delete_rules', ruleGroup.rules|length) }}
+
- {{ 'save_rules_by_moving'|_ }}
+ {{ trans_choice('firefly.save_rules_by_moving', ruleGroup.rules|length) }}
diff --git a/resources/views/v1/search/search.twig b/resources/views/v1/search/search.twig
index d200bad228..f28c3b9f69 100644
--- a/resources/views/v1/search/search.twig
+++ b/resources/views/v1/search/search.twig
@@ -1,9 +1,9 @@
{% if hasPages %}
- {{ trans('firefly.search_found_transactions', {count: '>'~groups.perPage, time: searchTime}) }}
+ {{ trans('firefly.search_found_more_transactions', {count: groups.perPage, time: searchTime}) }}
{% else %}
- {{ trans('firefly.search_found_transactions', {count: groups.count, time: searchTime}) }}
+ {{ trans_choice('firefly.search_found_transactions', groups.count, {time: searchTime}) }}
{% endif %}
{# ONE: WITHDRAWAL TO DEPOSIT #}
{% if sourceType.type == 'Withdrawal' and destinationType.type == 'Deposit' %}
- {{ 'convert_expl_w_d'|_ }}
+ {{ trans_choice('firefly.convert_expl_w_d', groupArray.transactions|length) }}
+ {{ trans_choice('firefly.convert_select_sources', groupArray.transactions|length) }}
{% endif %}
{# TWO: WITHDRAWAL TO TRANSFER #}
{% if sourceType.type == 'Withdrawal' and destinationType.type == 'Transfer' %}
- {{ 'convert_expl_w_t'|_ }}
+ {{ trans_choice('firefly.convert_expl_w_t', groupArray.transactions|length) }}
+ {{ trans_choice('firefly.convert_select_destinations', groupArray.transactions|length) }}
{% endif %}
{# THREE: DEPOSIT TO WITHDRAWAL #}
{% if sourceType.type == 'Deposit' and destinationType.type == 'Withdrawal' %}
- {{ 'convert_expl_d_w'|_ }}
+ {{ trans_choice('firefly.convert_expl_d_w', groupArray.transactions|length) }}
+ {{ trans_choice('firefly.convert_select_destinations', groupArray.transactions|length) }}
{% endif %}
{# FOUR: DEPOSIT TO TRANSFER#}
{% if sourceType.type == 'Deposit' and destinationType.type == 'Transfer' %}
- {{ 'convert_expl_d_t'|_ }}
+ {{ trans_choice('firefly.convert_expl_d_t', groupArray.transactions|length) }}
+ {{ trans_choice('firefly.convert_select_sources', groupArray.transactions|length) }}
{% endif %}
{# FIVE: TRANSFER TO WITHDRAWAL #}
{% if sourceType.type == 'Transfer' and destinationType.type == 'Withdrawal' %}
- {{ 'convert_expl_t_w'|_ }}
+ {{ trans_choice('firefly.convert_expl_t_w', groupArray.transactions|length) }}
+ {{ trans_choice('firefly.convert_select_destinations', groupArray.transactions|length) }}
{% endif %}
{# SIX: TRANSFER TO DEPOSIT #}
{% if sourceType.type == 'Transfer' and destinationType.type == 'Deposit' %}
- {{ 'convert_expl_t_d'|_ }}
+ {{ trans_choice('firefly.convert_expl_t_d', groupArray.transactions|length) }}
+ {{ trans_choice('firefly.convert_select_sources', groupArray.transactions|length) }}
{% endif %}
1)},removeAttr:function(t){return this.each((function(){C.removeAttr(this,t)}))}}),C.extend({attr:function(t,e,n){var i,o,r=t.nodeType;if(3!==r&&8!==r&&2!==r)return void 0===t.getAttribute?C.prop(t,e,n):(1===r&&C.isXMLDoc(t)||(o=C.attrHooks[e.toLowerCase()]||(C.expr.match.bool.test(e)?he:void 0)),void 0!==n?null===n?void C.removeAttr(t,e):o&&"set"in o&&void 0!==(i=o.set(t,n,e))?i:(t.setAttribute(e,n+""),n):o&&"get"in o&&null!==(i=o.get(t,e))?i:null==(i=C.find.attr(t,e))?void 0:i)},attrHooks:{type:{set:function(t,e){if(!v.radioValue&&"radio"===e&&D(t,"input")){var n=t.value;return t.setAttribute("type",e),n&&(t.value=n),e}}}},removeAttr:function(t,e){var n,i=0,o=e&&e.match(P);if(o&&1===t.nodeType)for(;n=o[i++];)t.removeAttribute(n)}}),he={set:function(t,e,n){return!1===e?C.removeAttr(t,n):t.setAttribute(n,n),n}},C.each(C.expr.match.bool.source.match(/\w+/g),(function(t,e){var n=ge[e]||C.find.attr;ge[e]=function(t,e,i){var o,r,s=e.toLowerCase();return i||(r=ge[s],ge[s]=o,o=null!=n(t,e,i)?s:null,ge[s]=r),o}}));var ve=/^(?:input|select|textarea|button)$/i,me=/^(?:a|area)$/i;function ye(t){return(t.match(P)||[]).join(" ")}function be(t){return t.getAttribute&&t.getAttribute("class")||""}function xe(t){return Array.isArray(t)?t:"string"==typeof t&&t.match(P)||[]}C.fn.extend({prop:function(t,e){return U(this,C.prop,t,e,arguments.length>1)},removeProp:function(t){return this.each((function(){delete this[C.propFix[t]||t]}))}}),C.extend({prop:function(t,e,n){var i,o,r=t.nodeType;if(3!==r&&8!==r&&2!==r)return 1===r&&C.isXMLDoc(t)||(e=C.propFix[e]||e,o=C.propHooks[e]),void 0!==n?o&&"set"in o&&void 0!==(i=o.set(t,n,e))?i:t[e]=n:o&&"get"in o&&null!==(i=o.get(t,e))?i:t[e]},propHooks:{tabIndex:{get:function(t){var e=C.find.attr(t,"tabindex");return e?parseInt(e,10):ve.test(t.nodeName)||me.test(t.nodeName)&&t.href?0:-1}}},propFix:{for:"htmlFor",class:"className"}}),v.optSelected||(C.propHooks.selected={get:function(t){var e=t.parentNode;return e&&e.parentNode&&e.parentNode.selectedIndex,null},set:function(t){var e=t.parentNode;e&&(e.selectedIndex,e.parentNode&&e.parentNode.selectedIndex)}}),C.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],(function(){C.propFix[this.toLowerCase()]=this})),C.fn.extend({addClass:function(t){var e,n,i,o,r,s,a,l=0;if(m(t))return this.each((function(e){C(this).addClass(t.call(this,e,be(this)))}));if((e=xe(t)).length)for(;n=this[l++];)if(o=be(n),i=1===n.nodeType&&" "+ye(o)+" "){for(s=0;r=e[s++];)i.indexOf(" "+r+" ")<0&&(i+=r+" ");o!==(a=ye(i))&&n.setAttribute("class",a)}return this},removeClass:function(t){var e,n,i,o,r,s,a,l=0;if(m(t))return this.each((function(e){C(this).removeClass(t.call(this,e,be(this)))}));if(!arguments.length)return this.attr("class","");if((e=xe(t)).length)for(;n=this[l++];)if(o=be(n),i=1===n.nodeType&&" "+ye(o)+" "){for(s=0;r=e[s++];)for(;i.indexOf(" "+r+" ")>-1;)i=i.replace(" "+r+" "," ");o!==(a=ye(i))&&n.setAttribute("class",a)}return this},toggleClass:function(t,e){var n=typeof t,i="string"===n||Array.isArray(t);return"boolean"==typeof e&&i?e?this.addClass(t):this.removeClass(t):m(t)?this.each((function(n){C(this).toggleClass(t.call(this,n,be(this),e),e)})):this.each((function(){var e,o,r,s;if(i)for(o=0,r=C(this),s=xe(t);e=s[o++];)r.hasClass(e)?r.removeClass(e):r.addClass(e);else void 0!==t&&"boolean"!==n||((e=be(this))&&J.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===t?"":J.get(this,"__className__")||""))}))},hasClass:function(t){var e,n,i=0;for(e=" "+t+" ";n=this[i++];)if(1===n.nodeType&&(" "+ye(be(n))+" ").indexOf(e)>-1)return!0;return!1}});var we=/\r/g;C.fn.extend({val:function(t){var e,n,i,o=this[0];return arguments.length?(i=m(t),this.each((function(n){var o;1===this.nodeType&&(null==(o=i?t.call(this,n,C(this).val()):t)?o="":"number"==typeof o?o+="":Array.isArray(o)&&(o=C.map(o,(function(t){return null==t?"":t+""}))),(e=C.valHooks[this.type]||C.valHooks[this.nodeName.toLowerCase()])&&"set"in e&&void 0!==e.set(this,o,"value")||(this.value=o))}))):o?(e=C.valHooks[o.type]||C.valHooks[o.nodeName.toLowerCase()])&&"get"in e&&void 0!==(n=e.get(o,"value"))?n:"string"==typeof(n=o.value)?n.replace(we,""):null==n?"":n:void 0}}),C.extend({valHooks:{option:{get:function(t){var e=C.find.attr(t,"value");return null!=e?e:ye(C.text(t))}},select:{get:function(t){var e,n,i,o=t.options,r=t.selectedIndex,s="select-one"===t.type,a=s?null:[],l=s?r+1:o.length;for(i=r<0?l:s?r:0;i
- Authorized Applications
+ {{ $t('firefly.profile_authorized_apps') }}
-
diff --git a/resources/views/v1/reports/budget/partials/accounts.twig b/resources/views/v1/reports/budget/partials/accounts.twig
index b85fe8cf11..cb21e4f5f5 100644
--- a/resources/views/v1/reports/budget/partials/accounts.twig
+++ b/resources/views/v1/reports/budget/partials/accounts.twig
@@ -29,4 +29,4 @@
{% endfor %}
-
\ No newline at end of file
+
diff --git a/resources/views/v1/reports/category/partials/account-per-category.twig b/resources/views/v1/reports/category/partials/account-per-category.twig
index a45085672c..cb960c33bb 100644
--- a/resources/views/v1/reports/category/partials/account-per-category.twig
+++ b/resources/views/v1/reports/category/partials/account-per-category.twig
@@ -28,4 +28,4 @@
{% endfor %}
{% endfor %}
-
\ No newline at end of file
+
diff --git a/resources/views/v1/reports/category/partials/accounts.twig b/resources/views/v1/reports/category/partials/accounts.twig
index 5fd35138ef..4e9ce9e9a2 100644
--- a/resources/views/v1/reports/category/partials/accounts.twig
+++ b/resources/views/v1/reports/category/partials/accounts.twig
@@ -43,4 +43,4 @@
{% endfor %}
-
\ No newline at end of file
+
diff --git a/resources/views/v1/reports/double/partials/accounts-per-asset.twig b/resources/views/v1/reports/double/partials/accounts-per-asset.twig
index 59a20b9703..6a19774fbf 100644
--- a/resources/views/v1/reports/double/partials/accounts-per-asset.twig
+++ b/resources/views/v1/reports/double/partials/accounts-per-asset.twig
@@ -41,4 +41,4 @@
{% endfor %}
-
\ No newline at end of file
+
diff --git a/resources/views/v1/reports/double/partials/accounts.twig b/resources/views/v1/reports/double/partials/accounts.twig
index 104243afc0..7149f2f45e 100644
--- a/resources/views/v1/reports/double/partials/accounts.twig
+++ b/resources/views/v1/reports/double/partials/accounts.twig
@@ -52,4 +52,4 @@
{% endfor %}
-
\ No newline at end of file
+
diff --git a/resources/views/v1/reports/tag/partials/account-per-tag.twig b/resources/views/v1/reports/tag/partials/account-per-tag.twig
index 2df6c1c0ae..871cf05d71 100644
--- a/resources/views/v1/reports/tag/partials/account-per-tag.twig
+++ b/resources/views/v1/reports/tag/partials/account-per-tag.twig
@@ -37,4 +37,4 @@
-
\ No newline at end of file
+
diff --git a/resources/views/v1/reports/tag/partials/accounts.twig b/resources/views/v1/reports/tag/partials/accounts.twig
index 5fd35138ef..4e9ce9e9a2 100644
--- a/resources/views/v1/reports/tag/partials/accounts.twig
+++ b/resources/views/v1/reports/tag/partials/accounts.twig
@@ -43,4 +43,4 @@
{% endfor %}
-
\ No newline at end of file
+
diff --git a/resources/views/v1/rules/index.twig b/resources/views/v1/rules/index.twig
index 059b00707b..e1090a2a00 100644
--- a/resources/views/v1/rules/index.twig
+++ b/resources/views/v1/rules/index.twig
@@ -150,7 +150,7 @@
{% if not rule.active %}
class="text-muted"
{% endif %}
- data-id="{{ trigger.id }}">{{ trans(('firefly.rule_trigger_' ~ trigger.trigger_type), {trigger_value: trigger.trigger_value}) }}
+ data-id="{{ trigger.id }}">{{ trans_choice(('firefly.rule_trigger_' ~ trigger.trigger_type), trigger.trigger_value, {trigger_value: trigger.trigger_value}) }}
{% if trigger.stop_processing %}
diff --git a/resources/views/v1/rules/rule-group/delete.twig b/resources/views/v1/rules/rule-group/delete.twig
index 332cd444c1..32e5b472cf 100644
--- a/resources/views/v1/rules/rule-group/delete.twig
+++ b/resources/views/v1/rules/rule-group/delete.twig
@@ -23,15 +23,14 @@
{{ trans('form.ruleGroup_areYouSure', {'title': ruleGroup.title}) }}
-
-
@@ -67,7 +67,7 @@
Name
- Scopes
+ {{ $t('firefly.name') }}
+ {{ $t('firefly.profile_scopes') }}
- Revoke
+ {{ $t('firefly.profile_revoke') }}
diff --git a/resources/assets/js/components/passport/Clients.vue b/resources/assets/js/components/passport/Clients.vue
index 43824810f0..92ad305320 100644
--- a/resources/assets/js/components/passport/Clients.vue
+++ b/resources/assets/js/components/passport/Clients.vue
@@ -34,23 +34,23 @@
- OAuth Clients
+ {{ $t('firefly.profile_oauth_clients') }}
-
\ No newline at end of file
+
-
@@ -76,14 +76,14 @@
Client ID
- Name
- Secret
+ {{ $t('firefly.profile_oauth_client_id') }}
+ {{ $t('firefly.name') }}
+ {{ $t('firefly.profile_oauth_client_secret') }}
- Edit
+ {{ $t('firefly.edit') }}
- Delete
+ {{ $t('firefly.delete') }}
@@ -92,7 +92,7 @@
@@ -105,14 +105,14 @@
- Create Client
+ {{ $t('firefly.profile_oauth_create_client') }}
- Edit Client
+ {{ $t('firefly.profile_oauth_edit_client') }}
- Personal Access Tokens
+ {{ $t('firefly.profile_personal_access_tokens') }}
-
diff --git a/resources/views/v1/auth/lost-two-factor.twig b/resources/views/v1/auth/lost-two-factor.twig
index a5a8391f2c..4a9e293390 100644
--- a/resources/views/v1/auth/lost-two-factor.twig
+++ b/resources/views/v1/auth/lost-two-factor.twig
@@ -10,38 +10,37 @@
-
{# favicons #}
{% include('partials.favicons') %}
-
-
-
@@ -63,7 +63,7 @@
Name
+ {{ $t('firefly.name') }}
- Delete
+ {{ $t('firefly.delete') }}
@@ -72,7 +72,7 @@
@@ -86,14 +86,14 @@
- Create Token
+ {{ $t('firefly.profile_create_token') }}
{{ 'two_factor_lost_header'|_ }}
- {{ 'two_factor_lost_header'|_ }}
-
-
+
@@ -103,20 +103,20 @@
{% if first.transactiontype.type != 'Deposit' or splits == 1 %}
- {{ 'source_accounts'|_ }}
+ {{ trans_choice('firefly.source_accounts', accounts['source']|length ) }}
- {% for journal in groupArray.transactions %}
- {% if 'Cash account' == journal.source_type %}
+ {% for account in accounts['source'] %}
+ {% if 'Cash account' == account.type %}
({{ 'cash'|_ }})
{% else %}
-
- {{ journal.source_name }}
+
+ {{ account.name }}
{% endif %}
- {% if loop.index0 != groupArray.transactions|length -1 %}, {% endif %}
+ {% if loop.index0 != accounts['source']|length -1 %}, {% endif %}
{% endfor %}
@@ -131,6 +131,13 @@
{{ formatAmountBySymbol(amount.amount, amount.symbol, amount.decimal_places, false) }}{% if loop.index0 != amounts|length -1 %}, {% endif %}
+ {% elseif first.transactiontype.type == 'Opening balance' %}
+ {# Opening balance stored amount is always negative: find out which way the money goes #}
+ {% if groupArray.transactions[0].source_type == 'Initial balance account' %}
+ {{ formatAmountBySymbol(amount.amount*-1,amount.symbol, amount.decimal_places) }}
+ {% else %}
+ {{ formatAmountBySymbol(amount.amount,amount.symbol, amount.decimal_places) }}
+ {% endif %}
{% endif %}
{% endfor %}
diff --git a/resources/views/v1/transactions/single/edit.twig b/resources/views/v1/transactions/single/edit.twig
index 2a701f88ce..8faafdbec8 100644
--- a/resources/views/v1/transactions/single/edit.twig
+++ b/resources/views/v1/transactions/single/edit.twig
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/tests/Feature/Controllers/Recurring/ShowControllerTest.php b/tests/Feature/Controllers/Recurring/ShowControllerTest.php
index e64db56a9d..f457f3c296 100644
--- a/tests/Feature/Controllers/Recurring/ShowControllerTest.php
+++ b/tests/Feature/Controllers/Recurring/ShowControllerTest.php
@@ -93,4 +93,4 @@ class ShowControllerTest extends TestCase
$response->assertSee('
- {{ 'destination_accounts'|_ }}
+ {{ trans_choice('firefly.destination_accounts', accounts['destination']|length ) }}
- {% for journal in groupArray.transactions %}
- {% if 'Cash account' == journal.destination_type %}
+ {% for account in accounts['destination'] %}
+ {% if 'Cash account' == account.type %}
({{ 'cash'|_ }})
{% else %}
-
- {{ journal.destination_name }}
+
+ {{ account.name }}
{% endif %}
- {% if loop.index0 != groupArray.transactions|length -1 %}, {% endif %}
+ {% if loop.index0 != accounts['destination']|length -1 %}, {% endif %}
{% endfor %}