Skip to content

Commit de92bfe

Browse files
committed
rename
1 parent e15f758 commit de92bfe

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

src/main/java/stirling/software/SPDF/controller/api/AdditionalLanguageJsController.java renamed to src/main/java/stirling/software/SPDF/controller/api/AdditionalJsController.java

+18-18
Original file line numberDiff line numberDiff line change
@@ -18,40 +18,40 @@
1818

1919
@RestController
2020
@RequestMapping("/js")
21-
public class AdditionalLanguageJsController {
21+
public class AdditionalJsController {
2222

2323
private final LanguageService languageService;
2424

25-
public AdditionalLanguageJsController(LanguageService languageService) {
25+
public AdditionalJsController(LanguageService languageService) {
2626
this.languageService = languageService;
2727
}
2828

2929
@Hidden
30-
@GetMapping(value = "/additionalLanguageCode.js", produces = "application/javascript")
31-
public void generateAdditionalLanguageJs(HttpServletResponse response) throws IOException {
30+
@GetMapping(value = "/additional.js", produces = "application/javascript")
31+
public void generateAdditionalJs(HttpServletResponse response) throws IOException {
3232
Set<String> supportedLanguages = languageService.getSupportedLanguages();
3333
response.setContentType("application/javascript");
3434
PrintWriter writer = response.getWriter();
35-
// Erstelle das JavaScript dynamisch
35+
// Dynamically generate the JavaScript
3636
writer.println(
3737
"const supportedLanguages = "
3838
+ toJsonArray(new ArrayList<>(supportedLanguages))
3939
+ ";");
40-
// Generiere die `getDetailedLanguageCode`-Funktion
40+
// Generate the `getDetailedLanguageCode` function
4141
writer.println(
4242
"""
43-
function getDetailedLanguageCode() {
44-
const userLanguages = navigator.languages ? navigator.languages : [navigator.language];
45-
for (let lang of userLanguages) {
46-
let matchedLang = supportedLanguages.find(supportedLang => supportedLang.startsWith(lang.replace('-', '_')));
47-
if (matchedLang) {
48-
return matchedLang;
49-
}
50-
}
51-
// Fallback
52-
return "en_GB";
43+
function getDetailedLanguageCode() {
44+
const userLanguages = navigator.languages ? navigator.languages : [navigator.language];
45+
for (let lang of userLanguages) {
46+
let matchedLang = supportedLanguages.find(supportedLang => supportedLang.startsWith(lang.replace('-', '_')));
47+
if (matchedLang) {
48+
return matchedLang;
5349
}
54-
""");
50+
}
51+
// Fallback
52+
return "en_GB";
53+
}
54+
""");
5555

5656
writer.println(
5757
"""
@@ -65,7 +65,7 @@ function getDetailedLanguageCode() {
6565
writer.flush();
6666
}
6767

68-
// Hilfsfunktion zum Konvertieren der Liste in ein JSON-Array
68+
// Helper function to convert list to JSON array
6969
private String toJsonArray(List<String> list) {
7070
StringBuilder jsonArray = new StringBuilder("[");
7171
for (int i = 0; i < list.size(); i++) {

src/main/resources/templates/fragments/navbar.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div th:fragment="navbar" class="mx-auto" style="position: sticky; top:0; z-index:10000">
22
<script th:src="@{'/js/languageSelection.js'}"></script>
33
<script th:src="@{'/js/navbar.js'}"></script>
4-
<script th:src="@{'/js/additionalLanguageCode.js'}"></script>
4+
<script th:src="@{'/js/additional.js'}"></script>
55
<script th:inline="javascript">
66
// Initializing the scripts
77
initLanguageSettings();

src/main/resources/templates/login.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<th:block th:insert="~{fragments/common :: head(title=#{login.title}, header=#{login.header})}"></th:block>
55
<link rel="stylesheet" th:href="@{'/css/login.css'}">
66
<script th:src="@{'/js/languageSelection.js'}"></script>
7-
<script th:src="@{'/js/additionalLanguageCode.js'}"></script>
7+
<script th:src="@{'/js/additional.js'}"></script>
88
</head>
99

1010
<body>

0 commit comments

Comments
 (0)