Language names should not be translated

.settings/org.eclipse.core.resources.prefs

@@ -4,6 +4,7 @@ encoding//src/main/resources/content/language.properties=UTF-8
 encoding//src/main/resources/content/language_es.properties=UTF-8
 encoding//src/main/resources/content/language_fa.properties=UTF-8
 encoding//src/main/resources/content/language_sl.properties=UTF-8
+encoding//src/main/webapp/WEB-INF/decorator/header.jsp=UTF-8
 encoding//src/main/webapp/WEB-INF/jsp/accession/data.jsp=UTF-8
 encoding//src/main/webapp/WEB-INF/jsp/descr/index.jsp=UTF-8
 encoding//src/main/webapp/WEB-INF/jsp/filter/index.jsp=UTF-8

src/main/resources/content/language.properties

@@ -57,14 +57,6 @@ pagination.previous-page=< Previous
 locale.language.change=Change locale
 i18n.content-not-translated=The content is not available in your language. Please contact us if you can help!
 
-# Languages (Do not translate)
-locale.language.en=English
-locale.language.ru=Russian
-locale.language.fa=Persian
-locale.language.es=Spanish
-locale.language.sl=Sloven\u0161\u010Dina
-
-
 data.error.404=The data you requested was not found in the system.
 page.rendertime=Processing this page took {0}ms.
 

src/main/webapp/WEB-INF/decorator/header.jsp

@@ -21,16 +21,16 @@
 		<div class="notimportant navbar pull-right">
 			<div class="nav-collapse">
 				<ul class="nav">
-					<li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown"> <spring:message code="locale.language.${pageContext.response.locale}" /> <b class="caret"></b>
+					<li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown"> <c:out value="${pageContext.response.locale.displayLanguage}" /> <b class="caret"></b>
 					</a>
 						<ul class="dropdown-menu">
-							<li><a href="?lang=en"><spring:message code="locale.language.en" /></a></li>
-							<li><a href="?lang=es"><spring:message code="locale.language.es" /></a></li>
-							<li><a href="?lang=fa"><spring:message code="locale.language.fa" /></a></li>
+							<li><a href="?lang=en">English</a></li>
+							<li><a href="?lang=es">Spanish</a></li>
+							<li><a href="?lang=fa">Persian</a></li>
 							
 							<%-- Only show fully translated languages --%>
 							<security:authorize access="isAuthenticated()">
-							<li><a href="?lang=sl"><spring:message code="locale.language.sl" /></a></li>
+							<li><a href="?lang=sl">Slovene</a></li>
 							</security:authorize>
 							
 							<li><a target="_blank" href="https://www.transifex.com/projects/p/genesys/"><spring:message code="menu.translate" /></a></li>