fixing accept-language header issue

WebContent/WEB-INF/web.xml

@@ -58,6 +58,10 @@
 	<filter>
 		<filter-name>struts2</filter-name>
 		<filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
+		 <init-param>
+        	<param-name>struts.i18n.encoding</param-name>
+        	<param-value>UTF-8</param-value>
+    	</init-param>
 	</filter>
 	<filter-mapping>
 		<filter-name>struts2</filter-name>

pom.xml

@@ -10,7 +10,7 @@
 		<connection>scm:git:https://github.com/factionsecurity/faction.git</connection>
 		<developerConnection>
 			scm:git:https://github.com/factionsecurity/faction.git</developerConnection>
-		<tag>1.2.0</tag>
+		<tag>1.2.1-SNAPSHOT</tag>
 	</scm>
 	<properties>
 		<aws.java.sdk.version>2.18.16</aws.java.sdk.version>

release.properties

@@ -1,5 +1,5 @@
 #release configuration
-#Sun Mar 24 22:30:01 CDT 2024
+#Sun Mar 24 23:05:26 CDT 2024
 completedPhase=scm-commit-release
 exec.activateProfiles=github
 exec.additionalArguments=-Dmaven.javadoc.skip\=true -Dmaven.test.skipTests\=true -Dmaven.test.skip\=true

src/com/fuse/actions/scheduling/EditAssessment.java

@@ -63,8 +63,6 @@ public class EditAssessment extends FSActionSupport {
 	private Long campId;
 	private List<Files> files;
 	private String cf;
-	private String statusName;
-	private List<String> status;
 	private Boolean randId = true;
 	private List<AuditLog> logs;
 	private String updatedText = "";
@@ -96,7 +94,6 @@ public String execute() throws ParseException {
 			this.randId = ss.getEnableRandAppId();
 		else
 			this.randId = true;
-		this.status = ss.getStatus();
 
 		if (action != null && action.equals("get")) {
 			currentAssessment = em.find(Assessment.class, (long) this.aid);
@@ -170,13 +167,6 @@ public String execute() throws ParseException {
 				return this.ERRORJSON;
 			}
 
-			if (statusName != null && !statusName.trim().equals("")) {
-
-				if (!ss.getStatus().stream().anyMatch(s -> s.equals(this.statusName.trim()))) {
-					this._message = "Status is not defined.";
-					return this.ERRORJSON;
-				}
-			}
 
 			HibHelper.getInstance().preJoin();
 			em.joinTransaction();
@@ -201,7 +191,6 @@ public String execute() throws ParseException {
 					am.setType(Type);
 					am.setAccessNotes(this.notes);
 					am.setDistributionList(this.distro);
-					am.setStatus(statusName);
 					Map<String, Files> sessionfiles = null;
 					if (camp != null)
 						am.setCampaign(camp);
@@ -561,18 +550,10 @@ public void setCf(String cf) {
 		this.cf = cf;
 	}
 
-	public List<String> getStatus() {
-		return status;
-	}
-
 	public Boolean getRandId() {
 		return randId;
 	}
 
-	public void setStatusName(String statusName) {
-		this.statusName = statusName;
-	}
-
 	public List<AuditLog> getLogs() {
 		return logs;
 	}

src/struts.xml

@@ -5,7 +5,8 @@
 <struts>
 
 	<constant name="struts.multipart.maxSize" value="10000000"/>	
-
+	<constant name="struts.i18n.reload" value="true" />
+	<constant name="struts.locale" value="en_US" />
     <package name="default" namespace="/" extends="struts-default">
       <interceptors>
       	 <interceptor name="staticParams" class="com.opensymphony.xwork2.interceptor.StaticParametersInterceptor"/>