fix language selection in user settings, release 2.24.0

fhoehnel · Feb 9, 2020 · 7f57848 · 7f57848
1 parent 89ba4f6
commit 7f57848
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>de.webfilesys</groupId>
   <artifactId>webfilesys</artifactId>
   <packaging>war</packaging>
-  <version>2.23.0</version>
+  <version>2.24.0</version>
   <name>webfilesys Maven Webapp</name>
   <url>http://maven.apache.org</url>
   <dependencies>

diff --git a/src/main/java/de/webfilesys/WebFileSys.java b/src/main/java/de/webfilesys/WebFileSys.java
@@ -44,7 +44,7 @@ public class WebFileSys
 {
 	private static WebFileSys instance = null;
 
-	public static final String VERSION = "Version 2.24.0-beta5 (04 Feb 2020)";
+	public static final String VERSION = "Version 2.24.0 (09 Feb 2020)";
 
     public static final String THUMB_DIR = "thumbnails";
 

diff --git a/src/main/java/de/webfilesys/gui/xsl/XslUserSettingsHandler.java b/src/main/java/de/webfilesys/gui/xsl/XslUserSettingsHandler.java
@@ -72,7 +72,7 @@ protected void process() {
 		userSettingsElem.appendChild(availableLanguagesElem);
 
 		for (String availableLanguage : LanguageManager.getInstance().getAvailableLanguages()) {
-			Element languageElem = doc.createElement("language");
+			Element languageElem = doc.createElement("lang");
 			XmlUtil.setElementText(languageElem, availableLanguage);
 			availableLanguagesElem.appendChild(languageElem);
 			if (availableLanguage.equals(selectedLanguage)) {

diff --git a/src/main/webapp/help/English/help.html b/src/main/webapp/help/English/help.html
@@ -10,21 +10,21 @@
 
 <center>
 
-<font color=red>
+<font color="red">
 
 <h2> WebFileSys </h2>
 
 <h2> the universal web-based file manager </h2>
 
-<h4> version 2.23.0</h4>
+<h4> version 2.24.0</h4>
 
 </font>
 
 <hr>
 
 </center>
 
-<font color=navy>
+<font color="navy">
 
 This is a <b>dummy</b> help file in English language.
 <br><br>

diff --git a/src/main/webapp/help/German/help.html b/src/main/webapp/help/German/help.html
@@ -10,21 +10,21 @@
 
 <center>
 
-<font color=red>
+<font color="red">
 
 <h2> WebFileSys </h2>
 
 <h2> der universelle Web-Filemanager </h2>
 
-<h4> Version 2.23.0 </h4>
+<h4> Version 2.24.0 </h4>
 
 </font>
 
 <hr>
 
 </center>
 
-<font color=navy>
+<font color="navy">
 
 Das ist eine <b>leere</b> Hilfe-Datei in deutscher Sprache.
 <br><br>

diff --git a/src/main/webapp/help/Spanish/help.html b/src/main/webapp/help/Spanish/help.html
@@ -14,21 +14,21 @@
 
 <center>
 
-<font color=red>
+<font color="red">
 
 <h2> WebFileSys </h2>
 
 <h2> el administrador de archivos universal basado en web </h2>
 
-<h4> version 2.23.0 </h4>
+<h4> version 2.24.0 </h4>
 
 </font>
 
 <hr>
 
 </center>
 
-<font color=navy>
+<font color="navy">
 
 Este es un <b>ejemplo</b> de un archivo de ayuda en idioma español.
 <br><br>

diff --git a/src/main/webapp/xsl/userSettings.xsl b/src/main/webapp/xsl/userSettings.xsl
@@ -99,7 +99,7 @@
 				<td class="formParm1"><b><span resource="label.language"></span></b></td>
 				<td class="formParm2">
 				  <select name="language" size="1">
-				    <xsl:for-each select="/userSettings/availableLanguages/language">
+				    <xsl:for-each select="/userSettings/availableLanguages/lang">
 				      <option>
 				        <xsl:attribute name="value"><xsl:value-of select="."/></xsl:attribute>
 				        <xsl:if test="@selected">