Skip to content

Commit

Permalink
Merge pull request #14093 from nextcloud/fix/noid/i18n-email
Browse files Browse the repository at this point in the history
fix(i18n): replace 'e-mail' to 'email' in strings
  • Loading branch information
Antreesy authored Jan 9, 2025
2 parents 40b8671 + 5456e92 commit 58dce9f
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion src/components/AdminSettings/SignalingServers.vue
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
{{ t('spreed', 'Don\'t warn about connectivity issues in calls with more than 2 participants') }}
</NcCheckboxRadioSwitch>
</template>

</section>
</template>

Expand Down
2 changes: 1 addition & 1 deletion src/components/ConversationSettings/LobbySettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<template #icon>
<IconFileUpload :size="20" />
</template>
{{ t('spreed', 'Import e-mail participants') }}
{{ t('spreed', 'Import email participants') }}
</NcButton>

<ImportEmailsDialog v-if="isImportEmailsDialogOpen"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ export default {
const response = await request({
searchText: this.searchText,
token: 'new',
forceTypes: [SHARE.TYPE.EMAIL], // e-mail guests are allowed directly after conversation creation
forceTypes: [SHARE.TYPE.EMAIL], // email guests are allowed directly after conversation creation
})

this.searchResults = response?.data?.ocs?.data || []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ describe('Participant.vue', () => {
}, result)
})

it('renders e-mail as status for e-mail guest', async () => {
it('renders email as status for email guest', async () => {
participant.actorType = ATTENDEE.ACTOR_TYPE.EMAILS
participant.participantType = PARTICIPANT.TYPE.GUEST
participant.invitedActorId = '[email protected]'
Expand Down
2 changes: 1 addition & 1 deletion src/store/participantsStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,7 @@ const actions = {
* @param {object} data - the wrapping object.
* @param {string} data.token - conversation token.
* @param {number} [data.attendeeId] - attendee id to target, or null for all.
* @param {string} [data.actorId] - if attendee is provided, the actorId (e-mail) to show in the message.
* @param {string} [data.actorId] - if attendee is provided, the actorId (email) to show in the message.
*/
async resendInvitations(_, { token, attendeeId, actorId }) {
if (attendeeId) {
Expand Down

0 comments on commit 58dce9f

Please sign in to comment.