Continued a bit: (please cherry-pick)

- variable was not fully renamed, fixed
- renamed countryI18nkey -> countryI18nKey
- fixed name of context property (was shortended)

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
index 63020e782534342b3f63eafe1d8a252dbd054dc7..a0d729a0ae255e88ec6eec78fe78d1bea548bdda 100644 (file)
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -170,7 +170,7 @@
                                        <h:selectOneMenu  styleClass="select" id="country" value="#{adminContactController.country}">
                                                <f:converter converterId="CountryConverter" />
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nkey]})" />
+                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
                                        </h:selectOneMenu>
                                </div>
 

diff --git a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
index 597d477048af52bc3945fdad3c4e241a844dcaa0..0b2fd8f80491e1480f88ac066021550d01a3fae1 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
+++ b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
@@ -67,7 +67,7 @@
                                <div class="table_right_medium">
                                        <h:selectOneMenu styleClass="select" id="providerCountry" value="#{adminMobileProviderController.providerCountry}">
                                                <f:converter converterId="CountryConverter" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nkey]})" />
+                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
                                        </h:selectOneMenu>
                                </div>
 

diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index c878ceb54156090f759c2b536092b4d3343e02e1..2340f122d1f2e8891a69a60c57ada6d99682528e 100644 (file)
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -185,7 +185,7 @@
                                        <h:selectOneMenu styleClass="select" id="country" value="#{contactController.country}">
                                                <f:converter converterId="CountryConverter" />
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nkey]})" />
+                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
                                        </h:selectOneMenu>
                                </div>
 

diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index 75a17588df84ab7509db5c959d2426bdbdbf2a62..3db8bbd35ab7ad05b452db1aef76268b24de9297 100644 (file)
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -19,8 +19,8 @@
     </context-param>
     <context-param>
         <description>Whether "resend confirmation link" is enabled.</description>
-        <param-name>is_feature_user_resend_confirm_link_enabled</param-name>
-        <param-value>false</param-value>
+        <param-name>is_feature_user_resend_confirmation_link_enabled</param-name>
+        <param-value>true</param-value>
     </context-param>
     <context-param>
         <description>Whether default timezon is set from system's timezone</description>

diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml
index 26b383ae5e7ba08b058e1b07cdf3f5b0ecc88e0d..6e6b3e7e51137db4b02da51f2d792b9ac216be5e 100644 (file)
--- a/web/admin/country/admin_country_list.xhtml
+++ b/web/admin/country/admin_country_list.xhtml
@@ -47,7 +47,7 @@
                                                <h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME}" />
                                        </f:facet>
 
-                                       <h:outputText value="#{msg[country.countryI18nkey]}" />
+                                       <h:outputText value="#{msg[country.countryI18nKey]}" />
                                </h:column>
                        </h:dataTable>
 

diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
index 8d30d8b19be303bc2db7e134e6d39b7c6d336971..d14802947373b9d28080f61fecabc0545e4d08b1 100644 (file)
--- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -47,7 +47,7 @@
                                                <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}" />
                                        </f:facet>
 
-                                       <h:outputText value="#{msg[mobile.providerCountry.countryI18nkey]}" />
+                                       <h:outputText value="#{msg[mobile.providerCountry.countryI18nKey]}" />
                                </h:column>
 
                                <h:column>

diff --git a/web/customer/empty_basket.xhtml b/web/customer/empty_basket.xhtml
index c27205a26cc17e962b532b1b83fe70d2f899071a..382a2f79520d022ecc14e510bcf92422e96975b0 100644 (file)
--- a/web/customer/empty_basket.xhtml
+++ b/web/customer/empty_basket.xhtml
@@ -15,50 +15,46 @@
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
-                               <h:form id="form_resend_link">
-                                       <div class="table">
-                                               <div class="table_header">
-                                                       <h:outputText value="#{msg.GUEST_RESEND_LINK_TITLE}" />
-                                               </div>
-
-                                               <fieldset id="email_address_notice">
-                                                       <legend title="#{msg.RESEND_CONFIRMATION_LINK_LEGEND_TITLE}">
-                                                               <h:outputText value="#{msg.RESEND_CONFIRMATION_LINK_LEGEND}" />
-                                                       </legend>
+                       <h:form id="form_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
+                               <div class="table">
+                                       <div class="table_header">
+                                               <h:outputText value="#{msg.GUEST_RESEND_LINK_TITLE}" />
+                                       </div>
 
