Change locale identifiers from 'site.thx.*' to 'message.*'

frontend/src/components/UserSettings/UserPassword.spec.js

@@ -189,7 +189,7 @@ describe('UserCard_FormUserPasswort', () => {
           })
 
           it('toasts a success message', () => {
-            expect(toastSuccessSpy).toBeCalledWith('site.thx.reset')
+            expect(toastSuccessSpy).toBeCalledWith('message.reset')
           })
 
           it('cancels the edit process', () => {

frontend/src/components/UserSettings/UserPassword.vue

@@ -89,7 +89,7 @@ export default {
           },
         })
         .then(() => {
-          this.toastSuccess(this.$t('site.thx.reset'))
+          this.toastSuccess(this.$t('message.reset'))
           this.cancelEdit()
         })
         .catch((error) => {

frontend/src/locales/de.json

@@ -172,6 +172,16 @@
     "minus": "−",
     "pipe": "|"
   },
+  "message": {
+    "activateEmail": "Dein Konto wurde noch nicht aktiviert. Bitte überprüfe deine E-Mail und klicke den Aktivierungslink oder fordere einen neuen Aktivierungslink über die Password Reset Seite.",
+    "checkEmail": "Deine E-Mail wurde erfolgreich verifiziert. Du kannst dich jetzt anmelden.",
+    "email": "Wir haben dir eine E-Mail gesendet.",
+    "errorTitle": "Achtung!",
+    "register": "Du bist jetzt registriert, bitte überprüfe deine Emails und klicke auf den Aktivierungslink.",
+    "reset": "Dein Passwort wurde geändert.",
+    "title": "Danke!",
+    "unsetPassword": "Dein Passwort wurde noch nicht gesetzt. Bitte setze es neu."
+  },
   "navigation": {
     "admin_area": "Adminbereich",
     "logout": "Abmelden",
@@ -240,16 +250,6 @@
       "one_number": "Zahl erforderlich.",
       "special-char": "Sonderzeichen erforderlich (z.B. _ oder ä)",
       "uppercase": "Großbuchstabe erforderlich."
-    },
-    "thx": {
-      "activateEmail": "Dein Konto wurde noch nicht aktiviert. Bitte überprüfe deine E-Mail und klicke den Aktivierungslink oder fordere einen neuen Aktivierungslink über die Password Reset Seite.",
-      "checkEmail": "Deine E-Mail wurde erfolgreich verifiziert. Du kannst dich jetzt anmelden.",
-      "email": "Wir haben dir eine E-Mail gesendet.",
-      "errorTitle": "Achtung!",
-      "register": "Du bist jetzt registriert, bitte überprüfe deine Emails und klicke auf den Aktivierungslink.",
-      "reset": "Dein Passwort wurde geändert.",
-      "title": "Danke!",
-      "unsetPassword": "Dein Passwort wurde noch nicht gesetzt. Bitte setze es neu."
     }
   },
   "success": "Erfolg",

frontend/src/locales/en.json

@@ -172,6 +172,16 @@
     "minus": "−",
     "pipe": "|"
   },
+  "message": {
+    "activateEmail": "Your account has not been activated yet. Please check your emails and click the activation link or order a new activation link over the password reset page.",
+    "checkEmail": "Your email has been successfully verified. You can sign in now.",
+    "email": "We have sent you an email.",
+    "errorTitle": "Attention!",
+    "register": "You are registered now, please check your emails and click the activation link.",
+    "reset": "Your password has been changed.",
+    "title": "Thank you!",
+    "unsetPassword": "Your password has not been set yet. Please set it again."
+  },
   "navigation": {
     "admin_area": "Admin Area",
     "logout": "Logout",
@@ -240,16 +250,6 @@
       "one_number": "One number required.",
       "special-char": "One special character required (e.g. _ or ä)",
       "uppercase": "One uppercase letter required."
-    },
-    "thx": {
-      "activateEmail": "Your account has not been activated yet. Please check your emails and click the activation link or order a new activation link over the password reset page.",
-      "checkEmail": "Your email has been successfully verified. You can sign in now.",
-      "email": "We have sent you an email.",
-      "errorTitle": "Attention!",
-      "register": "You are registered now, please check your emails and click the activation link.",
-      "reset": "Your password has been changed.",
-      "title": "Thank you!",
-      "unsetPassword": "Your password has not been set yet. Please set it again."
     }
   },
   "success": "Success",

