Skip to content

Commit 6b411c7

Browse files
committed
Merge pull request 'feature/pdf' from feature/pdf into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/onlyoffice-jira/pulls/3
2 parents 5266079 + 361f5b4 commit 6b411c7

11 files changed

+10
-15
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
- default template for create new blank file
1515
- demo server address changed
1616
- extended list supported formats
17+
- create pdf instead docxf
18+
- remove filling for oform
1719

1820
## 2.3.0
1921
## Added

src/main/resources/atlassian-plugin.xml

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<resource type="download" name="word.ico" location="/images/word.ico"/>
4848
<resource type="download" name="cell.ico" location="/images/cell.ico"/>
4949
<resource type="download" name="slide.ico" location="/images/slide.ico"/>
50+
<resource type="download" name="pdf.ico" location="/images/pdf.ico"/>
5051
<dependency>jira.webresources:messages</dependency>
5152
</web-resource>
5253

src/main/resources/images/pdf.ico

5.3 KB
Binary file not shown.

src/main/resources/js/onlyoffice-attachments.js

-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ jQuery(function() {
3232

3333
if (AJS.Onlyoffice.FormatManager.isEditable(ext) && dropZone.length != 0) {
3434
titleButton = AJS.I18n.getText("onlyoffice.connector.editlink");
35-
} else if (AJS.Onlyoffice.FormatManager.isFillForm(ext) && dropZone.length != 0){
36-
titleButton = AJS.I18n.getText("onlyoffice.connector.fillFormlink");;
3735
} else if (AJS.Onlyoffice.FormatManager.isViewable(ext)) {
3836
titleButton = AJS.I18n.getText("onlyoffice.connector.viewlink");
3937
}

src/main/resources/lang-resource.properties

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ onlyoffice.configuration.banner.message=Easily launch the editors in the cloud w
2020
onlyoffice.configuration.banner.button=Get Now
2121
onlyoffice.connector.editlink=Edit in ONLYOFFICE
2222
onlyoffice.connector.viewlink=View in ONLYOFFICE
23-
onlyoffice.connector.fillFormlink=Fill in form in ONLYOFFICE
2423
onlyoffice.connector.error.NotSupportedFormat=Sorry, this file format isn't supported
2524
onlyoffice.connector.error.AccessDenied=You don't have enough permission to view the file
2625
onlyoffice.connector.error.Unknown=An unknown error occurred during the operation.
@@ -29,7 +28,7 @@ onlyoffice.connector.dialog.create-file.field.type=File type
2928
onlyoffice.connector.dialog.create-file.field.type.option.word=Document
3029
onlyoffice.connector.dialog.create-file.field.type.option.cell=Spreadsheet
3130
onlyoffice.connector.dialog.create-file.field.type.option.slide=Presentation
32-
onlyoffice.connector.dialog.create-file.field.type.option.form=Form template
31+
onlyoffice.connector.dialog.create-file.field.type.option.pdf=PDF Form
3332
onlyoffice.connector.dialog.create-file.field.name=Name
3433
onlyoffice.connector.dialog.create-file.button.create=Create
3534
onlyoffice.connector.dialog.create-file.button.cancel=Cancel

src/main/resources/lang-resource_de.properties

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ onlyoffice.configuration.banner.message=\u00d6ffnen Sie die Editoren in der Clou
2020
onlyoffice.configuration.banner.button=Jetzt erhalten
2121
onlyoffice.connector.editlink=Mit ONLYOFFICE bearbeiten
2222
onlyoffice.connector.viewlink=Ansicht in ONLYOFFICE
23-
onlyoffice.connector.fillFormlink=Formular in ONLYOFFICE ausf\u00fcllen,
2423
onlyoffice.connector.error.NotSupportedFormat=Das Dateiformat wird nicht unterst\u00fctzt
2524
onlyoffice.connector.error.AccessDenied=Sie haben keine Berechtigung, die Datei durchzusehen
2625
onlyoffice.connector.error.Unknown=Ein unbekannter Fehler ist w\u00e4hrend des Vorgangs aufgetreten.
@@ -29,7 +28,7 @@ onlyoffice.connector.dialog.create-file.field.type=Dateityp
2928
onlyoffice.connector.dialog.create-file.field.type.option.word=Dokument
3029
onlyoffice.connector.dialog.create-file.field.type.option.cell=Tabelle
3130
onlyoffice.connector.dialog.create-file.field.type.option.slide=Pr\u00e4sentation
32-
onlyoffice.connector.dialog.create-file.field.type.option.form=Formularvorlage
31+
onlyoffice.connector.dialog.create-file.field.type.option.pdf=PDF-Formular
3332
onlyoffice.connector.dialog.create-file.field.name=Name
3433
onlyoffice.connector.dialog.create-file.button.create=Erstellen
3534
onlyoffice.connector.dialog.create-file.button.cancel=Abbrechen

src/main/resources/lang-resource_es.properties

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ onlyoffice.configuration.banner.message=Inicie f\u00e1cilmente los editores en l
2020
onlyoffice.configuration.banner.button=Obtener ahora
2121
onlyoffice.connector.editlink=Editar en ONLYOFFICE
2222
onlyoffice.connector.viewlink=Ver en ONLYOFFICE
23-
onlyoffice.connector.fillFormlink=Rellenar el formulario en ONLYOFFICE,
2423
onlyoffice.connector.error.NotSupportedFormat=Lo sentimos, pero el formato de archivo no se admite
2524
onlyoffice.connector.error.AccessDenied=No hay permiso suficiente para ver el archivo
2625
onlyoffice.connector.error.Unknown=Se produjo un error desconocido durante la operaci\u00f3n.
@@ -29,7 +28,7 @@ onlyoffice.connector.dialog.create-file.field.type=Tipo de archivo
2928
onlyoffice.connector.dialog.create-file.field.type.option.word=Documento
3029
onlyoffice.connector.dialog.create-file.field.type.option.cell=Hoja de c\u00e1lculo
3130
onlyoffice.connector.dialog.create-file.field.type.option.slide=Presentaci\u00f3n
32-
onlyoffice.connector.dialog.create-file.field.type.option.form=Plantilla de formulario
31+
onlyoffice.connector.dialog.create-file.field.type.option.pdf=Formulario PDF
3332
onlyoffice.connector.dialog.create-file.field.name=Nombre
3433
onlyoffice.connector.dialog.create-file.button.create=Crear
3534
onlyoffice.connector.dialog.create-file.button.cancel=Cancelar

src/main/resources/lang-resource_fr.properties

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ onlyoffice.configuration.banner.message=Lancez facilement les \u00e9diteurs dans
2020
onlyoffice.configuration.banner.button=Ottieni ora
2121
onlyoffice.connector.editlink=Modifier dans ONLYOFFICE
2222
onlyoffice.connector.viewlink=Voir dans ONLYOFFICE
23-
onlyoffice.connector.fillFormlink=Remplir le formulaire dans ONLYOFFICE
2423
onlyoffice.connector.error.NotSupportedFormat=D\u00e9sol\u00e9, ce format de fichier n'est pas pris en charge
2524
onlyoffice.connector.error.AccessDenied=Vous n'avez pas l'autorisation suffisante pour lire le fichier
2625
onlyoffice.connector.error.Unknown=Une erreur inconnue s'est produite pendant l'op\u00E9ration.
@@ -29,7 +28,7 @@ onlyoffice.connector.dialog.create-file.field.type=Type de fichier
2928
onlyoffice.connector.dialog.create-file.field.type.option.word=Document
3029
onlyoffice.connector.dialog.create-file.field.type.option.cell=Feuille de calcul
3130
onlyoffice.connector.dialog.create-file.field.type.option.slide=Pr\u00e9sentation
32-
onlyoffice.connector.dialog.create-file.field.type.option.form=Mod\u00e8le de formulaire
31+
onlyoffice.connector.dialog.create-file.field.type.option.pdf=Formulaire PDF
3332
onlyoffice.connector.dialog.create-file.field.name=Nom
3433
onlyoffice.connector.dialog.create-file.button.create=Cr\u00e9er
3534
onlyoffice.connector.dialog.create-file.button.cancel=Annuler

src/main/resources/lang-resource_it.properties

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ onlyoffice.configuration.banner.message=Avvia facilmente gli editor nel cloud se
2020
onlyoffice.configuration.banner.button=Ottieni ora
2121
onlyoffice.connector.editlink=Modifica in ONLYOFFICE
2222
onlyoffice.connector.viewlink=Visualizza in ONLYOFFICE
23-
onlyoffice.connector.fillFormlink=Compilare il modulo in ONLYOFFICE
2423
onlyoffice.connector.error.NotSupportedFormat=Scusa, questo formato file non \u00e8 supportato
2524
onlyoffice.connector.error.AccessDenied=Non si dispone di permessi sufficienti per visualizzare il file
2625
onlyoffice.connector.error.Unknown=Si \u00e8 verificato un errore sconosciuto durante l'operazione.
@@ -29,7 +28,7 @@ onlyoffice.connector.dialog.create-file.field.type=Tipo di file
2928
onlyoffice.connector.dialog.create-file.field.type.option.word=Documento
3029
onlyoffice.connector.dialog.create-file.field.type.option.cell=Foglio di calcolo
3130
onlyoffice.connector.dialog.create-file.field.type.option.slide=Presentazione
32-
onlyoffice.connector.dialog.create-file.field.type.option.form=Modello di modulo
31+
onlyoffice.connector.dialog.create-file.field.type.option.pdf=Modulo PDF
3332
onlyoffice.connector.dialog.create-file.field.name=Nome
3433
onlyoffice.connector.dialog.create-file.button.create=Creare
3534
onlyoffice.connector.dialog.create-file.button.cancel=Annullare

src/main/resources/lang-resource_ru.properties

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ onlyoffice.configuration.banner.message=\u041b\u0435\u0433\u043a\u043e\u0020\u04
2020
onlyoffice.configuration.banner.button=\u041f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\u0020\u0441\u0435\u0439\u0447\u0430\u0441
2121
onlyoffice.connector.editlink=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0432 ONLYOFFICE
2222
onlyoffice.connector.viewlink=\u041E\u0442\u043A\u0440\u044B\u0442\u044C \u0432 ONLYOFFICE
23-
onlyoffice.connector.fillFormlink=\u0417\u0430\u043f\u043e\u043b\u043d\u0438\u0442\u044c\u0020\u0444\u043e\u0440\u043c\u0443\u0020\u0432 ONLYOFFICE
2423
onlyoffice.connector.error.NotSupportedFormat=\u041a\u0020\u0441\u043e\u0436\u0430\u043b\u0435\u043d\u0438\u044e\u002c\u0020\u044d\u0442\u043e\u0442\u0020\u0444\u043e\u0440\u043c\u0430\u0442\u0020\u0444\u0430\u0439\u043b\u0430\u0020\u043d\u0435\u0020\u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f
2524
onlyoffice.connector.error.AccessDenied=\u041d\u0435\u0434\u043e\u0441\u0442\u0430\u0442\u043e\u0447\u043d\u043e\u0020\u043f\u0440\u0430\u0432\u0020\u0434\u043b\u044f\u0020\u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0430\u0020\u0444\u0430\u0439\u043b\u0430
2625
onlyoffice.connector.error.Unknown=\u0412\u0020\u0445\u043e\u0434\u0435\u0020\u043e\u043f\u0435\u0440\u0430\u0446\u0438\u0438\u0020\u043f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430\u0020\u043d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f\u0020\u043e\u0448\u0438\u0431\u043a\u0430.
@@ -29,7 +28,7 @@ onlyoffice.connector.dialog.create-file.field.type=\u0422\u0438\u043f\u0020\u044
2928
onlyoffice.connector.dialog.create-file.field.type.option.word=\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442
3029
onlyoffice.connector.dialog.create-file.field.type.option.cell=\u0422\u0430\u0431\u043b\u0438\u0446\u0430
3130
onlyoffice.connector.dialog.create-file.field.type.option.slide=\u041f\u0440\u0435\u0437\u0435\u043d\u0442\u0430\u0446\u0438\u044f
32-
onlyoffice.connector.dialog.create-file.field.type.option.form=\u0428\u0430\u0431\u043b\u043e\u043d\u0020\u0444\u043e\u0440\u043c\u044b
31+
onlyoffice.connector.dialog.create-file.field.type.option.pdf=PDF-\u0444\u043e\u0440\u043c\u0430
3332
onlyoffice.connector.dialog.create-file.field.name=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435
3433
onlyoffice.connector.dialog.create-file.button.create=\u0421\u043e\u0437\u0434\u0430\u0442\u044c
3534
onlyoffice.connector.dialog.create-file.button.cancel=\u041e\u0442\u043c\u0435\u043d\u0430

src/main/resources/templates/actions/create-file.vm

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<option value="word">$i18n.getText('onlyoffice.connector.dialog.create-file.field.type.option.word')</option>
2525
<option value="cell">$i18n.getText('onlyoffice.connector.dialog.create-file.field.type.option.cell')</option>
2626
<option value="slide">$i18n.getText('onlyoffice.connector.dialog.create-file.field.type.option.slide')</option>
27-
<option value="form">$i18n.getText('onlyoffice.connector.dialog.create-file.field.type.option.form')</option>
27+
<option value="pdf">$i18n.getText('onlyoffice.connector.dialog.create-file.field.type.option.pdf')</option>
2828
</select>
2929
</div>
3030

0 commit comments

Comments
 (0)