diff --git a/src/app/components/main-chat/show-channel-member/open-send-prv-message-window/open-send-prv-message-window.component.html b/src/app/components/main-chat/show-channel-member/open-send-prv-message-window/open-send-prv-message-window.component.html index 9d16c5e..ad98649 100644 --- a/src/app/components/main-chat/show-channel-member/open-send-prv-message-window/open-send-prv-message-window.component.html +++ b/src/app/components/main-chat/show-channel-member/open-send-prv-message-window/open-send-prv-message-window.component.html @@ -35,7 +35,7 @@
-

{{ "open-send-prv-message.adress" | translate }}

+

{{ "open-send-prv-message.address" | translate }}

{{ i.email }} diff --git a/src/app/components/main-login/login/login.component.html b/src/app/components/main-login/login/login.component.html index 9e6deaa..0e65064 100644 --- a/src/app/components/main-login/login/login.component.html +++ b/src/app/components/main-login/login/login.component.html @@ -69,7 +69,7 @@
- {{ "login.midSeperator" | translate }} + {{ "login.midSeparator" | translate }}
diff --git a/src/app/components/main-login/password-forget/password-forget.component.html b/src/app/components/main-login/password-forget/password-forget.component.html index 7cf2d32..d2071b7 100644 --- a/src/app/components/main-login/password-forget/password-forget.component.html +++ b/src/app/components/main-login/password-forget/password-forget.component.html @@ -30,7 +30,7 @@ id="email" name="email" type="email" - placeholder="{{ 'passwordForget.inputfield' | translate }}" + placeholder="{{ 'passwordForget.inputField' | translate }}" required [ngClass]="{ aktivInput: emailField.valid && emailField.touched }" pattern="[^@]+@[^.]+\..+" diff --git a/src/app/components/main-login/password-reset/password-reset.component.html b/src/app/components/main-login/password-reset/password-reset.component.html index 5b39ee8..fb07b14 100644 --- a/src/app/components/main-login/password-reset/password-reset.component.html +++ b/src/app/components/main-login/password-reset/password-reset.component.html @@ -27,7 +27,7 @@ minlength="6" [(ngModel)]="password" name="password" - placeholder="{{ 'passwordReset.inputfield' | translate }}" + placeholder="{{ 'passwordReset.inputField' | translate }}" type="password" id="message" required @@ -51,7 +51,7 @@ minlength="6" [(ngModel)]="passwordRepeat" name="passwordRepeat" - placeholder="{{ 'passwordReset.inputfield2' | translate }}" + placeholder="{{ 'passwordReset.inputField2' | translate }}" id="message" type="password" required diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 3c2612a..9a227e5 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -3,20 +3,20 @@ "header": "Anmeldung", "infoText": "Wir empfehlen dir, die E-Mail-Adresse zu nutzen, die du bei der Arbeit verwendest.", "inputField": "beispielname@email.com", - "inputField2": "Passwort", + "inputField1": "Passwort", "midText": "Passwort vergessen?", - "midSeperator": "ODER", + "midSeparator": "ODER", "googleBtn": "Anmeldung mit Google", "BtnLeft": "Anmelden", "BtnRight": "Gäste-Login", "topText": "Neu bei DABubble?", "topText2": "Konto erstellen", - "errorText": "*Email ist erforderlich.", - "errorText2": "*Passwort ist erforderlich.", - "errorText3": "*Ungültige Anmeldeinformationen.", - "errorText4": "*Zuviele fehlgeschlagener Anmeldeversuche.", - "errorText5": "*Bitte Überprüfe deine Eingaben.", - "errorText6": "*Bitte versuchen Sie es später erneut.", + "errorText": "Email ist erforderlich.", + "errorText2": "Passwort ist erforderlich.", + "errorText3": "Ungültige Anmeldeinformationen.", + "errorText4": "Zu viele fehlgeschlagener Anmeldeversuche.", + "errorText5": "Bitte Überprüfe deine Eingaben.", + "errorText6": "Bitte versuchen Sie es später erneut.", "loginDialog0": "Einloggen", "loginDialog1": "Bitte warten..." }, @@ -31,9 +31,9 @@ "midText2": "Datenschutzerklärung", "midText3": "zu.", "Btn": "Weiter", - "errorText": "*Name ist erforderlich.", - "errorText2": "*Email ist erforderlich.", - "errorText3": "*Bitte geben Sie ein Passwort ein (mind. 6 Zeichen)." + "errorText": "Name ist erforderlich.", + "errorText2": "Email ist erforderlich.", + "errorText3": "Bitte geben Sie ein Passwort ein (mind. 6 Zeichen)." }, "chooseAvatar": { @@ -47,27 +47,27 @@ "passwordForget": { "header": "Passwort zurücksetzen", "infoText": "Bitte geben Sie Ihre E-Mail-Adresse ein.", - "inputfield": "beispielname@email.com", + "inputField": "beispielname@email.com", "infoTextBottom": "Wir senden Ihnen eine E-Mail, Über die Sie Ihr Passwort ändern können.", "Btn": "E-Mail senden", - "errorText": "*Email ist erforderlich." + "errorText": "Email ist erforderlich." }, "passwordReset": { "header": "Passwort zurücksetzen", - "inputfield": "Neues Passwort", - "inputfield2": "Neues Passwort bestätigen", + "inputField": "Neues Passwort", + "inputField2": "Neues Passwort bestätigen", "Btn": "Passwort ändern", - "errorText": "*Bitte geben Sie ein neus Passwort ein (mind.6 Zeichen).", - "errorText2": "*Die Passwörter stimmen nicht überein." + "errorText": "Bitte geben Sie ein neues Passwort ein (mind.6 Zeichen).", + "errorText2": "Die Passwörter stimmen nicht überein." }, - "channel-informations": { + "channel-information": { "header": "Kanal Name", "channelInfo": "Beschreibung", "channelInfo2": "keine Beschreibung.", "channelMadeBy": "Erstellt von", - "channelErrorText": "*Nur der Ersteller kann den Kanal bearbeiten", + "channelErrorText": "Nur der Ersteller kann den Kanal bearbeiten", "members": "Mitglieder", "leave": "Kanal verlassen" }, @@ -97,7 +97,7 @@ "profil": "Profil", "aktiv": "Aktiv", "offline": "Offline", - "adress": "E-Mail-Address", + "address": "E-Mail Adresse", "message": "Nachricht" }, @@ -136,7 +136,7 @@ "add-new-channel": { "header": "Kanal erstellen", - "info": "Kanäls dienen ihrem Team zur Kommuniktaion. Am besten sollten sie themenbezogen sein #marketing zum Beispiel.", + "info": "Kanäle dienen ihrem Team zur Kommunikation. Am besten sollten sie themenbezogen sein #marketing zum Beispiel.", "header2": "Kanal-Name", "required": "(erforderlich)", "placeholder": "(mind. 6 Buchstaben)", @@ -174,15 +174,15 @@ "fullName": "Vollständiger Name", "placeholder": "Ihr Name (min. 3 Buchstaben)", "placeholder2": "Ihre E-Mail-Adresse", - "email": "E-Mail-Addresse", + "email": "E-Mail Adresse", "cancel": "Abbrechen", "save": "Speichern", - "errorMessage": "* Änderungen am Gast Profil sind nicht möglich." + "errorMessage": "Änderungen am Gast Profil sind nicht möglich." }, "edit-user": { "edit": "bearbeiten", - "email": "E-Mail-Addresse" + "email": "E-Mail Adresse" }, "search-bar": { @@ -212,7 +212,7 @@ }, "user": { - "email": "E-Mail-Addresse", + "email": "E-Mail Adresse", "message": "Direktnachrichten" }, diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 2d822dd..5ca8abb 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -5,18 +5,18 @@ "inputField": "example.name@email.com", "inputField2": "Password", "midText": "Forgot password?", - "midSeperator": "OR", + "midSeparator": "OR", "googleBtn": "Sign in with Google", "BtnLeft": "Login", "BtnRight": "Guest Login", "topText": "New to DABubble?", "topText2": "Create account", - "errorText": "*Email is required.", - "errorText2": "*Password is required.", - "errorText3": "*Invalid login credentials.", - "errorText4": "*Too many failed login attempts.", - "errorText5": "*Please check your entries.", - "errorText6": "*Please try again later.", + "errorText": "Email is required.", + "errorText2": "Password is required.", + "errorText3": "Invalid login credentials.", + "errorText4": "Too many failed login attempts.", + "errorText5": "Please check your entries.", + "errorText6": "Please try again later.", "loginDialog0": "Logging in", "loginDialog1": "Please wait..." }, @@ -31,9 +31,9 @@ "midText2": "Privacy Policy", "midText3": ".", "Btn": "Continue", - "errorText": "*Name is required.", - "errorText2": "*Email is required.", - "errorText3": "*Please enter a password (at least 6 characters)." + "errorText": "Name is required.", + "errorText2": "Email is required.", + "errorText3": "Please enter a password (at least 6 characters)." }, "chooseAvatar": { @@ -47,27 +47,27 @@ "passwordForget": { "header": "Reset Password", "infoText": "Please enter your email address.", - "inputfield": "example.name@email.com", + "inputField": "example.name@email.com", "infoTextBottom": "We will send you an email to change your password.", "Btn": "Send Email", - "errorText": "*Email is required." + "errorText": "Email is required." }, "passwordReset": { "header": "Reset Password", - "inputfield": "New Password", - "inputfield2": "Confirm New Password", + "inputField": "New Password", + "inputField2": "Confirm New Password", "Btn": "Change Password", - "errorText": "*Please enter a new password (at least 6 characters).", - "errorText2": "*The passwords do not match." + "errorText": "Please enter a new password (at least 6 characters).", + "errorText2": "The passwords do not match." }, - "channel-informations": { + "channel-information": { "header": "Channel Name", "channelInfo": "Description", "channelInfo2": "no description.", "channelMadeBy": "Created by", - "channelErrorText": "*Only the creator can edit the channel", + "channelErrorText": "Only the creator can edit the channel", "members": "Members", "leave": "Leave Channel" }, @@ -97,7 +97,7 @@ "profil": "Profile", "aktiv": "Active", "offline": "Offline", - "adress": "Email Address", + "address": "Email Address", "message": "Message" }, @@ -123,7 +123,7 @@ "single-chat": { "edit": "(edited)", - "answer": "Replys", + "answer": "Reply's", "answer2": "Reply", "answer3": "Last reply:", "answer4": "Reply..." @@ -177,7 +177,7 @@ "email": "Email Address", "cancel": "Cancel", "save": "Save", - "errorMessage": "* Changes to the guest profile are not possible." + "errorMessage": "Changes to the guest profile are not possible." }, "edit-user": {