-                                                       <div class="table_row">
-                                                               <div class="table_left">
-                                                                       <h:outputLabel for="resendEmailAddress" value="#{msg.GUEST_RESEND_LINK_ENTER_EMAIL_ADDRESS}" />
-                                                               </div>
+                                       <fieldset id="email_address_notice">
+                                               <legend title="#{msg.RESEND_CONFIRMATION_LINK_LEGEND_TITLE}">
+                                                       <h:outputText value="#{msg.RESEND_CONFIRMATION_LINK_LEGEND}" />
+                                               </legend>
 
-                                                               <div class="table_right">
-                                                                       <h:inputText styleClass="input" id="resendEmailAddress" size="20" maxlength="255" value="#{resendController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
-                                                                               <f:validator validatorId="EmailAddressValidator" />
-                                                                       </h:inputText>
-                                                               </div>
+                                               <div class="table_row">
+                                                       <div class="table_left">
+                                                               <h:outputLabel for="resendEmailAddress" value="#{msg.GUEST_RESEND_LINK_ENTER_EMAIL_ADDRESS}" />
                                                        </div>
-                                               </fieldset>
 
-                                               <div>
-                                                       <h:message for="resendEmailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                                                       <div class="table_right">
+                                                               <h:inputText styleClass="input" id="resendEmailAddress" size="20" maxlength="255" value="#{resendController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
+                                                                       <f:validator validatorId="EmailAddressValidator" />
+                                                               </h:inputText>
+                                                       </div>
                                                </div>
+                                       </fieldset>
 
-                                               <div class="table_row">
-                                                       <h:outputText value="#{msg.GUEST_RESEND_CONFIRMATION_LINK_NOTICE}" />
-                                               </div>
+                                       <div>
+                                               <h:message for="resendEmailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                                       </div>
 
-                                               <div class="table_footer">
-                                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton styleClass="submit" type="submit" id="resend_link" value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}" action="#{resendController.doResendLink()}" />
-                                               </div>
+                                       <div class="table_row">
+                                               <h:outputText value="#{msg.GUEST_RESEND_CONFIRMATION_LINK_NOTICE}" />
+                                       </div>
+
+                                       <div class="table_footer">
+                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton styleClass="submit" type="submit" id="resend_link" value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}" action="#{resendController.doResendLink()}" />
                                        </div>
-                               </h:form>
-                       </ui:fragment>
+                               </div>
+                       </h:form>
 
-                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}">
-                               <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" />
-                       </ui:fragment>
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/guest/user/register_done.xhtml b/web/guest/user/register_done.xhtml
index c4e8ab67142ab7bbb45dabdb3bf07791f8a6df16..5a4d6080c7f5b9c62b1ae5fc2d14f67ca96fd298 100644 (file)
--- a/web/guest/user/register_done.xhtml
+++ b/web/guest/user/register_done.xhtml
@@ -20,9 +20,7 @@
                        </div>
 
                        <div class="registration_form">
-                               <h:link id="resend_link" styleClass="resend_link" value="#{msg.LINK_GUEST_RESENT_CONFIRMATION_LINK}" outcome="user_resend_link">
-                                       <f:param name="user_id" value="#{userController.userId}" />
-                               </h:link>
+                               <h:link id="resend_link" styleClass="resend_link" value="#{msg.LINK_GUEST_RESEND_CONFIRMATION_LINK}" outcome="user_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
                        </div>
                </ui:define>
        </ui:composition>