update text content

This commit is contained in:
MaysWind
2024-04-06 13:07:16 +08:00
parent cb57b216d0
commit 4b68ccf678
70 changed files with 557 additions and 563 deletions
+8 -8
View File
@@ -8,11 +8,11 @@
<f7-list strong inset dividers class="margin-top">
<f7-list-item :title="$t('Status')" :after="$t(isEnableApplicationLock ? 'Enabled' : 'Disabled')"></f7-list-item>
<f7-list-item v-if="isEnableApplicationLock">
<span>{{ $t('Unlock By PIN Code') }}</span>
<span>{{ $t('Unlock with PIN Code') }}</span>
<f7-toggle checked disabled></f7-toggle>
</f7-list-item>
<f7-list-item v-if="isEnableApplicationLock && isSupportedWebAuthn">
<span>{{ $t('Unlock By WebAuthn') }}</span>
<span>{{ $t('Unlock with WebAuthn') }}</span>
<f7-toggle :checked="isEnableApplicationLockWebAuthn" @toggle:change="isEnableApplicationLockWebAuthn = $event"></f7-toggle>
</f7-list-item>
<f7-list-button v-if="isEnableApplicationLock" @click="disable(null)">{{ $t('Disable') }}</f7-list-button>
@@ -20,14 +20,14 @@
</f7-list>
<pin-code-input-sheet :title="$t('PIN Code')"
:hint="$t('Please input a new 6-digit PIN code. PIN code would encrypt your local data, so you need input this PIN code when you launch this app. If this PIN code is lost, you should re-login.')"
:hint="$t('Please enter a new 6-digit PIN code. The PIN code would encrypt your local data, so you need to enter it every time you open this app. If this PIN code is lost, you will need to log in again.')"
v-model:show="showInputPinCodeSheetForEnable"
v-model="currentPinCodeForEnable"
@pincode:confirm="enable">
</pin-code-input-sheet>
<pin-code-input-sheet :title="$t('PIN Code')"
:hint="$t('Please enter your current PIN code when disable application lock.')"
:hint="$t('Your current PIN code is required to disable application lock.')"
v-model:show="showInputPinCodeSheetForDisable"
v-model="currentPinCodeForDisable"
@pincode:confirm="disable">
@@ -94,7 +94,7 @@ export default {
self.$hideLoading();
if (error.notSupported) {
self.$toast('This device does not support WebAuthn');
self.$toast('WebAuth is not supported on this device');
} else if (error.name === 'NotAllowedError') {
self.$toast('User has canceled authentication');
} else if (error.invalid) {
@@ -132,14 +132,14 @@ export default {
}
if (!this.currentPinCodeForEnable || this.currentPinCodeForEnable.length !== 6) {
this.$alert('PIN code is invalid');
this.$alert('Invalid PIN code');
return;
}
const user = this.userStore.currentUserInfo;
if (!user || !user.username) {
this.$alert('An error has occurred');
this.$alert('An error occurred');
return;
}
@@ -163,7 +163,7 @@ export default {
}
if (!this.$user.isCorrectPinCode(pinCode)) {
this.$alert('PIN code is wrong');
this.$alert('Incorrect PIN code');
return;
}
+1 -1
View File
@@ -57,7 +57,7 @@
</div>
</template>
<f7-swipeout-actions right v-if="exchangeRate.currencyCode !== baseCurrency">
<f7-swipeout-button color="primary" close :text="$t('Set As Baseline')" @click="setAsBaseline(exchangeRate.currencyCode, getConvertedAmount(exchangeRate))"></f7-swipeout-button>
<f7-swipeout-button color="primary" close :text="$t('Set as Base')" @click="setAsBaseline(exchangeRate.currencyCode, getConvertedAmount(exchangeRate))"></f7-swipeout-button>
</f7-swipeout-actions>
</f7-list-item>
</f7-list>
+9 -9
View File
@@ -142,7 +142,7 @@
</div>
<div class="padding-horizontal padding-bottom">
<p class="no-margin">
<span>{{ $t('Please input your email address used for registration and we\'ll send you an email with reset password link') }}</span>
<span>{{ $t('Please enter your email address used for registration and we\'ll send you an email with a reset password link') }}</span>
</p>
<f7-list strong class="no-margin">
<f7-list-input
@@ -249,9 +249,9 @@ export default {
},
twoFAVerifyTypeSwitchName() {
if (this.twoFAVerifyType === 'backupcode') {
return 'Use a passcode';
return 'Use Passcode';
} else {
return 'Use a backup code';
return 'Use Backup Code';
}
},
currentLanguageCode() {
@@ -270,12 +270,12 @@ export default {
const router = self.f7router;
if (!this.username) {
self.$alert('Username cannot be empty');
self.$alert('Username cannot be blank');
return;
}
if (!this.password) {
self.$alert('Password cannot be empty');
self.$alert('Password cannot be blank');
return;
}
@@ -346,10 +346,10 @@ export default {
}
if (this.twoFAVerifyType === 'passcode' && !this.passcode) {
self.$alert('Passcode cannot be empty');
self.$alert('Passcode cannot be blank');
return;
} else if (this.twoFAVerifyType === 'backupcode' && !this.backupCode) {
self.$alert('Backup code cannot be empty');
self.$alert('Backup code cannot be blank');
return;
}
@@ -388,7 +388,7 @@ export default {
const self = this;
if (!self.forgetPasswordEmail) {
self.$alert('Email address cannot be empty');
self.$alert('Email address cannot be blank');
return;
}
@@ -416,7 +416,7 @@ export default {
const self = this;
if (!self.currentPasswordForResendVerifyEmail) {
self.$toast('Current password cannot be empty');
self.$toast('Current password cannot be blank');
return;
}
+11 -11
View File
@@ -31,7 +31,7 @@
type="password"
autocomplete="new-password"
clear-button
:label="$t('Confirmation Password')"
:label="$t('Confirm Password')"
:placeholder="$t('Re-enter the password')"
v-model:value="user.confirmPassword"
></f7-list-input>
@@ -257,24 +257,24 @@ export default {
},
inputEmptyProblemMessage() {
if (!this.user.username) {
return 'Username cannot be empty';
return 'Username cannot be blank';
} else if (!this.user.password) {
return 'Password cannot be empty';
return 'Password cannot be blank';
} else if (!this.user.confirmPassword) {
return 'Confirmation password cannot be empty';
return 'Password confirmation cannot be blank';
} else if (!this.user.email) {
return 'Email address cannot be empty';
return 'Email address cannot be blank';
} else if (!this.user.nickname) {
return 'Nickname cannot be empty';
return 'Nickname cannot be blank';
} else if (!this.user.defaultCurrency) {
return 'Default currency cannot be empty';
return 'Default currency cannot be blank';
} else {
return null;
}
},
inputInvalidProblemMessage() {
if (this.user.password && this.user.confirmPassword && this.user.password !== this.user.confirmPassword) {
return 'Password and confirmation password do not match';
return 'Password and password confirmation do not match';
} else {
return null;
}
@@ -310,9 +310,9 @@ export default {
self.$hideLoading();
if (self.usePresetCategories && !response.presetCategoriesSaved) {
self.$toast('You have been successfully registered, but something wrong with adding preset categories. You can re-add preset categories in settings page anytime.', 5000);
self.$toast('You have been successfully registered, but there was an failure when adding preset categories. You can re-add preset categories in settings page anytime.', 5000);
} else if (response.needVerifyEmail) {
self.$toast('You have been successfully registered. Account activation link has been sent to your email address, please activate your account first.', 5000);
self.$toast('You have been successfully registered. An account activation link has been sent to your email address, please activate your account first.', 5000);
} else {
self.$toast('You have been successfully registered');
}
@@ -334,7 +334,7 @@ export default {
self.$hideLoading();
if (self.usePresetCategories && !response.presetCategoriesSaved) {
self.$toast('You have been successfully registered, but something wrong with adding preset categories. You can re-add preset categories in settings page anytime.');
self.$toast('You have been successfully registered, but there was an failure when adding preset categories. You can re-add preset categories in settings page anytime.');
} else {
self.$toast('You have been successfully registered');
}
+8 -8
View File
@@ -17,8 +17,8 @@
</f7-list>
<f7-list>
<f7-list-button :class="{ 'disabled': !isPinCodeValid(pinCode) }" :text="$t('Unlock By PIN Code')" @click="unlockByPin"></f7-list-button>
<f7-list-button v-if="isWebAuthnAvailable" :text="$t('Unlock By WebAuthn')" @click="unlockByWebAuthn"></f7-list-button>
<f7-list-button :class="{ 'disabled': !isPinCodeValid(pinCode) }" :text="$t('Unlock with PIN Code')" @click="unlockByPin"></f7-list-button>
<f7-list-button v-if="isWebAuthnAvailable" :text="$t('Unlock with WebAuthn')" @click="unlockByWebAuthn"></f7-list-button>
<f7-block-footer>
<f7-link :text="$t('Re-login')" @click="relogin"></f7-link>
</f7-block-footer>
@@ -120,7 +120,7 @@ export default {
}
if (!webauthn.isSupported()) {
self.$toast('This device does not support WebAuthn');
self.$toast('WebAuth is not supported on this device');
return;
}
@@ -150,11 +150,11 @@ export default {
logger.error('failed to use webauthn to verify', error);
if (error.notSupported) {
self.$toast('This device does not support WebAuthn');
self.$toast('WebAuth is not supported on this device');
} else if (error.name === 'NotAllowedError') {
self.$toast('User has canceled authentication');
} else if (error.invalid) {
self.$toast('Failed to authenticate by WebAuthn');
self.$toast('Failed to authenticate with WebAuthn');
} else {
self.$toast('User has canceled or this device does not support WebAuthn');
}
@@ -175,7 +175,7 @@ export default {
const user = self.userStore.currentUserInfo;
if (!user || !user.username) {
self.$alert('An error has occurred');
self.$alert('An error occurred');
return;
}
@@ -194,8 +194,8 @@ export default {
router.refreshPage();
} catch (ex) {
logger.error('failed to unlock by pin code', ex);
self.$toast('PIN code is wrong');
logger.error('failed to unlock with pin code', ex);
self.$toast('Incorrect PIN code');
}
},
relogin() {
+14 -14
View File
@@ -282,7 +282,7 @@
<f7-list-item group-title>
<small>{{ $t('Sub Account') + ' #' + (idx + 1) }}</small>
<f7-button rasied fill class="subaccount-delete-button" color="red" icon-f7="trash" icon-size="16px"
:tooltip="$t('Remove Sub Account')"
:tooltip="$t('Remove Sub-account')"
v-if="!editAccountId"
@click="removeSubAccount(subAccount, false)">
</f7-button>
@@ -291,8 +291,8 @@
<f7-list-input
type="text"
clear-button
:label="$t('Sub Account Name')"
:placeholder="$t('Your sub account name')"
:label="$t('Sub-account Name')"
:placeholder="$t('Your sub-account name')"
v-model:value="subAccount.name"
></f7-list-input>
@@ -304,7 +304,7 @@
<div class="item-content">
<div class="item-inner">
<div class="item-header">
<span>{{ $t('Sub Account Icon') }}</span>
<span>{{ $t('Sub-account Icon') }}</span>
</div>
<div class="item-title">
<div class="list-item-custom-title no-padding">
@@ -326,7 +326,7 @@
<div class="item-content">
<div class="item-inner">
<div class="item-header">
<span>{{ $t('Sub Account Color') }}</span>
<span>{{ $t('Sub-account Color') }}</span>
</div>
<div class="item-title">
<div class="list-item-custom-title no-padding">
@@ -370,7 +370,7 @@
link="#" no-chevron
class="list-item-with-header-and-title"
:class="{ 'disabled': editAccountId }"
:header="$t('Sub Account Balance')"
:header="$t('Sub-account Balance')"
:title="getAccountBalance(subAccount)"
@click="subAccount.showBalanceSheet = true"
>
@@ -389,7 +389,7 @@
type="textarea"
style="height: auto"
:label="$t('Description')"
:placeholder="$t('Your sub account description (optional)')"
:placeholder="$t('Your sub-account description (optional)')"
v-textarea-auto-size
v-model:value="subAccount.comment"
></f7-list-input>
@@ -398,7 +398,7 @@
<f7-actions close-by-outside-click close-on-escape :opened="showMoreActionSheet" @actions:closed="showMoreActionSheet = false">
<f7-actions-group>
<f7-actions-button @click="addSubAccount">{{ $t('Add Sub Account') }}</f7-actions-button>
<f7-actions-button @click="addSubAccount">{{ $t('Add Sub-account') }}</f7-actions-button>
</f7-actions-group>
<f7-actions-group>
<f7-actions-button bold close>{{ $t('Cancel') }}</f7-actions-button>
@@ -407,7 +407,7 @@
<f7-actions close-by-outside-click close-on-escape :opened="showDeleteActionSheet" @actions:closed="showDeleteActionSheet = false">
<f7-actions-group>
<f7-actions-label>{{ $t('Are you sure you want to remove this sub account?') }}</f7-actions-label>
<f7-actions-label>{{ $t('Are you sure you want to remove this sub-account?') }}</f7-actions-label>
<f7-actions-button color="red" @click="removeSubAccount(subAccountToDelete, true)">{{ $t('Remove') }}</f7-actions-button>
</f7-actions-group>
<f7-actions-group>
@@ -567,7 +567,7 @@ export default {
},
removeSubAccount(subAccount, confirm) {
if (!subAccount) {
this.$alert('An error has occurred');
this.$alert('An error occurred');
return;
}
@@ -676,13 +676,13 @@ export default {
},
getInputEmptyProblemMessage(account, isSubAccount) {
if (!isSubAccount && !account.category) {
return 'Account category cannot be empty';
return 'Account category cannot be blank';
} else if (!isSubAccount && !account.type) {
return 'Account type cannot be empty';
return 'Account type cannot be blank';
} else if (!account.name) {
return 'Account name cannot be empty';
return 'Account name cannot be blank';
} else if (account.type === this.allAccountTypes.SingleAccount && !account.currency) {
return 'Account currency cannot be empty';
return 'Account currency cannot be blank';
} else {
return null;
}
+3 -3
View File
@@ -152,8 +152,8 @@
<f7-actions close-by-outside-click close-on-escape :opened="showMoreActionSheet" @actions:closed="showMoreActionSheet = false">
<f7-actions-group>
<f7-actions-button @click="setSortable()">{{ $t('Sort') }}</f7-actions-button>
<f7-actions-button v-if="!showHidden" @click="showHidden = true">{{ $t('Show Hidden Account') }}</f7-actions-button>
<f7-actions-button v-if="showHidden" @click="showHidden = false">{{ $t('Hide Hidden Account') }}</f7-actions-button>
<f7-actions-button v-if="!showHidden" @click="showHidden = true">{{ $t('Show Hidden Accounts') }}</f7-actions-button>
<f7-actions-button v-if="showHidden" @click="showHidden = false">{{ $t('Hide Hidden Accounts') }}</f7-actions-button>
</f7-actions-group>
<f7-actions-group>
<f7-actions-button bold close>{{ $t('Cancel') }}</f7-actions-button>
@@ -408,7 +408,7 @@ export default {
const self = this;
if (!account) {
self.$alert('An error has occurred');
self.$alert('An error occurred');
return;
}
+1 -1
View File
@@ -187,7 +187,7 @@ export default {
},
inputEmptyProblemMessage() {
if (!this.category.name) {
return 'Category name cannot be empty';
return 'Category name cannot be blank';
} else {
return null;
}
+3 -3
View File
@@ -66,8 +66,8 @@
<f7-actions close-by-outside-click close-on-escape :opened="showMoreActionSheet" @actions:closed="showMoreActionSheet = false">
<f7-actions-group>
<f7-actions-button @click="setSortable()">{{ $t('Sort') }}</f7-actions-button>
<f7-actions-button v-if="!showHidden" @click="showHidden = true">{{ $t('Show Hidden Transaction Category') }}</f7-actions-button>
<f7-actions-button v-if="showHidden" @click="showHidden = false">{{ $t('Hide Hidden Transaction Category') }}</f7-actions-button>
<f7-actions-button v-if="!showHidden" @click="showHidden = true">{{ $t('Show Hidden Transaction Categories') }}</f7-actions-button>
<f7-actions-button v-if="showHidden" @click="showHidden = false">{{ $t('Hide Hidden Transaction Categories') }}</f7-actions-button>
</f7-actions-group>
<f7-actions-group>
<f7-actions-button bold close>{{ $t('Cancel') }}</f7-actions-button>
@@ -357,7 +357,7 @@ export default {
const self = this;
if (!category) {
self.$alert('An error has occurred');
self.$alert('An error occurred');
return;
}
+2 -2
View File
@@ -37,8 +37,8 @@
<f7-list-item :title="$t('Default Transaction Category Filter')" link="/statistic/filter/category?modifyDefault=1"></f7-list-item>
<f7-list-item
:title="$t('Default Sort By')"
smart-select :smart-select-params="{ openIn: 'popup', popupPush: true, closeOnSelect: true, scrollToSelectedItem: true, searchbar: true, searchbarPlaceholder: $t('Sort By'), searchbarDisableText: $t('Cancel'), appendSearchbarNotFound: $t('No results'), popupCloseLinkText: $t('Done') }">
:title="$t('Default Sort Order')"
smart-select :smart-select-params="{ openIn: 'popup', popupPush: true, closeOnSelect: true, scrollToSelectedItem: true, searchbar: true, searchbarPlaceholder: $t('Sort Order'), searchbarDisableText: $t('Cancel'), appendSearchbarNotFound: $t('No results'), popupCloseLinkText: $t('Done') }">
<select v-model="defaultSortingType">
<option :value="sortingType.type"
:key="sortingType.type"
@@ -31,7 +31,7 @@
<f7-card v-if="query.chartType === allChartTypes.Pie">
<f7-card-header class="no-border display-block">
<div class="statistics-chart-header full-line text-align-right">
<span style="margin-right: 4px;">{{ $t('Sort By') }}</span>
<span style="margin-right: 4px;">{{ $t('Sort by') }}</span>
<f7-link href="#" popover-open=".sorting-type-popover-menu">{{ querySortingTypeName }}</f7-link>
</div>
</f7-card-header>
@@ -84,7 +84,7 @@
{{ totalAmountName }}
</div>
<div class="align-self-flex-end">
<span style="margin-right: 4px;">{{ $t('Sort By') }}</span>
<span style="margin-right: 4px;">{{ $t('Sort by') }}</span>
<f7-link href="#" popover-open=".sorting-type-popover-menu">{{ querySortingTypeName }}</f7-link>
</div>
</div>
+3 -3
View File
@@ -123,8 +123,8 @@
<f7-actions close-by-outside-click close-on-escape :opened="showMoreActionSheet" @actions:closed="showMoreActionSheet = false">
<f7-actions-group>
<f7-actions-button @click="setSortable()">{{ $t('Sort') }}</f7-actions-button>
<f7-actions-button v-if="!showHidden" @click="showHidden = true">{{ $t('Show Hidden Transaction Tag') }}</f7-actions-button>
<f7-actions-button v-if="showHidden" @click="showHidden = false">{{ $t('Hide Hidden Transaction Tag') }}</f7-actions-button>
<f7-actions-button v-if="!showHidden" @click="showHidden = true">{{ $t('Show Hidden Transaction Tags') }}</f7-actions-button>
<f7-actions-button v-if="showHidden" @click="showHidden = false">{{ $t('Hide Hidden Transaction Tags') }}</f7-actions-button>
</f7-actions-group>
<f7-actions-group>
<f7-actions-button bold close>{{ $t('Cancel') }}</f7-actions-button>
@@ -392,7 +392,7 @@ export default {
const self = this;
if (!tag) {
self.$alert('An error has occurred');
self.$alert('An error occurred');
return;
}
+10 -10
View File
@@ -33,7 +33,7 @@
<f7-list-item class="list-item-with-header-and-title list-item-title-hide-overflow" header="Category" title="Category Names"></f7-list-item>
<f7-list-item class="list-item-with-header-and-title" header="Account" title="Account Name"></f7-list-item>
<f7-list-item class="list-item-with-header-and-title" header="Transaction Time" title="YYYY/MM/DD HH:mm:ss"></f7-list-item>
<f7-list-item class="list-item-with-header-and-title list-item-title-hide-overflow list-item-no-item-after" header="Transaction Time Zone" title="(UTC XX:XX) System Default" link="#" :no-chevron="mode === 'view'"></f7-list-item>
<f7-list-item class="list-item-with-header-and-title list-item-title-hide-overflow list-item-no-item-after" header="Transaction Timezone" title="(UTC XX:XX) System Default" link="#" :no-chevron="mode === 'view'"></f7-list-item>
<f7-list-item class="list-item-with-header-and-title list-item-title-hide-overflow" header="Geographic Location" title="No Location"></f7-list-item>
<f7-list-item header="Tags">
<template #footer>
@@ -230,8 +230,8 @@
:no-chevron="mode === 'view'"
class="list-item-with-header-and-title list-item-title-hide-overflow list-item-no-item-after"
:class="{ 'readonly': mode === 'view' }"
:header="$t('Transaction Time Zone')"
smart-select :smart-select-params="{ openIn: 'popup', popupPush: true, closeOnSelect: true, scrollToSelectedItem: true, searchbar: true, searchbarPlaceholder: $t('Timezone'), searchbarDisableText: $t('Cancel'), appendSearchbarNotFound: $t('No results'), pageTitle: $t('Transaction Time Zone'), popupCloseLinkText: $t('Done') }">
:header="$t('Transaction Timezone')"
smart-select :smart-select-params="{ openIn: 'popup', popupPush: true, closeOnSelect: true, scrollToSelectedItem: true, searchbar: true, searchbarPlaceholder: $t('Timezone'), searchbarDisableText: $t('Cancel'), appendSearchbarNotFound: $t('No results'), pageTitle: $t('Transaction Timezone'), popupCloseLinkText: $t('Done') }">
<select v-model="transaction.timeZone">
<option :value="timezone.name" :key="timezone.name"
v-for="timezone in allTimezones">{{ timezone.displayNameWithUtcOffset }}</option>
@@ -668,8 +668,8 @@ export default {
Promise.all(promises).then(function (responses) {
if (query.id && !responses[3]) {
self.$toast('Unable to get transaction');
self.loadingError = 'Unable to get transaction';
self.$toast('Unable to retrieve transaction');
self.loadingError = 'Unable to retrieve transaction';
return;
}
@@ -749,7 +749,7 @@ export default {
};
if (self.transaction.sourceAmount === 0) {
self.$confirm('Are you sure you want to save this transaction whose amount is 0?', () => {
self.$confirm('Are you sure you want to save this transaction with a zero amount?', () => {
doSubmit();
});
} else {
@@ -763,7 +763,7 @@ export default {
logger.warn('this browser does not support geo location');
if (forceUpdate) {
self.$toast('Unable to get current position');
self.$toast('Unable to retrieve current position');
}
return;
}
@@ -774,7 +774,7 @@ export default {
self.geoLocationStatus = 'error';
if (forceUpdate) {
self.$toast('Unable to get current position');
self.$toast('Unable to retrieve current position');
}
return;
@@ -787,11 +787,11 @@ export default {
longitude: position.coords.longitude
};
}, function (err) {
logger.error('cannot get current position', err);
logger.error('cannot retrieve current position', err);
self.geoLocationStatus = 'error';
if (forceUpdate) {
self.$toast('Unable to get current position');
self.$toast('Unable to retrieve current position');
}
});
+1 -1
View File
@@ -790,7 +790,7 @@ export default {
const self = this;
if (!transaction) {
self.$alert('An error has occurred');
self.$alert('An error occurred');
return;
}
@@ -56,7 +56,7 @@
</f7-sheet>
<password-input-sheet :title="$t('Are you sure you want to clear all data?')"
:hint="$t('You CANNOT undo this action. This will clear your accounts, categories, tags and transactions data. Please input your current password to confirm.')"
:hint="$t('You CANNOT undo this action. This will clear your accounts, categories, tags and transactions data. Please enter your current password to confirm.')"
:confirm-disabled="clearingData"
:cancel-disabled="clearingData"
color="red"
+5 -5
View File
@@ -15,7 +15,7 @@
</f7-list>
<passcode-input-sheet :title="$t('Enable Two-Factor Authentication')"
:hint="$t('Please use two factor authentication app scan the below qrcode and input current passcode')"
:hint="$t('Please use a two-factor authentication app to scan the qrcode below and enter the current passcode.')"
:confirm-disabled="enableConfirming"
:cancel-disabled="enableConfirming"
v-model:show="showInputPasscodeSheetForEnable"
@@ -27,7 +27,7 @@
</passcode-input-sheet>
<password-input-sheet :title="$t('Disable Two-Factor Authentication')"
:hint="$t('Please enter your current password when disable two factor authentication')"
:hint="$t('Your current password is required to disable two-factor authentication.')"
:confirm-disabled="disabling"
:cancel-disabled="disabling"
v-model:show="showInputPasswordSheetForDisable"
@@ -36,7 +36,7 @@
</password-input-sheet>
<password-input-sheet :title="$t('Regenerate Backup Codes')"
:hint="$t('Please enter your current password when regenerate two factor authentication backup codes. If you regenerate backup codes, the old codes will be invalidated.')"
:hint="$t('Your current password is required to regenerate backup codes for two-factor authentication. If you regenerate backup codes, the previous ones will become invalid.')"
:confirm-disabled="regenerating"
:cancel-disabled="regenerating"
v-model:show="showInputPasswordSheetForRegenerate"
@@ -46,7 +46,7 @@
<information-sheet class="backup-code-sheet"
:title="$t('Backup Code')"
:hint="$t('Please copy these backup codes to safe place, the below codes can only be shown once. If these codes were lost, you can regenerate backup codes at any time.')"
:hint="$t('Please copy these backup codes to safe place, the following backup codes will be displayed only once. If these codes were lost, you can regenerate them at any time.')"
:information="currentBackupCode"
:row-count="10"
:enable-copy="true"
@@ -187,7 +187,7 @@ export default {
self.status = false;
self.showInputPasswordSheetForDisable = false;
self.$toast('Two factor authentication has been disabled');
self.$toast('Two-factor authentication has been disabled');
}).catch(error => {
self.disabling = false;
self.$hideLoading();
+15 -15
View File
@@ -11,14 +11,14 @@
<f7-list strong inset dividers class="margin-vertical skeleton-text" v-if="loading">
<f7-list-input label="Password" placeholder="Your password"></f7-list-input>
<f7-list-input label="Confirmation Password" placeholder="Re-enter the password"></f7-list-input>
<f7-list-input label="Confirm Password" placeholder="Re-enter the password"></f7-list-input>
<f7-list-input label="E-mail" placeholder="Your email address"></f7-list-input>
<f7-list-input label="Nickname" placeholder="Your nickname"></f7-list-input>
</f7-list>
<f7-list strong inset dividers class="margin-vertical skeleton-text" v-if="loading">
<f7-list-item class="list-item-with-header-and-title list-item-no-item-after" header="Default Account" title="Not Specified"></f7-list-item>
<f7-list-item class="list-item-with-header-and-title list-item-no-item-after" header="Editable Transaction Scope" title="All" link="#"></f7-list-item>
<f7-list-item class="list-item-with-header-and-title list-item-no-item-after" header="Default Account" title="Unspecified"></f7-list-item>
<f7-list-item class="list-item-with-header-and-title list-item-no-item-after" header="Editable Transaction Range" title="All" link="#"></f7-list-item>
</f7-list>
<f7-list strong inset dividers class="margin-vertical skeleton-text" v-if="loading">
@@ -45,7 +45,7 @@
type="password"
autocomplete="new-password"
clear-button
:label="$t('Confirmation Password')"
:label="$t('Confirm Password')"
:placeholder="$t('Re-enter the password')"
v-model:value="newProfile.confirmPassword"
></f7-list-input>
@@ -54,7 +54,7 @@
type="email"
autocomplete="email"
clear-button
:label="$t('E-mail') + ' ' + (emailVerified ? $t('(Verified)') : $t('(Unverified)'))"
:label="$t('E-mail') + ' ' + (emailVerified ? $t('(Verified)') : $t('(Not Verified)'))"
:placeholder="$t('Your email address')"
v-model:value="newProfile.email"
></f7-list-input>
@@ -77,7 +77,7 @@
link="#" no-chevron
:class="{ 'disabled': !allVisibleAccounts.length }"
:header="$t('Default Account')"
:title="getNameByKeyValue(allAccounts, newProfile.defaultAccountId, 'id', 'name', $t('Not Specified'))"
:title="getNameByKeyValue(allAccounts, newProfile.defaultAccountId, 'id', 'name', $t('Unspecified'))"
@click="showAccountSheet = true"
>
<two-column-list-item-selection-sheet primary-key-field="id" primary-value-field="category"
@@ -96,9 +96,9 @@
<f7-list-item
class="list-item-with-header-and-title list-item-no-item-after"
:header="$t('Editable Transaction Scope')"
:header="$t('Editable Transaction Range')"
:title="getNameByKeyValue(allTransactionEditScopeTypes, newProfile.transactionEditScope, 'type', 'displayName')"
smart-select :smart-select-params="{ openIn: 'popup', popupPush: true, closeOnSelect: true, scrollToSelectedItem: true, searchbar: true, searchbarPlaceholder: $t('Date Range'), searchbarDisableText: $t('Cancel'), appendSearchbarNotFound: $t('No results'), pageTitle: $t('Editable Transaction Scope'), popupCloseLinkText: $t('Done') }"
smart-select :smart-select-params="{ openIn: 'popup', popupPush: true, closeOnSelect: true, scrollToSelectedItem: true, searchbar: true, searchbarPlaceholder: $t('Date Range'), searchbarDisableText: $t('Cancel'), appendSearchbarNotFound: $t('No results'), pageTitle: $t('Editable Transaction Range'), popupCloseLinkText: $t('Done') }"
>
<select v-model="newProfile.transactionEditScope">
<option :value="option.type"
@@ -366,22 +366,22 @@ export default {
this.newProfile.shortTimeFormat === this.oldProfile.shortTimeFormat) {
return 'Nothing has been modified';
} else if (!this.newProfile.password && this.newProfile.confirmPassword) {
return 'Password cannot be empty';
return 'Password cannot be blank';
} else if (this.newProfile.password && !this.newProfile.confirmPassword) {
return 'Confirmation password cannot be empty';
return 'Password confirmation cannot be blank';
} else {
return null;
}
},
inputInvalidProblemMessage() {
if (this.newProfile.password && this.newProfile.confirmPassword && this.newProfile.password !== this.newProfile.confirmPassword) {
return 'Password and confirmation password do not match';
return 'Password and password confirmation do not match';
} else if (!this.newProfile.email) {
return 'Email address cannot be empty';
return 'Email address cannot be blank';
} else if (!this.newProfile.nickname) {
return 'Nickname cannot be empty';
return 'Nickname cannot be blank';
} else if (!this.newProfile.defaultCurrency) {
return 'Default currency cannot be empty';
return 'Default currency cannot be blank';
} else {
return null;
}
@@ -391,7 +391,7 @@ export default {
},
langAndRegionInputInvalidProblemMessage() {
if (!this.newProfile.defaultCurrency) {
return 'Default currency cannot be empty';
return 'Default currency cannot be blank';
} else {
return null;
}