From: Roland Häder <roland@mxchange.org>
Date: Tue, 2 Aug 2016 13:57:50 +0000 (+0200)
Subject: Continued a bit: (please cherry-pick)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bf86e19bebf72b0a11c2dbdbb43df42d576c69d9;p=jfinancials-war.git

Continued a bit: (please cherry-pick)
- variable was not fully renamed, fixed
---

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 59d5d2bd..d3d6af9a 100644
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -220,7 +220,7 @@
 					<h:selectOneMenu styleClass="select" id="countryPhoneCode" value="#{adminContactController.phoneCountry}">
 						<f:converter converterId="CountryConverter" />
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
+						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
 					</h:selectOneMenu>
 
 					<h:inputText styleClass="input" id="phoneAreaCode" size="5" maxlength="10" value="#{adminContactController.phoneAreaCode}">
@@ -244,7 +244,7 @@
 					<h:selectOneMenu styleClass="select" id="faxCountryCode" value="#{adminContactController.faxCountry}">
 						<f:converter converterId="CountryConverter" />
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
+						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
 					</h:selectOneMenu>
 
 					<h:inputText styleClass="input" id="faxAreaCode" size="5" maxlength="10" value="#{adminContactController.faxAreaCode}">
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 b53e1d90..597d4770 100644
--- 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[c.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 5c8363b2..adf10ba6 100644
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -215,7 +215,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[c.countryI18nkey]})" />
+						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nkey]})" />
 					</h:selectOneMenu>
 				</div>
 
@@ -235,7 +235,7 @@
 					<h:selectOneMenu styleClass="select" id="countryPhoneCode" value="#{contactController.phoneCountry}">
 						<f:converter converterId="CountryConverter" />
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
+						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
 					</h:selectOneMenu>
 
 					<h:inputText styleClass="input" id="phoneAreaCode" size="5" maxlength="10" value="#{contactController.phoneAreaCode}">
@@ -259,7 +259,7 @@
 					<h:selectOneMenu styleClass="select" id="faxCountryCode" value="#{contactController.faxCountry}">
 						<f:converter converterId="CountryConverter" />
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
+						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
 					</h:selectOneMenu>
 
 					<h:inputText styleClass="input" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
diff --git a/web/WEB-INF/templates/generic/mobile_selection_box.tpl b/web/WEB-INF/templates/generic/mobile_selection_box.tpl
index 2985f768..fd7e654a 100644
--- a/web/WEB-INF/templates/generic/mobile_selection_box.tpl
+++ b/web/WEB-INF/templates/generic/mobile_selection_box.tpl
@@ -9,7 +9,7 @@
 		<h:selectOneMenu styleClass="select" id="cellphoneCarrier" value="#{targetController.cellphoneCarrier}">
 			<f:converter converterId="MobileProviderConverter" />
 			<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-			<f:selectItems value="#{mobileProviderController.allMobileProvider()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{p.providerDialPrefix} (#{p.providerName})" />
+			<f:selectItems value="#{mobileProviderController.allMobileProvider()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
 		</h:selectOneMenu>
 
 		<h:inputText styleClass="input" id="cellphoneNumber" size="10" maxlength="20" value="#{targetController.cellphoneNumber}">