From: Roland Häder <roland@mxchange.org>
Date: Tue, 3 May 2016 14:10:24 +0000 (+0200)
Subject: renamed i18n string, generic now
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=83d017cd75887583213e246ef5be2a6a0cdf56cf;p=jjobs-war.git

renamed i18n string, generic now
---

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index d850e8e6..edf0f718 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -437,7 +437,7 @@ ADMIN_LINK_EDIT_CONTACT=Kontaktdaten editieren
 ADMIN_LINK_EDIT_CONTACT_TITLE=Hier k\u00f6nnen Sie die Kontaktdaten editieren.
 BUTTON_ADMIN_EDIT_USER=Benutzerdaten \u00e4ndern
 ADMIN_EDIT_USER_TITLE=Benutzerdaten editieren
-ADMIN_USER_DATA_PASSWORD_EDIT_NOTICE=Wenn Sie das Passwort \u00e4ndern wollen, m\u00fcssen Sie es zweimal eingeben, anderfalls beide leer lassen.
+ADMIN_DATA_PASSWORD_EDIT_NOTICE=Wenn Sie das Passwort \u00e4ndern wollen, m\u00fcssen Sie es zweimal eingeben, anderfalls beide leer lassen.
 ERROR_PARAMETER_MODE_NOT_SET=Fehler: Parameter 'modus' nicht gesetzt.
 ADMIN_EDIT_CONTACT_TITLE=Kontaktdaten editieren (Id-Nummer: {0})
 BUTTON_ADMIN_EDIT_CONTACT=Kontaktdaten \u00e4ndern
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index b5c8f78a..4faa93fd 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -415,7 +415,7 @@ ADMIN_LINK_EDIT_CONTACT=Edit contact data
 ADMIN_LINK_EDIT_CONTACT_TITLE=Here you can edit contact data.
 BUTTON_ADMIN_EDIT_USER=Change user data
 ADMIN_EDIT_USER_TITLE=Edit user data
-ADMIN_USER_DATA_PASSWORD_EDIT_NOTICE=If you want to change the password, enter it twice, otherwise leave both empty.
+ADMIN_DATA_PASSWORD_EDIT_NOTICE=If you want to change the password, enter it twice, otherwise leave both empty.
 ERROR_PARAMETER_MODE_NOT_SET=Error: Parameter 'modus' is not set.
 ADMIN_EDIT_CONTACT_TITLE=Edit contact data (id number: {0})
 BUTTON_ADMIN_EDIT_CONTACT=Change contact data
diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
index 08f223d9..cc44ad7f 100644
--- a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
@@ -1,88 +1,88 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<h:outputText styleClass="errors" value="#{msg.ADMIN_USER_DATA_PASSWORD_NOTICE}" rendered="#{empty mode}" />
-
-	<ui:fragment rendered="#{not empty mode}">
-		<div class="para">
-			<fieldset id="login_data">
-				<legend title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}">#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}</legend>
-
-				<div class="table_row">
-					<div class="table_left_medium">
-						<h:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
-					</div>
-
-					<div class="table_right">
-						<h:inputText class="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
-					</div>
-
-					<div class="clear"></div>
-				</div>
-
-				<div class="para"></div>
-
-				<ui:fragment rendered="#{mode == 'add'}">
-					<div class="table_row">
-						<div class="table_left_medium">
-							<h:outputLabel for="emailAddress" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_EMAIL_ADDRESS}" />
-						</div>
-
-						<div class="table_right">
-							<h:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" required="true" />
-						</div>
-
-						<div class="clear"></div>
-					</div>
-
-					<div class="para"></div>
-				</ui:fragment>
-
-				<div class="table_row">
-					<div class="table_left">
-						<h:outputLabel for="password1" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD1}" />
-					</div>
-
-					<div class="table_right">
-						<h:inputSecret class="input" id="password1" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
-					</div>
-
-					<div class="clear"></div>
-				</div>
-
-				<div class="table_row">
-					<div class="table_left">
-						<h:outputLabel for="password2" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD2}" />
-					</div>
-
-					<div class="table_right">
-						<h:inputSecret class="input" id="password2" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
-					</div>
-
-					<div class="clear"></div>
-				</div>
-
-				<div class="para notice">
-					<ul>
-						<li>#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}</li>
-
-						<li>
-							<h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />
-							<h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_ADD_NOTICE}" rendered="#{mode == 'add'}" />
-						</li>
-
-						<ui:fragment rendered="#{mode == 'add'}">
-							<li>
-								<h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_ADDRESS_NOTICE}" />
-							</li>
-						</ui:fragment>
-					</ul>
-				</div>
-			</fieldset>
-		</div>
-	</ui:fragment>
-</ui:composition>
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<h:outputText styleClass="errors" value="#{msg.ADMIN_USER_DATA_PASSWORD_NOTICE}" rendered="#{empty mode}" />
+
+	<ui:fragment rendered="#{not empty mode}">
+		<div class="para">
+			<fieldset id="login_data">
+				<legend title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}">#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}</legend>
+
+				<div class="table_row">
+					<div class="table_left_medium">
+						<h:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
+					</div>
+
+					<div class="table_right">
+						<h:inputText class="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
+					</div>
+
+					<div class="clear"></div>
+				</div>
+
+				<div class="para"></div>
+
+				<ui:fragment rendered="#{mode == 'add'}">
+					<div class="table_row">
+						<div class="table_left_medium">
+							<h:outputLabel for="emailAddress" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_EMAIL_ADDRESS}" />
+						</div>
+
+						<div class="table_right">
+							<h:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" required="true" />
+						</div>
+
+						<div class="clear"></div>
+					</div>
+
+					<div class="para"></div>
+				</ui:fragment>
+
+				<div class="table_row">
+					<div class="table_left">
+						<h:outputLabel for="password1" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD1}" />
+					</div>
+
+					<div class="table_right">
+						<h:inputSecret class="input" id="password1" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
+					</div>
+
+					<div class="clear"></div>
+				</div>
+
+				<div class="table_row">
+					<div class="table_left">
+						<h:outputLabel for="password2" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD2}" />
+					</div>
+
+					<div class="table_right">
+						<h:inputSecret class="input" id="password2" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
+					</div>
+
+					<div class="clear"></div>
+				</div>
+
+				<div class="para notice">
+					<ul>
+						<li>#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}</li>
+
+						<li>
+							<h:outputText value="#{msg.ADMIN_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />
+							<h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_ADD_NOTICE}" rendered="#{mode == 'add'}" />
+						</li>
+
+						<ui:fragment rendered="#{mode == 'add'}">
+							<li>
+								<h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_ADDRESS_NOTICE}" />
+							</li>
+						</ui:fragment>
+					</ul>
+				</div>
+			</fieldset>
+		</div>
+	</ui:fragment>
+</ui:composition>