Skip to content

Commit 536455d

Browse files
committed
fix: Change file creation labels to be document type only without "New" wording
Signed-off-by: Julius Knorr <jus@bitgrid.net>
1 parent 971405c commit 536455d

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

cypress/e2e/new.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ describe('New file menu', function() {
2323
.click()
2424

2525
cy.get('button[role="menuitem"]')
26-
.contains('New document')
26+
.contains('Document')
2727
.should('be.visible')
2828

2929
cy.get('form[data-cy-upload-picker=""]')

cypress/e2e/templates.spec.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ describe('Global templates', function() {
7474
.as('newFileMenu')
7575

7676
cy.get('@newFileMenu').click()
77-
cy.get('button[role="menuitem"]').contains('New presentation').click()
77+
cy.get('button[role="menuitem"]').contains('Presentation').click()
7878

7979
cy.get('input[data-cy-files-new-node-dialog-input=""]').type('FileFromSystemTemplate')
8080
cy.get('button[data-cy-files-new-node-dialog-submit=""]').click()
@@ -115,7 +115,7 @@ describe('Global templates', function() {
115115
.click()
116116

117117
cy.get('button[role="menuitem"]')
118-
.contains('New presentation')
118+
.contains('Presentation')
119119
.should('be.visible')
120120
.click()
121121
cy.get('.input-field__input')
@@ -145,7 +145,7 @@ describe('User templates', function() {
145145
.as('newFileMenu')
146146

147147
cy.get('@newFileMenu').click()
148-
cy.get('button[role="menuitem"]').contains('New presentation').click()
148+
cy.get('button[role="menuitem"]').contains('Presentation').click()
149149

150150
cy.get('input[data-cy-files-new-node-dialog-input=""]').type('FileFromTemplate')
151151
cy.get('button[data-cy-files-new-node-dialog-submit=""]').click()
@@ -218,7 +218,7 @@ describe('User templates', function() {
218218
.as('newFileMenu')
219219

220220
cy.get('@newFileMenu').click()
221-
cy.get('button[role="menuitem"]').contains('New document').click()
221+
cy.get('button[role="menuitem"]').contains('Document').click()
222222

223223
cy.get('input[data-cy-files-new-node-dialog-input=""]').type('FileFromTemplateWithFields')
224224
cy.get('button[data-cy-files-new-node-dialog-submit=""]').click()

cypress/support/commands.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ Cypress.Commands.add('newFileFromMenu', (fileType = 'document', fileName = 'MyNe
509509
.click()
510510

511511
cy.get('button[role="menuitem"]')
512-
.contains('New ' + fileType)
512+
.contains(fileType)
513513
.should('be.visible')
514514
.click()
515515

lib/Listener/RegisterTemplateFileCreatorListener.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function handle(Event $event): void {
5050
$appPath = $this->appManager->getAppPath('richdocuments');
5151

5252
$templateManager->registerTemplateFileCreator(function () use ($ooxml, $appPath) {
53-
$odtType = new TemplateFileCreator('richdocuments', $this->l10n->t('New document'), ($ooxml ? '.docx' : '.odt'));
53+
$odtType = new TemplateFileCreator('richdocuments', $this->l10n->t('Document'), ($ooxml ? '.docx' : '.odt'));
5454
if ($ooxml) {
5555
$odtType->addMimetype('application/msword');
5656
$odtType->addMimetype('application/vnd.openxmlformats-officedocument.wordprocessingml.document');
@@ -63,7 +63,7 @@ public function handle(Event $event): void {
6363
return $odtType;
6464
});
6565
$templateManager->registerTemplateFileCreator(function () use ($ooxml, $appPath) {
66-
$odsType = new TemplateFileCreator('richdocuments', $this->l10n->t('New spreadsheet'), ($ooxml ? '.xlsx' : '.ods'));
66+
$odsType = new TemplateFileCreator('richdocuments', $this->l10n->t('Spreadsheet'), ($ooxml ? '.xlsx' : '.ods'));
6767
if ($ooxml) {
6868
$odsType->addMimetype('application/vnd.ms-excel');
6969
$odsType->addMimetype('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
@@ -76,7 +76,7 @@ public function handle(Event $event): void {
7676
return $odsType;
7777
});
7878
$templateManager->registerTemplateFileCreator(function () use ($ooxml, $appPath) {
79-
$odpType = new TemplateFileCreator('richdocuments', $this->l10n->t('New presentation'), ($ooxml ? '.pptx' : '.odp'));
79+
$odpType = new TemplateFileCreator('richdocuments', $this->l10n->t('Presentation'), ($ooxml ? '.pptx' : '.odp'));
8080
if ($ooxml) {
8181
$odpType->addMimetype('application/vnd.ms-powerpoint');
8282
$odpType->addMimetype('application/vnd.openxmlformats-officedocument.presentationml.presentation');
@@ -90,7 +90,7 @@ public function handle(Event $event): void {
9090
});
9191

9292
$templateManager->registerTemplateFileCreator(function () use ($ooxml, $appPath) {
93-
$odpType = new TemplateFileCreator('richdocuments', $this->l10n->t('New diagram'), '.odg');
93+
$odpType = new TemplateFileCreator('richdocuments', $this->l10n->t('Diagram'), '.odg');
9494
$odpType->addMimetype('application/vnd.oasis.opendocument.graphics');
9595
$odpType->addMimetype('application/vnd.oasis.opendocument.graphics-template');
9696
$odpType->setIconSvgInline(file_get_contents($appPath . '/img/x-office-drawing.svg'));

0 commit comments

Comments
 (0)