frontend/src/pages/ForgotPassword.spec.js

@@ -111,7 +111,7 @@ describe('ForgotPassword', () => {
 
             it('shows error title, subtitle, login button', () => {
               expect(wrapper.vm.showPageMessage).toBe(true)
-              expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
+              expect(wrapper.find('.test-message-headline').text()).toBe('message.errorTitle')
               expect(wrapper.find('.test-message-subtitle').text()).toBe('error.email-already-sent')
               expect(wrapper.find('.test-message-button').text()).toBe('login')
             })
@@ -147,8 +147,8 @@ describe('ForgotPassword', () => {
 
             it('shows success title, subtitle, login button', () => {
               expect(wrapper.vm.showPageMessage).toBe(true)
-              expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title')
+              expect(wrapper.find('.test-message-headline').text()).toBe('message.title')
-              expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.email')
+              expect(wrapper.find('.test-message-subtitle').text()).toBe('message.email')
               expect(wrapper.find('.test-message-button').text()).toBe('login')
             })
 

frontend/src/pages/ForgotPassword.vue

@@ -26,8 +26,8 @@
     </b-container>
     <b-container v-else>
       <message
-        :headline="success ? $t('site.thx.title') : $t('site.thx.errorTitle')"
+        :headline="success ? $t('message.title') : $t('message.errorTitle')"
-        :subtitle="success ? $t('site.thx.email') : $t('error.email-already-sent')"
+        :subtitle="success ? $t('message.email') : $t('error.email-already-sent')"
         :buttonText="$t('login')"
         linkTo="/login"
       />

frontend/src/pages/Login.spec.js

@@ -198,8 +198,8 @@ describe('Login', () => {
 
           it('shows error title, subtitle, login button', () => {
             expect(wrapper.vm.showPageMessage).toBe(true)
-            expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
+            expect(wrapper.find('.test-message-headline').text()).toBe('message.errorTitle')
-            expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.activateEmail')
+            expect(wrapper.find('.test-message-subtitle').text()).toBe('message.activateEmail')
             expect(wrapper.find('.test-message-button').text()).toBe('settings.password.reset')
           })
 
@@ -227,8 +227,8 @@ describe('Login', () => {
 
           it('shows error title, subtitle, login button', () => {
             expect(wrapper.vm.showPageMessage).toBe(true)
-            expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
+            expect(wrapper.find('.test-message-headline').text()).toBe('message.errorTitle')
-            expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.unsetPassword')
+            expect(wrapper.find('.test-message-subtitle').text()).toBe('message.unsetPassword')
             expect(wrapper.find('.test-message-button').text()).toBe('settings.password.reset')
           })
 

frontend/src/pages/Login.vue

@@ -41,7 +41,7 @@
     </b-container>
     <b-container v-else>
       <message
-        :headline="$t('site.thx.errorTitle')"
+        :headline="$t('message.errorTitle')"
         :subtitle="errorSubtitle"
         :buttonText="$t('settings.password.reset')"
         :linkTo="errorLinkTo"
@@ -107,12 +107,12 @@ export default {
         .catch((error) => {
           if (error.message.includes('User email not validated')) {
             this.showPageMessage = true
-            this.errorSubtitle = this.$t('site.thx.activateEmail')
+            this.errorSubtitle = this.$t('message.activateEmail')
             this.errorLinkTo = '/forgot-password'
             this.toastError(this.$t('error.no-account'))
           } else if (error.message.includes('User has no password set yet')) {
             this.showPageMessage = true
-            this.errorSubtitle = this.$t('site.thx.unsetPassword')
+            this.errorSubtitle = this.$t('message.unsetPassword')
             this.errorLinkTo = '/reset-password/login'
             this.toastError(this.$t('error.no-account'))
           } else if (error.message.includes('No user with this credentials')) {

frontend/src/pages/Register.spec.js

@@ -202,8 +202,8 @@ describe('Register', () => {
 
         it('shows success title, subtitle', () => {
           expect(wrapper.vm.showPageMessage).toBe(true)
-          expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title')
+          expect(wrapper.find('.test-message-headline').text()).toBe('message.title')
-          expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.register')
+          expect(wrapper.find('.test-message-subtitle').text()).toBe('message.register')
         })
 
         it('button is not present', () => {

frontend/src/pages/Register.vue

@@ -90,7 +90,7 @@
       </validation-observer>
     </b-container>
     <b-container v-else>
-      <message :headline="$t('site.thx.title')" :subtitle="$t('site.thx.register')" />
+      <message :headline="$t('message.title')" :subtitle="$t('message.register')" />
     </b-container>
   </div>
 </template>

frontend/src/pages/ResetPassword.spec.js

@@ -120,7 +120,7 @@ describe('ResetPassword', () => {
 
           it('shows error title, subtitle, login button', () => {
             expect(wrapper.vm.showPageMessage).toBe(true)
-            expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
+            expect(wrapper.find('.test-message-headline').text()).toBe('message.errorTitle')
             expect(wrapper.find('.test-message-subtitle').text()).toBe(
               '...email was sent more than 23 hours and 10 minutes ago',
             )
@@ -158,7 +158,7 @@ describe('ResetPassword', () => {
 
           it('shows error title, subtitle, login button', () => {
             expect(wrapper.vm.showPageMessage).toBe(true)
-            expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
+            expect(wrapper.find('.test-message-headline').text()).toBe('message.errorTitle')
             expect(wrapper.find('.test-message-subtitle').text()).toBe('Error')
             expect(wrapper.find('.test-message-button').text()).toBe('settings.password.reset')
           })
@@ -207,8 +207,8 @@ describe('ResetPassword', () => {
 
           it('shows message title, subtitle, login button', () => {
             expect(wrapper.vm.showPageMessage).toBe(true)
-            expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title')
+            expect(wrapper.find('.test-message-headline').text()).toBe('message.title')
-            expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.checkEmail')
+            expect(wrapper.find('.test-message-subtitle').text()).toBe('message.checkEmail')
             expect(wrapper.find('.test-message-button').text()).toBe('login')
           })
 
@@ -239,8 +239,8 @@ describe('ResetPassword', () => {
 
           it('shows message title, subtitle, login button', () => {
             expect(wrapper.vm.showPageMessage).toBe(true)
-            expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title')
+            expect(wrapper.find('.test-message-headline').text()).toBe('message.title')
-            expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.reset')
+            expect(wrapper.find('.test-message-subtitle').text()).toBe('message.reset')
             expect(wrapper.find('.test-message-button').text()).toBe('login')
           })
 

frontend/src/pages/ResetPassword.vue

@@ -84,10 +84,10 @@ export default {
           this.form.passwordRepeat = ''
 
           this.showPageMessage = true
-          this.messageHeadline = this.$t('site.thx.title')
+          this.messageHeadline = this.$t('message.title')
           this.messageSubtitle = this.$route.path.includes('checkEmail')
-            ? this.$t('site.thx.checkEmail')
+            ? this.$t('message.checkEmail')
-            : this.$t('site.thx.reset')
+            : this.$t('message.reset')
           this.messageButtonText = this.$t('login')
           this.messageButtonLinktTo = '/login'
         })
@@ -103,7 +103,7 @@ export default {
             errorMessage = error.message
           }
           this.showPageMessage = true
-          this.messageHeadline = this.$t('site.thx.errorTitle')
+          this.messageHeadline = this.$t('message.errorTitle')
           this.messageSubtitle = errorMessage
           this.messageButtonText = this.$t('settings.password.reset')
           this.messageButtonLinktTo = '/forgot-password/resetPassword'