Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable30] fix(i18n): replace 'e-mail' to 'email' in strings #14094

Merged
merged 2 commits into from
Jan 9, 2025
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
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
Loading