Skip to content

Commit c40d7dd

Browse files
committed
🐛 Timespan should be displayed in settings
1 parent 4214e3e commit c40d7dd

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

src/renderer/components/MainPane/recurrings.vue

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@
4444
</div>
4545
<div class="control select is-primary">
4646
<select class="select" v-model="newRecurringOperation.timespan">
47-
<option value="days">{{ (newRecurringOperation.offset > 1 ? "TIME_SPAN.PLURAL.":"TIME_SPAN.SINGULAR.")+"days"| translate}}</option>
48-
<option value="weeks">{{ (newRecurringOperation.offset > 1 ? "TIME_SPAN.PLURAL.":"TIME_SPAN.SINGULAR.")+"weeks"| translate}}</option>
49-
<option value="months">{{ (newRecurringOperation.offset > 1 ? "TIME_SPAN.PLURAL.":"TIME_SPAN.SINGULAR.")+"months"| translate}}</option>
50-
<option value="quarters">{{ (newRecurringOperation.offset > 1 ? "TIME_SPAN.PLURAL.":"TIME_SPAN.SINGULAR.")+"quarters"| translate}}</option>
51-
<option value="years">{{ (newRecurringOperation.offset > 1 ? "TIME_SPAN.PLURAL.":"TIME_SPAN.SINGULAR.")+"years"| translate}}</option>
47+
<option value="day">{{ (newRecurringOperation.offset > 1 ? "TIME_SPAN.PLURAL.":"TIME_SPAN.SINGULAR.")+"days"| translate}}</option>
48+
<option value="week">{{ (newRecurringOperation.offset > 1 ? "TIME_SPAN.PLURAL.":"TIME_SPAN.SINGULAR.")+"weeks"| translate}}</option>
49+
<option value="month">{{ (newRecurringOperation.offset > 1 ? "TIME_SPAN.PLURAL.":"TIME_SPAN.SINGULAR.")+"months"| translate}}</option>
50+
<option value="quarter">{{ (newRecurringOperation.offset > 1 ? "TIME_SPAN.PLURAL.":"TIME_SPAN.SINGULAR.")+"quarters"| translate}}</option>
51+
<option value="year">{{ (newRecurringOperation.offset > 1 ? "TIME_SPAN.PLURAL.":"TIME_SPAN.SINGULAR.")+"years"| translate}}</option>
5252
</select>
5353
</div>
5454
</div>
@@ -222,7 +222,7 @@ export default {
222222
selectedAccount: this.$root.accounts[0],
223223
type: 'credit-card',
224224
offset: 1,
225-
timespan: 'days'
225+
timespan: this.$root.settings.defaultTimeSpan
226226
}
227227
}
228228
},
@@ -463,6 +463,7 @@ export default {
463463
},
464464
created: function () {
465465
this.getData()
466+
console.log(this.newRecurringOperation)
466467
}
467468
}
468469
</script>

src/renderer/settings/components/general.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@
8484
</div>
8585
<div class="control select is-primary">
8686
<select class="select" v-model="settings.defaultTimeSpan">
87-
<option value="days">{{ (settings.defaultOffset > 1 ? "TIME_SPAN.PLURAL.":"TIME_SPAN.SINGULAR.")+"days"| translate}}</option>
88-
<option value="weeks">{{ (settings.defaultOffset > 1 ? "TIME_SPAN.PLURAL.":"TIME_SPAN.SINGULAR.")+"weeks"| translate}}</option>
89-
<option value="months">{{ (settings.defaultOffset > 1 ? "TIME_SPAN.PLURAL.":"TIME_SPAN.SINGULAR.")+"months"| translate}}</option>
90-
<option value="quarters">{{ (settings.defaultOffset > 1 ? "TIME_SPAN.PLURAL.":"TIME_SPAN.SINGULAR.")+"quarters"| translate}}</option>
91-
<option value="years">{{ (settings.defaultOffset > 1 ? "TIME_SPAN.PLURAL.":"TIME_SPAN.SINGULAR.")+"years"| translate}}</option>
87+
<option value="day">{{ (settings.defaultOffset > 1 ? "TIME_SPAN.PLURAL.":"TIME_SPAN.SINGULAR.")+"days"| translate}}</option>
88+
<option value="week">{{ (settings.defaultOffset > 1 ? "TIME_SPAN.PLURAL.":"TIME_SPAN.SINGULAR.")+"weeks"| translate}}</option>
89+
<option value="month">{{ (settings.defaultOffset > 1 ? "TIME_SPAN.PLURAL.":"TIME_SPAN.SINGULAR.")+"months"| translate}}</option>
90+
<option value="quarter">{{ (settings.defaultOffset > 1 ? "TIME_SPAN.PLURAL.":"TIME_SPAN.SINGULAR.")+"quarters"| translate}}</option>
91+
<option value="year">{{ (settings.defaultOffset > 1 ? "TIME_SPAN.PLURAL.":"TIME_SPAN.SINGULAR.")+"years"| translate}}</option>
9292
</select>
9393
</div>
9494
</div>

0 commit comments

Comments
 (0)