diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index 8d02f56..f0dcb3c 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -6,16 +6,3 @@ # HINT: # Values from here will be used as a default if no entry was found in the language specific # message file or if a language specific file could not be found. - -welcome.title = Welcome back! -welcome.text = If umlauts such as äöü are not displayed correctly, something is broken - -profile.title = Dein Profil -profile.danger_zone = Danger Zone -profile.edit = Bearbeiten -profile.delete = Account löschen -profile.username = Nutzername -profile.password = Passwort -profile.address = Adresse -profile.authentification = Authentifikation -profile.userinformation = Nutzerinformationen diff --git a/src/main/resources/messages_de.properties b/src/main/resources/messages_de.properties deleted file mode 100644 index 653d377..0000000 --- a/src/main/resources/messages_de.properties +++ /dev/null @@ -1,17 +0,0 @@ -# ATTENTION: -# Spring Boot expects this file to be UTF-8 encoded 👍 However, some IDEs will open it in -# the wrong mode. For example, IntelliJ users must go to Preferences > Editor > File Encodings -# and set "Default encoding for properties files" to "UTF-8". -# -# HINT: Entries that are missing here are looked up in messages.properties - -welcome.title = Willkommen zurück! -welcome.text = Wenn Umlaute (äöü) falsch dargestellt werden, ist irgendwas kaputt - -nav.register=Registrierung -nav.login=Login -nav.inventory=Inventar -nav.employee=Angestellte -nav.customer=Kunden -nav.orders=Bestellungen -nav.orders.calender=Kalender diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties deleted file mode 100644 index b0aa556..0000000 --- a/src/main/resources/messages_en.properties +++ /dev/null @@ -1,14 +0,0 @@ -# ATTENTION: -# Spring Boot expects this file to be UTF-8 encoded 👍 However, some IDEs will open it in -# the wrong mode. For example, IntelliJ users must go to Preferences > Editor > File Encodings -# and set "Default encoding for properties files" to "UTF-8". -# -# HINT: Entries that are missing here are looked up in messages.properties - -nav.register=Register -nav.login=Login -nav.inventory=Inventory -nav.employee=Employee -nav.customer=Customer -nav.orders=Orders -nav.orders.calender=Calender diff --git a/src/main/resources/templates/layout.html b/src/main/resources/templates/layout.html index 0175ef1..8f4a21c 100644 --- a/src/main/resources/templates/layout.html +++ b/src/main/resources/templates/layout.html @@ -9,12 +9,12 @@ - Catering +
-

+

diff --git a/src/main/resources/templates/profile.html b/src/main/resources/templates/profile.html index c736367..0e96246 100644 --- a/src/main/resources/templates/profile.html +++ b/src/main/resources/templates/profile.html @@ -9,31 +9,31 @@
-

+

Authentifizierung

- +
- +
-

+

Nutzerinformationen

- +
- +
-
+
Danger Zone
- +
diff --git a/src/main/resources/templates/welcome.html b/src/main/resources/templates/welcome.html index 5a6093e..3be5e2c 100644 --- a/src/main/resources/templates/welcome.html +++ b/src/main/resources/templates/welcome.html @@ -2,7 +2,7 @@ + layout:decorate="~{layout.html}">
diff --git a/src/test/java/kickstart/welcome/WelcomeControllerIntegrationTests.java b/src/test/java/kickstart/welcome/WelcomeControllerIntegrationTests.java index fcda7d6..6b6f47e 100644 --- a/src/test/java/kickstart/welcome/WelcomeControllerIntegrationTests.java +++ b/src/test/java/kickstart/welcome/WelcomeControllerIntegrationTests.java @@ -35,6 +35,6 @@ class WelcomeControllerIntegrationTests { void showsWelcomeMessage() throws Exception { mvc.perform(get("/")) // .andExpect(status().isOk()) - .andExpect(content().string(containsString("Wilkommen bei Wurst’s Catering"))); + .andExpect(content().string(containsString("Catering Mampf"))); } }