diff options
| author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2020-08-28 13:41:01 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 13:41:01 +0300 |
| commit | c48790ff31b53bd14c0836bc75484489a93aba8d (patch) | |
| tree | 88bbe9de2cc395a1dc5dcff7f9590265b385c0ed | |
| parent | 380138f2f073e796633a5a7723232c441e270f88 (diff) | |
| parent | 52fb623d74e4a54331ad0cc8182fe20e6d82a61a (diff) | |
Merge pull request #3487 from nextcloud/fix/fix_wording
Fix favorite/important ranking and typos
| -rw-r--r-- | src/components/Envelope.vue | 8 | ||||
| -rw-r--r-- | src/components/Message.vue | 8 | ||||
| -rw-r--r-- | src/components/NavigationAccount.vue | 4 | ||||
| -rw-r--r-- | src/components/NavigationMailbox.vue | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/components/Envelope.vue b/src/components/Envelope.vue index aad27d236..375b1f2ee 100644 --- a/src/components/Envelope.vue +++ b/src/components/Envelope.vue @@ -45,14 +45,14 @@ <Moment :timestamp="data.dateInt" /> </div> <Actions class="app-content-list-item-menu" menu-align="right"> - <ActionButton icon="icon-starred" @click.prevent="onToggleFlagged"> + <ActionButton icon="icon-important" @click.prevent="onToggleImportant"> {{ - data.flags.flagged ? t('mail', 'Unfavorite') : t('mail', 'Favorite') + data.flags.important ? t('mail', 'Mark unimportant') : t('mail', 'Mark important') }} </ActionButton> - <ActionButton icon="icon-important" @click.prevent="onToggleImportant"> + <ActionButton icon="icon-starred" @click.prevent="onToggleFlagged"> {{ - data.flags.important ? t('mail', 'Mark unimportant') : t('mail', 'Mark important') + data.flags.flagged ? t('mail', 'Mark unfavorite') : t('mail', 'Mark favorite') }} </ActionButton> <ActionButton icon="icon-mail" @click.prevent="onToggleSeen"> diff --git a/src/components/Message.vue b/src/components/Message.vue index 209ee080d..0c34639e8 100644 --- a/src/components/Message.vue +++ b/src/components/Message.vue @@ -38,14 +38,14 @@ <ActionButton icon="icon-forward" @click="forwardMessage"> {{ t('mail', 'Forward') }} </ActionButton> - <ActionButton icon="icon-starred" @click.prevent="onToggleFlagged"> + <ActionButton icon="icon-important" @click.prevent="onToggleImportant"> {{ - envelope.flags.flagged ? t('mail', 'Unfavorite') : t('mail', 'Favorite') + envelope.flags.important ? t('mail', 'Mark unimportant') : t('mail', 'Mark important') }} </ActionButton> - <ActionButton icon="icon-important" @click.prevent="onToggleImportant"> + <ActionButton icon="icon-starred" @click.prevent="onToggleFlagged"> {{ - envelope.flags.important ? t('mail', 'Mark unimportant') : t('mail', 'Mark important') + envelope.flags.flagged ? t('mail', 'Mark unfavorite') : t('mail', 'Mark favorite') }} </ActionButton> <ActionButton icon="icon-mail" @click="onToggleSeen"> diff --git a/src/components/NavigationAccount.vue b/src/components/NavigationAccount.vue index 463fb1bef..67a0247ec 100644 --- a/src/components/NavigationAccount.vue +++ b/src/components/NavigationAccount.vue @@ -39,7 +39,7 @@ {{ quotaText }} </ActionText> <ActionRouter :to="settingsRoute" icon="icon-settings"> - {{ t('mail', 'Edit account') }} + {{ t('mail', 'Account settings') }} </ActionRouter> <ActionCheckbox :checked="account.showSubscribedOnly" @@ -55,7 +55,7 @@ {{ t('mail', 'Saving') }} </ActionText> <ActionButton v-if="!isFirst" icon="icon-triangle-n" @click="changeAccountOrderUp"> - {{ t('mail', 'Move Up') }} + {{ t('mail', 'Move up') }} </ActionButton> <ActionButton v-if="!isLast" icon="icon-triangle-s" @click="changeAccountOrderDown"> {{ t('mail', 'Move down') }} diff --git a/src/components/NavigationMailbox.vue b/src/components/NavigationMailbox.vue index feb25b35f..390995543 100644 --- a/src/components/NavigationMailbox.vue +++ b/src/components/NavigationMailbox.vue @@ -43,7 +43,7 @@ </ActionText> <ActionButton - v-if="mailbox.specialRole !== 'flagged'" + v-if="mailbox.specialRole !== 'flagged' && !account.isUnified" icon="icon-mail" :title="t('mail', 'Mark all as read')" :disabled="loadingMarkAsRead" |