Skip to content

Commit c628d7b

Browse files
authored
Merge pull request #5710 from nextcloud/backport/5692/stable34
[stable34] chore: Adjust naming to Nextcloud Office (Collabora)
2 parents 519e39b + feded18 commit c628d7b

12 files changed

Lines changed: 32 additions & 32 deletions

File tree

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
- SPDX-FileCopyrightText: 2013-2016 ownCloud, Inc.
44
- SPDX-License-Identifier: AGPL-3.0-or-later
55
-->
6-
# Nextcloud Office
6+
# Nextcloud Office (powered by Collabora Online)
77

88
[![REUSE status](https://api.reuse.software/badge/github.com/nextcloud/richdocuments)](https://api.reuse.software/info/github.com/nextcloud/richdocuments)
99

1010
**A [Nextcloud](https://nextcloud.com) app integrating Collabora Online into your Nextcloud!**
1111

1212
![](https://raw.githubusercontent.com/nextcloud/richdocuments/main/screenshots/Nextcloud-writer.png)
1313

14-
Nextcloud Office supports editing your documents in real time with multiple other editors, showing high fidelity, WYSIWYG rendering and preserving the layout and formatting of your documents.
14+
Nextcloud Office (Collabora) supports editing your documents in real time with multiple other editors, showing high fidelity, WYSIWYG rendering and preserving the layout and formatting of your documents.
1515

1616
Users can insert and reply to comments and invite others without a Nextcloud account for anonymous editing of files with a public link shared folder.
1717

18-
Nextcloud Office supports dozens of document formats including DOC, DOCX, PPT, PPTX, XLS, XLSX + ODF, Import/View Visio, Publisher and many more…
18+
Nextcloud Office (Collabora) supports dozens of document formats including DOC, DOCX, PPT, PPTX, XLS, XLSX + ODF, Import/View Visio, Publisher and many more…
1919

20-
Nextcloud Office is based on the Collabora Online Development Edition (CODE) and is available free and under heavy development, adding features and improvements all the time! Enterprise users have access to the more stable, scalable Collabora Online Enterprise based version through a Nextcloud support subscription.
20+
Nextcloud Office (Collabora) is based on the Collabora Online Development Edition (CODE) and is available free and under heavy development, adding features and improvements all the time! Enterprise users have access to the more stable, scalable Collabora Online Enterprise based version through a Nextcloud support subscription.
2121

2222
## Installation
2323

24-
Nextcloud Office is built on Collabora Online which requires a dedicated service running next to the Nextcloud webserver stack. There are several ways to run the coolwsd service. For full details, see the related section in the admin manual https://docs.nextcloud.com/server/latest/admin_manual/office/index.html
24+
Nextcloud Office (Collabora) is built on Collabora Online which requires a dedicated service running next to the Nextcloud webserver stack. There are several ways to run the coolwsd service. For full details, see the related section in the admin manual https://docs.nextcloud.com/server/latest/admin_manual/office/index.html
2525

2626
This repository covers only the Nextcloud integration app which requires a Collabora Online server to connect to.
2727

appinfo/info.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<info>
88
<id>richdocuments</id>
9-
<name>Nextcloud Office</name>
9+
<name>Nextcloud Office (Collabora)</name>
1010
<summary>Edit office documents directly in your browser.</summary>
1111
<description><![CDATA[This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.
1212

cypress/e2e/open.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,14 @@ describe('Open PDF with richdocuments', () => {
125125
cy.get('@pdfViewer').find('.pdfViewer').should('exist')
126126
})
127127

128-
// Verify that using the file action 'Edit with Nextcloud Office'
128+
// Verify that using the file action 'Edit with Nextcloud Office (Collabora)'
129129
// opens the file using richdocuments
130130
it('Open PDF with richdocuments', () => {
131131
cy.get('[data-cy-files-list-row-name="document.pdf"]').as('pdf')
132132
cy.get('@pdf').find('.action-items').as('actions')
133133

134134
cy.get('@actions').find('.action-item__menutoggle').click()
135-
cy.get('.action-button__longtext').contains('Edit with Nextcloud Office').click()
135+
cy.get('.action-button__longtext').contains('Edit with Nextcloud Office (Collabora)').click()
136136

137137
// Wait for Collabora to open
138138
cy.waitForViewer()

docs/app_settings.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
- SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
33
- SPDX-License-Identifier: AGPL-3.0-or-later
44
-->
5-
## Nextcloud Office App Settings
5+
## Nextcloud Office (Collabora) App Settings
66

77
### Collabora Online Server
88
URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client. Collabora Online should use the same protocol (http:// or https://) as the server installation. Naturally, https:// is recommended.
99

1010
### Restrict usage to specific groups
11-
By default the app is enabled for all. When this setting is active, only members of specified groups can use Nextcloud Office.
11+
By default the app is enabled for all. When this setting is active, only members of specified groups can use Nextcloud Office (Collabora).
1212

1313
### Restrict edit to specific groups
14-
By default all users can edit documents with Nextcloud Office. When this setting is active, only the members of specified groups can edit, others can only view documents.
14+
By default all users can edit documents with Nextcloud Office (Collabora). When this setting is active, only the members of specified groups can edit, others can only view documents.
1515

1616
### Use OOXML by default for new files
1717
By default new files created by users are in OpenDocument Format (ODF). When this setting is active, new files will be created in Office Open XML (OOXML) format.
@@ -27,7 +27,7 @@ Canonical webroot, in case there are multiple, for Collabora Online to use. Prov
2727

2828
### Theme
2929

30-
By default Nextcloud Office comes with Nextcloud theme (monochrome icons following Nextcloud style), to change to a more traditional office look:
30+
By default Nextcloud Office (Collabora) comes with Nextcloud theme (monochrome icons following Nextcloud style), to change to a more traditional office look:
3131

3232
occ config:app:set richdocuments theme --value="collabora"
3333

docs/frontend-integration.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
### Configuration
88

9-
The Nextcloud Office configuration for creating new files with their mimetype and extension per file type is exposed to `OCA.RichDocuments.config.create`.
9+
The Nextcloud Office (Collabora) configuration for creating new files with their mimetype and extension per file type is exposed to `OCA.RichDocuments.config.create`.
1010

1111
```json
1212
{
@@ -30,7 +30,7 @@ The Nextcloud Office configuration for creating new files with their mimetype an
3030
### Open viewer
3131

3232

33-
The following two methods are exposed in order to manually trigger the Nextcloud Office viewer opening a file:
33+
The following two methods are exposed in order to manually trigger the Nextcloud Office (Collabora) viewer opening a file:
3434

3535
#### Open an existing file
3636

@@ -247,7 +247,7 @@ Example failed event data:
247247
248248
### WOPI PostMessages
249249
250-
Collabora Online emits various post messages which are catched and handled by the Nextcloud Office
250+
Collabora Online emits various post messages which are catched and handled by the Nextcloud Office (Collabora)
251251
Integration app. Postmessages which are sent from the WOPI host (Collabora) to the editor (
252252
Nextcloud) are also exposed through the Nextcloud event bus under the `richdocuments:wopi-post`
253253
event name. For details on the post messages see

docs/issues.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ It is possible your firewall is blocking connections. Try to start docker after
2727

2828
### We are sorry, this is an unexpected connection error. Please try again. error.
2929

30-
The Nextcloud Office app doesn't work at the moment, if you enable it only for certain groups. Remove the group filter in the App section.
30+
The Nextcloud Office (Collabora) app doesn't work at the moment, if you enable it only for certain groups. Remove the group filter in the App section.
3131

32-
### Nextcloud Office doesn't handle my 100 users.
32+
### Nextcloud Office (Collabora) doesn't handle my 100 users.
3333

3434
This docker image is designed for home usage with a limited numbers of users and open documents. If you need a more scalable solution, consider a support subscription for a reliable, business-ready online office experience.
3535

36-
#### Nextcloud Office doesn't work with Encryption.
36+
#### Nextcloud Office (Collabora) doesn't work with Encryption.
3737

3838
Yes, this is currently unsupported. Find more questions and answers in the discussion thread on the forums and post a new topic in the Collabora category if you have unanswered questions!

lib/Service/CapabilitiesService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public function getProductName(): string {
107107
return $this->getCapabilities()['productName'];
108108
}
109109

110-
return $this->l10n->t('Nextcloud Office');
110+
return $this->l10n->t('Nextcloud Office (Collabora)');
111111
}
112112

113113
public function hasOtherOOXMLApps(): bool {

lib/TaskProcessing/TextToDocumentProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function getId(): string {
3333

3434
#[\Override]
3535
public function getName(): string {
36-
return $this->l->t('Nextcloud Office text document generator');
36+
return $this->l->t('Nextcloud Office (Collabora) text document generator');
3737
}
3838

3939
#[\Override]

lib/TaskProcessing/TextToSpreadsheetProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function getId(): string {
3333

3434
#[\Override]
3535
public function getName(): string {
36-
return $this->l->t('Nextcloud Office spreadsheet generator');
36+
return $this->l->t('Nextcloud Office (Collabora) spreadsheet generator');
3737
}
3838

3939
#[\Override]

src/components/AdminSettings.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<div class="section">
99
<h2>{{ productName }}</h2>
1010
<p v-if="hasNextcloudBranding" class="description">
11-
{{ t('richdocuments', 'Nextcloud Office is a powerful Collabora Online based online office suite with collaborative editing, which supports all major documents, spreadsheet and presentation file formats and works together with all modern browsers.') }}
11+
{{ t('richdocuments', 'Nextcloud Office (powered by Collabora Online) is a powerful online office suite with collaborative editing, which supports all major documents, spreadsheet and presentation file formats and works together with all modern browsers.') }}
1212
</p>
1313
<p v-else class="description">
1414
{{ t('richdocuments', 'Collabora Online is a powerful LibreOffice-based online office suite with collaborative editing, which supports all major documents, spreadsheet and presentation file formats and works together with all modern browsers.') }}
@@ -77,7 +77,7 @@
7777
:disabled="updating">
7878
<label for="customserver">{{ t('richdocuments', 'Use your own server') }}</label><br>
7979
<p class="option-inline">
80-
<em>{{ t('richdocuments', 'Nextcloud Office requires a separate server running Collabora Online to provide editing capabilities.') }}</em>
80+
<em>{{ t('richdocuments', 'Nextcloud Office (Collabora) requires a separate server running Collabora Online to provide editing capabilities.') }}</em>
8181
<em>{{ t('richdocuments', 'Collabora Online requires a separate server acting as a WOPI-like Client to provide editing capabilities.') }}</em>
8282
</p>
8383
<div v-if="serverMode === 'custom'" class="option-inline">
@@ -312,9 +312,9 @@
312312
<h2>{{ t('richdocuments', 'Secure View') }}</h2>
313313
<p>{{ t('richdocuments', 'Secure view enables you to secure office documents by blocking downloads, previews and showing a watermark') }}</p>
314314
<ul>
315-
<li>{{ t('richdocuments', 'The settings only apply to compatible office files that are opened in Nextcloud Office') }}</li>
315+
<li>{{ t('richdocuments', 'The settings only apply to compatible office files that are opened in Nextcloud Office (Collabora)') }}</li>
316316
<li>{{ t('richdocuments', 'Downloading the file through WebDAV will be blocked') }}</li>
317-
<li>{{ t('richdocuments', 'The following options within Nextcloud Office will be disabled: Copy, Download, Export, Print') }}</li>
317+
<li>{{ t('richdocuments', 'The following options within Nextcloud Office (Collabora) will be disabled: Copy, Download, Export, Print') }}</li>
318318
<li>{{ t('richdocuments', 'Files may still be downloadable via WOPI requests if WOPI settings are not correctly configured') }}</li>
319319
<li>{{ t('richdocuments', 'Previews will be blocked') }}</li>
320320
</ul>
@@ -483,7 +483,7 @@ export default {
483483
},
484484
data() {
485485
return {
486-
productName: loadState('richdocuments', 'productName', 'Nextcloud Office'),
486+
productName: loadState('richdocuments', 'productName', 'Nextcloud Office (Collabora)'),
487487
hasNextcloudBranding: loadState('richdocuments', 'hasNextcloudBranding', true),
488488
489489
serverMode: '',

0 commit comments

Comments
 (0)