LPS-26840 Localize country names

portal-impl/src/content/Language.properties

@@ -6321,4 +6321,236 @@ currency.XPT=Platinum Ounces
 currency.YER=Yemen Riyal
 currency.ZAR=South African Rand
 currency.ZMK=Zambian Kwacha
-currency.ZWD=Zimbabwe Dollar
+currency.ZWD=Zimbabwe Dollar
+
+##
+## Countries
+##
+
+afghanistan=Afghanistan
+albania=Albania
+algeria=Algeria
+american-samoa=American Samoa
+andorra=Andorra
+angola=Angola
+anguilla=Anguilla
+antarctica=Antarctica
+antigua=Antigua
+argentina=Argentina
+armenia=Armenia
+aruba=Aruba
+australia=Australia
+austria=Austria
+azerbaijan=Azerbaijan
+bahamas=Bahamas
+bahrain=Bahrain
+bangladesh=Bangladesh
+barbados=Barbados
+belarus=Belarus
+belgium=Belgium
+belize=Belize
+benin=Benin
+bermuda=Bermuda
+bhutan=Bhutan
+bolivia=Bolivia
+bosnia-herzegovina=Bosnia-Herzegovina
+botswana=Botswana
+brazil=Brazil
+british-virgin-islands=British Virgin Islands
+brunei=Brunei
+bulgaria=Bulgaria
+burkina-faso=Burkina Faso
+burma-myanmar=Burma (Myanmar)
+burundi=Burundi
+cambodia=Cambodia
+cameroon=Cameroon
+canada=Canada
+cape-verde-island=Cape Verde Island
+cayman-islands=Cayman Islands
+central-african-republic=Central African Republic
+chad=Chad
+chile=Chile
+china=China
+christmas-island=Christmas Island
+cocos-islands=Cocos Islands
+colombia=Colombia
+comoros=Comoros
+cook-islands=Cook Islands
+costa-rica=Costa Rica
+croatia=Croatia
+cuba=Cuba
+cyprus=Cyprus
+czech-republic=Czech Republic
+democratic-republic-of-congo=Democratic Republic of Congo
+denmark=Denmark
+djibouti=Djibouti
+dominica=Dominica
+dominican-republic=Dominican Republic
+ecuador=Ecuador
+egypt=Egypt
+el-salvador=El Salvador
+equatorial-guinea=Equatorial Guinea
+eritrea=Eritrea
+estonia=Estonia
+ethiopia=Ethiopia
+faeroe-islands=Faeroe Islands
+falkland-islands=Falkland Islands
+fiji-islands=Fiji Islands
+finland=Finland
+france=France
+french-guiana=French Guiana
+french-polynesia=French Polynesia
+gabon=Gabon
+gambia=Gambia
+georgia=Georgia
+germany=Germany
+ghana=Ghana
+gibraltar=Gibraltar
+greece=Greece
+greenland=Greenland
+grenada=Grenada
+guadeloupe=Guadeloupe
+guam=Guam
+guatemala=Guatemala
+guinea-bissau=Guinea-Bissau
+guinea=Guinea
+guyana=Guyana
+haiti=Haiti
+honduras=Honduras
+hong-kong=Hong Kong
+hungary=Hungary
+iceland=Iceland
+india=India
+indonesia=Indonesia
+iran=Iran
+iraq=Iraq
+ireland=Ireland
+israel=Israel
+italy=Italy
+ivory-coast=Ivory Coast
+jamaica=Jamaica
+japan=Japan
+jordan=Jordan
+kazakhstan=Kazakhstan
+kenya=Kenya
+kiribati=Kiribati
+kuwait=Kuwait
+kyrgyzstan=Kyrgyzstan
+laos=Laos
+latvia=Latvia
+lebanon=Lebanon
+lesotho=Lesotho
+liberia=Liberia
+libya=Libya
+liechtenstein=Liechtenstein
+lithuania=Lithuania
+luxembourg=Luxembourg
+macau=Macau
+macedonia=Macedonia
+madagascar=Madagascar
+malawi=Malawi
+malaysia=Malaysia
+maldives=Maldives
+mali=Mali
+malta=Malta
+marshall-islands=Marshall Islands
+martinique=Martinique
+mauritania=Mauritania
+mauritius=Mauritius
+mayotte-island=Mayotte Island
+mexico=Mexico
+micronesia=Micronesia
+moldova=Moldova
+monaco=Monaco
+mongolia=Mongolia
+montenegro=Montenegro
+montserrat=Montserrat
+morocco=Morocco
+mozambique=Mozambique
+namibia=Namibia
+nauru=Nauru
+nepal=Nepal
+netherlands-antilles=Netherlands Antilles
+netherlands=Netherlands
+new-caledonia=New Caledonia
+new-zealand=New Zealand
+nicaragua=Nicaragua
+niger=Niger
+nigeria=Nigeria
+niue=Niue
+norfolk-island=Norfolk Island
+north-korea=North Korea
+norway=Norway
+oman=Oman
+pakistan=Pakistan
+palau=Palau
+palestine=Palestine
+panama=Panama
+papua-new-guinea=Papua New Guinea
+paraguay=Paraguay
+peru=Peru
+philippines=Philippines
+poland=Poland
+portugal=Portugal
+puerto-rico=Puerto Rico
+qatar=Qatar
+republic-of-congo=Republic of Congo
+reunion-island=Reunion Island
+romania=Romania
+russia=Russia
+rwanda=Rwanda
+san-marino=San Marino
+sao-tome-principe=Sao Tome & Principe
+saudi-arabia=Saudi Arabia
+senegal=Senegal
+serbia=Serbia
+seychelles=Seychelles
+sierra-leone=Sierra Leone
+singapore=Singapore
+slovakia=Slovakia
+slovenia=Slovenia
+solomon-islands=Solomon Islands
+somalia=Somalia
+south-africa=South Africa
+south-korea=South Korea
+spain=Spain
+sri-lanka=Sri Lanka
+st-helena=St. Helena
+st-kitts=St. Kitts
+st-lucia=St. Lucia
+st-pierre-miquelon=St. Pierre & Miquelon
+st-vincent=St. Vincent
+sudan=Sudan
+suriname=Suriname
+swaziland=Swaziland
+sweden=Sweden
+switzerland=Switzerland
+syria=Syria
+taiwan=Taiwan
+tajikistan=Tajikistan
+tanzania=Tanzania
+thailand=Thailand
+togo=Togo
+tonga=Tonga
+trinidad-tobago=Trinidad & Tobago
+tunisia=Tunisia
+turkey=Turkey
+turkmenistan=Turkmenistan
+turks-caicos=Turks & Caicos
+tuvalu=Tuvalu
+uganda=Uganda
+ukraine=Ukraine
+united-arab-emirates=United Arab Emirates
+united-kingdom=United Kingdom
+united-states=United States
+uruguay=Uruguay
+uzbekistan=Uzbekistan
+vanuatu=Vanuatu
+vatican-city=Vatican City
+venezuela=Venezuela
+vietnam=Vietnam
+wallis-futuna=Wallis & Futuna
+western-samoa=Western Samoa
+yemen=Yemen
+zambia=Zambia
+zimbabwe=Zimbabwe

