Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/FormsEmptyContent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default {
title: t('forms', 'Form expired'),
description: t(
'forms',
'This form has expired and is no longer taking answers',
'This form has expired and is no longer taking responses',
),

icon: IconCheck,
Expand Down
2 changes: 1 addition & 1 deletion src/components/AppNavigationForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<template #icon>
<IconPoll :size="20" />
</template>
{{ t('forms', 'Results') }}
{{ t('forms', 'Responses') }}
</NcActionRouter>
<NcActionButton v-if="canEdit" close-after-click @click="onCloneForm">
<template #icon>
Expand Down
4 changes: 2 additions & 2 deletions src/components/SidebarTabs/SettingsSidebarTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
{{ t('forms', 'Close form') }}
</NcCheckboxRadioSwitch>
<p id="forms-settings__close-form" class="settings-hint">
{{ t('forms', 'Closed forms do not accept new submissions.') }}
{{ t('forms', 'Closed forms do not accept new responses.') }}
</p>
<NcCheckboxRadioSwitch
:model-value="isFormLockedPermanently"
Expand All @@ -112,7 +112,7 @@
{{
t(
'forms',
'Archived forms do not accept new submissions and can not be modified.',
'Archived forms do not accept new responses and cannot be modified.',
)
}}
</p>
Expand Down
4 changes: 2 additions & 2 deletions src/components/TopBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ const editView = {
disabled: false,
}
const resultsView = {
ariaLabel: t('forms', 'Show results'),
ariaLabel: t('forms', 'Show responses'),
icon: mdiPoll,
title: t('forms', 'Results'),
title: t('forms', 'Responses'),
id: 'results',
}

Expand Down
38 changes: 15 additions & 23 deletions src/views/Results.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
-->

<template>
<NcAppContent :page-heading="t('forms', 'Results')">
<NcAppContent :page-heading="t('forms', 'Responses')">
<NcDialog
:open.sync="showLinkedFileNotAvailableDialog"
:name="t('forms', 'Linked file not available')"
Expand Down Expand Up @@ -192,10 +192,10 @@
<!-- Empty search results -->
<NcEmptyContent
v-else-if="noFilteredSubmissions && submissionSearch.length > 0"
:name="t('forms', 'No results found')"
:name="t('forms', 'No responses found')"
class="forms-emptycontent"
:description="
t('forms', 'No results found for {submissionSearch}', {
t('forms', 'No responses found for \'{submissionSearch}\'', {
submissionSearch,
})
">
Expand All @@ -209,9 +209,7 @@
v-else-if="noSubmissions"
:name="t('forms', 'No responses yet')"
class="forms-emptycontent"
:description="
t('forms', 'Results of submitted forms will show up here')
">
:description="t('forms', 'Responses will show up here')">
<template #icon>
<IconPoll :size="64" />
</template>
Expand Down Expand Up @@ -259,14 +257,8 @@
<!-- Confirmation dialog for deleting all submissions -->
<NcDialog
:open.sync="showConfirmDeleteDialog"
:name="t('forms', 'Delete submissions')"
:message="
t(
'forms',
'Are you sure you want to delete all responses of {title}?',
{ title: formTitle },
)
"
:name="t('forms', 'Delete responses')"
:message="t('forms', 'Are you sure you want to delete all responses?')"
:buttons="confirmDeleteButtons" />
</NcAppContent>
</template>
Expand Down Expand Up @@ -435,7 +427,7 @@ export default {
},
},
{
label: t('forms', 'Delete submissions'),
label: t('forms', 'Delete responses'),
icon: IconDeleteSvg,
type: 'error',
callback: () => {
Expand Down Expand Up @@ -565,7 +557,7 @@ export default {

async loadFormResults() {
this.loadingResults = true
logger.debug(`Loading results for form ${this.form.hash}`)
logger.debug(`Loading responses for form ${this.form.hash}`)

try {
let response = null
Expand Down Expand Up @@ -598,8 +590,8 @@ export default {
this.questions = data.questions
this.filteredSubmissionsCount = data.filteredSubmissionsCount
} catch (error) {
logger.error('Error while loading results', { error })
showError(t('forms', 'There was an error while loading the results'))
logger.error('Error while loading responses', { error })
showError(t('forms', 'An error occurred while loading responses'))
} finally {
this.loadingResults = false
}
Expand Down Expand Up @@ -777,16 +769,16 @@ export default {
},
),
)
showSuccess(t('forms', 'Submission deleted'))
showSuccess(t('forms', 'Response deleted'))
const index = this.submissions.findIndex(
(search) => search.id === id,
)
this.submissions.splice(index, 1)
emit('forms:last-updated:set', this.form.id)
} catch (error) {
logger.error(`Error while removing response ${id}`, { error })
logger.error(`Error while deleting response ${id}`, { error })
showError(
t('forms', 'There was an error while removing this response'),
t('forms', 'An error occurred while deleting this response'),
)
} finally {
this.loadingResults = false
Expand All @@ -810,8 +802,8 @@ export default {
this.form.submissionCount = 0
emit('forms:last-updated:set', this.form.id)
} catch (error) {
logger.error('Error while removing responses', { error })
showError(t('forms', 'There was an error while removing responses'))
logger.error('Error while deleting responses', { error })
showError(t('forms', 'An error occurred while deleting responses'))
} finally {
this.loadingResults = false
}
Expand Down
12 changes: 6 additions & 6 deletions src/views/Submit.vue
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
:description="
t(
'forms',
'This form has expired and is no longer taking answers',
'This form has expired and is no longer taking responses',
)
">
<template #icon>
Expand All @@ -95,7 +95,7 @@
:description="
t(
'forms',
'This form was closed and is no longer taking answers',
'This form was closed and is no longer taking responses',
)
">
<template #icon>
Expand Down Expand Up @@ -480,7 +480,7 @@ export default {
hash() {
// If public view, abort. Should normally not occur.
if (this.publicView) {
logger.error('Hash changed on public View. Aborting.')
logger.error('Hash changed on public view. Aborting.')
return
}
this.resetData()
Expand Down Expand Up @@ -596,7 +596,7 @@ export default {
},

async fetchSubmission() {
logger.debug(`Loading submission ${this.submissionId}`)
logger.debug(`Loading response ${this.submissionId}`)

try {
const response = await axios.get(
Expand Down Expand Up @@ -667,9 +667,9 @@ export default {

this.answers = answers
} catch (error) {
logger.error('Error while loading submission', { error })
logger.error('Error while loading response', { error })
showError(
t('forms', 'There was an error while loading the submission'),
t('forms', 'There was an error while loading the response'),
)
}
},
Expand Down
Loading