Mirrors/Stirling-PDF
Mirrors/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Frooodle/Stirling-PDF.git synced 2025-09-12 17:52:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into add_mail_support

Browse Source
This commit is contained in:
Ludy 2025-05-03 09:48:04 +02:00 committed by GitHub
commit ddc121a9c9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -134,7 +134,7 @@ Stirling-PDF currently supports 39 languages!
| Hungarian (Magyar) (hu_HU) | ![99%](https://geps.dev/progress/99) | | Hungarian (Magyar) (hu_HU) | ![99%](https://geps.dev/progress/99) |
| Indonesian (Bahasa Indonesia) (id_ID) | ![80%](https://geps.dev/progress/80) | | Indonesian (Bahasa Indonesia) (id_ID) | ![80%](https://geps.dev/progress/80) |
| Irish (Gaeilge) (ga_IE) | ![91%](https://geps.dev/progress/91) | | Irish (Gaeilge) (ga_IE) | ![91%](https://geps.dev/progress/91) |
| Italian (Italiano) (it_IT) | ![98%](https://geps.dev/progress/98) | | Italian (Italiano) (it_IT) | ![99%](https://geps.dev/progress/99) |
| Japanese (日本語) (ja_JP) | ![93%](https://geps.dev/progress/93) | | Japanese (日本語) (ja_JP) | ![93%](https://geps.dev/progress/93) |
| Korean (한국어) (ko_KR) | ![92%](https://geps.dev/progress/92) | | Korean (한국어) (ko_KR) | ![92%](https://geps.dev/progress/92) |
| Norwegian (Norsk) (no_NB) | ![86%](https://geps.dev/progress/86) | | Norwegian (Norsk) (no_NB) | ![86%](https://geps.dev/progress/86) |

34
src/main/java/stirling/software/SPDF/config/security/database/DatabaseService.java
View File

@ -246,26 +246,28 @@ public class DatabaseService implements DatabaseInterface {
boolean isDBUrlH2 = boolean isDBUrlH2 =
datasource.getCustomDatabaseUrl().contains("h2") datasource.getCustomDatabaseUrl().contains("h2")
|| datasource.getCustomDatabaseUrl().contains("H2"); || datasource.getCustomDatabaseUrl().contains("H2");
boolean isCustomDatabase = datasource.isEnableCustomDatabase();
if (isTypeH2 && !isDBUrlH2) { if (isCustomDatabase) {
log.warn( if (isTypeH2 && !isDBUrlH2) {
"Datasource type is H2, but the URL does not contain 'h2'. " log.warn(
+ "Please check your configuration."); "Datasource type is H2, but the URL does not contain 'h2'. "
throw new IllegalStateException( + "Please check your configuration.");
"Datasource type is H2, but the URL does not contain 'h2'. Please check your" throw new IllegalStateException(
+ " configuration."); "Datasource type is H2, but the URL does not contain 'h2'. Please check"
} else if (!isTypeH2 && isDBUrlH2) { + " your configuration.");
log.warn( } else if (!isTypeH2 && isDBUrlH2) {
"Datasource URL contains 'h2', but the type is not H2. " log.warn(
+ "Please check your configuration."); "Datasource URL contains 'h2', but the type is not H2. "
throw new IllegalStateException( + "Please check your configuration.");
"Datasource URL contains 'h2', but the type is not H2. Please check your" throw new IllegalStateException(
+ " configuration."); "Datasource URL contains 'h2', but the type is not H2. Please check your"
+ " configuration.");
}
} }
boolean isH2 = isTypeH2 && isDBUrlH2; boolean isH2 = isTypeH2 && isDBUrlH2;
return !datasource.isEnableCustomDatabase() || isH2; return !isCustomDatabase || isH2;
} }
/** /**

2
src/main/resources/messages_it_IT.properties
View File

@ -609,7 +609,7 @@ login.userIsDisabled=L'utente è disattivato, l'accesso è attualmente bloccato
login.alreadyLoggedIn=Hai già effettuato l'accesso a login.alreadyLoggedIn=Hai già effettuato l'accesso a
login.alreadyLoggedIn2=dispositivi. Esci dai dispositivi e riprova. login.alreadyLoggedIn2=dispositivi. Esci dai dispositivi e riprova.
login.toManySessions=Hai troppe sessioni attive login.toManySessions=Hai troppe sessioni attive
login.logoutMessage=You have been logged out. login.logoutMessage=Sei stato disconnesso.
#auto-redact #auto-redact
autoRedact.title=Redazione automatica autoRedact.title=Redazione automatica