portal-web/docroot/html/js/liferay/dynamic_select.js

@@ -1,6 +1,25 @@
 AUI.add(
 	'liferay-dynamic-select',
 	function(A) {
+		var sortByValue = function(a, b) {
+			var pos = a.indexOf('">');
+
+			var nameA = a.substring(pos);
+
+			pos = b.indexOf('">');
+
+			var nameB = b.substring(pos);
+
+			if (nameA < nameB) {
+				return -1;
+			}
+			else if (nameA > nameB) {
+				return 1;
+			}
+			else {
+				return 0;
+			}
+		};
 
 		/**
 		 * OPTIONS
@@ -84,6 +103,8 @@ AUI.add(
 				var select = A.one('#' + options.select);
 				var selectId = options.selectId;
 				var selectDesc = options.selectDesc;
+				var selectLocalizeDesc = options.selectLocalizeDesc || false;
+				var selectSort = options.selectSort || false;
 				var selectVal = options.selectVal;
 				var selectNullable = options.selectNullable || true;
 
@@ -99,10 +120,18 @@ AUI.add(
 						var key = item[selectId];
 						var value = item[selectDesc];
 
+						if (selectLocalizeDesc) {
+							value = Liferay.Language.get(value);
+						}
+
 						selectOptions.push('<option value="' + key + '">' + value + '</option>');
 					}
 				);
 
+				if (selectSort) {
+					selectOptions = selectOptions.sort(sortByValue);
+				}
+
 				selectOptions = selectOptions.join('');
 
 				if (select) {

portal-web/docroot/html/portlet/directory/organization_search.jsp

@@ -96,6 +96,8 @@ if (displayTerms.getParentOrganizationId() > 0) {
 				selectData: Liferay.Address.getCountries,
 				selectDesc: 'name',
 				selectId: 'countryId',
+				selectLocalizeDesc: '<%= true %>',
+				selectSort: '<%= true %>',
 				selectVal: '<%= displayTerms.getCountryId() %>'
 			},
 			{

portal-web/docroot/html/portlet/users_admin/common/addresses.jsp

@@ -126,6 +126,8 @@ else {
 						select: '<portlet:namespace />addressCountryId<%= addressesIndex %>',
 						selectData: Liferay.Address.getCountries,
 						selectDesc: 'name',
+						selectLocalizeDesc: '<%= true %>',
+						selectSort: '<%= true %>',
 						selectId: 'countryId',
 						selectVal: '<%= countryId %>'
 					},
@@ -172,6 +174,8 @@ else {
 										select: '<portlet:namespace />addressCountryId' + guid,
 										selectData: Liferay.Address.getCountries,
 										selectDesc: 'name',
+										selectLocalizeDesc: '<%= true %>',
+										selectSort: '<%= true %>',
 										selectId: 'countryId',
 										selectVal: ''
 									},

portal-web/docroot/html/portlet/users_admin/organization/details.jsp

@@ -291,6 +291,8 @@ if (parentOrganization != null) {
 				select: '<portlet:namespace />countryId',
 				selectData: Liferay.Address.getCountries,
 				selectDesc: 'name',
+				selectLocalizeDesc: '<%= true %>',
+				selectSort: '<%= true %>',
 				selectId: 'countryId',
 				selectVal: '<%= countryId %>'
 			},

portal-web/docroot/html/portlet/users_admin/organization_search.jsp

@@ -85,6 +85,8 @@ if (displayTerms.getParentOrganizationId() > 0) {
 				select: '<portlet:namespace /><%= displayTerms.COUNTRY_ID %>',
 				selectData: Liferay.Address.getCountries,
 				selectDesc: 'name',
+				selectLocalizeDesc: '<%= true %>',
+				selectSort: '<%= true %>',
 				selectId: 'countryId',
 				selectVal: '<%= displayTerms.getCountryId() %>'
 			},