LPS-26840 Consolidate logic

juliocamarero · Apr 20, 2012 · e9159ac · e9159ac
1 parent 35be891
commit e9159ac
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 13 deletions.
diff --git a/portal-impl/src/com/liferay/portal/model/impl/CountryImpl.java b/portal-impl/src/com/liferay/portal/model/impl/CountryImpl.java
@@ -14,6 +14,11 @@
 
 package com.liferay.portal.model.impl;
 
+import com.liferay.portal.kernel.language.LanguageUtil;
+import com.liferay.portal.model.CountryConstants;
+
+import java.util.Locale;
+
 /**
  * @author Brian Wing Shun Chan
  */
@@ -22,4 +27,9 @@ public class CountryImpl extends CountryBaseImpl {
 	public CountryImpl() {
 	}
 
+	public String getName(Locale locale) {
+		return LanguageUtil.get(
+			locale, CountryConstants.NAME_PREFIX + getName());
+	}
+
 }
diff --git a/portal-service/src/com/liferay/portal/kernel/search/BaseIndexer.java b/portal-service/src/com/liferay/portal/kernel/search/BaseIndexer.java
@@ -1054,8 +1054,7 @@ protected List<String> getLocalizedCountryNames(Country country) {
 		Locale[] locales = LanguageUtil.getAvailableLocales();
 
 		for (Locale locale : locales) {
-			String countryName = LanguageUtil.get(
-				locale, "country." + country.getName());
+			String countryName = country.getName(locale);
 
 			countryName = countryName.toLowerCase();
 

diff --git a/portal-service/src/com/liferay/portal/model/Country.java b/portal-service/src/com/liferay/portal/model/Country.java
@@ -29,4 +29,5 @@ public interface Country extends CountryModel {
 	 *
 	 * Never modify this interface directly. Add methods to {@link com.liferay.portal.model.impl.CountryImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
 	 */
+	public java.lang.String getName(java.util.Locale locale);
 }
diff --git a/portal-service/src/com/liferay/portal/model/CountryConstants.java b/portal-service/src/com/liferay/portal/model/CountryConstants.java
@@ -27,4 +27,6 @@ public class CountryConstants {
 		PropsUtil.get(
 			PropsKeys.SQL_DATA_COM_LIFERAY_PORTAL_MODEL_COUNTRY_COUNTRY_ID));
 
+	public static final String NAME_PREFIX = "country.";
+
 }
diff --git a/portal-service/src/com/liferay/portal/model/CountryWrapper.java b/portal-service/src/com/liferay/portal/model/CountryWrapper.java
@@ -284,6 +284,10 @@ public java.lang.String toXmlString() {
 		return _country.toXmlString();
 	}
 
+	public java.lang.String getName(java.util.Locale locale) {
+		return _country.getName(locale);
+	}
+
 	/**
 	 * @deprecated Renamed to {@link #getWrappedModel}
 	 */

diff --git a/portal-service/src/com/liferay/portlet/UserAttributes.java b/portal-service/src/com/liferay/portlet/UserAttributes.java
@@ -16,7 +16,6 @@
 
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
-import com.liferay.portal.kernel.language.LanguageUtil;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.util.StringPool;
@@ -492,8 +491,7 @@ else if (name.equals(USER_HOME_INFO_POSTAL_COUNTRY)) {
 			if (_personalAddress != null) {
 				Country country = _personalAddress.getCountry();
 
-				return LanguageUtil.get(
-					_user.getLocale(), "country." + country.getName());
+				return country.getName(_user.getLocale());
 			}
 
 			return StringPool.BLANK;
@@ -636,8 +634,7 @@ else if (name.equals(USER_BUSINESS_INFO_POSTAL_COUNTRY)) {
 			if (_businessAddress != null) {
 				Country country = _businessAddress.getCountry();
 
-				return LanguageUtil.get(
-					_user.getLocale(), "country." + country.getName());
+				return country.getName(_user.getLocale());
 			}
 
 			return StringPool.BLANK;

diff --git a/portal-web/docroot/html/portlet/directory/organization_search.jsp b/portal-web/docroot/html/portlet/directory/organization_search.jsp
@@ -97,7 +97,7 @@ if (displayTerms.getParentOrganizationId() > 0) {
 				selectDesc: 'name',
 				selectId: 'countryId',
 				selectLocalizeDesc: '<%= true %>',
-				selectLocalizeDescPrefix: '<%= "country." %>',
+				selectLocalizeDescPrefix: '<%= CountryConstants.NAME_PREFIX %>',
 				selectSort: '<%= true %>',
 				selectVal: '<%= displayTerms.getCountryId() %>'
 			},

diff --git a/portal-web/docroot/html/portlet/users_admin/common/addresses.jsp b/portal-web/docroot/html/portlet/users_admin/common/addresses.jsp
@@ -127,7 +127,7 @@ else {
 						selectData: Liferay.Address.getCountries,
 						selectDesc: 'name',
 						selectLocalizeDesc: '<%= true %>',
-						selectLocalizeDescPrefix: '<%= "country." %>',
+						selectLocalizeDescPrefix: '<%= CountryConstants.NAME_PREFIX %>',
 						selectSort: '<%= true %>',
 						selectId: 'countryId',
 						selectVal: '<%= countryId %>'
@@ -176,7 +176,7 @@ else {
 										selectData: Liferay.Address.getCountries,
 										selectDesc: 'name',
 										selectLocalizeDesc: '<%= true %>',
-										selectLocalizeDescPrefix: '<%= "country." %>',
+										selectLocalizeDescPrefix: '<%= CountryConstants.NAME_PREFIX %>',
 										selectSort: '<%= true %>',
 										selectId: 'countryId',
 										selectVal: ''

diff --git a/portal-web/docroot/html/portlet/users_admin/organization/details.jsp b/portal-web/docroot/html/portlet/users_admin/organization/details.jsp
@@ -292,7 +292,7 @@ if (parentOrganization != null) {
 				selectData: Liferay.Address.getCountries,
 				selectDesc: 'name',
 				selectLocalizeDesc: '<%= true %>',
-				selectLocalizeDescPrefix: '<%= "country." %>',
+				selectLocalizeDescPrefix: '<%= CountryConstants.NAME_PREFIX %>',
 				selectSort: '<%= true %>',
 				selectId: 'countryId',
 				selectVal: '<%= countryId %>'

diff --git a/portal-web/docroot/html/portlet/users_admin/organization_search.jsp b/portal-web/docroot/html/portlet/users_admin/organization_search.jsp
@@ -86,7 +86,7 @@ if (displayTerms.getParentOrganizationId() > 0) {
 				selectData: Liferay.Address.getCountries,
 				selectDesc: 'name',
 				selectLocalizeDesc: '<%= true %>',
-				selectLocalizeDescPrefix: '<%= "country." %>',
+				selectLocalizeDescPrefix: '<%= CountryConstants.NAME_PREFIX %>',
 				selectSort: '<%= true %>',
 				selectId: 'countryId',
 				selectVal: '<%= displayTerms.getCountryId() %>'

diff --git a/portal-web/docroot/html/taglib/ui/write/page.jsp b/portal-web/docroot/html/taglib/ui/write/page.jsp
@@ -42,7 +42,7 @@ String property = (String)request.getAttribute("liferay-ui:write:property");
 					try {
 						country = CountryServiceUtil.getCountry(organization.getCountryId());
 
-						countryName = LanguageUtil.get(pageContext, "country." + country.getName());
+						countryName = country.getName(locale);
 					}
 					catch (Exception e) {
 					}