Please cherry-pick:

- opps, renamed to much ...

diff --git a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
index 99df50070c0ede806007609032afa685a8818431..0dd972a2a49c857a2dbd7a50bace4d5021542bb9 100644 (file)
--- a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
+++ b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
@@ -9,7 +9,7 @@
                <h:selectOneMenu styleClass="select right_space" id="phoneCountry" value="#{targetController.phoneCountry}">
                        <f:converter converterId="CountryConverter" />
                        <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                       <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.phoneCountry}" />
+                       <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
                </h:selectOneMenu>
 
                <h:inputText styleClass="input right_space" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.phoneAreaCode}">