]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Sat, 29 Jul 2017 21:53:00 +0000 (23:53 +0200)
committerRoland Häder <roland@mxchange.org>
Sat, 29 Jul 2017 21:53:50 +0000 (23:53 +0200)
- added missing i18n string
- removed double error message

Signed-off-by: Roland Häder <roland@mxchange.org>
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/guest/user/user_register.xhtml

index 58166a0e6930fa64945bcefeeedf8cfd99885fab..0b4d0fb4d1525fabe33d9a2888d0e14efd8ad19c 100644 (file)
@@ -842,3 +842,4 @@ ADMIN_BUSINESS_DATA_COMPANY_LEGAL_STATUS=Rechtsform (z.B. GmbH):
 ADMIN_BUSINESS_DATA_COMPANY_EMAIL_ADDRESS=Haupt-Email-Adresse:
 #@TODO Please fix German umlauts!
 BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON=Basisdaten hinzufuegen
+ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED=Fehler: Falscher Aufruf der Anmeldeseite, da die Eingangsseite als Anmeldeseite fungiert.
index 32a3b325e68ffa4f4d2b13fa9ad0ea1e648e1e57..81b8ef1c4ab5d5a62f53ae4222559f7fd542cba6 100644 (file)
@@ -819,3 +819,5 @@ ADMIN_BUSINESS_DATA_COMPANY_NAME_REQUIRED=Please enter the company's name withou
 ADMIN_BUSINESS_DATA_COMPANY_LEGAL_STATUS=Legal status (e.g. Inc.):
 ADMIN_BUSINESS_DATA_COMPANY_EMAIL_ADDRESS=Main email address:
 BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON=Add basic data
+#Fehler: Falscher Aufruf der Anmeldeseite, da die Eingangsseite als Anmeldeseite fungiert.
+ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED=Error: Wrong request on registration page as the index page serves as registration page.
index f4f92255eb9f4268378ecafd03634b91ef662336..ea28524e7bc78a05a12ad8d94cd8a5068d47aa0b 100644 (file)
                                <ui:param name="styleClass" value="errors" />
                        </ui:include>
                </ui:fragment>
-
-               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
        </ui:define>
 
        <ui:define name="content" rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}">