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/components/AdminSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
<NcFormBoxSwitch
v-model="state.use_popup"
@update:model-value="onUsePopupChanged">
{{ t('integration_matrix', 'Use a popup for OAuth login') }}
{{ t('integration_matrix', 'Use a pop-up for OAuth login') }}
</NcFormBoxSwitch>
<NcFormBoxSwitch
v-model="state.navlink_default"
Expand Down
6 changes: 3 additions & 3 deletions src/components/PersonalSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ export default {
const urlParams = new URLSearchParams(window.location.search.substr(1))
const matrixToken = urlParams.get('matrixToken')
if (matrixToken === 'success') {
showSuccess(t('integration_matrix', 'Successfully connected to Matrix!'))
showSuccess(t('integration_matrix', 'Connected to Matrix!'))
} else if (matrixToken === 'error') {
showError(t('integration_matrix', 'Error connecting to Matrix:') + ' ' + (urlParams.get('message') ?? ''))
}
Expand Down Expand Up @@ -239,7 +239,7 @@ export default {
this.state.user_name = data.userName
this.state.user_displayname = data.userDisplayName
this.state.user_avatar_set = !!data.userAvatarSet
showSuccess(t('integration_matrix', 'Successfully connected to Matrix!'))
showSuccess(t('integration_matrix', 'Connected to Matrix!'))
}
}).catch((error) => {
console.error(error)
Expand All @@ -257,7 +257,7 @@ export default {
this.errorMessage = t('integration_matrix', 'Invalid access token')
this.state.token = ''
} else {
showSuccess(t('integration_matrix', 'Successfully connected to Matrix!'))
showSuccess(t('integration_matrix', 'Connected to Matrix!'))
this.state.token = 'dummyTokenContent'
this.state.user_id = response.data.user_id
this.state.user_name = response.data.user_name
Expand Down
4 changes: 2 additions & 2 deletions src/components/SendFilesModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
class="warning-container">
<AlertBoxOutlineIcon class="warning-icon" />
<label>
{{ t('integration_matrix', 'Directories will be skipped, they can only be sent as links.') }}
{{ t('integration_matrix', 'Folders will be skipped, they can only be sent as links.') }}
</label>
</span>
<div class="matrix-footer">
Expand Down Expand Up @@ -287,7 +287,7 @@ export default {
expirationDate: null,
passwordEnabled: false,
password: '',
passwordPlaceholder: t('integration_matrix', 'password'),
passwordPlaceholder: t('integration_matrix', 'Password'),
STATES,
commentPlaceholder: t('integration_matrix', 'Message to send with the files'),
permissionOptions: {
Expand Down
10 changes: 3 additions & 7 deletions src/filesplugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@ function openRoomSelector(files) {
const sendAction = {
id: 'matrixSend',
displayName: ({ nodes }) => {
return nodes.length > 1
? t('integration_matrix', 'Send files to Matrix')
: t('integration_matrix', 'Send file to Matrix')
return n('integration_matrix', 'Send file to Matrix', 'Send files to Matrix', nodes.length)
},
enabled({ nodes, view }) {
return !OCA.Matrix.actionIgnoreLists.includes(view.id)
Expand Down Expand Up @@ -181,11 +179,10 @@ function sendPublicLinks(roomId, roomName, comment, permission, expirationDate,
showSuccess(
n(
'integration_matrix',
'A link to {fileName} was sent to {roomName}',
'{number} link was sent to {roomName}',
'{number} links were sent to {roomName}',
number,
{
fileName: OCA.Matrix.filesToSend[0].name,
roomName,
number,
},
Expand Down Expand Up @@ -214,11 +211,10 @@ function sendInternalLinks(roomId, roomName, comment) {
showSuccess(
n(
'integration_matrix',
'A link to {fileName} was sent to {roomName}',
'{number} link was sent to {roomName}',
'{number} links were sent to {roomName}',
number,
{
fileName: OCA.Matrix.filesToSend[0].name,
roomName,
number,
},
Expand Down
2 changes: 1 addition & 1 deletion src/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export function gotoSettingsConfirmDialog() {
.setText(
t('integration_matrix', 'You need to connect to a Matrix server before using the Matrix integration.')
+ ' --- '
+ t('integration_matrix', 'Do you want to go to your "Connected accounts" personal settings?'),
+ t('integration_matrix', 'Do you want to go to "Connected accounts" in your personal settings?'),
)
.setButtons([
{
Expand Down
Loading