diff --git a/login/Change_PW.aspx b/login/Change_PW.aspx
index c220abf..d1f058a 100644
--- a/login/Change_PW.aspx
+++ b/login/Change_PW.aspx
@@ -246,7 +246,7 @@
|
-
+
|
@@ -258,7 +258,7 @@
|
-
+
|
@@ -269,7 +269,7 @@
|
-
+
|
@@ -292,7 +292,7 @@
|
-
+
|
@@ -300,24 +300,24 @@
|
-
+
|
|
- The Password has to contain:
+ The Password has to contain:
|
-
- 1 Upper- and 1 lowercase letter
+ 1 Upper- and 1 lowercase letter
-
- and one special letter
+ and one special letter
-
- between 4 and 30 characters.
+ between 4 and 30 characters.
@@ -325,7 +325,7 @@
|
-
+
|
diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index d84af20..afd107a 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -87,7 +87,7 @@
width: 390px;
height: 613px;
margin: 0 auto;
- margin-top: 50%;
+ margin-top: 25%;
margin-left: 5%;
}
.container-fluid {
@@ -105,8 +105,7 @@
font-size: 11px;
border: 1px solid gray;
width: 395px;
- height: 713px;
-
+ height: 713px;
}
#lbl_Ueberschrift_M {
background-color: #003680;
@@ -350,7 +349,7 @@
-
+
|
@@ -367,7 +366,7 @@
|
|
-
+
|
diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb
index 7cf2889..e6cce68 100644
--- a/login/ForgotPW.aspx.vb
+++ b/login/ForgotPW.aspx.vb
@@ -61,18 +61,18 @@ Partial Class ForgotPW
If regexval_txt_Email.IsValid = False Then
regexval_txt_Email.ForeColor = Drawing.Color.OrangeRed
VERAG_VARIABLES.seterrorcount(2)
- regexval_txt_Email.ErrorMessage = VERAG_VARIABLES.geterrornumb + "Anmerkung: Die Domäne ist nicht die korrekt hinterlegte."
+ regexval_txt_Email.ErrorMessage = VERAG_VARIABLES.geterrornumb + "Annotation: The Domain is not valid!"
regexval_txt_Email_2.Validate()
If regexval_txt_Email_2.IsValid = True Then
email = txtEmail.Text
lblMessage.ForeColor = Drawing.Color.Lime
- lblMessage.Text = "E-mail Addresse ist validiert.."
+ lblMessage.Text = "E-mail Adresse is valid.."
End If
Else
regexval_txt_Email.Validate()
If regexval_txt_Email.IsValid = True Then
lblMessage.ForeColor = Drawing.Color.Lime
- lblMessage.Text = "E-mail Adresse ist korrekt."
+ lblMessage.Text = "E-mail Address is correct."
email = txtEmail.Text
End If
End If
@@ -86,7 +86,7 @@ Partial Class ForgotPW
Else
valid_getNumberInput.ForeColor = Drawing.Color.Red
VERAG_VARIABLES.seterrorcount(2)
- valid_getNumberInput.ErrorMessage = VERAG_VARIABLES.geterrornumb + "Die Kundennummer ist nicht numerisch oder zu lang."
+ valid_getNumberInput.ErrorMessage = VERAG_VARIABLES.geterrornumb + "The Customer-ID is not numeric or too long."
End If
End If
@@ -96,20 +96,20 @@ Partial Class ForgotPW
If check_UserName_regex.IsValid = False Then
check_UserName_regex.ForeColor = Drawing.Color.Red
VERAG_VARIABLES.seterrorcount(3)
- check_UserName_regex.ErrorMessage = VERAG_VARIABLES.geterrornumb + "Der Benutzername ist zu lange."
+ check_UserName_regex.ErrorMessage = VERAG_VARIABLES.geterrornumb + "Username is too long."
isusrnmright = False
Else
username = txt_Username.Text
isusrnmright = True
- check_UserName_regex.ForeColor = Drawing.Color.Lime
- check_UserName_regex.ErrorMessage = "Ein korrekter Benutzername ist eingegeben worden."
+ check_UserName_regex.ForeColor = Drawing.Color.Green
+ check_UserName_regex.ErrorMessage = "Username is not right."
End If
End If
Else
'MsgBox("The form has not been filled completeley.", MsgBoxStyle.Critical, "Error08")
lblMessage.ForeColor = Color.Red
VERAG_VARIABLES.seterrorcount(8)
- lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Das Formular muss vollständig ausgefüllt werden."
+ lblMessage.Text = VERAG_VARIABLES.geterrornumb + "This Form has to be filled completely."
End If
'Erweiterte Degub Msg-Box
@@ -150,7 +150,7 @@ Partial Class ForgotPW
ElseIf String.IsNullOrEmpty(txt_Username.Text) = True Then
check_UserName_regex.MatchTimeout = 3000
VERAG_VARIABLES.seterrorcount(5)
- check_UserName_regex.ErrorMessage = VERAG_VARIABLES.geterrornumb + "Kein passender Benutzername wurde in der Datenbank gefunden!"
+ check_UserName_regex.ErrorMessage = VERAG_VARIABLES.geterrornumb + "No Username was !"
isusrnmright = False
Try
check_UserName_regex.Validate()
@@ -162,17 +162,17 @@ Partial Class ForgotPW
email = txtEmail.Text
lblMessage.ForeColor = Color.Green
isemailright = True
- lblMessage.Text = "Die Email besteht in der Datenbank."
+ lblMessage.Text = "This email is from you!"
ElseIf String.IsNullOrEmpty(email) = True Then
lblMessage.ForeColor = Color.Red
isemailright = False
VERAG_VARIABLES.seterrorcount(6)
- lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Die eingegebene E-Mail passt nicht zum Datenbankeintrag. Bitte erneut versuchen."
+ lblMessage.Text = VERAG_VARIABLES.geterrornumb + "The e-mail does not match with the given User."
Else
lblMessage_M.ForeColor = Color.Red
isemailright = False
VERAG_VARIABLES.seterrorcount(7)
- lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Die E-Mail existiert in unserer Datenbank nicht."
+ lblMessage.Text = VERAG_VARIABLES.geterrornumb + "This e-mail address does not exist."
End If
If (txt_CustomerID.Text = dr("KundenNr").ToString() AndAlso String.IsNullOrEmpty(txt_CustomerID_M.Text) = True) And String.IsNullOrEmpty(UserID) = False Then
customerID = txt_CustomerID.Text
@@ -182,16 +182,16 @@ Partial Class ForgotPW
lblMessage_M.ForeColor = Color.Red
isCustomeridright = False
VERAG_VARIABLES.seterrorcount(9)
- lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Die einegebene Nutzernummer steht nicht in unserer Datenbank."
+ lblMessage.Text = VERAG_VARIABLES.geterrornumb + "The Customer-ID you entered is wrong."
Else
lblMessage.ForeColor = Color.Red
isCustomeridright = False
VERAG_VARIABLES.seterrorcount(8)
- lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Die Nutzernummer ist nicht in der Datenbank vorhanden."
+ lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Not such a Customer-ID is known."
End If
Catch ex As Exception
VERAG_VARIABLES.seterrorcount(408)
- Title = VERAG_VARIABLES.geterrornumb() + "Authentifizierungs-Fehler!"
+ Title = VERAG_VARIABLES.geterrornumb() + "Authentification-Error!"
'MsgBox(Msg, Style, Title)
'If MsgBox(Msg, Style, Title).Yes Then
'txtEmail.Text = String.Empty
@@ -256,7 +256,7 @@ Partial Class ForgotPW
Else
lblMessage.ForeColor = Drawing.Color.Red
VERAG_VARIABLES.seterrorcount(13)
- lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Datenbankverbindungsfehler." + Environment.NewLine + "Bitte den Admin kontaktieren."
+ lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Datenbankverbindungsfehler."
End If
Catch Exc As Exception
lblMessage.ForeColor = Drawing.Color.Red