Merge branch 'main' into testdriver

This commit is contained in:
Anthony Stirling 2024-11-15 13:24:21 +00:00 committed by GitHub
commit 40cb0b570c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
42 changed files with 82 additions and 34 deletions

View File

@ -32,6 +32,7 @@ ignore = [
ignore = [ ignore = [
'AddStampRequest.alphabet', 'AddStampRequest.alphabet',
'AddStampRequest.position', 'AddStampRequest.position',
'home.pipeline.title'
'PDFToBook.selectText.1', 'PDFToBook.selectText.1',
'PDFToText.tags', 'PDFToText.tags',
'addPageNumbers.selectText.3', 'addPageNumbers.selectText.3',
@ -41,9 +42,11 @@ ignore = [
'licenses.version', 'licenses.version',
'pipeline.title', 'pipeline.title',
'pipelineOptions.pipelineHeader', 'pipelineOptions.pipelineHeader',
'pro',
'sponsor', 'sponsor',
'text', 'text',
'watermark.type.1', 'watermark.type.1',
'certSign.name',
] ]
[el_GR] [el_GR]

View File

@ -304,7 +304,13 @@ public class UserService implements UserServiceInterface {
boolean isValidEmail = boolean isValidEmail =
username.matches( username.matches(
"^(?=.{1,64}@)[A-Za-z0-9]+(\\.[A-Za-z0-9_+.-]+)*@[^-][A-Za-z0-9-]+(\\.[A-Za-z0-9-]+)*(\\.[A-Za-z]{2,})$"); "^(?=.{1,64}@)[A-Za-z0-9]+(\\.[A-Za-z0-9_+.-]+)*@[^-][A-Za-z0-9-]+(\\.[A-Za-z0-9-]+)*(\\.[A-Za-z]{2,})$");
return isValidSimpleUsername || isValidEmail;
List<String> notAllowedUserList = new ArrayList<>();
notAllowedUserList.add("ALL_USERS".toLowerCase());
boolean notAllowedUser = notAllowedUserList.contains(username.toLowerCase());
return (isValidSimpleUsername || isValidEmail) && !notAllowedUser;
} }
private String getInvalidUsernameMessage() { private String getInvalidUsernameMessage() {

View File

@ -13,12 +13,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import stirling.software.SPDF.model.api.misc.ReplaceAndInvertColorRequest; import stirling.software.SPDF.model.api.misc.ReplaceAndInvertColorRequest;
import stirling.software.SPDF.service.misc.ReplaceAndInvertColorService; import stirling.software.SPDF.service.misc.ReplaceAndInvertColorService;
@RestController @RestController
@RequestMapping("/api/v1/misc") @RequestMapping("/api/v1/misc")
@Tag(name = "Misc", description = "Miscellaneous APIs")
public class ReplaceAndInvertColorController { public class ReplaceAndInvertColorController {
private ReplaceAndInvertColorService replaceAndInvertColorService; private ReplaceAndInvertColorService replaceAndInvertColorService;

View File

@ -188,8 +188,7 @@ public class WatermarkController {
float pageWidth = page.getMediaBox().getWidth(); float pageWidth = page.getMediaBox().getWidth();
float pageHeight = page.getMediaBox().getHeight(); float pageHeight = page.getMediaBox().getHeight();
// Calculating the new width and height depending on the angle.
//Calculating the new width and height depending on the angle.
float radians = (float) Math.toRadians(rotation); float radians = (float) Math.toRadians(rotation);
float newWatermarkWidth = float newWatermarkWidth =
(float) (float)
@ -200,7 +199,8 @@ public class WatermarkController {
(Math.abs(watermarkWidth * Math.sin(radians)) (Math.abs(watermarkWidth * Math.sin(radians))
+ Math.abs(watermarkHeight * Math.cos(radians))); + Math.abs(watermarkHeight * Math.cos(radians)));
//Calculating the number of rows and columns. // Calculating the number of rows and columns.
int watermarkRows = (int) (pageHeight / newWatermarkHeight + 1); int watermarkRows = (int) (pageHeight / newWatermarkHeight + 1);
int watermarkCols = (int) (pageWidth / newWatermarkWidth + 1); int watermarkCols = (int) (pageWidth / newWatermarkWidth + 1);

View File

@ -15,7 +15,7 @@ import stirling.software.SPDF.controller.api.pipeline.UserServiceInterface;
import stirling.software.SPDF.service.SignatureService; import stirling.software.SPDF.service.SignatureService;
@Controller @Controller
@RequestMapping("/api/v1/general/") @RequestMapping("/api/v1/general")
public class SignatureController { public class SignatureController {
@Autowired private SignatureService signatureService; @Autowired private SignatureService signatureService;

View File

@ -141,6 +141,7 @@ navbar.language=اللغات
navbar.settings=إعدادات navbar.settings=إعدادات
navbar.allTools=أدوات navbar.allTools=أدوات
navbar.multiTool=أدوات متعددة navbar.multiTool=أدوات متعددة
navbar.search=Search
navbar.sections.organize=تنظيم navbar.sections.organize=تنظيم
navbar.sections.convertTo=تحويل الى PDF navbar.sections.convertTo=تحويل الى PDF
navbar.sections.convertFrom=تحويل من PDF navbar.sections.convertFrom=تحويل من PDF

View File

@ -141,6 +141,7 @@ navbar.language=Езици
navbar.settings=Настройки navbar.settings=Настройки
navbar.allTools=Инструменти navbar.allTools=Инструменти
navbar.multiTool=Мулти инструменти navbar.multiTool=Мулти инструменти
navbar.search=Search
navbar.sections.organize=Организирайте navbar.sections.organize=Организирайте
navbar.sections.convertTo=Преобразуване в PDF navbar.sections.convertTo=Преобразуване в PDF
navbar.sections.convertFrom=Преобразуване от PDF navbar.sections.convertFrom=Преобразуване от PDF

View File

@ -140,7 +140,7 @@ navbar.darkmode=Mode Fosc
navbar.language=Idiomes navbar.language=Idiomes
navbar.settings=Opcions navbar.settings=Opcions
navbar.allTools=Eines navbar.allTools=Eines
navbar.multiTool=Multi Tool navbar.multiTool=Multi Tool=Search
navbar.sections.organize=Organitzar navbar.sections.organize=Organitzar
navbar.sections.convertTo=Convertir a PDF navbar.sections.convertTo=Convertir a PDF
navbar.sections.convertFrom=Convertir des de PDF navbar.sections.convertFrom=Convertir des de PDF

View File

@ -141,6 +141,7 @@ navbar.language=Jazyky
navbar.settings=Nastavení navbar.settings=Nastavení
navbar.allTools=Nástroje navbar.allTools=Nástroje
navbar.multiTool=Multifunkční nástroje navbar.multiTool=Multifunkční nástroje
navbar.search=Search
navbar.sections.organize=Organizovat navbar.sections.organize=Organizovat
navbar.sections.convertTo=Převést do PDF navbar.sections.convertTo=Převést do PDF
navbar.sections.convertFrom=Převést z PDF navbar.sections.convertFrom=Převést z PDF

View File

@ -141,6 +141,7 @@ navbar.language=Sprog
navbar.settings=Indstillinger navbar.settings=Indstillinger
navbar.allTools=Værktøjer navbar.allTools=Værktøjer
navbar.multiTool=Multi Værktøjer navbar.multiTool=Multi Værktøjer
navbar.search=Search
navbar.sections.organize=Organisér navbar.sections.organize=Organisér
navbar.sections.convertTo=Konvertér til PDF navbar.sections.convertTo=Konvertér til PDF
navbar.sections.convertFrom=Konvertér fra PDF navbar.sections.convertFrom=Konvertér fra PDF

View File

@ -141,6 +141,7 @@ navbar.language=Sprachen
navbar.settings=Einstellungen navbar.settings=Einstellungen
navbar.allTools=Werkzeuge navbar.allTools=Werkzeuge
navbar.multiTool=Multitools navbar.multiTool=Multitools
navbar.search=Suche
navbar.sections.organize=Organisieren navbar.sections.organize=Organisieren
navbar.sections.convertTo=In PDF konvertieren navbar.sections.convertTo=In PDF konvertieren
navbar.sections.convertFrom=Konvertieren von PDF navbar.sections.convertFrom=Konvertieren von PDF
@ -933,14 +934,14 @@ pdfOrganiser.placeholder=(z.B. 1,3,2 oder 4-8,2,10-12 oder 2n-1)
multiTool.title=PDF-Multitool multiTool.title=PDF-Multitool
multiTool.header=PDF-Multitool multiTool.header=PDF-Multitool
multiTool.uploadPrompts=Dateiname multiTool.uploadPrompts=Dateiname
multiTool.selectAll=Select All multiTool.selectAll=Alle auswählen
multiTool.deselectAll=Deselect All multiTool.deselectAll=Auswahl aufheben
multiTool.selectPages=Page Select multiTool.selectPages=Seiten auswählen
multiTool.selectedPages=Selected Pages multiTool.selectedPages=Ausgewählte Seiten
multiTool.page=Page multiTool.page=Seite
multiTool.deleteSelected=Delete Selected multiTool.deleteSelected=Auswahl löschen
multiTool.downloadAll=Export multiTool.downloadAll=Downloaden
multiTool.downloadSelected=Export Selected multiTool.downloadSelected=Auswahl downloaden
#view pdf #view pdf
viewPdf.title=PDF anzeigen viewPdf.title=PDF anzeigen
viewPdf.header=PDF anzeigen viewPdf.header=PDF anzeigen

View File

@ -141,6 +141,7 @@ navbar.language=Γλώσσες
navbar.settings=Ρυθμίσεις navbar.settings=Ρυθμίσεις
navbar.allTools=Εργαλεία navbar.allTools=Εργαλεία
navbar.multiTool=Multi Tools navbar.multiTool=Multi Tools
navbar.search=Search
navbar.sections.organize=Οργάνωση navbar.sections.organize=Οργάνωση
navbar.sections.convertTo=Μετατροπή σε PDF navbar.sections.convertTo=Μετατροπή σε PDF
navbar.sections.convertFrom=Μετατροπή από PDF navbar.sections.convertFrom=Μετατροπή από PDF

View File

@ -141,6 +141,7 @@ navbar.language=Languages
navbar.settings=Settings navbar.settings=Settings
navbar.allTools=Tools navbar.allTools=Tools
navbar.multiTool=Multi Tool navbar.multiTool=Multi Tool
navbar.search=Search
navbar.sections.organize=Organize navbar.sections.organize=Organize
navbar.sections.convertTo=Convert to PDF navbar.sections.convertTo=Convert to PDF
navbar.sections.convertFrom=Convert from PDF navbar.sections.convertFrom=Convert from PDF

View File

@ -141,6 +141,7 @@ navbar.language=Languages
navbar.settings=Settings navbar.settings=Settings
navbar.allTools=Tools navbar.allTools=Tools
navbar.multiTool=Multi Tool navbar.multiTool=Multi Tool
navbar.search=Search
navbar.sections.organize=Organize navbar.sections.organize=Organize
navbar.sections.convertTo=Convert to PDF navbar.sections.convertTo=Convert to PDF
navbar.sections.convertFrom=Convert from PDF navbar.sections.convertFrom=Convert from PDF

View File

@ -141,6 +141,7 @@ navbar.language=Idiomas
navbar.settings=Configuración navbar.settings=Configuración
navbar.allTools=Herramientas navbar.allTools=Herramientas
navbar.multiTool=Multi herramientas navbar.multiTool=Multi herramientas
navbar.search=Search
navbar.sections.organize=Organizar navbar.sections.organize=Organizar
navbar.sections.convertTo=Convertir a PDF navbar.sections.convertTo=Convertir a PDF
navbar.sections.convertFrom=Convertir desde PDF navbar.sections.convertFrom=Convertir desde PDF

View File

@ -141,6 +141,7 @@ navbar.language=Languages
navbar.settings=Ezarpenak navbar.settings=Ezarpenak
navbar.allTools=Tools navbar.allTools=Tools
navbar.multiTool=Multi Tools navbar.multiTool=Multi Tools
navbar.search=Search
navbar.sections.organize=Organize navbar.sections.organize=Organize
navbar.sections.convertTo=Convert to PDF navbar.sections.convertTo=Convert to PDF
navbar.sections.convertFrom=Convert from PDF navbar.sections.convertFrom=Convert from PDF

View File

@ -141,6 +141,7 @@ navbar.language=Langues
navbar.settings=Paramètres navbar.settings=Paramètres
navbar.allTools=Outils navbar.allTools=Outils
navbar.multiTool=Outils Multiples navbar.multiTool=Outils Multiples
navbar.search=Search
navbar.sections.organize=Organisation navbar.sections.organize=Organisation
navbar.sections.convertTo=Convertir en PDF navbar.sections.convertTo=Convertir en PDF
navbar.sections.convertFrom=Convertir depuis PDF navbar.sections.convertFrom=Convertir depuis PDF

View File

@ -141,6 +141,7 @@ navbar.language=Teangacha
navbar.settings=Socruithe navbar.settings=Socruithe
navbar.allTools=Uirlisí navbar.allTools=Uirlisí
navbar.multiTool=Uirlisí Il navbar.multiTool=Uirlisí Il
navbar.search=Search
navbar.sections.organize=Eagraigh navbar.sections.organize=Eagraigh
navbar.sections.convertTo=Tiontaigh go PDF navbar.sections.convertTo=Tiontaigh go PDF
navbar.sections.convertFrom=Tiontaigh ó PDF navbar.sections.convertFrom=Tiontaigh ó PDF

View File

@ -141,6 +141,7 @@ navbar.language=भाषा
navbar.settings=सेटिंग्स navbar.settings=सेटिंग्स
navbar.allTools=साधन navbar.allTools=साधन
navbar.multiTool=विभिन्न साधन navbar.multiTool=विभिन्न साधन
navbar.search=Search
navbar.sections.organize=संगठित करें navbar.sections.organize=संगठित करें
navbar.sections.convertTo=पीडीएफ में कनवर्ट करें navbar.sections.convertTo=पीडीएफ में कनवर्ट करें
navbar.sections.convertFrom=पीडीएफ से कनवर्ट करें navbar.sections.convertFrom=पीडीएफ से कनवर्ट करें

View File

@ -141,6 +141,7 @@ navbar.language=Jezici
navbar.settings=Postavke navbar.settings=Postavke
navbar.allTools=Alati navbar.allTools=Alati
navbar.multiTool=Multi Tools (Alati) navbar.multiTool=Multi Tools (Alati)
navbar.search=Search
navbar.sections.organize=Organizirati navbar.sections.organize=Organizirati
navbar.sections.convertTo=Pretvori u PDF navbar.sections.convertTo=Pretvori u PDF
navbar.sections.convertFrom=Pretvori iz PDF navbar.sections.convertFrom=Pretvori iz PDF

View File

@ -141,6 +141,7 @@ navbar.language=Nyelvek
navbar.settings=Beállítások navbar.settings=Beállítások
navbar.allTools=Eszközök navbar.allTools=Eszközök
navbar.multiTool=Multi Tools navbar.multiTool=Multi Tools
navbar.search=Search
navbar.sections.organize=Összeállítás navbar.sections.organize=Összeállítás
navbar.sections.convertTo=Átalakítás PDF-be navbar.sections.convertTo=Átalakítás PDF-be
navbar.sections.convertFrom=PDF-ből átalakítás navbar.sections.convertFrom=PDF-ből átalakítás

View File

@ -141,6 +141,7 @@ navbar.language=Bahasa
navbar.settings=Pengaturan navbar.settings=Pengaturan
navbar.allTools=Alat navbar.allTools=Alat
navbar.multiTool=Alat Multi navbar.multiTool=Alat Multi
navbar.search=Search
navbar.sections.organize=Atur navbar.sections.organize=Atur
navbar.sections.convertTo=Konversi ke PDF navbar.sections.convertTo=Konversi ke PDF
navbar.sections.convertFrom=Konversi dari PDF navbar.sections.convertFrom=Konversi dari PDF

View File

@ -141,6 +141,7 @@ navbar.language=Lingue
navbar.settings=Impostazioni navbar.settings=Impostazioni
navbar.allTools=Strumenti navbar.allTools=Strumenti
navbar.multiTool=Strumenti multipli navbar.multiTool=Strumenti multipli
navbar.search=Search
navbar.sections.organize=Organizza navbar.sections.organize=Organizza
navbar.sections.convertTo=Converti in PDF navbar.sections.convertTo=Converti in PDF
navbar.sections.convertFrom=Converti da PDF navbar.sections.convertFrom=Converti da PDF
@ -933,14 +934,14 @@ pdfOrganiser.placeholder=(ad es. 1,3,2 o 4-8,2,10-12 o 2n-1)
multiTool.title=Multifunzione PDF multiTool.title=Multifunzione PDF
multiTool.header=Multifunzione PDF multiTool.header=Multifunzione PDF
multiTool.uploadPrompts=Nome file multiTool.uploadPrompts=Nome file
multiTool.selectAll=Select All multiTool.selectAll=Seleziona tutto
multiTool.deselectAll=Deselect All multiTool.deselectAll=Deseleziona tutto
multiTool.selectPages=Page Select multiTool.selectPages=Seleziona pagina
multiTool.selectedPages=Selected Pages multiTool.selectedPages=Seleziona pagine
multiTool.page=Page multiTool.page=Pagina
multiTool.deleteSelected=Delete Selected multiTool.deleteSelected=Elimina selezionata
multiTool.downloadAll=Export multiTool.downloadAll=Esporta
multiTool.downloadSelected=Export Selected multiTool.downloadSelected=Esporta selezionata
#view pdf #view pdf
viewPdf.title=Visualizza PDF viewPdf.title=Visualizza PDF
viewPdf.header=Visualizza PDF viewPdf.header=Visualizza PDF

View File

@ -141,6 +141,7 @@ navbar.language=言語
navbar.settings=設定 navbar.settings=設定
navbar.allTools=ツール navbar.allTools=ツール
navbar.multiTool=マルチツール navbar.multiTool=マルチツール
navbar.search=Search
navbar.sections.organize=整理 navbar.sections.organize=整理
navbar.sections.convertTo=PDFへ変換 navbar.sections.convertTo=PDFへ変換
navbar.sections.convertFrom=PDFから変換 navbar.sections.convertFrom=PDFから変換

View File

@ -141,6 +141,7 @@ navbar.language=언어
navbar.settings=설정 navbar.settings=설정
navbar.allTools=도구 navbar.allTools=도구
navbar.multiTool=Multi Tools navbar.multiTool=Multi Tools
navbar.search=Search
navbar.sections.organize=조직 navbar.sections.organize=조직
navbar.sections.convertTo=PDF로 변환 navbar.sections.convertTo=PDF로 변환
navbar.sections.convertFrom=PDF에서 변환 navbar.sections.convertFrom=PDF에서 변환

View File

@ -141,6 +141,7 @@ navbar.language=Talen
navbar.settings=Instellingen navbar.settings=Instellingen
navbar.allTools=Tools navbar.allTools=Tools
navbar.multiTool=Multitools navbar.multiTool=Multitools
navbar.search=Search
navbar.sections.organize=Organizeren navbar.sections.organize=Organizeren
navbar.sections.convertTo=Converteren naar PDF navbar.sections.convertTo=Converteren naar PDF
navbar.sections.convertFrom=Converteren van PDF navbar.sections.convertFrom=Converteren van PDF

View File

@ -141,6 +141,7 @@ navbar.language=Språk
navbar.settings=Innstillinger navbar.settings=Innstillinger
navbar.allTools=Verktøy navbar.allTools=Verktøy
navbar.multiTool=Multi Verktøy navbar.multiTool=Multi Verktøy
navbar.search=Search
navbar.sections.organize=Organisere navbar.sections.organize=Organisere
navbar.sections.convertTo=Konverter til PDF navbar.sections.convertTo=Konverter til PDF
navbar.sections.convertFrom=Konverter fra PDF navbar.sections.convertFrom=Konverter fra PDF

View File

@ -141,6 +141,7 @@ navbar.language=Języki
navbar.settings=Ustawienia navbar.settings=Ustawienia
navbar.allTools=Narzędzia navbar.allTools=Narzędzia
navbar.multiTool=Narzędzie Wielofunkcyjne navbar.multiTool=Narzędzie Wielofunkcyjne
navbar.search=Search
navbar.sections.organize=Organizuj navbar.sections.organize=Organizuj
navbar.sections.convertTo=Przetwórz na PDF navbar.sections.convertTo=Przetwórz na PDF
navbar.sections.convertFrom=Przetwórz z PDF navbar.sections.convertFrom=Przetwórz z PDF

View File

@ -141,6 +141,7 @@ navbar.language=Idiomas
navbar.settings=Configurações navbar.settings=Configurações
navbar.allTools=Ferramentas navbar.allTools=Ferramentas
navbar.multiTool=Multiferramentas navbar.multiTool=Multiferramentas
navbar.search=Search
navbar.sections.organize=Organizar navbar.sections.organize=Organizar
navbar.sections.convertTo=Converter para PDF navbar.sections.convertTo=Converter para PDF
navbar.sections.convertFrom=Converter de PDF navbar.sections.convertFrom=Converter de PDF

View File

@ -141,6 +141,7 @@ navbar.language=Idiomas
navbar.settings=Configurações navbar.settings=Configurações
navbar.allTools=Ferramentas navbar.allTools=Ferramentas
navbar.multiTool=Multi Tools navbar.multiTool=Multi Tools
navbar.search=Search
navbar.sections.organize=Organizar navbar.sections.organize=Organizar
navbar.sections.convertTo=Converter para PDF navbar.sections.convertTo=Converter para PDF
navbar.sections.convertFrom=Converter de PDF navbar.sections.convertFrom=Converter de PDF

View File

@ -141,6 +141,7 @@ navbar.language=Limbi
navbar.settings=Setări navbar.settings=Setări
navbar.allTools=Instrumente navbar.allTools=Instrumente
navbar.multiTool=Instrumente Multiple navbar.multiTool=Instrumente Multiple
navbar.search=Search
navbar.sections.organize=Organizează navbar.sections.organize=Organizează
navbar.sections.convertTo=Convertește în PDF navbar.sections.convertTo=Convertește în PDF
navbar.sections.convertFrom=Convertește din PDF navbar.sections.convertFrom=Convertește din PDF

View File

@ -141,6 +141,7 @@ navbar.language=Языки
navbar.settings=Настройки navbar.settings=Настройки
navbar.allTools=Конвейеры navbar.allTools=Конвейеры
navbar.multiTool=Multi Tools navbar.multiTool=Multi Tools
navbar.search=Search
navbar.sections.organize=Организация navbar.sections.organize=Организация
navbar.sections.convertTo=Перевести в PDF navbar.sections.convertTo=Перевести в PDF
navbar.sections.convertFrom=Перевести из PDF navbar.sections.convertFrom=Перевести из PDF

View File

@ -141,6 +141,7 @@ navbar.language=Languages
navbar.settings=Nastavenia navbar.settings=Nastavenia
navbar.allTools=Tools navbar.allTools=Tools
navbar.multiTool=Multi Tools navbar.multiTool=Multi Tools
navbar.search=Search
navbar.sections.organize=Organize navbar.sections.organize=Organize
navbar.sections.convertTo=Convert to PDF navbar.sections.convertTo=Convert to PDF
navbar.sections.convertFrom=Convert from PDF navbar.sections.convertFrom=Convert from PDF

View File

@ -141,6 +141,7 @@ navbar.language=Languages
navbar.settings=Podešavanja navbar.settings=Podešavanja
navbar.allTools=Tools navbar.allTools=Tools
navbar.multiTool=Multi Tools navbar.multiTool=Multi Tools
navbar.search=Search
navbar.sections.organize=Organize navbar.sections.organize=Organize
navbar.sections.convertTo=Convert to PDF navbar.sections.convertTo=Convert to PDF
navbar.sections.convertFrom=Convert from PDF navbar.sections.convertFrom=Convert from PDF

View File

@ -141,6 +141,7 @@ navbar.language=Språk
navbar.settings=Inställningar navbar.settings=Inställningar
navbar.allTools=Verktyg navbar.allTools=Verktyg
navbar.multiTool=Multiverktyg navbar.multiTool=Multiverktyg
navbar.search=Search
navbar.sections.organize=Organisera navbar.sections.organize=Organisera
navbar.sections.convertTo=Konvertera till PDF navbar.sections.convertTo=Konvertera till PDF
navbar.sections.convertFrom=Konvertera från PDF navbar.sections.convertFrom=Konvertera från PDF

View File

@ -141,6 +141,7 @@ navbar.language=ภาษา
navbar.settings=การตั้งค่า navbar.settings=การตั้งค่า
navbar.allTools=เครื่องมือทั้งหมด navbar.allTools=เครื่องมือทั้งหมด
navbar.multiTool=เครื่องมือหลายตัว navbar.multiTool=เครื่องมือหลายตัว
navbar.search=Search
navbar.sections.organize=จัดระเบียบ navbar.sections.organize=จัดระเบียบ
navbar.sections.convertTo=แปลงเป็น PDF navbar.sections.convertTo=แปลงเป็น PDF
navbar.sections.convertFrom=แปลงจาก PDF navbar.sections.convertFrom=แปลงจาก PDF

View File

@ -141,6 +141,7 @@ navbar.language=Diller
navbar.settings=Ayarlar navbar.settings=Ayarlar
navbar.allTools=Araçlar navbar.allTools=Araçlar
navbar.multiTool=Çoklu Araçlar navbar.multiTool=Çoklu Araçlar
navbar.search=Search
navbar.sections.organize=Düzenle navbar.sections.organize=Düzenle
navbar.sections.convertTo=PDF'ye dönüştür navbar.sections.convertTo=PDF'ye dönüştür
navbar.sections.convertFrom=PDF'den dönüştür navbar.sections.convertFrom=PDF'den dönüştür

View File

@ -141,6 +141,7 @@ navbar.language=Мови
navbar.settings=Налаштування navbar.settings=Налаштування
navbar.allTools=Інструменти navbar.allTools=Інструменти
navbar.multiTool=Мультіінструмент navbar.multiTool=Мультіінструмент
navbar.search=Search
navbar.sections.organize=Організувати navbar.sections.organize=Організувати
navbar.sections.convertTo=Конвертувати в PDF navbar.sections.convertTo=Конвертувати в PDF
navbar.sections.convertFrom=Конвертувати з PDF navbar.sections.convertFrom=Конвертувати з PDF

View File

@ -141,6 +141,7 @@ navbar.language=Ngôn ngữ
navbar.settings=Cài đặt navbar.settings=Cài đặt
navbar.allTools=Công cụ navbar.allTools=Công cụ
navbar.multiTool=Đa công cụ navbar.multiTool=Đa công cụ
navbar.search=Search
navbar.sections.organize=Sắp xếp navbar.sections.organize=Sắp xếp
navbar.sections.convertTo=Chuyển đổi sang PDF navbar.sections.convertTo=Chuyển đổi sang PDF
navbar.sections.convertFrom=Chuyển đổi từ PDF navbar.sections.convertFrom=Chuyển đổi từ PDF

View File

@ -141,6 +141,7 @@ navbar.language=语言
navbar.settings=设置 navbar.settings=设置
navbar.allTools=工具箱 navbar.allTools=工具箱
navbar.multiTool=多功能工具 navbar.multiTool=多功能工具
navbar.search=Search
navbar.sections.organize=组织 navbar.sections.organize=组织
navbar.sections.convertTo=转换成PDF navbar.sections.convertTo=转换成PDF
navbar.sections.convertFrom=从PDF转换 navbar.sections.convertFrom=从PDF转换

View File

@ -141,6 +141,7 @@ navbar.language=語言
navbar.settings=設定 navbar.settings=設定
navbar.allTools=工具 navbar.allTools=工具
navbar.multiTool=複合工具 navbar.multiTool=複合工具
navbar.search=Search
navbar.sections.organize=整理 navbar.sections.organize=整理
navbar.sections.convertTo=轉換為 PDF navbar.sections.convertTo=轉換為 PDF
navbar.sections.convertFrom=從 PDF 轉換 navbar.sections.convertFrom=從 PDF 轉換

View File

@ -9,8 +9,10 @@
<script th:inline="javascript"> <script th:inline="javascript">
const currentVersion = /*[[${@appVersion}]]*/ ''; const currentVersion = /*[[${@appVersion}]]*/ '';
const noFavourites = /*[[#{noFavourites}]]*/ ''; const noFavourites = /*[[#{noFavourites}]]*/ '';
const updateAvailable = /*[[#{settings.updateAvailable}]]*/ ''; console.log(noFavourites);
const updateAvailable = /*[[#{settings.updateAvailable}]]*/ '';
</script> </script>
<script th:src="@{'/js/homecard.js'}"></script>
<script th:src="@{'/js/githubVersion.js'}"></script> <script th:src="@{'/js/githubVersion.js'}"></script>
<nav class="navbar navbar-expand-xl"> <nav class="navbar navbar-expand-xl">
<div class="container "> <div class="container ">
@ -308,10 +310,10 @@
</li> --> </li> -->
</ul> </ul>
<ul class="navbar-nav flex-nowrap"> <ul class="navbar-nav flex-nowrap">
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link" id="navbarDropdown-5" href="#" role="button" data-bs-toggle="dropdown" <a class="nav-link" id="navbarDropdown-5" href="#" role="button" data-bs-toggle="dropdown"
aria-haspopup="true" aria-expanded="false"> aria-haspopup="true" aria-expanded="false" th:title="#{navbar.favorite}">
<span class="material-symbols-rounded"> <span class="material-symbols-rounded">
star star
</span> </span>
@ -324,7 +326,7 @@
</div> </div>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" id="dark-mode-toggle" href="#"> <a class="nav-link" id="dark-mode-toggle" href="#" th:title="#{navbar.darkmode}">
<span class="material-symbols-rounded" id="dark-mode-icon"> <span class="material-symbols-rounded" id="dark-mode-icon">
dark_mode dark_mode
</span> </span>
@ -333,7 +335,7 @@
</li> </li>
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link" href="#" id="languageDropdown" role="button" data-bs-toggle="dropdown" <a class="nav-link" href="#" id="languageDropdown" role="button" data-bs-toggle="dropdown"
aria-haspopup="true" aria-expanded="false"> aria-haspopup="true" aria-expanded="false" th:title="#{navbar.language}">
<span class="material-symbols-rounded"> <span class="material-symbols-rounded">
language language
</span> </span>
@ -349,7 +351,7 @@
</li> </li>
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link" href="#" id="searchDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="nav-link" href="#" id="searchDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" th:title="#{navbar.search}">
<span class="material-symbols-rounded"> <span class="material-symbols-rounded">
search search
</span> </span>
@ -358,7 +360,7 @@
<div class="dropdown-menu dropdown-menu-tp" aria-labelledby="searchDropdown"> <div class="dropdown-menu dropdown-menu-tp" aria-labelledby="searchDropdown">
<div class="dropdown-menu-wrapper px-xl-2 px-2"> <div class="dropdown-menu-wrapper px-xl-2 px-2">
<form th:action="@{''}" class="d-flex p-2 search-form" id="searchForm"> <form th:action="@{''}" class="d-flex p-2 search-form" id="searchForm">
<input class="form-control search-input" type="search" placeholder="Search" aria-label="Search" id="navbarSearchInput"> <input class="form-control search-input" type="search" th:placeholder="#{navbar.search}" aria-label="Search" id="navbarSearchInput">
</form> </form>
<!-- Search Results --> <!-- Search Results -->
<div id="searchResults" class="search-results scrollable-y dropdown-mw-20"></div> <div id="searchResults" class="search-results scrollable-y dropdown-mw-20"></div>
@ -368,13 +370,13 @@
<li class="nav-item" th:if="${!@runningEE}"> <li class="nav-item" th:if="${!@runningEE}">
<a href="https://stirlingpdf.com/pricing" class="nav-link go-pro-link" target="_blank" rel="noopener noreferrer"> <a href="https://stirlingpdf.com/pricing" class="nav-link go-pro-link" target="_blank" rel="noopener noreferrer">
<span class="go-pro-badge" th:text="#{enterpriseEdition.button}"></span> <span class="go-pro-badge" th:text="#{enterpriseEdition.button}"></span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<!-- Settings Button --> <!-- Settings Button -->
<a href="#" class="nav-link" data-bs-toggle="modal" data-bs-target="#settingsModal"> <a href="#" class="nav-link" data-bs-toggle="modal" data-bs-target="#settingsModal" th:title="#{navbar.settings}">
<span class="material-symbols-rounded"> <span class="material-symbols-rounded">
settings settings
</span> </span>
@ -405,14 +407,14 @@
<p class="mb-0" th:utext="#{settings.appVersion} + ' ' + ${@appVersion}"></p> <p class="mb-0" th:utext="#{settings.appVersion} + ' ' + ${@appVersion}"></p>
<div class="d-flex justify-content-between align-items-center mb-3 mt-3"> <div class="d-flex justify-content-between align-items-center mb-3 mt-3">
<div class="footer-center" style="flex-direction: row;"> <div class="footer-center" style="flex-direction: row;">
<a href="https://github.com/Stirling-Tools/Stirling-PDF" class="mx-1" role="button" <a href="https://github.com/Stirling-Tools/Stirling-PDF" class="mx-1" role="button" target="_blank"
th:title="#{visitGithub}"> th:title="#{visitGithub}">
<img th:src="@{'/images/github.svg'}" alt="github"> <img th:src="@{'/images/github.svg'}" alt="github">
</a> </a>
<a href="https://hub.docker.com/r/frooodle/s-pdf" class="mx-1" role="button" th:title="#{seeDockerHub}"> <a href="https://hub.docker.com/r/frooodle/s-pdf" class="mx-1" role="button" target="_blank"th:title="#{seeDockerHub}">
<img th:src="@{'/images/docker.svg'}" alt="docker"> <img th:src="@{'/images/docker.svg'}" alt="docker">
</a> </a>
<a href="https://discord.gg/Cn8pWhQRxZ" class="mx-1" role="button" th:title="#{joinDiscord}"> <a href="https://discord.gg/Cn8pWhQRxZ" class="mx-1" role="button" target="_blank" th:title="#{joinDiscord}">
<img th:src="@{'/images/discord.svg'}" alt="discord"> <img th:src="@{'/images/discord.svg'}" alt="discord">
</a> </a>
</div> </div>