Merge pull request #487 from khoa-nd/master

Merged
chrisshayan · Jan 14, 2016 · be5e09e · be5e09e
2 parents 4dad2c5 + 41fb0e9
commit be5e09e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src/main/java/com/techlooper/model/GetPromotedResponse.java b/src/main/java/com/techlooper/model/GetPromotedResponse.java
@@ -7,6 +7,8 @@
  */
 public class GetPromotedResponse {
 
+    private String jobTitle;
+
     private Long totalJob;
 
     private Double salaryMin;
@@ -46,4 +48,12 @@ public List<TopDemandedSkillResponse> getTopDemandedSkills() {
     public void setTopDemandedSkills(List<TopDemandedSkillResponse> topDemandedSkills) {
         this.topDemandedSkills = topDemandedSkills;
     }
+
+    public String getJobTitle() {
+        return jobTitle;
+    }
+
+    public void setJobTitle(String jobTitle) {
+        this.jobTitle = jobTitle;
+    }
 }
diff --git a/src/main/java/com/techlooper/service/impl/VietnamWorksJobStatisticService.java b/src/main/java/com/techlooper/service/impl/VietnamWorksJobStatisticService.java
@@ -440,6 +440,7 @@ public GetPromotedResponse getTopDemandedSkillsByJobTitle(GetPromotedRequest req
                 (skill1, skill2) -> (int) skill2.getCount() - (int) skill1.getCount()
         ).filter(skill -> skill.getSkillName().length() <= 40).limit(limit).collect(toList()));
 
+        response.setJobTitle(request.getJobTitle());
         return response;
     }
 

diff --git a/src/main/resources/template/CHALLENGE_CONFIRM_ON_POST_CHALLENGE_VI.ftl b/src/main/resources/template/CHALLENGE_CONFIRM_ON_POST_CHALLENGE_VI.ftl
@@ -161,7 +161,7 @@
                     </tr>
                     <tr>
                     <#if challengeType == "PUBLIC">
-                        <#assign localizedChallengeType = "công cộng">
+                        <#assign localizedChallengeType = "cộng đồng">
                     <#elseif challengeType == "INTERNAL">
                         <#assign localizedChallengeType = "nội bộ">
                     </#if>