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 d850e8e6046ac2ec40632215a8ea151b01194868..edf0f7187d8484df6976c0fa349a4cfd6bf23326 100644 (file)
--- 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 b5c8f78a7fc529bff16eb2255ceff4c4898384c5..4faa93fd6ee76e12043e782f052be87474f50bf4 100644 (file)
--- 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 08f223d9223e26f47c2f61504373da6ac25407b1..cc44ad7f071947789d9244bf28fc373c24113715 100644 (file)
--- 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" ?>\r
+<ui:composition\r
+       xmlns="http://www.w3.org/1999/xhtml"\r
+       xmlns:f="http://xmlns.jcp.org/jsf/core"\r
+       xmlns:h="http://xmlns.jcp.org/jsf/html"\r
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">\r
+\r
+       <h:outputText styleClass="errors" value="#{msg.ADMIN_USER_DATA_PASSWORD_NOTICE}" rendered="#{empty mode}" />\r
+\r
+       <ui:fragment rendered="#{not empty mode}">\r
+               <div class="para">\r
+                       <fieldset id="login_data">\r
+                               <legend title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}">#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}</legend>\r
+\r
+                               <div class="table_row">\r
+                                       <div class="table_left_medium">\r
+                                               <h:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />\r
+                                       </div>\r
+\r
+                                       <div class="table_right">\r
+                                               <h:inputText class="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />\r
+                                       </div>\r
+\r
+                                       <div class="clear"></div>\r
+                               </div>\r
+\r
+                               <div class="para"></div>\r
+\r
+                               <ui:fragment rendered="#{mode == 'add'}">\r
+                                       <div class="table_row">\r
+                                               <div class="table_left_medium">\r
+                                                       <h:outputLabel for="emailAddress" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_EMAIL_ADDRESS}" />\r
+                                               </div>\r
+\r
+                                               <div class="table_right">\r
+                                                       <h:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" required="true" />\r
+                                               </div>\r
+\r
+                                               <div class="clear"></div>\r
+                                       </div>\r
+\r
+                                       <div class="para"></div>\r
+                               </ui:fragment>\r
+\r
+                               <div class="table_row">\r
+                                       <div class="table_left">\r
+                                               <h:outputLabel for="password1" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD1}" />\r
+                                       </div>\r
+\r
+                                       <div class="table_right">\r
+                                               <h:inputSecret class="input" id="password1" size="10" maxlength="255" value="#{adminUserController.userPassword}" />\r
+                                       </div>\r
+\r
+                                       <div class="clear"></div>\r
+                               </div>\r
+\r
+                               <div class="table_row">\r
+                                       <div class="table_left">\r
+                                               <h:outputLabel for="password2" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD2}" />\r
+                                       </div>\r
+\r
+                                       <div class="table_right">\r
+                                               <h:inputSecret class="input" id="password2" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />\r
+                                       </div>\r
+\r
+                                       <div class="clear"></div>\r
+                               </div>\r
+\r
+                               <div class="para notice">\r
+                                       <ul>\r
+                                               <li>#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}</li>\r
+\r
+                                               <li>\r
+                                                       <h:outputText value="#{msg.ADMIN_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />\r
+                                                       <h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_ADD_NOTICE}" rendered="#{mode == 'add'}" />\r
+                                               </li>\r
+\r
+                                               <ui:fragment rendered="#{mode == 'add'}">\r
+                                                       <li>\r
+                                                               <h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_ADDRESS_NOTICE}" />\r
+                                                       </li>\r
+                                               </ui:fragment>\r
+                                       </ul>\r
+                               </div>\r
+                       </fieldset>\r
+               </div>\r
+       </ui:fragment>\r
+</ui:composition>\r