From 03ce43bc750e0b502c350b554b69790ce70ce99c Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Wed, 23 May 2018 17:00:22 +0800
Subject: [PATCH 01/76] Add jvmarg and enable listeners for intelliJ

---
 .templates/ideaRunConfigurations/CI_Tests.xml     | 2 +-
 .templates/ideaRunConfigurations/Failed_Tests.xml | 2 +-
 .templates/ideaRunConfigurations/Local_Tests.xml  | 2 +-
 gradle.template.properties                        | 4 ++++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.templates/ideaRunConfigurations/CI_Tests.xml b/.templates/ideaRunConfigurations/CI_Tests.xml
index cc09b2f6668..982970e7737 100644
--- a/.templates/ideaRunConfigurations/CI_Tests.xml
+++ b/.templates/ideaRunConfigurations/CI_Tests.xml
@@ -25,7 +25,7 @@
     <option name="TEST_SEARCH_SCOPE">
       <value defaultName="wholeProject" />
     </option>
-    <option name="USE_DEFAULT_REPORTERS" value="false" />
+    <option name="USE_DEFAULT_REPORTERS" value="true" />
     <option name="PROPERTIES_FILE" value="" />
     <envs />
     <properties />
diff --git a/.templates/ideaRunConfigurations/Failed_Tests.xml b/.templates/ideaRunConfigurations/Failed_Tests.xml
index f5255e2d2ed..9068b944ca9 100644
--- a/.templates/ideaRunConfigurations/Failed_Tests.xml
+++ b/.templates/ideaRunConfigurations/Failed_Tests.xml
@@ -20,7 +20,7 @@
     <option name="TEST_SEARCH_SCOPE">
       <value defaultName="wholeProject" />
     </option>
-    <option name="USE_DEFAULT_REPORTERS" value="false" />
+    <option name="USE_DEFAULT_REPORTERS" value="true" />
     <option name="PROPERTIES_FILE" value="" />
     <envs />
     <properties />
diff --git a/.templates/ideaRunConfigurations/Local_Tests.xml b/.templates/ideaRunConfigurations/Local_Tests.xml
index 55383141a36..1e7947701c6 100644
--- a/.templates/ideaRunConfigurations/Local_Tests.xml
+++ b/.templates/ideaRunConfigurations/Local_Tests.xml
@@ -20,7 +20,7 @@
     <option name="TEST_SEARCH_SCOPE">
       <value defaultName="wholeProject" />
     </option>
-    <option name="USE_DEFAULT_REPORTERS" value="false" />
+    <option name="USE_DEFAULT_REPORTERS" value="true" />
     <option name="PROPERTIES_FILE" value="" />
     <envs />
     <properties />
diff --git a/gradle.template.properties b/gradle.template.properties
index de4eb1204ed..57cace80443 100644
--- a/gradle.template.properties
+++ b/gradle.template.properties
@@ -8,3 +8,7 @@ org.gradle.daemon=false
 # e.g org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home
 # e.g org.gradle.java.home=C:/Program Files/Java/jdk1.8.0_144
 # org.gradle.java.home=
+
+# Use this property to have the recommended language setting for tests
+# It is used to prevent local language settings causing the tests to fail
+org.gradle.jvmargs=-Duser.language=en
\ No newline at end of file

From f023d335e4acaf39691a7634b460322133e51064 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Wed, 23 May 2018 17:03:54 +0800
Subject: [PATCH 02/76] Correcting firefox version details to avoid confusion

---
 docs/development.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/development.md b/docs/development.md
index 2576bbd33a0..08052ad151d 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -137,7 +137,7 @@ Before running tests, modify `src/test/resources/test.properties` if necessary,
 
 ### Using Firefox
 
-* Only Firefox between versions 38.0.5 and 46.0.1 are supported.
+* Only Firefox between versions 38.0.5 and 46.0.0 are supported.
   * To downgrade your Firefox version, obtain the executable from [here](https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/).
   * If you want to use a different path for this version, choose `Custom setup` during install.
   * Remember to disable the auto-updates (`Options → Advanced tab → Update`).

From 66cc810a963b2b941117d138b93c6b7d53999045 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Wed, 23 May 2018 17:32:13 +0800
Subject: [PATCH 03/76] Add EOF

---
 gradle.template.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.template.properties b/gradle.template.properties
index 57cace80443..1b4402e2581 100644
--- a/gradle.template.properties
+++ b/gradle.template.properties
@@ -11,4 +11,4 @@ org.gradle.daemon=false
 
 # Use this property to have the recommended language setting for tests
 # It is used to prevent local language settings causing the tests to fail
-org.gradle.jvmargs=-Duser.language=en
\ No newline at end of file
+org.gradle.jvmargs=-Duser.language=en

From 4e3a56c3329d8eff16ccafe60b9e4728872026ee Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Thu, 24 May 2018 10:04:20 +0800
Subject: [PATCH 04/76] Default JDK for project

---
 .templates/ideaRunConfigurations/CI_Tests.xml     | 4 ++--
 .templates/ideaRunConfigurations/Failed_Tests.xml | 4 ++--
 .templates/ideaRunConfigurations/Local_Tests.xml  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.templates/ideaRunConfigurations/CI_Tests.xml b/.templates/ideaRunConfigurations/CI_Tests.xml
index 982970e7737..1a7c258ecdc 100644
--- a/.templates/ideaRunConfigurations/CI_Tests.xml
+++ b/.templates/ideaRunConfigurations/CI_Tests.xml
@@ -7,8 +7,8 @@
       </pattern>
     </extension>
     <module name="" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="1.8" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="SUITE_NAME" value="$PROJECT_DIR$/src/test/testng-ci.xml" />
     <option name="PACKAGE_NAME" value="" />
     <option name="MAIN_CLASS_NAME" value="" />
diff --git a/.templates/ideaRunConfigurations/Failed_Tests.xml b/.templates/ideaRunConfigurations/Failed_Tests.xml
index 9068b944ca9..8041b4dce4e 100644
--- a/.templates/ideaRunConfigurations/Failed_Tests.xml
+++ b/.templates/ideaRunConfigurations/Failed_Tests.xml
@@ -2,8 +2,8 @@
   <configuration default="false" name="Failed Tests" type="TestNG" factoryName="TestNG">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <module name="" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="1.8" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="SUITE_NAME" value="$PROJECT_DIR$/test-output/testng-failed.xml" />
     <option name="PACKAGE_NAME" value="" />
     <option name="MAIN_CLASS_NAME" value="" />
diff --git a/.templates/ideaRunConfigurations/Local_Tests.xml b/.templates/ideaRunConfigurations/Local_Tests.xml
index 1e7947701c6..ebdb0c02d23 100644
--- a/.templates/ideaRunConfigurations/Local_Tests.xml
+++ b/.templates/ideaRunConfigurations/Local_Tests.xml
@@ -2,8 +2,8 @@
   <configuration default="false" name="Local Tests" type="TestNG" factoryName="TestNG">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <module name="" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="1.8" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="SUITE_NAME" value="$PROJECT_DIR$/src/test/testng-local.xml" />
     <option name="PACKAGE_NAME" value="" />
     <option name="MAIN_CLASS_NAME" value="" />

From f9b85117ba6154cb759800ad3cc75479d3d14fde Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Thu, 24 May 2018 12:47:19 +0800
Subject: [PATCH 05/76] Fix instability caused due to Instant.now()

---
 .../test/cases/datatransfer/StudentProfileAttributesTest.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java b/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java
index a7f0e3c0b7d..06343303fe4 100644
--- a/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java
+++ b/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java
@@ -10,6 +10,7 @@
 import com.google.appengine.api.datastore.Text;
 
 import teammates.common.datatransfer.attributes.StudentProfileAttributes;
+import teammates.common.util.Const;
 import teammates.common.util.FieldValidator;
 import teammates.common.util.SanitizationHelper;
 import teammates.common.util.TimeHelper;
@@ -175,6 +176,7 @@ public void testSanitizeForSaving() {
     @Test
     public void testToEntity() {
         StudentProfile expectedEntity = createStudentProfileFrom(profile);
+        expectedEntity.setModifiedDate(Const.TIME_REPRESENTS_DEFAULT_TIMESTAMP);
         StudentProfileAttributes testProfile = StudentProfileAttributes.valueOf(expectedEntity);
         StudentProfile actualEntity = testProfile.toEntity();
 

From ff7a53976b4e93128e2237d870a5f8ae0f132d13 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Thu, 24 May 2018 15:33:40 +0800
Subject: [PATCH 06/76] Improve stability of tests

---
 .../cases/datatransfer/StudentProfileAttributesTest.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java b/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java
index 06343303fe4..14087742945 100644
--- a/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java
+++ b/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java
@@ -176,10 +176,13 @@ public void testSanitizeForSaving() {
     @Test
     public void testToEntity() {
         StudentProfile expectedEntity = createStudentProfileFrom(profile);
-        expectedEntity.setModifiedDate(Const.TIME_REPRESENTS_DEFAULT_TIMESTAMP);
         StudentProfileAttributes testProfile = StudentProfileAttributes.valueOf(expectedEntity);
         StudentProfile actualEntity = testProfile.toEntity();
 
+        // Done to prevent instability of tests due to Instant.now()
+        expectedEntity.setModifiedDate(Const.TIME_REPRESENTS_DEFAULT_TIMESTAMP);
+        actualEntity.setModifiedDate(Const.TIME_REPRESENTS_DEFAULT_TIMESTAMP);
+
         assertEquals(expectedEntity.getShortName(), actualEntity.getShortName());
         assertEquals(expectedEntity.getInstitute(), actualEntity.getInstitute());
         assertEquals(expectedEntity.getEmail(), actualEntity.getEmail());

From 9541cc2654cd8cfe3e791f2595224d4f83ad0104 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 4 Jun 2018 10:30:48 +0800
Subject: [PATCH 07/76] Requested changes

---
 gradle.template.properties                                    | 4 ++--
 .../test/cases/datatransfer/StudentProfileAttributesTest.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.template.properties b/gradle.template.properties
index 1b4402e2581..fe1737af704 100644
--- a/gradle.template.properties
+++ b/gradle.template.properties
@@ -10,5 +10,5 @@ org.gradle.daemon=false
 # org.gradle.java.home=
 
 # Use this property to have the recommended language setting for tests
-# It is used to prevent local language settings causing the tests to fail
-org.gradle.jvmargs=-Duser.language=en
+# The test environment REQUIRES the following locale. Do not change!
+org.gradle.jvmargs=-Duser.language=en -Duser.country=US
diff --git a/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java b/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java
index 14087742945..58fa838fe58 100644
--- a/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java
+++ b/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java
@@ -179,7 +179,7 @@ public void testToEntity() {
         StudentProfileAttributes testProfile = StudentProfileAttributes.valueOf(expectedEntity);
         StudentProfile actualEntity = testProfile.toEntity();
 
-        // Done to prevent instability of tests due to Instant.now()
+        // toEntity does not use the original modified date so we need to ensure they are the same
         expectedEntity.setModifiedDate(Const.TIME_REPRESENTS_DEFAULT_TIMESTAMP);
         actualEntity.setModifiedDate(Const.TIME_REPRESENTS_DEFAULT_TIMESTAMP);
 

From 7d9d351cb0edb066efcff36b800d5f4970d8cd0f Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Tue, 5 Jun 2018 12:04:04 +0800
Subject: [PATCH 08/76] Corrected meaning of comment

---
 gradle.template.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.template.properties b/gradle.template.properties
index fe1737af704..eb2c0516b89 100644
--- a/gradle.template.properties
+++ b/gradle.template.properties
@@ -9,6 +9,6 @@ org.gradle.daemon=false
 # e.g org.gradle.java.home=C:/Program Files/Java/jdk1.8.0_144
 # org.gradle.java.home=
 
-# Use this property to have the recommended language setting for tests
+# Use this property to have the required language setting for tests
 # The test environment REQUIRES the following locale. Do not change!
 org.gradle.jvmargs=-Duser.language=en -Duser.country=US

From 5bc55185dbf4cbb8b4d3d75f0d009a624b2b134d Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 18 Jun 2018 11:06:53 +0800
Subject: [PATCH 09/76] Remove redundant line

---
 gradle.template.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gradle.template.properties b/gradle.template.properties
index eb2c0516b89..b8207028427 100644
--- a/gradle.template.properties
+++ b/gradle.template.properties
@@ -9,6 +9,5 @@ org.gradle.daemon=false
 # e.g org.gradle.java.home=C:/Program Files/Java/jdk1.8.0_144
 # org.gradle.java.home=
 
-# Use this property to have the required language setting for tests
 # The test environment REQUIRES the following locale. Do not change!
 org.gradle.jvmargs=-Duser.language=en -Duser.country=US

From 40be6f9f0c5abb4514c67dfbc57b3c3090b15c19 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 2 Jul 2018 12:11:46 +0800
Subject: [PATCH 10/76] Set en_US as locale

---
 .../test/cases/BaseTestCaseWithMinimalGaeEnvironment.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java b/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
index 6726bd04edc..cf7bdd6f583 100644
--- a/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
+++ b/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
@@ -2,6 +2,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Locale;
 
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -21,15 +22,18 @@ public class BaseTestCaseWithMinimalGaeEnvironment extends BaseTestCase {
     private LocalServiceTestHelper helper = new LocalServiceTestHelper();
 
     /**
-     * Sets the environment of SystemProperty based on the URL.
+     * Sets the environment of SystemProperty based on the URL and the required locale for tests.
      */
     @BeforeSuite
-    public void setUpEnvironment() throws MalformedURLException {
+    public void setUpEnvironmentAndLocale() throws MalformedURLException {
         if (new URL(TestProperties.TEAMMATES_URL).getHost().contains(".appspot.com")) {
             SystemProperty.environment.set(SystemProperty.Environment.Value.Production);
         } else {
             SystemProperty.environment.set(SystemProperty.Environment.Value.Development);
         }
+
+        Locale.setDefault(new Locale("en", "US"));
+
     }
 
     @BeforeClass

From 0b16157710f76b1b51c0ac9509f010774c43b652 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 9 Jul 2018 13:45:36 +0800
Subject: [PATCH 11/76] Update locale in correct place

---
 src/test/java/teammates/test/cases/BaseTestCase.java   | 10 ++++++++++
 .../cases/BaseTestCaseWithMinimalGaeEnvironment.java   |  8 ++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/test/java/teammates/test/cases/BaseTestCase.java b/src/test/java/teammates/test/cases/BaseTestCase.java
index 19d725fe822..c1adf686952 100644
--- a/src/test/java/teammates/test/cases/BaseTestCase.java
+++ b/src/test/java/teammates/test/cases/BaseTestCase.java
@@ -3,11 +3,13 @@
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.Locale;
 
 import org.junit.Assert;
 import org.testng.AssertJUnit;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeSuite;
 
 import teammates.common.datatransfer.DataBundle;
 import teammates.common.util.FieldValidator;
@@ -38,6 +40,14 @@ public static void ______TS(String description) {
     }
     // CHECKSTYLE.ON:AbbreviationAsWordInName|MethodName
 
+    /**
+     * Set the required locale for tests
+     */
+    @BeforeSuite
+    public void setLocale() {
+        Locale.setDefault(new Locale("en", "US"));
+    }
+
     @BeforeClass
     public void printTestClassHeader() {
         print("[============================="
diff --git a/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java b/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
index cf7bdd6f583..6726bd04edc 100644
--- a/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
+++ b/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
@@ -2,7 +2,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Locale;
 
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -22,18 +21,15 @@ public class BaseTestCaseWithMinimalGaeEnvironment extends BaseTestCase {
     private LocalServiceTestHelper helper = new LocalServiceTestHelper();
 
     /**
-     * Sets the environment of SystemProperty based on the URL and the required locale for tests.
+     * Sets the environment of SystemProperty based on the URL.
      */
     @BeforeSuite
-    public void setUpEnvironmentAndLocale() throws MalformedURLException {
+    public void setUpEnvironment() throws MalformedURLException {
         if (new URL(TestProperties.TEAMMATES_URL).getHost().contains(".appspot.com")) {
             SystemProperty.environment.set(SystemProperty.Environment.Value.Production);
         } else {
             SystemProperty.environment.set(SystemProperty.Environment.Value.Development);
         }
-
-        Locale.setDefault(new Locale("en", "US"));
-
     }
 
     @BeforeClass

From d6c732e41103463be430862789f252ca45d31b63 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 9 Jul 2018 14:01:15 +0800
Subject: [PATCH 12/76] Trial commit to be reverted

---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 72ebf27b551..77e488dd802 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,9 @@ dist: trusty
 
 addons:
   firefox: "46.0"
+  apt:
+    packages:
+    - language-pack-de
 
 before_install:
   - |
@@ -28,6 +31,10 @@ before_install:
   - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid \
     --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1440x900x16"
   - nvm install node
+  - export LANG=de_DE.UTF-8
+  - export LC_NUMERIC=de_DE.UTF-8
+  - export LC_TIME=de_DE.UTF-8
+  - locale
 
 before_script:
   - export DISPLAY=:99.0
@@ -51,6 +58,7 @@ install: true
 script:
   - npm run build
   - ./gradlew appengineStart
+  - locale
   - ./gradlew ciTests
 
 after_failure:

From 7bab7258f73e2af52049a1b29d9ecf9cf7a7205a Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 9 Jul 2018 14:01:52 +0800
Subject: [PATCH 13/76] Add period

---
 src/test/java/teammates/test/cases/BaseTestCase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/teammates/test/cases/BaseTestCase.java b/src/test/java/teammates/test/cases/BaseTestCase.java
index c1adf686952..24e98c5add0 100644
--- a/src/test/java/teammates/test/cases/BaseTestCase.java
+++ b/src/test/java/teammates/test/cases/BaseTestCase.java
@@ -41,7 +41,7 @@ public static void ______TS(String description) {
     // CHECKSTYLE.ON:AbbreviationAsWordInName|MethodName
 
     /**
-     * Set the required locale for tests
+     * Set the required locale for tests.
      */
     @BeforeSuite
     public void setLocale() {

From e3ff717ef866ff71bc165753f61da2b2305769ef Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 9 Jul 2018 14:07:27 +0800
Subject: [PATCH 14/76] Trial commit

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 77e488dd802..47b598495a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,8 +32,7 @@ before_install:
     --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1440x900x16"
   - nvm install node
   - export LANG=de_DE.UTF-8
-  - export LC_NUMERIC=de_DE.UTF-8
-  - export LC_TIME=de_DE.UTF-8
+  - export LC_ALL=de_DE.UTF-8
   - locale
 
 before_script:

From c3cd19e8fb2119e7724bb9a07ba8580e8dedbfdc Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 9 Jul 2018 14:09:23 +0800
Subject: [PATCH 15/76] CI  fail?

---
 src/test/java/teammates/test/cases/BaseTestCase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/teammates/test/cases/BaseTestCase.java b/src/test/java/teammates/test/cases/BaseTestCase.java
index 24e98c5add0..dabe03b199c 100644
--- a/src/test/java/teammates/test/cases/BaseTestCase.java
+++ b/src/test/java/teammates/test/cases/BaseTestCase.java
@@ -45,7 +45,7 @@ public static void ______TS(String description) {
      */
     @BeforeSuite
     public void setLocale() {
-        Locale.setDefault(new Locale("en", "US"));
+        //Locale.setDefault(new Locale("en", "US"));
     }
 
     @BeforeClass

From 5469f296e77dc2e07b501fc2254a7724cdabee7a Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 9 Jul 2018 14:14:47 +0800
Subject: [PATCH 16/76] CI  fail- SCA?

---
 src/test/java/teammates/test/cases/BaseTestCase.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/java/teammates/test/cases/BaseTestCase.java b/src/test/java/teammates/test/cases/BaseTestCase.java
index dabe03b199c..ec1e68ffd10 100644
--- a/src/test/java/teammates/test/cases/BaseTestCase.java
+++ b/src/test/java/teammates/test/cases/BaseTestCase.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
-import java.util.Locale;
 
 import org.junit.Assert;
 import org.testng.AssertJUnit;

From 46d7dc63eb3d298d5a8d092c12b85c58c5fb56eb Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 9 Jul 2018 14:24:42 +0800
Subject: [PATCH 17/76] Revert unnecessary changes

---
 .travis.yml                                          | 7 -------
 src/test/java/teammates/test/cases/BaseTestCase.java | 3 ++-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 47b598495a4..72ebf27b551 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,9 +15,6 @@ dist: trusty
 
 addons:
   firefox: "46.0"
-  apt:
-    packages:
-    - language-pack-de
 
 before_install:
   - |
@@ -31,9 +28,6 @@ before_install:
   - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid \
     --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1440x900x16"
   - nvm install node
-  - export LANG=de_DE.UTF-8
-  - export LC_ALL=de_DE.UTF-8
-  - locale
 
 before_script:
   - export DISPLAY=:99.0
@@ -57,7 +51,6 @@ install: true
 script:
   - npm run build
   - ./gradlew appengineStart
-  - locale
   - ./gradlew ciTests
 
 after_failure:
diff --git a/src/test/java/teammates/test/cases/BaseTestCase.java b/src/test/java/teammates/test/cases/BaseTestCase.java
index ec1e68ffd10..24e98c5add0 100644
--- a/src/test/java/teammates/test/cases/BaseTestCase.java
+++ b/src/test/java/teammates/test/cases/BaseTestCase.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.Locale;
 
 import org.junit.Assert;
 import org.testng.AssertJUnit;
@@ -44,7 +45,7 @@ public static void ______TS(String description) {
      */
     @BeforeSuite
     public void setLocale() {
-        //Locale.setDefault(new Locale("en", "US"));
+        Locale.setDefault(new Locale("en", "US"));
     }
 
     @BeforeClass

From b22a6f94d0a34038a6b5823dbbd942cc5fc65bbc Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 9 Jul 2018 15:16:51 +0800
Subject: [PATCH 18/76] CI should pass

---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 72ebf27b551..20492b841b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,9 @@ dist: trusty
 
 addons:
   firefox: "46.0"
+  apt:
+      packages:
+      - language-pack-de
 
 before_install:
   - |
@@ -28,6 +31,9 @@ before_install:
   - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid \
     --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1440x900x16"
   - nvm install node
+  - export LANG=de_DE.UTF-8
+  - export LC_ALL=de_DE.UTF-8
+  - locale
 
 before_script:
   - export DISPLAY=:99.0

From 8bff1b8a1f3e23ac2e72394f9393123e5c4f1503 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 9 Jul 2018 17:51:50 +0800
Subject: [PATCH 19/76] CI should pass now for UI tests also

---
 .../test/cases/BaseTestCaseWithMinimalGaeEnvironment.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java b/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
index 6726bd04edc..2216e65ca36 100644
--- a/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
+++ b/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
@@ -2,6 +2,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Locale;
 
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -21,15 +22,17 @@ public class BaseTestCaseWithMinimalGaeEnvironment extends BaseTestCase {
     private LocalServiceTestHelper helper = new LocalServiceTestHelper();
 
     /**
-     * Sets the environment of SystemProperty based on the URL.
+     * Sets the environment of SystemProperty based on the URL and default locale required for tests
      */
     @BeforeSuite
-    public void setUpEnvironment() throws MalformedURLException {
+    public void setUpEnvironmentAndLocale() throws MalformedURLException {
         if (new URL(TestProperties.TEAMMATES_URL).getHost().contains(".appspot.com")) {
             SystemProperty.environment.set(SystemProperty.Environment.Value.Production);
         } else {
             SystemProperty.environment.set(SystemProperty.Environment.Value.Development);
         }
+
+        Locale.setDefault(new Locale("en", "US"));
     }
 
     @BeforeClass

From c488b4f98d76cda33b6a99c90bfdaa8ef4c1b21e Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 9 Jul 2018 19:06:46 +0800
Subject: [PATCH 20/76] CI should pass now for UI tests also

---
 .../test/cases/BaseTestCaseWithMinimalGaeEnvironment.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java b/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
index 2216e65ca36..66f73cb3abd 100644
--- a/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
+++ b/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
@@ -22,7 +22,7 @@ public class BaseTestCaseWithMinimalGaeEnvironment extends BaseTestCase {
     private LocalServiceTestHelper helper = new LocalServiceTestHelper();
 
     /**
-     * Sets the environment of SystemProperty based on the URL and default locale required for tests
+     * Sets the environment of SystemProperty based on the URL and default locale required for tests.
      */
     @BeforeSuite
     public void setUpEnvironmentAndLocale() throws MalformedURLException {

From b2c98fd7a692f6ef2163f03c04db9bb22dd73e54 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 9 Jul 2018 19:46:17 +0800
Subject: [PATCH 21/76] CI should pass now for UI tests also

---
 src/test/java/teammates/test/pageobjects/Browser.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/test/java/teammates/test/pageobjects/Browser.java b/src/test/java/teammates/test/pageobjects/Browser.java
index f9af891b733..00a88d7af49 100644
--- a/src/test/java/teammates/test/pageobjects/Browser.java
+++ b/src/test/java/teammates/test/pageobjects/Browser.java
@@ -84,6 +84,7 @@ private WebDriver createWebDriver() {
             profile.setPreference("browser.helperApps.neverAsk.saveToDisk", "text/csv,application/vnd.ms-excel");
             profile.setPreference("browser.download.folderList", 2);
             profile.setPreference("browser.download.dir", System.getProperty("java.io.tmpdir"));
+            profile.setPreference("intl.accept_languages","en_US");
             return new FirefoxDriver(profile);
 
         } else if (TestProperties.BROWSER_CHROME.equals(browser)) {
@@ -93,6 +94,7 @@ private WebDriver createWebDriver() {
 
             ChromeOptions options = new ChromeOptions();
             options.addArguments("--allow-file-access-from-files");
+            options.addArguments("--lang=en_US");
             return new ChromeDriver(options);
         }
         System.out.println("Using " + browser + " is not supported!");

From ecb60334b41a8322d294a23e0fe2b185cf3d350c Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Tue, 10 Jul 2018 01:23:50 +0800
Subject: [PATCH 22/76] Update Browser.java

---
 src/test/java/teammates/test/pageobjects/Browser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/teammates/test/pageobjects/Browser.java b/src/test/java/teammates/test/pageobjects/Browser.java
index 00a88d7af49..2e237883db7 100644
--- a/src/test/java/teammates/test/pageobjects/Browser.java
+++ b/src/test/java/teammates/test/pageobjects/Browser.java
@@ -84,7 +84,7 @@ private WebDriver createWebDriver() {
             profile.setPreference("browser.helperApps.neverAsk.saveToDisk", "text/csv,application/vnd.ms-excel");
             profile.setPreference("browser.download.folderList", 2);
             profile.setPreference("browser.download.dir", System.getProperty("java.io.tmpdir"));
-            profile.setPreference("intl.accept_languages","en_US");
+            profile.setPreference("intl.accept_languages", "en_US");
             return new FirefoxDriver(profile);
 
         } else if (TestProperties.BROWSER_CHROME.equals(browser)) {

From e5523075d951805054777ff873d94c1fb6252549 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Tue, 10 Jul 2018 16:02:41 +0800
Subject: [PATCH 23/76] Trial

---
 src/test/java/teammates/test/pageobjects/Browser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/teammates/test/pageobjects/Browser.java b/src/test/java/teammates/test/pageobjects/Browser.java
index 00a88d7af49..0433105fb9c 100644
--- a/src/test/java/teammates/test/pageobjects/Browser.java
+++ b/src/test/java/teammates/test/pageobjects/Browser.java
@@ -84,7 +84,7 @@ private WebDriver createWebDriver() {
             profile.setPreference("browser.helperApps.neverAsk.saveToDisk", "text/csv,application/vnd.ms-excel");
             profile.setPreference("browser.download.folderList", 2);
             profile.setPreference("browser.download.dir", System.getProperty("java.io.tmpdir"));
-            profile.setPreference("intl.accept_languages","en_US");
+            profile.setPreference("intl.accept_languages","en-us");
             return new FirefoxDriver(profile);
 
         } else if (TestProperties.BROWSER_CHROME.equals(browser)) {

From 506e20165fdbb711afa3279b6e1c2e6302d9d903 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Tue, 10 Jul 2018 16:04:26 +0800
Subject: [PATCH 24/76] Trial

---
 src/test/java/teammates/test/pageobjects/Browser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/teammates/test/pageobjects/Browser.java b/src/test/java/teammates/test/pageobjects/Browser.java
index c7e969d667f..aff3b908183 100644
--- a/src/test/java/teammates/test/pageobjects/Browser.java
+++ b/src/test/java/teammates/test/pageobjects/Browser.java
@@ -94,7 +94,7 @@ private WebDriver createWebDriver() {
 
             ChromeOptions options = new ChromeOptions();
             options.addArguments("--allow-file-access-from-files");
-            options.addArguments("--lang=en_US");
+            options.addArguments("--lang=en-us");
             return new ChromeDriver(options);
         }
         System.out.println("Using " + browser + " is not supported!");

From 49d0f8886793c8a46b7ede4a47ee31fd1880ee29 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Tue, 10 Jul 2018 16:44:38 +0800
Subject: [PATCH 25/76] Trial

---
 src/test/java/teammates/test/pageobjects/Browser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/teammates/test/pageobjects/Browser.java b/src/test/java/teammates/test/pageobjects/Browser.java
index aff3b908183..be4376ca6c7 100644
--- a/src/test/java/teammates/test/pageobjects/Browser.java
+++ b/src/test/java/teammates/test/pageobjects/Browser.java
@@ -84,7 +84,7 @@ private WebDriver createWebDriver() {
             profile.setPreference("browser.helperApps.neverAsk.saveToDisk", "text/csv,application/vnd.ms-excel");
             profile.setPreference("browser.download.folderList", 2);
             profile.setPreference("browser.download.dir", System.getProperty("java.io.tmpdir"));
-            profile.setPreference("intl.accept_languages", "en-us");
+            profile.setPreference("intl.accept_languages", "en-us, en");
             return new FirefoxDriver(profile);
 
         } else if (TestProperties.BROWSER_CHROME.equals(browser)) {

From 89b1025cf60d0c96c619c62caf63b2aee1f71283 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Wed, 11 Jul 2018 14:00:42 +0800
Subject: [PATCH 26/76] ofPattern(String) -> ofPattern(String, Locale.US)

---
 .../teammates/common/util/LogMessageGenerator.java    |  4 +++-
 src/main/java/teammates/common/util/TimeHelper.java   | 11 ++++++-----
 .../ui/pagedata/AdminActivityLogPageData.java         |  5 +++--
 .../cases/action/AdminActivityLogPageActionTest.java  |  5 +++--
 .../cases/action/AdminEmailLogPageActionTest.java     |  3 ++-
 .../InstructorFeedbackSessionsPageUiTest.java         |  3 ++-
 src/test/java/teammates/test/driver/HtmlHelper.java   |  7 ++++---
 7 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/main/java/teammates/common/util/LogMessageGenerator.java b/src/main/java/teammates/common/util/LogMessageGenerator.java
index 4418a742b68..e33055b425e 100644
--- a/src/main/java/teammates/common/util/LogMessageGenerator.java
+++ b/src/main/java/teammates/common/util/LogMessageGenerator.java
@@ -2,6 +2,7 @@
 
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
+import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -19,7 +20,8 @@ public class LogMessageGenerator {
     public static final Pattern PATTERN_ACTION_NAME = Pattern.compile("^/\\S+?/(?<actionName>[^\\s\\?]*)");
     public static final String PATTERN_ACTION_NAME_GROUP = "actionName";
 
-    private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern(Const.ActivityLog.TIME_FORMAT_LOGID);
+    private static final DateTimeFormatter FORMATTER =
+            DateTimeFormatter.ofPattern(Const.ActivityLog.TIME_FORMAT_LOGID, Locale.US);
 
     /**
      * Generates the log message for an *Action.
diff --git a/src/main/java/teammates/common/util/TimeHelper.java b/src/main/java/teammates/common/util/TimeHelper.java
index 4962def5da4..0bacb8bf0c0 100644
--- a/src/main/java/teammates/common/util/TimeHelper.java
+++ b/src/main/java/teammates/common/util/TimeHelper.java
@@ -17,6 +17,7 @@
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import teammates.common.exception.TeammatesException;
@@ -229,7 +230,7 @@ private static String formatLocalDateTime(LocalDateTime localDateTime, String pa
         if (localDateTime.getHour() == 12 && localDateTime.getMinute() == 0) {
             processedPattern = pattern.replace("a", "'NOON'");
         }
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(processedPattern);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(processedPattern, Locale.US);
         return localDateTime.format(formatter);
     }
 
@@ -338,7 +339,7 @@ private static String formatInstant(Instant instant, ZoneId timeZone, String pat
         if (zonedDateTime.getHour() == 12 && zonedDateTime.getMinute() == 0) {
             processedPattern = pattern.replace("a", "'NOON'");
         }
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(processedPattern);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(processedPattern, Locale.US);
         return zonedDateTime.format(formatter);
     }
 
@@ -487,7 +488,7 @@ public static String convertToStandardDuration(Long timeInMilliseconds) {
      * @throws AssertionError if there is a parsing error
      */
     public static Instant parseInstant(String dateTimeString) {
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(SystemParams.DEFAULT_DATE_TIME_FORMAT);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(SystemParams.DEFAULT_DATE_TIME_FORMAT, Locale.US);
         try {
             return ZonedDateTime.parse(dateTimeString, formatter).toInstant();
         } catch (DateTimeParseException e) {
@@ -508,7 +509,7 @@ public static LocalDateTime parseLocalDateTime(String dateTimeString, String pat
             return null;
         }
 
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern, Locale.US);
         try {
             return LocalDateTime.parse(dateTimeString, formatter);
         } catch (DateTimeParseException e) {
@@ -528,7 +529,7 @@ public static LocalDate parseLocalDate(String dateString, String pattern) {
             return null;
         }
 
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern, Locale.US);
         try {
             return LocalDate.parse(dateString, formatter);
         } catch (DateTimeParseException e) {
diff --git a/src/main/java/teammates/ui/pagedata/AdminActivityLogPageData.java b/src/main/java/teammates/ui/pagedata/AdminActivityLogPageData.java
index a927fccc5b8..0ec3a751b51 100644
--- a/src/main/java/teammates/ui/pagedata/AdminActivityLogPageData.java
+++ b/src/main/java/teammates/ui/pagedata/AdminActivityLogPageData.java
@@ -8,6 +8,7 @@
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import teammates.common.datatransfer.attributes.AccountAttributes;
 import teammates.common.exception.InvalidParametersException;
@@ -261,12 +262,12 @@ private QueryParameters parseQuery(String query) throws ParseException, InvalidP
                 }
 
             } else if ("from".equals(label)) {
-                fromDateValue = LocalDate.parse(values[0], DateTimeFormatter.ofPattern("dd/MM/yy"))
+                fromDateValue = LocalDate.parse(values[0], DateTimeFormatter.ofPattern("dd/MM/yy", Locale.US))
                         .atStartOfDay(Const.SystemParams.ADMIN_TIME_ZONE).toInstant().toEpochMilli();
                 isFromDateSpecifiedInQuery = true;
 
             } else if ("to".equals(label)) {
-                toDateValue = LocalDate.parse(values[0], DateTimeFormatter.ofPattern("dd/MM/yy"))
+                toDateValue = LocalDate.parse(values[0], DateTimeFormatter.ofPattern("dd/MM/yy", Locale.US))
                         .atTime(LocalTime.MAX).atZone(Const.SystemParams.ADMIN_TIME_ZONE).toInstant().toEpochMilli();
             } else {
                 q.add(label, values);
diff --git a/src/test/java/teammates/test/cases/action/AdminActivityLogPageActionTest.java b/src/test/java/teammates/test/cases/action/AdminActivityLogPageActionTest.java
index c25c67d7f16..f0c2c5a039d 100644
--- a/src/test/java/teammates/test/cases/action/AdminActivityLogPageActionTest.java
+++ b/src/test/java/teammates/test/cases/action/AdminActivityLogPageActionTest.java
@@ -7,6 +7,7 @@
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import org.testng.annotations.BeforeGroups;
 import org.testng.annotations.Test;
@@ -84,13 +85,13 @@ private void loadLogMessages() {
 
     private String formatAdminDate(Instant instant) {
         return instant.atZone(Const.SystemParams.ADMIN_TIME_ZONE).toLocalDate()
-                .format(DateTimeFormatter.ofPattern("dd/MM/yy"));
+                .format(DateTimeFormatter.ofPattern("dd/MM/yy", Locale.US));
     }
 
     private String formatActivityLogTimeTruncated(Instant instant, ZoneId zoneId) {
         // Some timings are adjusted slightly in the tests. Hence instead of testing for exact match,
         // we test matching up to the hour.
-        return DateTimeFormatter.ofPattern("dd/MM/yyyy HH").format(instant.atZone(zoneId));
+        return DateTimeFormatter.ofPattern("dd/MM/yyyy HH", Locale.US).format(instant.atZone(zoneId));
     }
 
     private String getExpectedAjaxTimeString(Instant instant, ZoneId zoneId) {
diff --git a/src/test/java/teammates/test/cases/action/AdminEmailLogPageActionTest.java b/src/test/java/teammates/test/cases/action/AdminEmailLogPageActionTest.java
index 114be3b80f2..9cf7f0242da 100644
--- a/src/test/java/teammates/test/cases/action/AdminEmailLogPageActionTest.java
+++ b/src/test/java/teammates/test/cases/action/AdminEmailLogPageActionTest.java
@@ -6,6 +6,7 @@
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import org.testng.annotations.BeforeGroups;
 import org.testng.annotations.Test;
@@ -51,7 +52,7 @@ public class AdminEmailLogPageActionTest extends BaseActionTest {
     // 130 seconds is chosen so that it will be around 50 logs within 2 hours before now.
     private static final int LOG_MESSAGE_INTERVAL_MANY_LOGS = 130;
 
-    private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("dd/MM/yyyy");
+    private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("dd/MM/yyyy", Locale.US);
 
     private static final Instant TODAY = Instant.now();
     private static final Instant YESTERDAY = TimeHelper.getInstantDaysOffsetFromNow(-1);
diff --git a/src/test/java/teammates/test/cases/browsertests/InstructorFeedbackSessionsPageUiTest.java b/src/test/java/teammates/test/cases/browsertests/InstructorFeedbackSessionsPageUiTest.java
index a474553e25e..e15facbcb2a 100644
--- a/src/test/java/teammates/test/cases/browsertests/InstructorFeedbackSessionsPageUiTest.java
+++ b/src/test/java/teammates/test/cases/browsertests/InstructorFeedbackSessionsPageUiTest.java
@@ -7,6 +7,7 @@
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import org.openqa.selenium.By;
 import org.testng.annotations.BeforeMethod;
@@ -721,7 +722,7 @@ private void testDatePickerScripts(LocalDate defaultStartDate) {
         feedbackPage.clickCustomVisibleTimeButton();
         feedbackPage.clickCustomPublishTimeButton();
 
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("EEE MMM dd yyyy");
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("EEE MMM dd yyyy", Locale.US);
 
         ______TS("validate visible date range before editing start date");
 
diff --git a/src/test/java/teammates/test/driver/HtmlHelper.java b/src/test/java/teammates/test/driver/HtmlHelper.java
index 4ea7ac904d6..805a4f6bf3a 100644
--- a/src/test/java/teammates/test/driver/HtmlHelper.java
+++ b/src/test/java/teammates/test/driver/HtmlHelper.java
@@ -5,6 +5,7 @@
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.util.Locale;
 
 import org.jsoup.Jsoup;
 import org.jsoup.helper.W3CDom;
@@ -411,12 +412,12 @@ private static String suppressVariationsInInjectedValues(String content) {
      */
     private static String replaceUnpredictableValuesWithPlaceholders(String content) {
         LocalDate today = LocalDate.now();
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy, ");
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy, ", Locale.US);
         String dateToday = formatter.format(today);
         String dateYesterday = formatter.format(today.minusDays(1));
         String dateTomorrow = formatter.format(today.plusDays(1));
-        String dateTodayInIso8601 = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'").format(today);
-        String dateTodayInCoursesPageFormat = DateTimeFormatter.ofPattern("d MMM yyyy").format(today);
+        String dateTodayInIso8601 = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'", Locale.US).format(today);
+        String dateTodayInCoursesPageFormat = DateTimeFormatter.ofPattern("d MMM yyyy", Locale.US).format(today);
         return content // dev server admin absolute URLs (${teammates.url}/_ah/...)
                       .replace("\"" + TestProperties.TEAMMATES_URL + "/_ah", "\"/_ah")
                       // logout URL generated by Google

From 2db4073c11bb826abdaf43d95546b113ada6df7f Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Wed, 11 Jul 2018 15:18:34 +0800
Subject: [PATCH 27/76] Update locale for DecimalFormat

---
 .../FeedbackConstantSumQuestionDetails.java   |  8 +++--
 .../questions/FeedbackMcqQuestionDetails.java | 20 ++++++++----
 .../questions/FeedbackMsqQuestionDetails.java |  9 ++++--
 ...FeedbackNumericalScaleQuestionDetails.java |  5 +++
 .../FeedbackRubricQuestionDetails.java        | 32 ++++++++++++-------
 .../teammates/common/util/StringHelper.java   |  5 ++-
 6 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackConstantSumQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackConstantSumQuestionDetails.java
index ebd57b9f1c6..b7d20509c3d 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackConstantSumQuestionDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackConstantSumQuestionDetails.java
@@ -1,11 +1,13 @@
 package teammates.common.datatransfer.questions;
 
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
@@ -447,7 +449,8 @@ public String getQuestionResultStatisticsHtml(
 
         Map<String, List<Integer>> optionPoints = generateOptionPointsMapping(responses);
 
-        DecimalFormat df = new DecimalFormat("#.##");
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+        DecimalFormat df = new DecimalFormat("#.##", decimalFormatSymbols);
 
         Map<String, List<Integer>> sortedOptionPoints = new TreeMap<>();
 
@@ -509,7 +512,8 @@ public String getQuestionResultStatisticsCsv(
         List<String> options = constSumOptions;
         Map<String, List<Integer>> optionPoints = generateOptionPointsMapping(responses);
 
-        DecimalFormat df = new DecimalFormat("#.##");
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+        DecimalFormat df = new DecimalFormat("#.##", decimalFormatSymbols);
 
         Map<String, List<Integer>> sortedOptionPoints = new TreeMap<>();
 
diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackMcqQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackMcqQuestionDetails.java
index d52a59cfe24..3cf9fb4ac3b 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackMcqQuestionDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackMcqQuestionDetails.java
@@ -1,11 +1,13 @@
 package teammates.common.datatransfer.questions;
 
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import teammates.common.datatransfer.FeedbackParticipantType;
@@ -385,7 +387,8 @@ private List<String> generateOptionList(String courseId) {
     public String getQuestionSpecificEditFormHtml(int questionNumber) {
         StringBuilder optionListHtml = new StringBuilder();
         String optionFragmentTemplate = FormTemplates.MCQ_EDIT_FORM_OPTIONFRAGMENT;
-        DecimalFormat weightFormat = new DecimalFormat("#.##");
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+        DecimalFormat weightFormat = new DecimalFormat("#.##", decimalFormatSymbols);
 
         // Create MCQ options
         for (int i = 0; i < numOfMcqChoices; i++) {
@@ -524,7 +527,8 @@ public String getQuestionResultStatisticsHtml(List<FeedbackResponseAttributes> u
                 hasAssignedWeights ? mcqStats.calculateWeightedPercentagePerOption(answerFrequency)
                 : new LinkedHashMap<>();
 
-        DecimalFormat df = new DecimalFormat("#.##");
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+        DecimalFormat df = new DecimalFormat("#.##", decimalFormatSymbols);
 
         for (String key : answerFrequency.keySet()) {
             int count = answerFrequency.get(key);
@@ -798,7 +802,8 @@ public List<String> generateStatisticsForEachRecipient(String recipientEmail,
 
             Assumption.assertTrue("Weights should be enabled when calling the function", hasAssignedWeights);
             List<String> recipientStats = new ArrayList<>();
-            DecimalFormat df = new DecimalFormat("0.00");
+            DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+            DecimalFormat df = new DecimalFormat("0.00", decimalFormatSymbols);
 
             String recipientName = bundle.getNameForEmail(recipientEmail);
             String recipientTeam = bundle.getTeamNameForEmail(recipientEmail);
@@ -880,7 +885,8 @@ public String getResponseSummaryStatsCsv(List<FeedbackResponseAttributes> respon
             Map<String, Integer> answerFrequency = collateAnswerFrequency(responses);
 
             StringBuilder fragments = new StringBuilder();
-            DecimalFormat df = new DecimalFormat("#.##");
+            DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+            DecimalFormat df = new DecimalFormat("#.##", decimalFormatSymbols);
 
             // If weights are assigned, CSV file should include 'weight' and 'average' column as well.
             if (hasAssignedWeights) {
@@ -928,7 +934,8 @@ public String getPerRecipientResponseStatsCsv(List<FeedbackResponseAttributes> r
 
         public String getPerRecipientResponseStatsHeaderCsv() {
             StringBuilder header = new StringBuilder(100);
-            DecimalFormat df = new DecimalFormat("#.##");
+            DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+            DecimalFormat df = new DecimalFormat("#.##", decimalFormatSymbols);
 
             header.append("Team, Recipient Name,");
 
@@ -993,7 +1000,8 @@ private String getRecipientStatsHeaderFragmentHtml(String header) {
          */
         public String getRecipientStatsHeaderHtml() {
             StringBuilder headerBuilder = new StringBuilder(100);
-            DecimalFormat df = new DecimalFormat("#.##");
+            DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+            DecimalFormat df = new DecimalFormat("#.##", decimalFormatSymbols);
             StringBuilder choicesHtmlBuilder = new StringBuilder(100);
 
             for (int i = 0; i < mcqChoices.size(); i++) {
diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackMsqQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackMsqQuestionDetails.java
index e5df486d760..72c0f70c6cb 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackMsqQuestionDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackMsqQuestionDetails.java
@@ -1,11 +1,13 @@
 package teammates.common.datatransfer.questions;
 
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import teammates.common.datatransfer.FeedbackParticipantType;
@@ -546,7 +548,8 @@ public String getQuestionResultStatisticsHtml(List<FeedbackResponseAttributes> r
         if (numChoicesSelected == -1) {
             return "";
         }
-        DecimalFormat df = new DecimalFormat("#.##");
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+        DecimalFormat df = new DecimalFormat("#.##", decimalFormatSymbols);
 
         StringBuilder fragments = new StringBuilder();
         answerFrequency.forEach((key, value) ->
@@ -573,8 +576,8 @@ public String getQuestionResultStatisticsCsv(
         if (numChoicesSelected == -1) {
             return "";
         }
-
-        DecimalFormat df = new DecimalFormat("#.##");
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+        DecimalFormat df = new DecimalFormat("#.##", decimalFormatSymbols);
         StringBuilder fragments = new StringBuilder();
         answerFrequency.forEach((key, value) -> fragments.append(SanitizationHelper.sanitizeForCsv(key) + ','
                 + value.toString() + ','
diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleQuestionDetails.java
index 253f3edebef..a51bef40ad9 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleQuestionDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleQuestionDetails.java
@@ -2,10 +2,12 @@
 
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
@@ -211,6 +213,7 @@ private String getInstructorQuestionResultsStatisticsHtml(
         df.setMinimumFractionDigits(0);
         df.setMaximumFractionDigits(5);
         df.setRoundingMode(RoundingMode.DOWN);
+        df.setDecimalFormatSymbols(new DecimalFormatSymbols(Locale.US));
 
         StringBuilder fragmentHtml = new StringBuilder();
 
@@ -279,6 +282,7 @@ private String getStudentQuestionResultsStatisticsHtml(
         df.setMinimumFractionDigits(0);
         df.setMaximumFractionDigits(5);
         df.setRoundingMode(RoundingMode.DOWN);
+        df.setDecimalFormatSymbols(new DecimalFormatSymbols(Locale.US));
 
         boolean isRecipientTypeGeneral = question.recipientType == FeedbackParticipantType.NONE;
         boolean isRecipientTypeTeam = question.recipientType == FeedbackParticipantType.TEAMS
@@ -479,6 +483,7 @@ public String getQuestionResultStatisticsCsv(
         df.setMinimumFractionDigits(0);
         df.setMaximumFractionDigits(5);
         df.setRoundingMode(RoundingMode.DOWN);
+        df.setDecimalFormatSymbols(new DecimalFormatSymbols(Locale.US));
 
         String csvHeader = "Team, Recipient, Average, Minimum, Maximum"
                          + (showAvgExcludingSelf ? ", Average excluding self response" : "")
diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
index 1036662f97a..4a7439e6a18 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
@@ -1,11 +1,13 @@
 package teammates.common.datatransfer.questions;
 
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -376,7 +378,8 @@ private String getSubmissionFormMobileHtml(String questionNumberString, String r
     @Override
     public String getQuestionSpecificEditFormHtml(int questionNumber) {
         String questionNumberString = Integer.toString(questionNumber);
-        DecimalFormat weightFormat = new DecimalFormat("#.##");
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+        DecimalFormat weightFormat = new DecimalFormat("#.##", decimalFormatSymbols);
 
         // Create table row header fragments
         StringBuilder tableHeaderFragmentHtml = new StringBuilder();
@@ -561,7 +564,8 @@ private String getRecipientStatsHeaderFragmentHtml(String header) {
 
     public String getRecipientStatsHeaderHtml() {
         StringBuilder headerBuilder = new StringBuilder(100);
-        DecimalFormat dfWeight = new DecimalFormat("#.##");
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+        DecimalFormat dfWeight = new DecimalFormat("#.##", decimalFormatSymbols);
         StringBuilder choicesHtmlBuilder = new StringBuilder(100);
 
         for (int i = 0; i < rubricChoices.size(); i++) {
@@ -595,7 +599,8 @@ public String getQuestionResultStatisticsHtml(List<FeedbackResponseAttributes> r
         boolean isExcludingSelfOptionAvailable =
                 recipientType.equals(FeedbackParticipantType.OWN_TEAM_MEMBERS_INCLUDING_SELF);
 
-        DecimalFormat weightFormat = new DecimalFormat("#.##");
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+        DecimalFormat weightFormat = new DecimalFormat("#.##", decimalFormatSymbols);
 
         // Create table row header fragments
         StringBuilder tableHeaderFragmentHtml = new StringBuilder();
@@ -687,8 +692,9 @@ Slots.TABLE_HEADER_ROW_FRAGMENT_HTML, getRecipientStatsHeaderHtml(),
     private StringBuilder getQuestionResultsStatisticsBodyHtml(FeedbackRubricQuestionDetails fqd,
                                                                int[][] responseFrequency, float[][] rubricStats) {
 
-        DecimalFormat df = new DecimalFormat("#");
-        DecimalFormat dfAverage = new DecimalFormat("0.00");
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+        DecimalFormat df = new DecimalFormat("#", decimalFormatSymbols);
+        DecimalFormat dfAverage = new DecimalFormat("0.00", decimalFormatSymbols);
 
         String tableBodyFragmentTemplate = FormTemplates.RUBRIC_RESULT_STATS_BODY_FRAGMENT;
         String tableBodyTemplate = FormTemplates.RUBRIC_RESULT_STATS_BODY;
@@ -779,7 +785,8 @@ public String getQuestionResultStatisticsCsv(
         }
 
         StringBuilder csv = new StringBuilder();
-        DecimalFormat dfWeight = new DecimalFormat("#.##");
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+        DecimalFormat dfWeight = new DecimalFormat("#.##", decimalFormatSymbols);
 
         // table header
         for (int i = 0; i < rubricChoices.size(); i++) {
@@ -799,8 +806,8 @@ public String getQuestionResultStatisticsCsv(
         csv.append(System.lineSeparator());
 
         // table body
-        DecimalFormat df = new DecimalFormat("#");
-        DecimalFormat dfAverage = new DecimalFormat("0.00");
+        DecimalFormat df = new DecimalFormat("#", decimalFormatSymbols);
+        DecimalFormat dfAverage = new DecimalFormat("0.00", decimalFormatSymbols);
 
         int[][] responseFrequency = RubricStatistics.calculateResponseFrequency(responses, this);
         float[][] rubricStats = RubricStatistics.calculatePercentageFrequencyAndAverage(this,
@@ -886,7 +893,8 @@ public String getCsvHeader() {
 
     public String getRecipientStatsCsvHeader() {
         StringBuilder header = new StringBuilder(100);
-        DecimalFormat dfWeight = new DecimalFormat("#.##");
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+        DecimalFormat dfWeight = new DecimalFormat("#.##", decimalFormatSymbols);
         String headerFragment = "Team,Recipient Name,Recipient's Email,Sub Question,";
 
         header.append(headerFragment);
@@ -1128,7 +1136,8 @@ public String getHtmlForSubQuestion(int subQuestion) {
             String alphabeticalIndex = StringHelper.integerToLowerCaseAlphabeticalIndex(subQuestion + 1);
             String subQuestionString = SanitizationHelper.sanitizeForHtml(alphabeticalIndex + ") "
                     + getRubricSubQuestions().get(subQuestion));
-            DecimalFormat df = new DecimalFormat("0.00");
+            DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+            DecimalFormat df = new DecimalFormat("0.00", decimalFormatSymbols);
 
             List<String> cols = new ArrayList<>();
 
@@ -1180,7 +1189,8 @@ public String getCsvForSubQuestion(int subQuestion) {
             String alphabeticalIndex = StringHelper.integerToLowerCaseAlphabeticalIndex(subQuestion + 1);
             String subQuestionString = SanitizationHelper.sanitizeForCsv(alphabeticalIndex + ") "
                     + getRubricSubQuestions().get(subQuestion));
-            DecimalFormat df = new DecimalFormat("0.00");
+            DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+            DecimalFormat df = new DecimalFormat("0.00", decimalFormatSymbols);
 
             // Append recipient identification details and rubric subQuestion
             csv.append(recipientTeam).append(',')
diff --git a/src/main/java/teammates/common/util/StringHelper.java b/src/main/java/teammates/common/util/StringHelper.java
index 4e74832bb7e..1bcd56074f5 100644
--- a/src/main/java/teammates/common/util/StringHelper.java
+++ b/src/main/java/teammates/common/util/StringHelper.java
@@ -1,10 +1,12 @@
 package teammates.common.util;
 
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.regex.Pattern;
@@ -181,7 +183,8 @@ public static <T> String toString(List<T> list, String delimiter) {
     }
 
     public static String toDecimalFormatString(double doubleVal) {
-        DecimalFormat df = new DecimalFormat("0.###");
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+        DecimalFormat df = new DecimalFormat("0.###", decimalFormatSymbols);
         return df.format(doubleVal);
     }
 

From b65c8e3cc07da5c723d89419fc994ba783dd7f52 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Sun, 15 Jul 2018 13:01:39 +0800
Subject: [PATCH 28/76] Remove unnecessary changes

---
 gradle.template.properties                                  | 3 ---
 src/test/java/teammates/test/cases/BaseTestCase.java        | 2 +-
 .../test/cases/BaseTestCaseWithMinimalGaeEnvironment.java   | 6 ++----
 src/test/java/teammates/test/pageobjects/Browser.java       | 2 --
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/gradle.template.properties b/gradle.template.properties
index b8207028427..de4eb1204ed 100644
--- a/gradle.template.properties
+++ b/gradle.template.properties
@@ -8,6 +8,3 @@ org.gradle.daemon=false
 # e.g org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home
 # e.g org.gradle.java.home=C:/Program Files/Java/jdk1.8.0_144
 # org.gradle.java.home=
-
-# The test environment REQUIRES the following locale. Do not change!
-org.gradle.jvmargs=-Duser.language=en -Duser.country=US
diff --git a/src/test/java/teammates/test/cases/BaseTestCase.java b/src/test/java/teammates/test/cases/BaseTestCase.java
index 24e98c5add0..8bf132f0098 100644
--- a/src/test/java/teammates/test/cases/BaseTestCase.java
+++ b/src/test/java/teammates/test/cases/BaseTestCase.java
@@ -45,7 +45,7 @@ public static void ______TS(String description) {
      */
     @BeforeSuite
     public void setLocale() {
-        Locale.setDefault(new Locale("en", "US"));
+        Locale.setDefault(Locale.US);
     }
 
     @BeforeClass
diff --git a/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java b/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
index 66f73cb3abd..c9f86ccab3a 100644
--- a/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
+++ b/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
@@ -2,7 +2,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Locale;
 
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -22,17 +21,16 @@ public class BaseTestCaseWithMinimalGaeEnvironment extends BaseTestCase {
     private LocalServiceTestHelper helper = new LocalServiceTestHelper();
 
     /**
-     * Sets the environment of SystemProperty based on the URL and default locale required for tests.
+     * Sets the environment of SystemProperty based on the URL.
      */
     @BeforeSuite
-    public void setUpEnvironmentAndLocale() throws MalformedURLException {
+    public void setUpEnvironment() throws MalformedURLException {
         if (new URL(TestProperties.TEAMMATES_URL).getHost().contains(".appspot.com")) {
             SystemProperty.environment.set(SystemProperty.Environment.Value.Production);
         } else {
             SystemProperty.environment.set(SystemProperty.Environment.Value.Development);
         }
 
-        Locale.setDefault(new Locale("en", "US"));
     }
 
     @BeforeClass
diff --git a/src/test/java/teammates/test/pageobjects/Browser.java b/src/test/java/teammates/test/pageobjects/Browser.java
index be4376ca6c7..f9af891b733 100644
--- a/src/test/java/teammates/test/pageobjects/Browser.java
+++ b/src/test/java/teammates/test/pageobjects/Browser.java
@@ -84,7 +84,6 @@ private WebDriver createWebDriver() {
             profile.setPreference("browser.helperApps.neverAsk.saveToDisk", "text/csv,application/vnd.ms-excel");
             profile.setPreference("browser.download.folderList", 2);
             profile.setPreference("browser.download.dir", System.getProperty("java.io.tmpdir"));
-            profile.setPreference("intl.accept_languages", "en-us, en");
             return new FirefoxDriver(profile);
 
         } else if (TestProperties.BROWSER_CHROME.equals(browser)) {
@@ -94,7 +93,6 @@ private WebDriver createWebDriver() {
 
             ChromeOptions options = new ChromeOptions();
             options.addArguments("--allow-file-access-from-files");
-            options.addArguments("--lang=en-us");
             return new ChromeDriver(options);
         }
         System.out.println("Using " + browser + " is not supported!");

From ac5389713044fb471a1ddc09638476ae5f1413d6 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 16 Jul 2018 11:24:30 +0800
Subject: [PATCH 29/76] Standard style

---
 src/main/java/teammates/common/util/StringHelper.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/teammates/common/util/StringHelper.java b/src/main/java/teammates/common/util/StringHelper.java
index 1bcd56074f5..f476c63b78e 100644
--- a/src/main/java/teammates/common/util/StringHelper.java
+++ b/src/main/java/teammates/common/util/StringHelper.java
@@ -1,7 +1,7 @@
 package teammates.common.util;
 
 import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -183,8 +183,9 @@ public static <T> String toString(List<T> list, String delimiter) {
     }
 
     public static String toDecimalFormatString(double doubleVal) {
-        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-        DecimalFormat df = new DecimalFormat("0.###", decimalFormatSymbols);
+        NumberFormat nf = NumberFormat.getNumberInstance(Locale.US);
+        DecimalFormat df = (DecimalFormat) nf;
+        df.applyPattern("0.###");
         return df.format(doubleVal);
     }
 

From 8cbd8fabf393d733ace99127d554d138bbb5809f Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 16 Jul 2018 11:42:21 +0800
Subject: [PATCH 30/76] Remove setting locale in tests

---
 src/test/java/teammates/test/cases/BaseTestCase.java | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/test/java/teammates/test/cases/BaseTestCase.java b/src/test/java/teammates/test/cases/BaseTestCase.java
index 8bf132f0098..c1f1d46bd7f 100644
--- a/src/test/java/teammates/test/cases/BaseTestCase.java
+++ b/src/test/java/teammates/test/cases/BaseTestCase.java
@@ -40,14 +40,6 @@ public static void ______TS(String description) {
     }
     // CHECKSTYLE.ON:AbbreviationAsWordInName|MethodName
 
-    /**
-     * Set the required locale for tests.
-     */
-    @BeforeSuite
-    public void setLocale() {
-        Locale.setDefault(Locale.US);
-    }
-
     @BeforeClass
     public void printTestClassHeader() {
         print("[============================="

From cc45720ed79006b509ee05e7061dc77188fd1aeb Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 16 Jul 2018 11:50:45 +0800
Subject: [PATCH 31/76] SCA

---
 src/test/java/teammates/test/cases/BaseTestCase.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/test/java/teammates/test/cases/BaseTestCase.java b/src/test/java/teammates/test/cases/BaseTestCase.java
index c1f1d46bd7f..19d725fe822 100644
--- a/src/test/java/teammates/test/cases/BaseTestCase.java
+++ b/src/test/java/teammates/test/cases/BaseTestCase.java
@@ -3,13 +3,11 @@
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
-import java.util.Locale;
 
 import org.junit.Assert;
 import org.testng.AssertJUnit;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeSuite;
 
 import teammates.common.datatransfer.DataBundle;
 import teammates.common.util.FieldValidator;

From 1e90b3015ea505b75d0763c14d39559ed7335810 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 16 Jul 2018 11:56:02 +0800
Subject: [PATCH 32/76] Generalise method

---
 ...FeedbackNumericalScaleQuestionDetails.java | 20 +++++++++----------
 ...FeedbackNumericalScaleResponseDetails.java |  2 +-
 .../teammates/common/util/StringHelper.java   |  2 +-
 ...tructorFeedbackQuestionEditActionTest.java |  4 ++--
 ...rFeedbackSubmissionEditSaveActionTest.java |  4 ++--
 ...tFeedbackSubmissionEditSaveActionTest.java |  8 ++++----
 .../InstructorFeedbackEditPage.java           |  2 +-
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleQuestionDetails.java
index a51bef40ad9..d6e779ba3e1 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleQuestionDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleQuestionDetails.java
@@ -97,7 +97,7 @@ public String getQuestionWithExistingResponseSubmissionFormHtml(
                 Slots.RESPONSE_INDEX, Integer.toString(responseIdx),
                 Slots.MIN_SCALE, Integer.toString(minScale),
                 Slots.MAX_SCALE, Integer.toString(maxScale),
-                Slots.STEP, StringHelper.toDecimalFormatString(step),
+                Slots.STEP, StringHelper.toDecimalFormatString("0.###", step),
                 Slots.EXISTING_ANSWER, numscaleResponseDetails.getAnswerString(),
                 Slots.POSSIBLE_VALUES_STRING, getPossibleValuesStringSubmit(),
                 Slots.FEEDBACK_RESPONSE_TEXT, Const.ParamsNames.FEEDBACK_RESPONSE_TEXT,
@@ -117,7 +117,7 @@ public String getQuestionWithoutExistingResponseSubmissionFormHtml(
                 Slots.RESPONSE_INDEX, Integer.toString(responseIdx),
                 Slots.MIN_SCALE, Integer.toString(minScale),
                 Slots.MAX_SCALE, Integer.toString(maxScale),
-                Slots.STEP, StringHelper.toDecimalFormatString(step),
+                Slots.STEP, StringHelper.toDecimalFormatString("0.###", step),
                 Slots.EXISTING_ANSWER, "",
                 Slots.POSSIBLE_VALUES_STRING, getPossibleValuesStringSubmit(),
                 Slots.FEEDBACK_RESPONSE_TEXT, Const.ParamsNames.FEEDBACK_RESPONSE_TEXT,
@@ -133,7 +133,7 @@ public String getQuestionSpecificEditFormHtml(int questionNumber) {
                 Slots.QUESTION_NUMBER, Integer.toString(questionNumber),
                 Slots.MIN_SCALE, Integer.toString(minScale),
                 Slots.MAX_SCALE, Integer.toString(maxScale),
-                Slots.STEP, StringHelper.toDecimalFormatString(step),
+                Slots.STEP, StringHelper.toDecimalFormatString("0.###", step),
                 Slots.POSSIBLE_VALUES, getPossibleValuesStringEdit(),
                 Slots.NUMSCALE_MIN, Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN,
                 Slots.NUMSCALE_MAX, Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX,
@@ -698,17 +698,17 @@ private String getPossibleValuesString() {
         StringBuilder possibleValuesString = new StringBuilder();
         if (possibleValuesCount > 6) {
             possibleValuesString
-                .append(StringHelper.toDecimalFormatString(minScale)).append(", ")
-                .append(StringHelper.toDecimalFormatString(minScale + step)).append(", ")
-                .append(StringHelper.toDecimalFormatString(minScale + 2 * step)).append(", ..., ")
-                .append(StringHelper.toDecimalFormatString(maxScale - 2 * step)).append(", ")
-                .append(StringHelper.toDecimalFormatString(maxScale - step)).append(", ")
-                .append(StringHelper.toDecimalFormatString(maxScale));
+                .append(StringHelper.toDecimalFormatString("0.###", minScale)).append(", ")
+                .append(StringHelper.toDecimalFormatString("0.###", minScale + step)).append(", ")
+                .append(StringHelper.toDecimalFormatString("0.###", minScale + 2 * step)).append(", ..., ")
+                .append(StringHelper.toDecimalFormatString("0.###", maxScale - 2 * step)).append(", ")
+                .append(StringHelper.toDecimalFormatString("0.###", maxScale - step)).append(", ")
+                .append(StringHelper.toDecimalFormatString("0.###", maxScale));
         } else {
             possibleValuesString.append(Integer.toString(minScale));
             cur = minScale + step;
             while (maxScale - cur >= -1e-9) {
-                possibleValuesString.append(", ").append(StringHelper.toDecimalFormatString(cur));
+                possibleValuesString.append(", ").append(StringHelper.toDecimalFormatString("0.###", cur));
                 cur += step;
             }
         }
diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleResponseDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleResponseDetails.java
index 93cfa74ee39..963141f07e7 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleResponseDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleResponseDetails.java
@@ -34,7 +34,7 @@ public double getAnswer() {
 
     @Override
     public String getAnswerString() {
-        return StringHelper.toDecimalFormatString(answer);
+        return StringHelper.toDecimalFormatString("0.###", answer);
     }
 
     @Override
diff --git a/src/main/java/teammates/common/util/StringHelper.java b/src/main/java/teammates/common/util/StringHelper.java
index f476c63b78e..b6da2c71599 100644
--- a/src/main/java/teammates/common/util/StringHelper.java
+++ b/src/main/java/teammates/common/util/StringHelper.java
@@ -182,7 +182,7 @@ public static <T> String toString(List<T> list, String delimiter) {
                 .collect(Collectors.joining(delimiter));
     }
 
-    public static String toDecimalFormatString(double doubleVal) {
+    public static String toDecimalFormatString(String pattern, double doubleVal) {
         NumberFormat nf = NumberFormat.getNumberInstance(Locale.US);
         DecimalFormat df = (DecimalFormat) nf;
         df.applyPattern("0.###");
diff --git a/src/test/java/teammates/test/cases/action/InstructorFeedbackQuestionEditActionTest.java b/src/test/java/teammates/test/cases/action/InstructorFeedbackQuestionEditActionTest.java
index 8afcf454c67..bc1bc6b502d 100644
--- a/src/test/java/teammates/test/cases/action/InstructorFeedbackQuestionEditActionTest.java
+++ b/src/test/java/teammates/test/cases/action/InstructorFeedbackQuestionEditActionTest.java
@@ -982,7 +982,7 @@ public void testExecuteAndPostProcessNumScale() {
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN, Integer.toString(numscaleDetails.getMinScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX, Integer.toString(numscaleDetails.getMaxScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP,
-                StringHelper.toDecimalFormatString(numscaleDetails.getStep()),
+                StringHelper.toDecimalFormatString("0.###", numscaleDetails.getStep()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMBEROFENTITIESTYPE, "max",
                 Const.ParamsNames.FEEDBACK_QUESTION_SHOWRESPONSESTO, FeedbackParticipantType.INSTRUCTORS.toString(),
                 Const.ParamsNames.FEEDBACK_QUESTION_SHOWGIVERTO, FeedbackParticipantType.INSTRUCTORS.toString(),
@@ -1021,7 +1021,7 @@ public void testExecuteAndPostProcessNumScale() {
                 Const.ParamsNames.FEEDBACK_QUESTION_DESCRIPTION, "more details",
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN, Integer.toString(1),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX, Integer.toString(10),
-                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP, StringHelper.toDecimalFormatString(1.0),
+                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP, StringHelper.toDecimalFormatString("0.###", 1.0),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMBEROFENTITIESTYPE, "max",
                 Const.ParamsNames.FEEDBACK_QUESTION_SHOWRESPONSESTO, FeedbackParticipantType.INSTRUCTORS.toString(),
                 Const.ParamsNames.FEEDBACK_QUESTION_SHOWGIVERTO, FeedbackParticipantType.INSTRUCTORS.toString(),
diff --git a/src/test/java/teammates/test/cases/action/InstructorFeedbackSubmissionEditSaveActionTest.java b/src/test/java/teammates/test/cases/action/InstructorFeedbackSubmissionEditSaveActionTest.java
index 6112a6c69b0..af6104d2f63 100644
--- a/src/test/java/teammates/test/cases/action/InstructorFeedbackSubmissionEditSaveActionTest.java
+++ b/src/test/java/teammates/test/cases/action/InstructorFeedbackSubmissionEditSaveActionTest.java
@@ -445,7 +445,7 @@ public void testExecuteAndPostProcess() {
                 Const.ParamsNames.FEEDBACK_RESPONSE_TEXT + "-1-0", "3.5",
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN + "-1-0", Integer.toString(fqd.getMinScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX + "-1-0", Integer.toString(fqd.getMaxScale()),
-                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString(fqd.getStep())
+                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString("0.###", fqd.getStep())
         };
 
         a = getAction(submissionParams);
@@ -472,7 +472,7 @@ public void testExecuteAndPostProcess() {
                 Const.ParamsNames.FEEDBACK_RESPONSE_TEXT + "-1-0", "",
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN + "-1-0", Integer.toString(fqd.getMinScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX + "-1-0", Integer.toString(fqd.getMaxScale()),
-                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString(fqd.getStep())
+                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString("0.###", fqd.getStep())
         };
 
         a = getAction(submissionParams);
diff --git a/src/test/java/teammates/test/cases/action/StudentFeedbackSubmissionEditSaveActionTest.java b/src/test/java/teammates/test/cases/action/StudentFeedbackSubmissionEditSaveActionTest.java
index c07c21695dd..c59d1d14494 100644
--- a/src/test/java/teammates/test/cases/action/StudentFeedbackSubmissionEditSaveActionTest.java
+++ b/src/test/java/teammates/test/cases/action/StudentFeedbackSubmissionEditSaveActionTest.java
@@ -606,7 +606,7 @@ public void testExecuteAndPostProcess() throws Exception {
                 Const.ParamsNames.FEEDBACK_RESPONSE_TEXT + "-1-0", "1",
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN + "-1-0", Integer.toString(fqd.getMinScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX + "-1-0", Integer.toString(fqd.getMaxScale()),
-                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString(fqd.getStep())
+                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString("0.###", fqd.getStep())
         };
 
         a = getAction(submissionParams);
@@ -637,7 +637,7 @@ public void testExecuteAndPostProcess() throws Exception {
                 Const.ParamsNames.FEEDBACK_RESPONSE_TEXT + "-1-0", "",
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN + "-1-0", Integer.toString(fqd.getMinScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX + "-1-0", Integer.toString(fqd.getMaxScale()),
-                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString(fqd.getStep())
+                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString("0.###", fqd.getStep())
         };
 
         a = getAction(submissionParams);
@@ -951,7 +951,7 @@ public void testExecuteAndPostProcess() throws Exception {
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN + "-1-0", Integer.toString(fqd.getMinScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX + "-1-0", Integer.toString(fqd.getMaxScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0",
-                        StringHelper.toDecimalFormatString(fqd.getStep()),
+                        StringHelper.toDecimalFormatString("0.###", fqd.getStep()),
                 Const.ParamsNames.SEND_SUBMISSION_EMAIL, "on",
 
                 Const.ParamsNames.REGKEY, studentKey,
@@ -999,7 +999,7 @@ public void testExecuteAndPostProcess() throws Exception {
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN + "-1-0", Integer.toString(fqd.getMinScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX + "-1-0", Integer.toString(fqd.getMaxScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0",
-                        StringHelper.toDecimalFormatString(fqd.getStep()),
+                        StringHelper.toDecimalFormatString("0.###", fqd.getStep()),
 
                 Const.ParamsNames.REGKEY, studentKey,
                 Const.ParamsNames.STUDENT_EMAIL, unregisteredStudent.email
diff --git a/src/test/java/teammates/test/pageobjects/InstructorFeedbackEditPage.java b/src/test/java/teammates/test/pageobjects/InstructorFeedbackEditPage.java
index 98528ef1917..825fa7c84fd 100644
--- a/src/test/java/teammates/test/pageobjects/InstructorFeedbackEditPage.java
+++ b/src/test/java/teammates/test/pageobjects/InstructorFeedbackEditPage.java
@@ -265,7 +265,7 @@ public void fillStepNumScaleBox(String step, int qnNumber) {
     }
 
     public void fillStepNumScaleBox(double step, int qnNumber) {
-        fillStepNumScaleBox(StringHelper.toDecimalFormatString(step), qnNumber);
+        fillStepNumScaleBox(StringHelper.toDecimalFormatString("0.###", step), qnNumber);
     }
 
     public void fillStepNumScaleBoxForNewQuestion(String step) {

From 137b480699d3eaa100c7ffaf4b7f99e5eb54bec5 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 16 Jul 2018 12:23:22 +0800
Subject: [PATCH 33/76] Generalise method

---
 .../FeedbackConstantSumQuestionDetails.java   | 17 ++----
 .../questions/FeedbackMcqQuestionDetails.java | 60 ++++++++-----------
 .../questions/FeedbackMsqQuestionDetails.java | 12 +---
 .../FeedbackRubricQuestionDetails.java        | 52 +++++-----------
 .../teammates/common/util/StringHelper.java   |  2 +-
 5 files changed, 49 insertions(+), 94 deletions(-)

diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackConstantSumQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackConstantSumQuestionDetails.java
index b7d20509c3d..2d36fab2ce0 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackConstantSumQuestionDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackConstantSumQuestionDetails.java
@@ -1,13 +1,10 @@
 package teammates.common.datatransfer.questions;
 
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
@@ -449,9 +446,6 @@ public String getQuestionResultStatisticsHtml(
 
         Map<String, List<Integer>> optionPoints = generateOptionPointsMapping(responses);
 
-        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-        DecimalFormat df = new DecimalFormat("#.##", decimalFormatSymbols);
-
         Map<String, List<Integer>> sortedOptionPoints = new TreeMap<>();
 
         Map<String, String> identifierMap = new HashMap<>();
@@ -478,14 +472,14 @@ public String getQuestionResultStatisticsHtml(
                         Slots.TEAM, SanitizationHelper.sanitizeForHtml(teamName),
                         Slots.CONSTSUM_POINTS_RECEIVED, pointsReceived,
                         Slots.CONSTSUM_TOTAL_POINTS, Integer.toString(total),
-                        Slots.CONSTSUM_AVERAGE_POINTS, df.format(average)));
+                        Slots.CONSTSUM_AVERAGE_POINTS, StringHelper.toDecimalFormatString("#.##", average)));
             } else {
 
                 fragments.append(Templates.populateTemplate(FormTemplates.CONSTSUM_RESULT_STATS_OPTIONFRAGMENT,
                         Slots.CONSTSUM_OPTION_VALUE, SanitizationHelper.sanitizeForHtml(option),
                         Slots.CONSTSUM_POINTS_RECEIVED, pointsReceived,
                         Slots.CONSTSUM_TOTAL_POINTS, Integer.toString(total),
-                        Slots.CONSTSUM_AVERAGE_POINTS, df.format(average)));
+                        Slots.CONSTSUM_AVERAGE_POINTS, StringHelper.toDecimalFormatString("#.##", average)));
             }
         });
 
@@ -512,9 +506,6 @@ public String getQuestionResultStatisticsCsv(
         List<String> options = constSumOptions;
         Map<String, List<Integer>> optionPoints = generateOptionPointsMapping(responses);
 
-        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-        DecimalFormat df = new DecimalFormat("#.##", decimalFormatSymbols);
-
         Map<String, List<Integer>> sortedOptionPoints = new TreeMap<>();
 
         Map<String, String> identifierMap = new HashMap<>();
@@ -542,8 +533,8 @@ public String getQuestionResultStatisticsCsv(
             double total = computeTotal(points);
 
             fragments.append(option)
-                    .append(',').append(df.format(average))
-                    .append(',').append(df.format(total))
+                    .append(',').append(StringHelper.toDecimalFormatString("#.##", average))
+                    .append(',').append(StringHelper.toDecimalFormatString("#.##", total))
                     .append(',').append(StringHelper.join(",", points))
                     .append(System.lineSeparator());
 
diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackMcqQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackMcqQuestionDetails.java
index 3cf9fb4ac3b..14afd3e73cc 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackMcqQuestionDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackMcqQuestionDetails.java
@@ -1,13 +1,10 @@
 package teammates.common.datatransfer.questions;
 
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 
 import teammates.common.datatransfer.FeedbackParticipantType;
@@ -23,6 +20,7 @@
 import teammates.common.util.HttpRequestHelper;
 import teammates.common.util.Logger;
 import teammates.common.util.SanitizationHelper;
+import teammates.common.util.StringHelper;
 import teammates.common.util.Templates;
 import teammates.common.util.Templates.FeedbackQuestion.FormTemplates;
 import teammates.common.util.Templates.FeedbackQuestion.Slots;
@@ -387,8 +385,6 @@ private List<String> generateOptionList(String courseId) {
     public String getQuestionSpecificEditFormHtml(int questionNumber) {
         StringBuilder optionListHtml = new StringBuilder();
         String optionFragmentTemplate = FormTemplates.MCQ_EDIT_FORM_OPTIONFRAGMENT;
-        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-        DecimalFormat weightFormat = new DecimalFormat("#.##", decimalFormatSymbols);
 
         // Create MCQ options
         for (int i = 0; i < numOfMcqChoices; i++) {
@@ -409,13 +405,15 @@ public String getQuestionSpecificEditFormHtml(int questionNumber) {
                     Templates.populateTemplate(weightFragmentTemplate,
                             Slots.QUESTION_NUMBER, Integer.toString(questionNumber),
                             Slots.ITERATOR, Integer.toString(i),
-                            Slots.MCQ_WEIGHT, hasAssignedWeights ? weightFormat.format(mcqWeights.get(i)) : "0",
+                            Slots.MCQ_WEIGHT,
+                                hasAssignedWeights ? StringHelper.toDecimalFormatString("#.##", mcqWeights.get(i)) : "0",
                             Slots.MCQ_PARAM_WEIGHT, Const.ParamsNames.FEEDBACK_QUESTION_MCQ_WEIGHT);
             weightFragmentHtml.append(weightFragment).append(System.lineSeparator());
         }
 
         // Create MCQ other weight value
-        String mcqOtherWeightValue = hasAssignedWeights && otherEnabled ? weightFormat.format(mcqOtherWeight) : "0";
+        String mcqOtherWeightValue =
+                hasAssignedWeights && otherEnabled ? StringHelper.toDecimalFormatString("#.##", mcqOtherWeight) : "0";
 
         return Templates.populateTemplate(
                 FormTemplates.MCQ_EDIT_FORM,
@@ -527,26 +525,24 @@ public String getQuestionResultStatisticsHtml(List<FeedbackResponseAttributes> u
                 hasAssignedWeights ? mcqStats.calculateWeightedPercentagePerOption(answerFrequency)
                 : new LinkedHashMap<>();
 
-        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-        DecimalFormat df = new DecimalFormat("#.##", decimalFormatSymbols);
-
         for (String key : answerFrequency.keySet()) {
             int count = answerFrequency.get(key);
             // If weights are allowed, show the corresponding weights of a choice.
             String weightString = "";
             if ("Other".equals(key)) {
-                weightString = hasAssignedWeights ? df.format(mcqOtherWeight) : "-";
+                weightString = hasAssignedWeights ? StringHelper.toDecimalFormatString("#.##", mcqOtherWeight) : "-";
             } else {
-                weightString = hasAssignedWeights ? df.format(mcqWeights.get(mcqChoices.indexOf(key))) : "-";
+                weightString = hasAssignedWeights ?
+                        StringHelper.toDecimalFormatString("#.##", mcqWeights.get(mcqChoices.indexOf(key))) : "-";
             }
 
             responseSummaryFragments.append(Templates.populateTemplate(FormTemplates.MCQ_RESULT_STATS_OPTIONFRAGMENT,
                     Slots.MCQ_CHOICE_VALUE, SanitizationHelper.sanitizeForHtml(key),
                     Slots.MCQ_WEIGHT, weightString,
                     Slots.COUNT, Integer.toString(count),
-                    Slots.PERCENTAGE, df.format(100 * (double) count / responses.size()),
-                    Slots.WEIGHTED_PERCENTAGE,
-                            hasAssignedWeights ? df.format(weightedPercentagePerOption.get(key)) : "-"));
+                    Slots.PERCENTAGE, StringHelper.toDecimalFormatString("#.##", 100 * (double) count / responses.size()),
+                    Slots.WEIGHTED_PERCENTAGE, hasAssignedWeights ?
+                            StringHelper.toDecimalFormatString("#.##", weightedPercentagePerOption.get(key)) : "-"));
         }
 
         // If weights are assigned, create the per recipient statistics table,
@@ -802,8 +798,6 @@ public List<String> generateStatisticsForEachRecipient(String recipientEmail,
 
             Assumption.assertTrue("Weights should be enabled when calling the function", hasAssignedWeights);
             List<String> recipientStats = new ArrayList<>();
-            DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-            DecimalFormat df = new DecimalFormat("0.00", decimalFormatSymbols);
 
             String recipientName = bundle.getNameForEmail(recipientEmail);
             String recipientTeam = bundle.getTeamNameForEmail(recipientEmail);
@@ -832,9 +826,9 @@ public List<String> generateStatisticsForEachRecipient(String recipientEmail,
                 numOfResponsesForThisRecipient += responseCount;
             }
 
-            recipientStats.add(df.format(total));
+            recipientStats.add(StringHelper.toDecimalFormatString("0.00", total));
             average = numOfResponsesForThisRecipient == 0 ? 0 : total / numOfResponsesForThisRecipient;
-            recipientStats.add(df.format(average));
+            recipientStats.add(StringHelper.toDecimalFormatString("0.00", average));
 
             return recipientStats;
         }
@@ -885,8 +879,6 @@ public String getResponseSummaryStatsCsv(List<FeedbackResponseAttributes> respon
             Map<String, Integer> answerFrequency = collateAnswerFrequency(responses);
 
             StringBuilder fragments = new StringBuilder();
-            DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-            DecimalFormat df = new DecimalFormat("#.##", decimalFormatSymbols);
 
             // If weights are assigned, CSV file should include 'weight' and 'average' column as well.
             if (hasAssignedWeights) {
@@ -897,23 +889,26 @@ public String getResponseSummaryStatsCsv(List<FeedbackResponseAttributes> respon
                     int responseCount = answerFrequency.get(key);
                     String weightString = "";
                     if ("Other".equals(key)) {
-                        weightString = df.format(mcqOtherWeight);
+                        weightString = StringHelper.toDecimalFormatString("#.##", mcqOtherWeight);
                     } else {
-                        weightString = df.format(mcqWeights.get(mcqChoices.indexOf(key)));
+                        weightString = StringHelper.toDecimalFormatString("#.##", mcqWeights.get(mcqChoices.indexOf(key)));
                     }
 
                     fragments.append(SanitizationHelper.sanitizeForCsv(key)).append(',')
                              .append(SanitizationHelper.sanitizeForCsv(weightString)).append(',')
                              .append(Integer.toString(responseCount)).append(',')
-                             .append(df.format(100 * (double) responseCount / responses.size())).append(',')
-                             .append(df.format(weightedPercentagePerOption.get(key))).append(System.lineSeparator());
+                             .append(StringHelper.toDecimalFormatString("#.##",
+                                     100 * (double) responseCount / responses.size())).append(',')
+                             .append(StringHelper.toDecimalFormatString("#.##",
+                                     weightedPercentagePerOption.get(key))).append(System.lineSeparator());
                 }
             } else {
                 header = "Choice, Response Count, Percentage (%)";
 
                 answerFrequency.forEach((key, value) -> fragments.append(SanitizationHelper.sanitizeForCsv(key)).append(',')
                         .append(value.toString()).append(',')
-                        .append(df.format(100 * (double) value / responses.size())).append(System.lineSeparator()));
+                        .append(StringHelper.toDecimalFormatString("#.##",
+                                100 * (double) value / responses.size())).append(System.lineSeparator()));
             }
 
             return header + System.lineSeparator() + fragments.toString();
@@ -934,17 +929,16 @@ public String getPerRecipientResponseStatsCsv(List<FeedbackResponseAttributes> r
 
         public String getPerRecipientResponseStatsHeaderCsv() {
             StringBuilder header = new StringBuilder(100);
-            DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-            DecimalFormat df = new DecimalFormat("#.##", decimalFormatSymbols);
 
             header.append("Team, Recipient Name,");
 
             for (int i = 0; i < numOfMcqChoices; i++) {
-                String choiceString = mcqChoices.get(i) + " [" + df.format(mcqWeights.get(i)) + "]";
+                String choiceString = mcqChoices.get(i) + " ["
+                        + StringHelper.toDecimalFormatString("#.##", mcqWeights.get(i)) + "]";
                 header.append(SanitizationHelper.sanitizeForCsv(choiceString)).append(',');
             }
             if (otherEnabled) {
-                String otherOptionString = "Other [" + df.format(mcqOtherWeight) + "]";
+                String otherOptionString = "Other [" + StringHelper.toDecimalFormatString("#.##", mcqOtherWeight) + "]";
                 header.append(SanitizationHelper.sanitizeForCsv(otherOptionString)).append(',');
             }
             header.append("Total, Average").append(System.lineSeparator());
@@ -1000,17 +994,15 @@ private String getRecipientStatsHeaderFragmentHtml(String header) {
          */
         public String getRecipientStatsHeaderHtml() {
             StringBuilder headerBuilder = new StringBuilder(100);
-            DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-            DecimalFormat df = new DecimalFormat("#.##", decimalFormatSymbols);
             StringBuilder choicesHtmlBuilder = new StringBuilder(100);
 
             for (int i = 0; i < mcqChoices.size(); i++) {
-                String weight = df.format(mcqWeights.get(i));
+                String weight = StringHelper.toDecimalFormatString("#.##", mcqWeights.get(i));
                 String html = getRecipientStatsHeaderFragmentHtml(mcqChoices.get(i) + " [" + weight + "]");
                 choicesHtmlBuilder.append(html);
             }
             if (otherEnabled) {
-                String otherWeight = df.format(mcqOtherWeight);
+                String otherWeight = StringHelper.toDecimalFormatString("#.##", mcqOtherWeight);
                 String html = getRecipientStatsHeaderFragmentHtml("Other" + " [" + otherWeight + "]");
                 choicesHtmlBuilder.append(html);
             }
diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackMsqQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackMsqQuestionDetails.java
index 72c0f70c6cb..4ac9f2ef404 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackMsqQuestionDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackMsqQuestionDetails.java
@@ -1,13 +1,10 @@
 package teammates.common.datatransfer.questions;
 
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 
 import teammates.common.datatransfer.FeedbackParticipantType;
@@ -548,8 +545,6 @@ public String getQuestionResultStatisticsHtml(List<FeedbackResponseAttributes> r
         if (numChoicesSelected == -1) {
             return "";
         }
-        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-        DecimalFormat df = new DecimalFormat("#.##", decimalFormatSymbols);
 
         StringBuilder fragments = new StringBuilder();
         answerFrequency.forEach((key, value) ->
@@ -557,7 +552,8 @@ public String getQuestionResultStatisticsHtml(List<FeedbackResponseAttributes> r
                                 Slots.MSQ_CHOICE_VALUE, key,
                                 Slots.COUNT, value.toString(),
                                 Slots.PERCENTAGE,
-                                df.format(100 * divideOrReturnZero(value, numChoicesSelected)))));
+                                StringHelper.toDecimalFormatString("#.##",
+                                        100 * divideOrReturnZero(value, numChoicesSelected)))));
 
         return Templates.populateTemplate(FormTemplates.MSQ_RESULT_STATS, Slots.FRAGMENTS, fragments.toString());
     }
@@ -576,12 +572,10 @@ public String getQuestionResultStatisticsCsv(
         if (numChoicesSelected == -1) {
             return "";
         }
-        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-        DecimalFormat df = new DecimalFormat("#.##", decimalFormatSymbols);
         StringBuilder fragments = new StringBuilder();
         answerFrequency.forEach((key, value) -> fragments.append(SanitizationHelper.sanitizeForCsv(key) + ','
                 + value.toString() + ','
-                + df.format(100 * divideOrReturnZero(value, numChoicesSelected))
+                + StringHelper.toDecimalFormatString("#.##", 100 * divideOrReturnZero(value, numChoicesSelected))
                 + System.lineSeparator()));
 
         return "Choice, Response Count, Percentage" + System.lineSeparator()
diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
index 4a7439e6a18..b6f989f5a85 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
@@ -1,13 +1,10 @@
 package teammates.common.datatransfer.questions;
 
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -378,8 +375,6 @@ private String getSubmissionFormMobileHtml(String questionNumberString, String r
     @Override
     public String getQuestionSpecificEditFormHtml(int questionNumber) {
         String questionNumberString = Integer.toString(questionNumber);
-        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-        DecimalFormat weightFormat = new DecimalFormat("#.##", decimalFormatSymbols);
 
         // Create table row header fragments
         StringBuilder tableHeaderFragmentHtml = new StringBuilder();
@@ -402,7 +397,8 @@ public String getQuestionSpecificEditFormHtml(int questionNumber) {
                     Templates.populateTemplate(tableWeightFragmentTemplate,
                             Slots.QUESTION_INDEX, questionNumberString,
                             Slots.COL, Integer.toString(i),
-                            Slots.RUBRIC_WEIGHT, hasAssignedWeights ? weightFormat.format(rubricWeights.get(i)) : "0",
+                            Slots.RUBRIC_WEIGHT,
+                                hasAssignedWeights ? StringHelper.toDecimalFormatString("#.##", rubricWeights.get(i)) : "0",
                             Slots.RUBRIC_PARAM_WEIGHT, Const.ParamsNames.FEEDBACK_QUESTION_RUBRIC_WEIGHT);
             tableWeightFragmentHtml.append(tableWeightCell).append(System.lineSeparator());
         }
@@ -564,12 +560,10 @@ private String getRecipientStatsHeaderFragmentHtml(String header) {
 
     public String getRecipientStatsHeaderHtml() {
         StringBuilder headerBuilder = new StringBuilder(100);
-        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-        DecimalFormat dfWeight = new DecimalFormat("#.##", decimalFormatSymbols);
         StringBuilder choicesHtmlBuilder = new StringBuilder(100);
 
         for (int i = 0; i < rubricChoices.size(); i++) {
-            String weight = dfWeight.format(rubricWeights.get(i));
+            String weight = StringHelper.toDecimalFormatString("#.##", rubricWeights.get(i));
             String html = getRecipientStatsHeaderFragmentHtml(rubricChoices.get(i) + " (Weight: " + weight + ")");
             choicesHtmlBuilder.append(html);
         }
@@ -599,8 +593,6 @@ public String getQuestionResultStatisticsHtml(List<FeedbackResponseAttributes> r
         boolean isExcludingSelfOptionAvailable =
                 recipientType.equals(FeedbackParticipantType.OWN_TEAM_MEMBERS_INCLUDING_SELF);
 
-        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-        DecimalFormat weightFormat = new DecimalFormat("#.##", decimalFormatSymbols);
 
         // Create table row header fragments
         StringBuilder tableHeaderFragmentHtml = new StringBuilder();
@@ -610,7 +602,7 @@ public String getQuestionResultStatisticsHtml(List<FeedbackResponseAttributes> r
             String header = SanitizationHelper.sanitizeForHtml(rubricChoices.get(i))
                           + (fqd.hasAssignedWeights
                             ? "<span style=\"font-weight:normal;\"> (Weight: "
-                              + weightFormat.format(rubricWeights.get(i)) + ")</span>"
+                              + StringHelper.toDecimalFormatString("#.##", rubricWeights.get(i)) + ")</span>"
                             : "");
 
             String tableHeaderCell =
@@ -692,10 +684,6 @@ Slots.TABLE_HEADER_ROW_FRAGMENT_HTML, getRecipientStatsHeaderHtml(),
     private StringBuilder getQuestionResultsStatisticsBodyHtml(FeedbackRubricQuestionDetails fqd,
                                                                int[][] responseFrequency, float[][] rubricStats) {
 
-        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-        DecimalFormat df = new DecimalFormat("#", decimalFormatSymbols);
-        DecimalFormat dfAverage = new DecimalFormat("0.00", decimalFormatSymbols);
-
         String tableBodyFragmentTemplate = FormTemplates.RUBRIC_RESULT_STATS_BODY_FRAGMENT;
         String tableBodyTemplate = FormTemplates.RUBRIC_RESULT_STATS_BODY;
 
@@ -707,7 +695,7 @@ private StringBuilder getQuestionResultsStatisticsBodyHtml(FeedbackRubricQuestio
 
             for (int j = 0; j < numOfRubricChoices; j++) {
                 String percentageFrequencyString = isSubQuestionRespondedTo
-                        ? df.format(rubricStats[i][j] * 100) + "%"
+                        ? StringHelper.toDecimalFormatString("#", rubricStats[i][j] * 100) + "%"
                         : STATISTICS_NO_VALUE_STRING;
                 String tableBodyCell = Templates.populateTemplate(tableBodyFragmentTemplate,
                         Slots.RUBRIC_PERCENTAGE_FREQUENCY_OR_AVERAGE,
@@ -718,7 +706,7 @@ private StringBuilder getQuestionResultsStatisticsBodyHtml(FeedbackRubricQuestio
 
             if (fqd.hasAssignedWeights) {
                 String averageString = isSubQuestionRespondedTo
-                        ? dfAverage.format(rubricStats[i][numOfRubricChoices])
+                        ? StringHelper.toDecimalFormatString("0.00", rubricStats[i][numOfRubricChoices])
                         : STATISTICS_NO_VALUE_STRING;
                 String tableBodyAverageCell = Templates.populateTemplate(tableBodyFragmentTemplate,
                         Slots.RUBRIC_PERCENTAGE_FREQUENCY_OR_AVERAGE, averageString);
@@ -785,15 +773,13 @@ public String getQuestionResultStatisticsCsv(
         }
 
         StringBuilder csv = new StringBuilder();
-        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-        DecimalFormat dfWeight = new DecimalFormat("#.##", decimalFormatSymbols);
 
         // table header
         for (int i = 0; i < rubricChoices.size(); i++) {
 
             String header = rubricChoices.get(i)
                           + (hasAssignedWeights
-                            ? " (Weight: " + dfWeight.format(rubricWeights.get(i)) + ")"
+                            ? " (Weight: " + StringHelper.toDecimalFormatString("#.##", rubricWeights.get(i)) + ")"
                             : "");
 
             csv.append(',').append(SanitizationHelper.sanitizeForCsv(header));
@@ -806,9 +792,6 @@ public String getQuestionResultStatisticsCsv(
         csv.append(System.lineSeparator());
 
         // table body
-        DecimalFormat df = new DecimalFormat("#", decimalFormatSymbols);
-        DecimalFormat dfAverage = new DecimalFormat("0.00", decimalFormatSymbols);
-
         int[][] responseFrequency = RubricStatistics.calculateResponseFrequency(responses, this);
         float[][] rubricStats = RubricStatistics.calculatePercentageFrequencyAndAverage(this,
                 responseFrequency);
@@ -819,14 +802,14 @@ public String getQuestionResultStatisticsCsv(
             boolean isSubQuestionRespondedTo = responseFrequency[i][numOfRubricChoices] > 0;
             for (int j = 0; j < rubricChoices.size(); j++) {
                 String percentageFrequencyString = isSubQuestionRespondedTo
-                                                 ? df.format(rubricStats[i][j] * 100) + "%"
+                                                 ? StringHelper.toDecimalFormatString("#", rubricStats[i][j] * 100) + "%"
                                                  : STATISTICS_NO_VALUE_STRING;
                 csv.append("," + percentageFrequencyString + " (" + responseFrequency[i][j] + ")");
             }
 
             if (hasAssignedWeights) {
                 String averageString = isSubQuestionRespondedTo
-                                     ? dfAverage.format(rubricStats[i][rubricWeights.size()])
+                                     ? StringHelper.toDecimalFormatString("0.00", rubricStats[i][rubricWeights.size()])
                                      : STATISTICS_NO_VALUE_STRING;
                 csv.append(',').append(averageString);
             }
@@ -893,8 +876,6 @@ public String getCsvHeader() {
 
     public String getRecipientStatsCsvHeader() {
         StringBuilder header = new StringBuilder(100);
-        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-        DecimalFormat dfWeight = new DecimalFormat("#.##", decimalFormatSymbols);
         String headerFragment = "Team,Recipient Name,Recipient's Email,Sub Question,";
 
         header.append(headerFragment);
@@ -905,7 +886,8 @@ public String getRecipientStatsCsvHeader() {
             rubricChoiceBuilder.append(rubricChoices.get(i));
 
             if (hasAssignedWeights) {
-                rubricChoiceBuilder.append(" (Weight: ").append(dfWeight.format(rubricWeights.get(i))).append(')');
+                rubricChoiceBuilder.append(" (Weight: ")
+                        .append(StringHelper.toDecimalFormatString("#.##", rubricWeights.get(i))).append(')');
             }
 
             header.append(SanitizationHelper.sanitizeForCsv(rubricChoiceBuilder.toString())).append(',');
@@ -1136,8 +1118,6 @@ public String getHtmlForSubQuestion(int subQuestion) {
             String alphabeticalIndex = StringHelper.integerToLowerCaseAlphabeticalIndex(subQuestion + 1);
             String subQuestionString = SanitizationHelper.sanitizeForHtml(alphabeticalIndex + ") "
                     + getRubricSubQuestions().get(subQuestion));
-            DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-            DecimalFormat df = new DecimalFormat("0.00", decimalFormatSymbols);
 
             List<String> cols = new ArrayList<>();
 
@@ -1152,9 +1132,9 @@ public String getHtmlForSubQuestion(int subQuestion) {
             }
 
             // <td> entries which display aggregate statistics
-            cols.add(df.format(totalPerSubQuestion[subQuestion]));
+            cols.add(StringHelper.toDecimalFormatString("0.00", totalPerSubQuestion[subQuestion]));
             cols.add(respondentsPerSubQuestion[subQuestion] == 0 ? "0.00"
-                    : df.format(totalPerSubQuestion[subQuestion] / respondentsPerSubQuestion[subQuestion]));
+                    : StringHelper.toDecimalFormatString("0.00", totalPerSubQuestion[subQuestion] / respondentsPerSubQuestion[subQuestion]));
 
             // Generate HTML for all <td> entries using template
             for (String col : cols) {
@@ -1189,8 +1169,6 @@ public String getCsvForSubQuestion(int subQuestion) {
             String alphabeticalIndex = StringHelper.integerToLowerCaseAlphabeticalIndex(subQuestion + 1);
             String subQuestionString = SanitizationHelper.sanitizeForCsv(alphabeticalIndex + ") "
                     + getRubricSubQuestions().get(subQuestion));
-            DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-            DecimalFormat df = new DecimalFormat("0.00", decimalFormatSymbols);
 
             // Append recipient identification details and rubric subQuestion
             csv.append(recipientTeam).append(',')
@@ -1204,9 +1182,9 @@ public String getCsvForSubQuestion(int subQuestion) {
             }
 
             // Append aggregate statistics
-            csv.append(',').append(df.format(totalPerSubQuestion[subQuestion])).append(',')
+            csv.append(',').append(StringHelper.toDecimalFormatString("0.00", totalPerSubQuestion[subQuestion])).append(',')
                .append(respondentsPerSubQuestion[subQuestion] == 0 ? "0.00"
-                       : df.format(totalPerSubQuestion[subQuestion] / respondentsPerSubQuestion[subQuestion]))
+                       : StringHelper.toDecimalFormatString("0.00", totalPerSubQuestion[subQuestion] / respondentsPerSubQuestion[subQuestion]))
                .append(System.lineSeparator());
 
             return csv.toString();
diff --git a/src/main/java/teammates/common/util/StringHelper.java b/src/main/java/teammates/common/util/StringHelper.java
index b6da2c71599..7be45838f64 100644
--- a/src/main/java/teammates/common/util/StringHelper.java
+++ b/src/main/java/teammates/common/util/StringHelper.java
@@ -185,7 +185,7 @@ public static <T> String toString(List<T> list, String delimiter) {
     public static String toDecimalFormatString(String pattern, double doubleVal) {
         NumberFormat nf = NumberFormat.getNumberInstance(Locale.US);
         DecimalFormat df = (DecimalFormat) nf;
-        df.applyPattern("0.###");
+        df.applyPattern(pattern);
         return df.format(doubleVal);
     }
 

From eff2637e3729cb80d161d4f9d2b85b02b48969e0 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 16 Jul 2018 12:49:53 +0800
Subject: [PATCH 34/76] Clean up

---
 .travis.yml                                                 | 6 ------
 .../InstructorFeedbackSubmissionEditSaveActionTest.java     | 6 ++++--
 .../action/StudentFeedbackSubmissionEditSaveActionTest.java | 6 ++++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 20492b841b4..72ebf27b551 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,9 +15,6 @@ dist: trusty
 
 addons:
   firefox: "46.0"
-  apt:
-      packages:
-      - language-pack-de
 
 before_install:
   - |
@@ -31,9 +28,6 @@ before_install:
   - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid \
     --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1440x900x16"
   - nvm install node
-  - export LANG=de_DE.UTF-8
-  - export LC_ALL=de_DE.UTF-8
-  - locale
 
 before_script:
   - export DISPLAY=:99.0
diff --git a/src/test/java/teammates/test/cases/action/InstructorFeedbackSubmissionEditSaveActionTest.java b/src/test/java/teammates/test/cases/action/InstructorFeedbackSubmissionEditSaveActionTest.java
index af6104d2f63..4ffd803111f 100644
--- a/src/test/java/teammates/test/cases/action/InstructorFeedbackSubmissionEditSaveActionTest.java
+++ b/src/test/java/teammates/test/cases/action/InstructorFeedbackSubmissionEditSaveActionTest.java
@@ -445,7 +445,8 @@ public void testExecuteAndPostProcess() {
                 Const.ParamsNames.FEEDBACK_RESPONSE_TEXT + "-1-0", "3.5",
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN + "-1-0", Integer.toString(fqd.getMinScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX + "-1-0", Integer.toString(fqd.getMaxScale()),
-                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString("0.###", fqd.getStep())
+                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0",
+                    StringHelper.toDecimalFormatString("0.###", fqd.getStep())
         };
 
         a = getAction(submissionParams);
@@ -472,7 +473,8 @@ public void testExecuteAndPostProcess() {
                 Const.ParamsNames.FEEDBACK_RESPONSE_TEXT + "-1-0", "",
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN + "-1-0", Integer.toString(fqd.getMinScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX + "-1-0", Integer.toString(fqd.getMaxScale()),
-                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString("0.###", fqd.getStep())
+                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0",
+                    StringHelper.toDecimalFormatString("0.###", fqd.getStep())
         };
 
         a = getAction(submissionParams);
diff --git a/src/test/java/teammates/test/cases/action/StudentFeedbackSubmissionEditSaveActionTest.java b/src/test/java/teammates/test/cases/action/StudentFeedbackSubmissionEditSaveActionTest.java
index c59d1d14494..8fa9ea70efb 100644
--- a/src/test/java/teammates/test/cases/action/StudentFeedbackSubmissionEditSaveActionTest.java
+++ b/src/test/java/teammates/test/cases/action/StudentFeedbackSubmissionEditSaveActionTest.java
@@ -606,7 +606,8 @@ public void testExecuteAndPostProcess() throws Exception {
                 Const.ParamsNames.FEEDBACK_RESPONSE_TEXT + "-1-0", "1",
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN + "-1-0", Integer.toString(fqd.getMinScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX + "-1-0", Integer.toString(fqd.getMaxScale()),
-                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString("0.###", fqd.getStep())
+                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0",
+                    StringHelper.toDecimalFormatString("0.###", fqd.getStep())
         };
 
         a = getAction(submissionParams);
@@ -637,7 +638,8 @@ public void testExecuteAndPostProcess() throws Exception {
                 Const.ParamsNames.FEEDBACK_RESPONSE_TEXT + "-1-0", "",
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN + "-1-0", Integer.toString(fqd.getMinScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX + "-1-0", Integer.toString(fqd.getMaxScale()),
-                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString("0.###", fqd.getStep())
+                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0",
+                    StringHelper.toDecimalFormatString("0.###", fqd.getStep())
         };
 
         a = getAction(submissionParams);

From b3cb589b6f8de32abfa5cf49dbbd580d3ade9ad1 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 16 Jul 2018 13:27:20 +0800
Subject: [PATCH 35/76] SCA

---
 .../questions/FeedbackRubricQuestionDetails.java          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
index b6f989f5a85..31f88827c4f 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
@@ -1133,8 +1133,8 @@ public String getHtmlForSubQuestion(int subQuestion) {
 
             // <td> entries which display aggregate statistics
             cols.add(StringHelper.toDecimalFormatString("0.00", totalPerSubQuestion[subQuestion]));
-            cols.add(respondentsPerSubQuestion[subQuestion] == 0 ? "0.00"
-                    : StringHelper.toDecimalFormatString("0.00", totalPerSubQuestion[subQuestion] / respondentsPerSubQuestion[subQuestion]));
+            cols.add(respondentsPerSubQuestion[subQuestion] == 0 ? "0.00" : StringHelper.toDecimalFormatString("0.00",
+                    totalPerSubQuestion[subQuestion] / respondentsPerSubQuestion[subQuestion]));
 
             // Generate HTML for all <td> entries using template
             for (String col : cols) {
@@ -1183,8 +1183,8 @@ public String getCsvForSubQuestion(int subQuestion) {
 
             // Append aggregate statistics
             csv.append(',').append(StringHelper.toDecimalFormatString("0.00", totalPerSubQuestion[subQuestion])).append(',')
-               .append(respondentsPerSubQuestion[subQuestion] == 0 ? "0.00"
-                       : StringHelper.toDecimalFormatString("0.00", totalPerSubQuestion[subQuestion] / respondentsPerSubQuestion[subQuestion]))
+               .append(respondentsPerSubQuestion[subQuestion] == 0 ? "0.00" : StringHelper.toDecimalFormatString("0.00",
+                       totalPerSubQuestion[subQuestion] / respondentsPerSubQuestion[subQuestion]))
                .append(System.lineSeparator());
 
             return csv.toString();

From a33143be7c4d2d41076936fefb32604c97305901 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 16 Jul 2018 14:09:28 +0800
Subject: [PATCH 36/76] SCA

---
 .../questions/FeedbackMcqQuestionDetails.java             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackMcqQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackMcqQuestionDetails.java
index 14afd3e73cc..41280417bf7 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackMcqQuestionDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackMcqQuestionDetails.java
@@ -532,8 +532,8 @@ public String getQuestionResultStatisticsHtml(List<FeedbackResponseAttributes> u
             if ("Other".equals(key)) {
                 weightString = hasAssignedWeights ? StringHelper.toDecimalFormatString("#.##", mcqOtherWeight) : "-";
             } else {
-                weightString = hasAssignedWeights ?
-                        StringHelper.toDecimalFormatString("#.##", mcqWeights.get(mcqChoices.indexOf(key))) : "-";
+                weightString = hasAssignedWeights
+                        ? StringHelper.toDecimalFormatString("#.##", mcqWeights.get(mcqChoices.indexOf(key))) : "-";
             }
 
             responseSummaryFragments.append(Templates.populateTemplate(FormTemplates.MCQ_RESULT_STATS_OPTIONFRAGMENT,
@@ -541,8 +541,8 @@ public String getQuestionResultStatisticsHtml(List<FeedbackResponseAttributes> u
                     Slots.MCQ_WEIGHT, weightString,
                     Slots.COUNT, Integer.toString(count),
                     Slots.PERCENTAGE, StringHelper.toDecimalFormatString("#.##", 100 * (double) count / responses.size()),
-                    Slots.WEIGHTED_PERCENTAGE, hasAssignedWeights ?
-                            StringHelper.toDecimalFormatString("#.##", weightedPercentagePerOption.get(key)) : "-"));
+                    Slots.WEIGHTED_PERCENTAGE, hasAssignedWeights
+                            ? StringHelper.toDecimalFormatString("#.##", weightedPercentagePerOption.get(key)) : "-"));
         }
 
         // If weights are assigned, create the per recipient statistics table,

From 1faa3eba26c0201e565784f98d0de40a5d3b2273 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 16 Jul 2018 14:27:41 +0800
Subject: [PATCH 37/76] SCA

---
 .../datatransfer/questions/FeedbackRubricQuestionDetails.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
index 31f88827c4f..58f8ac74758 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
@@ -593,7 +593,6 @@ public String getQuestionResultStatisticsHtml(List<FeedbackResponseAttributes> r
         boolean isExcludingSelfOptionAvailable =
                 recipientType.equals(FeedbackParticipantType.OWN_TEAM_MEMBERS_INCLUDING_SELF);
 
-
         // Create table row header fragments
         StringBuilder tableHeaderFragmentHtml = new StringBuilder();
         String tableHeaderFragmentTemplate = FormTemplates.RUBRIC_RESULT_STATS_HEADER_FRAGMENT;

From 16329194a15a346e6cda3262459f1d18b398a73f Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Tue, 17 Jul 2018 11:39:00 +0800
Subject: [PATCH 38/76] Add TeammatesDateTimeFormatter

---
 .../common/util/LogMessageGenerator.java      |  3 +--
 .../util/TeammatesDateTimeFormatter.java      | 21 +++++++++++++++++++
 .../teammates/common/util/TimeHelper.java     | 11 +++++-----
 .../ui/pagedata/AdminActivityLogPageData.java |  7 +++----
 .../AdminActivityLogPageActionTest.java       |  7 +++----
 .../action/AdminEmailLogPageActionTest.java   |  4 ++--
 .../InstructorFeedbackSessionsPageUiTest.java |  4 ++--
 .../teammates/test/driver/HtmlHelper.java     |  8 +++----
 8 files changed, 41 insertions(+), 24 deletions(-)
 create mode 100644 src/main/java/teammates/common/util/TeammatesDateTimeFormatter.java

diff --git a/src/main/java/teammates/common/util/LogMessageGenerator.java b/src/main/java/teammates/common/util/LogMessageGenerator.java
index e33055b425e..92f3dea2592 100644
--- a/src/main/java/teammates/common/util/LogMessageGenerator.java
+++ b/src/main/java/teammates/common/util/LogMessageGenerator.java
@@ -2,7 +2,6 @@
 
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
-import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -21,7 +20,7 @@ public class LogMessageGenerator {
     public static final String PATTERN_ACTION_NAME_GROUP = "actionName";
 
     private static final DateTimeFormatter FORMATTER =
-            DateTimeFormatter.ofPattern(Const.ActivityLog.TIME_FORMAT_LOGID, Locale.US);
+            TeammatesDateTimeFormatter.ofPattern(Const.ActivityLog.TIME_FORMAT_LOGID);
 
     /**
      * Generates the log message for an *Action.
diff --git a/src/main/java/teammates/common/util/TeammatesDateTimeFormatter.java b/src/main/java/teammates/common/util/TeammatesDateTimeFormatter.java
new file mode 100644
index 00000000000..aa8ab09c263
--- /dev/null
+++ b/src/main/java/teammates/common/util/TeammatesDateTimeFormatter.java
@@ -0,0 +1,21 @@
+package teammates.common.util;
+
+import java.time.format.DateTimeFormatter;
+import java.util.Locale;
+
+/**
+ * DateTimeFormatter for TEAMMATES with default Locale.US settings.
+ */
+public class TeammatesDateTimeFormatter {
+
+    private TeammatesDateTimeFormatter() {
+        // Utility class
+    }
+
+    /**
+     * Returns DateTimeFormatter instance with Locale.US as default locale.
+     */
+    public static DateTimeFormatter ofPattern(String pattern) {
+        return DateTimeFormatter.ofPattern(pattern, Locale.US);
+    }
+}
diff --git a/src/main/java/teammates/common/util/TimeHelper.java b/src/main/java/teammates/common/util/TimeHelper.java
index 0bacb8bf0c0..e364542c4dd 100644
--- a/src/main/java/teammates/common/util/TimeHelper.java
+++ b/src/main/java/teammates/common/util/TimeHelper.java
@@ -17,7 +17,6 @@
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 
 import teammates.common.exception.TeammatesException;
@@ -230,7 +229,7 @@ private static String formatLocalDateTime(LocalDateTime localDateTime, String pa
         if (localDateTime.getHour() == 12 && localDateTime.getMinute() == 0) {
             processedPattern = pattern.replace("a", "'NOON'");
         }
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(processedPattern, Locale.US);
+        DateTimeFormatter formatter = TeammatesDateTimeFormatter.ofPattern(processedPattern);
         return localDateTime.format(formatter);
     }
 
@@ -339,7 +338,7 @@ private static String formatInstant(Instant instant, ZoneId timeZone, String pat
         if (zonedDateTime.getHour() == 12 && zonedDateTime.getMinute() == 0) {
             processedPattern = pattern.replace("a", "'NOON'");
         }
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(processedPattern, Locale.US);
+        DateTimeFormatter formatter = TeammatesDateTimeFormatter.ofPattern(processedPattern);
         return zonedDateTime.format(formatter);
     }
 
@@ -488,7 +487,7 @@ public static String convertToStandardDuration(Long timeInMilliseconds) {
      * @throws AssertionError if there is a parsing error
      */
     public static Instant parseInstant(String dateTimeString) {
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(SystemParams.DEFAULT_DATE_TIME_FORMAT, Locale.US);
+        DateTimeFormatter formatter = TeammatesDateTimeFormatter.ofPattern(SystemParams.DEFAULT_DATE_TIME_FORMAT);
         try {
             return ZonedDateTime.parse(dateTimeString, formatter).toInstant();
         } catch (DateTimeParseException e) {
@@ -509,7 +508,7 @@ public static LocalDateTime parseLocalDateTime(String dateTimeString, String pat
             return null;
         }
 
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern, Locale.US);
+        DateTimeFormatter formatter = TeammatesDateTimeFormatter.ofPattern(pattern);
         try {
             return LocalDateTime.parse(dateTimeString, formatter);
         } catch (DateTimeParseException e) {
@@ -529,7 +528,7 @@ public static LocalDate parseLocalDate(String dateString, String pattern) {
             return null;
         }
 
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern, Locale.US);
+        DateTimeFormatter formatter = TeammatesDateTimeFormatter.ofPattern(pattern);
         try {
             return LocalDate.parse(dateString, formatter);
         } catch (DateTimeParseException e) {
diff --git a/src/main/java/teammates/ui/pagedata/AdminActivityLogPageData.java b/src/main/java/teammates/ui/pagedata/AdminActivityLogPageData.java
index 0ec3a751b51..6d0cede6e7b 100644
--- a/src/main/java/teammates/ui/pagedata/AdminActivityLogPageData.java
+++ b/src/main/java/teammates/ui/pagedata/AdminActivityLogPageData.java
@@ -5,10 +5,8 @@
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import teammates.common.datatransfer.attributes.AccountAttributes;
 import teammates.common.exception.InvalidParametersException;
@@ -16,6 +14,7 @@
 import teammates.common.util.Assumption;
 import teammates.common.util.Const;
 import teammates.common.util.StringHelper;
+import teammates.common.util.TeammatesDateTimeFormatter;
 import teammates.common.util.TimeHelper;
 import teammates.ui.template.AdminActivityLogTableRow;
 
@@ -262,12 +261,12 @@ private QueryParameters parseQuery(String query) throws ParseException, InvalidP
                 }
 
             } else if ("from".equals(label)) {
-                fromDateValue = LocalDate.parse(values[0], DateTimeFormatter.ofPattern("dd/MM/yy", Locale.US))
+                fromDateValue = LocalDate.parse(values[0], TeammatesDateTimeFormatter.ofPattern("dd/MM/yy"))
                         .atStartOfDay(Const.SystemParams.ADMIN_TIME_ZONE).toInstant().toEpochMilli();
                 isFromDateSpecifiedInQuery = true;
 
             } else if ("to".equals(label)) {
-                toDateValue = LocalDate.parse(values[0], DateTimeFormatter.ofPattern("dd/MM/yy", Locale.US))
+                toDateValue = LocalDate.parse(values[0], TeammatesDateTimeFormatter.ofPattern("dd/MM/yy"))
                         .atTime(LocalTime.MAX).atZone(Const.SystemParams.ADMIN_TIME_ZONE).toInstant().toEpochMilli();
             } else {
                 q.add(label, values);
diff --git a/src/test/java/teammates/test/cases/action/AdminActivityLogPageActionTest.java b/src/test/java/teammates/test/cases/action/AdminActivityLogPageActionTest.java
index f0c2c5a039d..3647dc42245 100644
--- a/src/test/java/teammates/test/cases/action/AdminActivityLogPageActionTest.java
+++ b/src/test/java/teammates/test/cases/action/AdminActivityLogPageActionTest.java
@@ -4,10 +4,8 @@
 import java.lang.reflect.Type;
 import java.time.Instant;
 import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import org.testng.annotations.BeforeGroups;
 import org.testng.annotations.Test;
@@ -17,6 +15,7 @@
 import teammates.common.util.ActivityLogEntry;
 import teammates.common.util.Const;
 import teammates.common.util.JsonUtils;
+import teammates.common.util.TeammatesDateTimeFormatter;
 import teammates.common.util.TimeHelper;
 import teammates.test.driver.FileHelper;
 import teammates.test.driver.TestProperties;
@@ -85,13 +84,13 @@ private void loadLogMessages() {
 
     private String formatAdminDate(Instant instant) {
         return instant.atZone(Const.SystemParams.ADMIN_TIME_ZONE).toLocalDate()
-                .format(DateTimeFormatter.ofPattern("dd/MM/yy", Locale.US));
+                .format(TeammatesDateTimeFormatter.ofPattern("dd/MM/yy"));
     }
 
     private String formatActivityLogTimeTruncated(Instant instant, ZoneId zoneId) {
         // Some timings are adjusted slightly in the tests. Hence instead of testing for exact match,
         // we test matching up to the hour.
-        return DateTimeFormatter.ofPattern("dd/MM/yyyy HH", Locale.US).format(instant.atZone(zoneId));
+        return TeammatesDateTimeFormatter.ofPattern("dd/MM/yyyy HH").format(instant.atZone(zoneId));
     }
 
     private String getExpectedAjaxTimeString(Instant instant, ZoneId zoneId) {
diff --git a/src/test/java/teammates/test/cases/action/AdminEmailLogPageActionTest.java b/src/test/java/teammates/test/cases/action/AdminEmailLogPageActionTest.java
index 9cf7f0242da..9b6032f8f50 100644
--- a/src/test/java/teammates/test/cases/action/AdminEmailLogPageActionTest.java
+++ b/src/test/java/teammates/test/cases/action/AdminEmailLogPageActionTest.java
@@ -6,7 +6,6 @@
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import org.testng.annotations.BeforeGroups;
 import org.testng.annotations.Test;
@@ -16,6 +15,7 @@
 import teammates.common.util.Const;
 import teammates.common.util.EmailLogEntry;
 import teammates.common.util.JsonUtils;
+import teammates.common.util.TeammatesDateTimeFormatter;
 import teammates.common.util.TimeHelper;
 import teammates.test.driver.FileHelper;
 import teammates.test.driver.TestProperties;
@@ -52,7 +52,7 @@ public class AdminEmailLogPageActionTest extends BaseActionTest {
     // 130 seconds is chosen so that it will be around 50 logs within 2 hours before now.
     private static final int LOG_MESSAGE_INTERVAL_MANY_LOGS = 130;
 
-    private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("dd/MM/yyyy", Locale.US);
+    private static final DateTimeFormatter DATE_FORMATTER = TeammatesDateTimeFormatter.ofPattern("dd/MM/yyyy");
 
     private static final Instant TODAY = Instant.now();
     private static final Instant YESTERDAY = TimeHelper.getInstantDaysOffsetFromNow(-1);
diff --git a/src/test/java/teammates/test/cases/browsertests/InstructorFeedbackSessionsPageUiTest.java b/src/test/java/teammates/test/cases/browsertests/InstructorFeedbackSessionsPageUiTest.java
index e15facbcb2a..cf01cd26056 100644
--- a/src/test/java/teammates/test/cases/browsertests/InstructorFeedbackSessionsPageUiTest.java
+++ b/src/test/java/teammates/test/cases/browsertests/InstructorFeedbackSessionsPageUiTest.java
@@ -7,7 +7,6 @@
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import org.openqa.selenium.By;
 import org.testng.annotations.BeforeMethod;
@@ -20,6 +19,7 @@
 import teammates.common.util.AppUrl;
 import teammates.common.util.Const;
 import teammates.common.util.FieldValidator;
+import teammates.common.util.TeammatesDateTimeFormatter;
 import teammates.common.util.TimeHelper;
 import teammates.test.driver.AssertHelper;
 import teammates.test.driver.BackDoor;
@@ -722,7 +722,7 @@ private void testDatePickerScripts(LocalDate defaultStartDate) {
         feedbackPage.clickCustomVisibleTimeButton();
         feedbackPage.clickCustomPublishTimeButton();
 
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("EEE MMM dd yyyy", Locale.US);
+        DateTimeFormatter formatter = TeammatesDateTimeFormatter.ofPattern("EEE MMM dd yyyy");
 
         ______TS("validate visible date range before editing start date");
 
diff --git a/src/test/java/teammates/test/driver/HtmlHelper.java b/src/test/java/teammates/test/driver/HtmlHelper.java
index 805a4f6bf3a..b20b365da6f 100644
--- a/src/test/java/teammates/test/driver/HtmlHelper.java
+++ b/src/test/java/teammates/test/driver/HtmlHelper.java
@@ -5,7 +5,6 @@
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.Locale;
 
 import org.jsoup.Jsoup;
 import org.jsoup.helper.W3CDom;
@@ -17,6 +16,7 @@
 import teammates.common.util.Const;
 import teammates.common.util.SanitizationHelper;
 import teammates.common.util.StringHelper;
+import teammates.common.util.TeammatesDateTimeFormatter;
 import teammates.common.util.TimeHelper;
 
 /**
@@ -412,12 +412,12 @@ private static String suppressVariationsInInjectedValues(String content) {
      */
     private static String replaceUnpredictableValuesWithPlaceholders(String content) {
         LocalDate today = LocalDate.now();
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy, ", Locale.US);
+        DateTimeFormatter formatter = TeammatesDateTimeFormatter.ofPattern("EEE, dd MMM yyyy, ");
         String dateToday = formatter.format(today);
         String dateYesterday = formatter.format(today.minusDays(1));
         String dateTomorrow = formatter.format(today.plusDays(1));
-        String dateTodayInIso8601 = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'", Locale.US).format(today);
-        String dateTodayInCoursesPageFormat = DateTimeFormatter.ofPattern("d MMM yyyy", Locale.US).format(today);
+        String dateTodayInIso8601 = TeammatesDateTimeFormatter.ofPattern("yyyy-MM-dd'T'").format(today);
+        String dateTodayInCoursesPageFormat = TeammatesDateTimeFormatter.ofPattern("d MMM yyyy").format(today);
         return content // dev server admin absolute URLs (${teammates.url}/_ah/...)
                       .replace("\"" + TestProperties.TEAMMATES_URL + "/_ah", "\"/_ah")
                       // logout URL generated by Google

From 3061d0af386d843713304619f3d49f0adac92d56 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Tue, 17 Jul 2018 11:46:00 +0800
Subject: [PATCH 39/76] TeammatesDateTimeFormatter -> final class

---
 .../java/teammates/common/util/TeammatesDateTimeFormatter.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/teammates/common/util/TeammatesDateTimeFormatter.java b/src/main/java/teammates/common/util/TeammatesDateTimeFormatter.java
index aa8ab09c263..b7b0f7f80de 100644
--- a/src/main/java/teammates/common/util/TeammatesDateTimeFormatter.java
+++ b/src/main/java/teammates/common/util/TeammatesDateTimeFormatter.java
@@ -6,7 +6,7 @@
 /**
  * DateTimeFormatter for TEAMMATES with default Locale.US settings.
  */
-public class TeammatesDateTimeFormatter {
+public final class TeammatesDateTimeFormatter {
 
     private TeammatesDateTimeFormatter() {
         // Utility class

From 1b2eacc6c219fb60ce32767d22804ebc232b530b Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Wed, 23 May 2018 17:00:22 +0800
Subject: [PATCH 40/76] Add jvmarg and enable listeners for intelliJ

---
 .templates/ideaRunConfigurations/CI_Tests.xml     | 2 +-
 .templates/ideaRunConfigurations/Failed_Tests.xml | 2 +-
 .templates/ideaRunConfigurations/Local_Tests.xml  | 2 +-
 gradle.template.properties                        | 4 ++++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.templates/ideaRunConfigurations/CI_Tests.xml b/.templates/ideaRunConfigurations/CI_Tests.xml
index cc09b2f6668..982970e7737 100644
--- a/.templates/ideaRunConfigurations/CI_Tests.xml
+++ b/.templates/ideaRunConfigurations/CI_Tests.xml
@@ -25,7 +25,7 @@
     <option name="TEST_SEARCH_SCOPE">
       <value defaultName="wholeProject" />
     </option>
-    <option name="USE_DEFAULT_REPORTERS" value="false" />
+    <option name="USE_DEFAULT_REPORTERS" value="true" />
     <option name="PROPERTIES_FILE" value="" />
     <envs />
     <properties />
diff --git a/.templates/ideaRunConfigurations/Failed_Tests.xml b/.templates/ideaRunConfigurations/Failed_Tests.xml
index f5255e2d2ed..9068b944ca9 100644
--- a/.templates/ideaRunConfigurations/Failed_Tests.xml
+++ b/.templates/ideaRunConfigurations/Failed_Tests.xml
@@ -20,7 +20,7 @@
     <option name="TEST_SEARCH_SCOPE">
       <value defaultName="wholeProject" />
     </option>
-    <option name="USE_DEFAULT_REPORTERS" value="false" />
+    <option name="USE_DEFAULT_REPORTERS" value="true" />
     <option name="PROPERTIES_FILE" value="" />
     <envs />
     <properties />
diff --git a/.templates/ideaRunConfigurations/Local_Tests.xml b/.templates/ideaRunConfigurations/Local_Tests.xml
index 55383141a36..1e7947701c6 100644
--- a/.templates/ideaRunConfigurations/Local_Tests.xml
+++ b/.templates/ideaRunConfigurations/Local_Tests.xml
@@ -20,7 +20,7 @@
     <option name="TEST_SEARCH_SCOPE">
       <value defaultName="wholeProject" />
     </option>
-    <option name="USE_DEFAULT_REPORTERS" value="false" />
+    <option name="USE_DEFAULT_REPORTERS" value="true" />
     <option name="PROPERTIES_FILE" value="" />
     <envs />
     <properties />
diff --git a/gradle.template.properties b/gradle.template.properties
index de4eb1204ed..57cace80443 100644
--- a/gradle.template.properties
+++ b/gradle.template.properties
@@ -8,3 +8,7 @@ org.gradle.daemon=false
 # e.g org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home
 # e.g org.gradle.java.home=C:/Program Files/Java/jdk1.8.0_144
 # org.gradle.java.home=
+
+# Use this property to have the recommended language setting for tests
+# It is used to prevent local language settings causing the tests to fail
+org.gradle.jvmargs=-Duser.language=en
\ No newline at end of file

From 8c1f9e3f93e2d13477786e28b215de4bbbf06a50 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Wed, 23 May 2018 17:03:54 +0800
Subject: [PATCH 41/76] Correcting firefox version details to avoid confusion

---
 docs/development.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/development.md b/docs/development.md
index 2576bbd33a0..08052ad151d 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -137,7 +137,7 @@ Before running tests, modify `src/test/resources/test.properties` if necessary,
 
 ### Using Firefox
 
-* Only Firefox between versions 38.0.5 and 46.0.1 are supported.
+* Only Firefox between versions 38.0.5 and 46.0.0 are supported.
   * To downgrade your Firefox version, obtain the executable from [here](https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/).
   * If you want to use a different path for this version, choose `Custom setup` during install.
   * Remember to disable the auto-updates (`Options → Advanced tab → Update`).

From 6c8c741e362aac2f3b94bc6fa47f8ca2e18a7428 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Wed, 23 May 2018 17:32:13 +0800
Subject: [PATCH 42/76] Add EOF

---
 gradle.template.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.template.properties b/gradle.template.properties
index 57cace80443..1b4402e2581 100644
--- a/gradle.template.properties
+++ b/gradle.template.properties
@@ -11,4 +11,4 @@ org.gradle.daemon=false
 
 # Use this property to have the recommended language setting for tests
 # It is used to prevent local language settings causing the tests to fail
-org.gradle.jvmargs=-Duser.language=en
\ No newline at end of file
+org.gradle.jvmargs=-Duser.language=en

From dad9f3a2e1bcf75f1364a341ac489a72ce24a9b3 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Thu, 24 May 2018 10:04:20 +0800
Subject: [PATCH 43/76] Default JDK for project

---
 .templates/ideaRunConfigurations/CI_Tests.xml     | 4 ++--
 .templates/ideaRunConfigurations/Failed_Tests.xml | 4 ++--
 .templates/ideaRunConfigurations/Local_Tests.xml  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.templates/ideaRunConfigurations/CI_Tests.xml b/.templates/ideaRunConfigurations/CI_Tests.xml
index 982970e7737..1a7c258ecdc 100644
--- a/.templates/ideaRunConfigurations/CI_Tests.xml
+++ b/.templates/ideaRunConfigurations/CI_Tests.xml
@@ -7,8 +7,8 @@
       </pattern>
     </extension>
     <module name="" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="1.8" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="SUITE_NAME" value="$PROJECT_DIR$/src/test/testng-ci.xml" />
     <option name="PACKAGE_NAME" value="" />
     <option name="MAIN_CLASS_NAME" value="" />
diff --git a/.templates/ideaRunConfigurations/Failed_Tests.xml b/.templates/ideaRunConfigurations/Failed_Tests.xml
index 9068b944ca9..8041b4dce4e 100644
--- a/.templates/ideaRunConfigurations/Failed_Tests.xml
+++ b/.templates/ideaRunConfigurations/Failed_Tests.xml
@@ -2,8 +2,8 @@
   <configuration default="false" name="Failed Tests" type="TestNG" factoryName="TestNG">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <module name="" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="1.8" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="SUITE_NAME" value="$PROJECT_DIR$/test-output/testng-failed.xml" />
     <option name="PACKAGE_NAME" value="" />
     <option name="MAIN_CLASS_NAME" value="" />
diff --git a/.templates/ideaRunConfigurations/Local_Tests.xml b/.templates/ideaRunConfigurations/Local_Tests.xml
index 1e7947701c6..ebdb0c02d23 100644
--- a/.templates/ideaRunConfigurations/Local_Tests.xml
+++ b/.templates/ideaRunConfigurations/Local_Tests.xml
@@ -2,8 +2,8 @@
   <configuration default="false" name="Local Tests" type="TestNG" factoryName="TestNG">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <module name="" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="1.8" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="SUITE_NAME" value="$PROJECT_DIR$/src/test/testng-local.xml" />
     <option name="PACKAGE_NAME" value="" />
     <option name="MAIN_CLASS_NAME" value="" />

From 74ae51789165182a387ba125554e093d8fcb8b89 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Thu, 24 May 2018 12:47:19 +0800
Subject: [PATCH 44/76] Fix instability caused due to Instant.now()

---
 .../test/cases/datatransfer/StudentProfileAttributesTest.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java b/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java
index a7f0e3c0b7d..06343303fe4 100644
--- a/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java
+++ b/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java
@@ -10,6 +10,7 @@
 import com.google.appengine.api.datastore.Text;
 
 import teammates.common.datatransfer.attributes.StudentProfileAttributes;
+import teammates.common.util.Const;
 import teammates.common.util.FieldValidator;
 import teammates.common.util.SanitizationHelper;
 import teammates.common.util.TimeHelper;
@@ -175,6 +176,7 @@ public void testSanitizeForSaving() {
     @Test
     public void testToEntity() {
         StudentProfile expectedEntity = createStudentProfileFrom(profile);
+        expectedEntity.setModifiedDate(Const.TIME_REPRESENTS_DEFAULT_TIMESTAMP);
         StudentProfileAttributes testProfile = StudentProfileAttributes.valueOf(expectedEntity);
         StudentProfile actualEntity = testProfile.toEntity();
 

From 84f2bedc95af91639c07be93a65ba8cbae99a8dc Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Thu, 24 May 2018 15:33:40 +0800
Subject: [PATCH 45/76] Improve stability of tests

---
 .../cases/datatransfer/StudentProfileAttributesTest.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java b/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java
index 06343303fe4..14087742945 100644
--- a/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java
+++ b/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java
@@ -176,10 +176,13 @@ public void testSanitizeForSaving() {
     @Test
     public void testToEntity() {
         StudentProfile expectedEntity = createStudentProfileFrom(profile);
-        expectedEntity.setModifiedDate(Const.TIME_REPRESENTS_DEFAULT_TIMESTAMP);
         StudentProfileAttributes testProfile = StudentProfileAttributes.valueOf(expectedEntity);
         StudentProfile actualEntity = testProfile.toEntity();
 
+        // Done to prevent instability of tests due to Instant.now()
+        expectedEntity.setModifiedDate(Const.TIME_REPRESENTS_DEFAULT_TIMESTAMP);
+        actualEntity.setModifiedDate(Const.TIME_REPRESENTS_DEFAULT_TIMESTAMP);
+
         assertEquals(expectedEntity.getShortName(), actualEntity.getShortName());
         assertEquals(expectedEntity.getInstitute(), actualEntity.getInstitute());
         assertEquals(expectedEntity.getEmail(), actualEntity.getEmail());

From 7ee31d9a556e6e5914a182ab9fcc67152e4280c5 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 4 Jun 2018 10:30:48 +0800
Subject: [PATCH 46/76] Requested changes

---
 gradle.template.properties                                    | 4 ++--
 .../test/cases/datatransfer/StudentProfileAttributesTest.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.template.properties b/gradle.template.properties
index 1b4402e2581..fe1737af704 100644
--- a/gradle.template.properties
+++ b/gradle.template.properties
@@ -10,5 +10,5 @@ org.gradle.daemon=false
 # org.gradle.java.home=
 
 # Use this property to have the recommended language setting for tests
-# It is used to prevent local language settings causing the tests to fail
-org.gradle.jvmargs=-Duser.language=en
+# The test environment REQUIRES the following locale. Do not change!
+org.gradle.jvmargs=-Duser.language=en -Duser.country=US
diff --git a/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java b/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java
index 14087742945..58fa838fe58 100644
--- a/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java
+++ b/src/test/java/teammates/test/cases/datatransfer/StudentProfileAttributesTest.java
@@ -179,7 +179,7 @@ public void testToEntity() {
         StudentProfileAttributes testProfile = StudentProfileAttributes.valueOf(expectedEntity);
         StudentProfile actualEntity = testProfile.toEntity();
 
-        // Done to prevent instability of tests due to Instant.now()
+        // toEntity does not use the original modified date so we need to ensure they are the same
         expectedEntity.setModifiedDate(Const.TIME_REPRESENTS_DEFAULT_TIMESTAMP);
         actualEntity.setModifiedDate(Const.TIME_REPRESENTS_DEFAULT_TIMESTAMP);
 

From 6bd77de1af8d691def7370006ae5c2315f21c2db Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Tue, 5 Jun 2018 12:04:04 +0800
Subject: [PATCH 47/76] Corrected meaning of comment

---
 gradle.template.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.template.properties b/gradle.template.properties
index fe1737af704..eb2c0516b89 100644
--- a/gradle.template.properties
+++ b/gradle.template.properties
@@ -9,6 +9,6 @@ org.gradle.daemon=false
 # e.g org.gradle.java.home=C:/Program Files/Java/jdk1.8.0_144
 # org.gradle.java.home=
 
-# Use this property to have the recommended language setting for tests
+# Use this property to have the required language setting for tests
 # The test environment REQUIRES the following locale. Do not change!
 org.gradle.jvmargs=-Duser.language=en -Duser.country=US

From b2cbf3aa5d46d785ac9a40d4ac4281ad7c244f43 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 18 Jun 2018 11:06:53 +0800
Subject: [PATCH 48/76] Remove redundant line

---
 gradle.template.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gradle.template.properties b/gradle.template.properties
index eb2c0516b89..b8207028427 100644
--- a/gradle.template.properties
+++ b/gradle.template.properties
@@ -9,6 +9,5 @@ org.gradle.daemon=false
 # e.g org.gradle.java.home=C:/Program Files/Java/jdk1.8.0_144
 # org.gradle.java.home=
 
-# Use this property to have the required language setting for tests
 # The test environment REQUIRES the following locale. Do not change!
 org.gradle.jvmargs=-Duser.language=en -Duser.country=US

From 326e9f890ae480302fdf47ace5f1e813fc2a6be0 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 2 Jul 2018 12:11:46 +0800
Subject: [PATCH 49/76] Set en_US as locale

---
 .../test/cases/BaseTestCaseWithMinimalGaeEnvironment.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java b/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
index 6726bd04edc..cf7bdd6f583 100644
--- a/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
+++ b/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
@@ -2,6 +2,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Locale;
 
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -21,15 +22,18 @@ public class BaseTestCaseWithMinimalGaeEnvironment extends BaseTestCase {
     private LocalServiceTestHelper helper = new LocalServiceTestHelper();
 
     /**
-     * Sets the environment of SystemProperty based on the URL.
+     * Sets the environment of SystemProperty based on the URL and the required locale for tests.
      */
     @BeforeSuite
-    public void setUpEnvironment() throws MalformedURLException {
+    public void setUpEnvironmentAndLocale() throws MalformedURLException {
         if (new URL(TestProperties.TEAMMATES_URL).getHost().contains(".appspot.com")) {
             SystemProperty.environment.set(SystemProperty.Environment.Value.Production);
         } else {
             SystemProperty.environment.set(SystemProperty.Environment.Value.Development);
         }
+
+        Locale.setDefault(new Locale("en", "US"));
+
     }
 
     @BeforeClass

From 57f6af14fe5d543a238619fe5100a96d30cb6052 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 9 Jul 2018 13:45:36 +0800
Subject: [PATCH 50/76] Update locale in correct place

---
 src/test/java/teammates/test/cases/BaseTestCase.java   | 10 ++++++++++
 .../cases/BaseTestCaseWithMinimalGaeEnvironment.java   |  8 ++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/test/java/teammates/test/cases/BaseTestCase.java b/src/test/java/teammates/test/cases/BaseTestCase.java
index 19d725fe822..c1adf686952 100644
--- a/src/test/java/teammates/test/cases/BaseTestCase.java
+++ b/src/test/java/teammates/test/cases/BaseTestCase.java
@@ -3,11 +3,13 @@
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.Locale;
 
 import org.junit.Assert;
 import org.testng.AssertJUnit;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeSuite;
 
 import teammates.common.datatransfer.DataBundle;
 import teammates.common.util.FieldValidator;
@@ -38,6 +40,14 @@ public static void ______TS(String description) {
     }
     // CHECKSTYLE.ON:AbbreviationAsWordInName|MethodName
 
+    /**
+     * Set the required locale for tests
+     */
+    @BeforeSuite
+    public void setLocale() {
+        Locale.setDefault(new Locale("en", "US"));
+    }
+
     @BeforeClass
     public void printTestClassHeader() {
         print("[============================="
diff --git a/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java b/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
index cf7bdd6f583..6726bd04edc 100644
--- a/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
+++ b/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
@@ -2,7 +2,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Locale;
 
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -22,18 +21,15 @@ public class BaseTestCaseWithMinimalGaeEnvironment extends BaseTestCase {
     private LocalServiceTestHelper helper = new LocalServiceTestHelper();
 
     /**
-     * Sets the environment of SystemProperty based on the URL and the required locale for tests.
+     * Sets the environment of SystemProperty based on the URL.
      */
     @BeforeSuite
-    public void setUpEnvironmentAndLocale() throws MalformedURLException {
+    public void setUpEnvironment() throws MalformedURLException {
         if (new URL(TestProperties.TEAMMATES_URL).getHost().contains(".appspot.com")) {
             SystemProperty.environment.set(SystemProperty.Environment.Value.Production);
         } else {
             SystemProperty.environment.set(SystemProperty.Environment.Value.Development);
         }
-
-        Locale.setDefault(new Locale("en", "US"));
-
     }
 
     @BeforeClass

From 9e443221958e3792fb0372afa7bdbf17b290b411 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 9 Jul 2018 14:01:15 +0800
Subject: [PATCH 51/76] Trial commit to be reverted

---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 72ebf27b551..77e488dd802 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,9 @@ dist: trusty
 
 addons:
   firefox: "46.0"
+  apt:
+    packages:
+    - language-pack-de
 
 before_install:
   - |
@@ -28,6 +31,10 @@ before_install:
   - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid \
     --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1440x900x16"
   - nvm install node
+  - export LANG=de_DE.UTF-8
+  - export LC_NUMERIC=de_DE.UTF-8
+  - export LC_TIME=de_DE.UTF-8
+  - locale
 
 before_script:
   - export DISPLAY=:99.0
@@ -51,6 +58,7 @@ install: true
 script:
   - npm run build
   - ./gradlew appengineStart
+  - locale
   - ./gradlew ciTests
 
 after_failure:

From 884d8c1b9dc60e1b26d16b1002397b7692870509 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 9 Jul 2018 14:01:52 +0800
Subject: [PATCH 52/76] Add period

---
 src/test/java/teammates/test/cases/BaseTestCase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/teammates/test/cases/BaseTestCase.java b/src/test/java/teammates/test/cases/BaseTestCase.java
index c1adf686952..24e98c5add0 100644
--- a/src/test/java/teammates/test/cases/BaseTestCase.java
+++ b/src/test/java/teammates/test/cases/BaseTestCase.java
@@ -41,7 +41,7 @@ public static void ______TS(String description) {
     // CHECKSTYLE.ON:AbbreviationAsWordInName|MethodName
 
     /**
-     * Set the required locale for tests
+     * Set the required locale for tests.
      */
     @BeforeSuite
     public void setLocale() {

From d143614dda690c03f5fa7c94edf422da845cb28c Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 9 Jul 2018 14:07:27 +0800
Subject: [PATCH 53/76] Trial commit

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 77e488dd802..47b598495a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,8 +32,7 @@ before_install:
     --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1440x900x16"
   - nvm install node
   - export LANG=de_DE.UTF-8
-  - export LC_NUMERIC=de_DE.UTF-8
-  - export LC_TIME=de_DE.UTF-8
+  - export LC_ALL=de_DE.UTF-8
   - locale
 
 before_script:

From a0d0a7a54bc22bcc304fe4d01bf659d09e4c9f5c Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 9 Jul 2018 14:09:23 +0800
Subject: [PATCH 54/76] CI  fail?

---
 src/test/java/teammates/test/cases/BaseTestCase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/teammates/test/cases/BaseTestCase.java b/src/test/java/teammates/test/cases/BaseTestCase.java
index 24e98c5add0..dabe03b199c 100644
--- a/src/test/java/teammates/test/cases/BaseTestCase.java
+++ b/src/test/java/teammates/test/cases/BaseTestCase.java
@@ -45,7 +45,7 @@ public static void ______TS(String description) {
      */
     @BeforeSuite
     public void setLocale() {
-        Locale.setDefault(new Locale("en", "US"));
+        //Locale.setDefault(new Locale("en", "US"));
     }
 
     @BeforeClass

From b7c41c4b5889198b887d1a9220d9212873bc3f39 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 9 Jul 2018 14:14:47 +0800
Subject: [PATCH 55/76] CI  fail- SCA?

---
 src/test/java/teammates/test/cases/BaseTestCase.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/java/teammates/test/cases/BaseTestCase.java b/src/test/java/teammates/test/cases/BaseTestCase.java
index dabe03b199c..ec1e68ffd10 100644
--- a/src/test/java/teammates/test/cases/BaseTestCase.java
+++ b/src/test/java/teammates/test/cases/BaseTestCase.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
-import java.util.Locale;
 
 import org.junit.Assert;
 import org.testng.AssertJUnit;

From 641d6e36a471aff98e77956de93f3aeaa98b7c30 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 9 Jul 2018 14:24:42 +0800
Subject: [PATCH 56/76] Revert unnecessary changes

---
 .travis.yml                                          | 7 -------
 src/test/java/teammates/test/cases/BaseTestCase.java | 3 ++-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 47b598495a4..72ebf27b551 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,9 +15,6 @@ dist: trusty
 
 addons:
   firefox: "46.0"
-  apt:
-    packages:
-    - language-pack-de
 
 before_install:
   - |
@@ -31,9 +28,6 @@ before_install:
   - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid \
     --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1440x900x16"
   - nvm install node
-  - export LANG=de_DE.UTF-8
-  - export LC_ALL=de_DE.UTF-8
-  - locale
 
 before_script:
   - export DISPLAY=:99.0
@@ -57,7 +51,6 @@ install: true
 script:
   - npm run build
   - ./gradlew appengineStart
-  - locale
   - ./gradlew ciTests
 
 after_failure:
diff --git a/src/test/java/teammates/test/cases/BaseTestCase.java b/src/test/java/teammates/test/cases/BaseTestCase.java
index ec1e68ffd10..24e98c5add0 100644
--- a/src/test/java/teammates/test/cases/BaseTestCase.java
+++ b/src/test/java/teammates/test/cases/BaseTestCase.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.Locale;
 
 import org.junit.Assert;
 import org.testng.AssertJUnit;
@@ -44,7 +45,7 @@ public static void ______TS(String description) {
      */
     @BeforeSuite
     public void setLocale() {
-        //Locale.setDefault(new Locale("en", "US"));
+        Locale.setDefault(new Locale("en", "US"));
     }
 
     @BeforeClass

From 82f661c157a6a9f909a390783181bf13132c564e Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 9 Jul 2018 15:16:51 +0800
Subject: [PATCH 57/76] CI should pass

---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 72ebf27b551..20492b841b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,9 @@ dist: trusty
 
 addons:
   firefox: "46.0"
+  apt:
+      packages:
+      - language-pack-de
 
 before_install:
   - |
@@ -28,6 +31,9 @@ before_install:
   - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid \
     --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1440x900x16"
   - nvm install node
+  - export LANG=de_DE.UTF-8
+  - export LC_ALL=de_DE.UTF-8
+  - locale
 
 before_script:
   - export DISPLAY=:99.0

From 1ef9bb629579a6e0bcdd74c12224776f85cf0119 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 9 Jul 2018 17:51:50 +0800
Subject: [PATCH 58/76] CI should pass now for UI tests also

---
 .../test/cases/BaseTestCaseWithMinimalGaeEnvironment.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java b/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
index 6726bd04edc..2216e65ca36 100644
--- a/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
+++ b/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
@@ -2,6 +2,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Locale;
 
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -21,15 +22,17 @@ public class BaseTestCaseWithMinimalGaeEnvironment extends BaseTestCase {
     private LocalServiceTestHelper helper = new LocalServiceTestHelper();
 
     /**
-     * Sets the environment of SystemProperty based on the URL.
+     * Sets the environment of SystemProperty based on the URL and default locale required for tests
      */
     @BeforeSuite
-    public void setUpEnvironment() throws MalformedURLException {
+    public void setUpEnvironmentAndLocale() throws MalformedURLException {
         if (new URL(TestProperties.TEAMMATES_URL).getHost().contains(".appspot.com")) {
             SystemProperty.environment.set(SystemProperty.Environment.Value.Production);
         } else {
             SystemProperty.environment.set(SystemProperty.Environment.Value.Development);
         }
+
+        Locale.setDefault(new Locale("en", "US"));
     }
 
     @BeforeClass

From e54d7f34fc057a9fec1bd6f4c810db0fb4e1402f Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 9 Jul 2018 19:06:46 +0800
Subject: [PATCH 59/76] CI should pass now for UI tests also

---
 .../test/cases/BaseTestCaseWithMinimalGaeEnvironment.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java b/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
index 2216e65ca36..66f73cb3abd 100644
--- a/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
+++ b/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
@@ -22,7 +22,7 @@ public class BaseTestCaseWithMinimalGaeEnvironment extends BaseTestCase {
     private LocalServiceTestHelper helper = new LocalServiceTestHelper();
 
     /**
-     * Sets the environment of SystemProperty based on the URL and default locale required for tests
+     * Sets the environment of SystemProperty based on the URL and default locale required for tests.
      */
     @BeforeSuite
     public void setUpEnvironmentAndLocale() throws MalformedURLException {

From 995a5320c6b1333a4d2d775a880be27e9acce882 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 9 Jul 2018 19:46:17 +0800
Subject: [PATCH 60/76] CI should pass now for UI tests also

---
 src/test/java/teammates/test/pageobjects/Browser.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/test/java/teammates/test/pageobjects/Browser.java b/src/test/java/teammates/test/pageobjects/Browser.java
index f9af891b733..00a88d7af49 100644
--- a/src/test/java/teammates/test/pageobjects/Browser.java
+++ b/src/test/java/teammates/test/pageobjects/Browser.java
@@ -84,6 +84,7 @@ private WebDriver createWebDriver() {
             profile.setPreference("browser.helperApps.neverAsk.saveToDisk", "text/csv,application/vnd.ms-excel");
             profile.setPreference("browser.download.folderList", 2);
             profile.setPreference("browser.download.dir", System.getProperty("java.io.tmpdir"));
+            profile.setPreference("intl.accept_languages","en_US");
             return new FirefoxDriver(profile);
 
         } else if (TestProperties.BROWSER_CHROME.equals(browser)) {
@@ -93,6 +94,7 @@ private WebDriver createWebDriver() {
 
             ChromeOptions options = new ChromeOptions();
             options.addArguments("--allow-file-access-from-files");
+            options.addArguments("--lang=en_US");
             return new ChromeDriver(options);
         }
         System.out.println("Using " + browser + " is not supported!");

From b374d4ecd47d1878d1d0c3b560e79fd5d930478e Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Tue, 10 Jul 2018 01:23:50 +0800
Subject: [PATCH 61/76] Update Browser.java

---
 src/test/java/teammates/test/pageobjects/Browser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/teammates/test/pageobjects/Browser.java b/src/test/java/teammates/test/pageobjects/Browser.java
index 00a88d7af49..2e237883db7 100644
--- a/src/test/java/teammates/test/pageobjects/Browser.java
+++ b/src/test/java/teammates/test/pageobjects/Browser.java
@@ -84,7 +84,7 @@ private WebDriver createWebDriver() {
             profile.setPreference("browser.helperApps.neverAsk.saveToDisk", "text/csv,application/vnd.ms-excel");
             profile.setPreference("browser.download.folderList", 2);
             profile.setPreference("browser.download.dir", System.getProperty("java.io.tmpdir"));
-            profile.setPreference("intl.accept_languages","en_US");
+            profile.setPreference("intl.accept_languages", "en_US");
             return new FirefoxDriver(profile);
 
         } else if (TestProperties.BROWSER_CHROME.equals(browser)) {

From bc1f3fecbbd3040b9859ae05d990c8e761cbaa96 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Tue, 10 Jul 2018 16:02:41 +0800
Subject: [PATCH 62/76] Trial

---
 src/test/java/teammates/test/pageobjects/Browser.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/test/java/teammates/test/pageobjects/Browser.java b/src/test/java/teammates/test/pageobjects/Browser.java
index 2e237883db7..f9af891b733 100644
--- a/src/test/java/teammates/test/pageobjects/Browser.java
+++ b/src/test/java/teammates/test/pageobjects/Browser.java
@@ -84,7 +84,6 @@ private WebDriver createWebDriver() {
             profile.setPreference("browser.helperApps.neverAsk.saveToDisk", "text/csv,application/vnd.ms-excel");
             profile.setPreference("browser.download.folderList", 2);
             profile.setPreference("browser.download.dir", System.getProperty("java.io.tmpdir"));
-            profile.setPreference("intl.accept_languages", "en_US");
             return new FirefoxDriver(profile);
 
         } else if (TestProperties.BROWSER_CHROME.equals(browser)) {
@@ -94,7 +93,6 @@ private WebDriver createWebDriver() {
 
             ChromeOptions options = new ChromeOptions();
             options.addArguments("--allow-file-access-from-files");
-            options.addArguments("--lang=en_US");
             return new ChromeDriver(options);
         }
         System.out.println("Using " + browser + " is not supported!");

From fcabacf2cd8c818cff7ea605561258befed8d077 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Wed, 11 Jul 2018 14:00:42 +0800
Subject: [PATCH 63/76] ofPattern(String) -> ofPattern(String, Locale.US)

---
 .../teammates/common/util/LogMessageGenerator.java    |  4 +++-
 src/main/java/teammates/common/util/TimeHelper.java   | 11 ++++++-----
 .../ui/pagedata/AdminActivityLogPageData.java         |  5 +++--
 .../cases/action/AdminActivityLogPageActionTest.java  |  5 +++--
 .../cases/action/AdminEmailLogPageActionTest.java     |  3 ++-
 .../InstructorFeedbackSessionsPageUiTest.java         |  3 ++-
 src/test/java/teammates/test/driver/HtmlHelper.java   |  7 ++++---
 7 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/main/java/teammates/common/util/LogMessageGenerator.java b/src/main/java/teammates/common/util/LogMessageGenerator.java
index 4418a742b68..e33055b425e 100644
--- a/src/main/java/teammates/common/util/LogMessageGenerator.java
+++ b/src/main/java/teammates/common/util/LogMessageGenerator.java
@@ -2,6 +2,7 @@
 
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
+import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -19,7 +20,8 @@ public class LogMessageGenerator {
     public static final Pattern PATTERN_ACTION_NAME = Pattern.compile("^/\\S+?/(?<actionName>[^\\s\\?]*)");
     public static final String PATTERN_ACTION_NAME_GROUP = "actionName";
 
-    private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern(Const.ActivityLog.TIME_FORMAT_LOGID);
+    private static final DateTimeFormatter FORMATTER =
+            DateTimeFormatter.ofPattern(Const.ActivityLog.TIME_FORMAT_LOGID, Locale.US);
 
     /**
      * Generates the log message for an *Action.
diff --git a/src/main/java/teammates/common/util/TimeHelper.java b/src/main/java/teammates/common/util/TimeHelper.java
index 4962def5da4..0bacb8bf0c0 100644
--- a/src/main/java/teammates/common/util/TimeHelper.java
+++ b/src/main/java/teammates/common/util/TimeHelper.java
@@ -17,6 +17,7 @@
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import teammates.common.exception.TeammatesException;
@@ -229,7 +230,7 @@ private static String formatLocalDateTime(LocalDateTime localDateTime, String pa
         if (localDateTime.getHour() == 12 && localDateTime.getMinute() == 0) {
             processedPattern = pattern.replace("a", "'NOON'");
         }
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(processedPattern);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(processedPattern, Locale.US);
         return localDateTime.format(formatter);
     }
 
@@ -338,7 +339,7 @@ private static String formatInstant(Instant instant, ZoneId timeZone, String pat
         if (zonedDateTime.getHour() == 12 && zonedDateTime.getMinute() == 0) {
             processedPattern = pattern.replace("a", "'NOON'");
         }
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(processedPattern);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(processedPattern, Locale.US);
         return zonedDateTime.format(formatter);
     }
 
@@ -487,7 +488,7 @@ public static String convertToStandardDuration(Long timeInMilliseconds) {
      * @throws AssertionError if there is a parsing error
      */
     public static Instant parseInstant(String dateTimeString) {
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(SystemParams.DEFAULT_DATE_TIME_FORMAT);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(SystemParams.DEFAULT_DATE_TIME_FORMAT, Locale.US);
         try {
             return ZonedDateTime.parse(dateTimeString, formatter).toInstant();
         } catch (DateTimeParseException e) {
@@ -508,7 +509,7 @@ public static LocalDateTime parseLocalDateTime(String dateTimeString, String pat
             return null;
         }
 
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern, Locale.US);
         try {
             return LocalDateTime.parse(dateTimeString, formatter);
         } catch (DateTimeParseException e) {
@@ -528,7 +529,7 @@ public static LocalDate parseLocalDate(String dateString, String pattern) {
             return null;
         }
 
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern, Locale.US);
         try {
             return LocalDate.parse(dateString, formatter);
         } catch (DateTimeParseException e) {
diff --git a/src/main/java/teammates/ui/pagedata/AdminActivityLogPageData.java b/src/main/java/teammates/ui/pagedata/AdminActivityLogPageData.java
index a927fccc5b8..0ec3a751b51 100644
--- a/src/main/java/teammates/ui/pagedata/AdminActivityLogPageData.java
+++ b/src/main/java/teammates/ui/pagedata/AdminActivityLogPageData.java
@@ -8,6 +8,7 @@
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import teammates.common.datatransfer.attributes.AccountAttributes;
 import teammates.common.exception.InvalidParametersException;
@@ -261,12 +262,12 @@ private QueryParameters parseQuery(String query) throws ParseException, InvalidP
                 }
 
             } else if ("from".equals(label)) {
-                fromDateValue = LocalDate.parse(values[0], DateTimeFormatter.ofPattern("dd/MM/yy"))
+                fromDateValue = LocalDate.parse(values[0], DateTimeFormatter.ofPattern("dd/MM/yy", Locale.US))
                         .atStartOfDay(Const.SystemParams.ADMIN_TIME_ZONE).toInstant().toEpochMilli();
                 isFromDateSpecifiedInQuery = true;
 
             } else if ("to".equals(label)) {
-                toDateValue = LocalDate.parse(values[0], DateTimeFormatter.ofPattern("dd/MM/yy"))
+                toDateValue = LocalDate.parse(values[0], DateTimeFormatter.ofPattern("dd/MM/yy", Locale.US))
                         .atTime(LocalTime.MAX).atZone(Const.SystemParams.ADMIN_TIME_ZONE).toInstant().toEpochMilli();
             } else {
                 q.add(label, values);
diff --git a/src/test/java/teammates/test/cases/action/AdminActivityLogPageActionTest.java b/src/test/java/teammates/test/cases/action/AdminActivityLogPageActionTest.java
index c25c67d7f16..f0c2c5a039d 100644
--- a/src/test/java/teammates/test/cases/action/AdminActivityLogPageActionTest.java
+++ b/src/test/java/teammates/test/cases/action/AdminActivityLogPageActionTest.java
@@ -7,6 +7,7 @@
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import org.testng.annotations.BeforeGroups;
 import org.testng.annotations.Test;
@@ -84,13 +85,13 @@ private void loadLogMessages() {
 
     private String formatAdminDate(Instant instant) {
         return instant.atZone(Const.SystemParams.ADMIN_TIME_ZONE).toLocalDate()
-                .format(DateTimeFormatter.ofPattern("dd/MM/yy"));
+                .format(DateTimeFormatter.ofPattern("dd/MM/yy", Locale.US));
     }
 
     private String formatActivityLogTimeTruncated(Instant instant, ZoneId zoneId) {
         // Some timings are adjusted slightly in the tests. Hence instead of testing for exact match,
         // we test matching up to the hour.
-        return DateTimeFormatter.ofPattern("dd/MM/yyyy HH").format(instant.atZone(zoneId));
+        return DateTimeFormatter.ofPattern("dd/MM/yyyy HH", Locale.US).format(instant.atZone(zoneId));
     }
 
     private String getExpectedAjaxTimeString(Instant instant, ZoneId zoneId) {
diff --git a/src/test/java/teammates/test/cases/action/AdminEmailLogPageActionTest.java b/src/test/java/teammates/test/cases/action/AdminEmailLogPageActionTest.java
index 114be3b80f2..9cf7f0242da 100644
--- a/src/test/java/teammates/test/cases/action/AdminEmailLogPageActionTest.java
+++ b/src/test/java/teammates/test/cases/action/AdminEmailLogPageActionTest.java
@@ -6,6 +6,7 @@
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import org.testng.annotations.BeforeGroups;
 import org.testng.annotations.Test;
@@ -51,7 +52,7 @@ public class AdminEmailLogPageActionTest extends BaseActionTest {
     // 130 seconds is chosen so that it will be around 50 logs within 2 hours before now.
     private static final int LOG_MESSAGE_INTERVAL_MANY_LOGS = 130;
 
-    private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("dd/MM/yyyy");
+    private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("dd/MM/yyyy", Locale.US);
 
     private static final Instant TODAY = Instant.now();
     private static final Instant YESTERDAY = TimeHelper.getInstantDaysOffsetFromNow(-1);
diff --git a/src/test/java/teammates/test/cases/browsertests/InstructorFeedbackSessionsPageUiTest.java b/src/test/java/teammates/test/cases/browsertests/InstructorFeedbackSessionsPageUiTest.java
index 1d43bb0b353..634edb8984d 100644
--- a/src/test/java/teammates/test/cases/browsertests/InstructorFeedbackSessionsPageUiTest.java
+++ b/src/test/java/teammates/test/cases/browsertests/InstructorFeedbackSessionsPageUiTest.java
@@ -7,6 +7,7 @@
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import org.openqa.selenium.By;
 import org.testng.annotations.BeforeMethod;
@@ -721,7 +722,7 @@ private void testDatePickerScripts(LocalDate defaultStartDate) {
         feedbackPage.clickCustomVisibleTimeButton();
         feedbackPage.clickCustomPublishTimeButton();
 
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("EEE MMM dd yyyy");
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("EEE MMM dd yyyy", Locale.US);
 
         ______TS("validate visible date range before editing start date");
 
diff --git a/src/test/java/teammates/test/driver/HtmlHelper.java b/src/test/java/teammates/test/driver/HtmlHelper.java
index 4ea7ac904d6..805a4f6bf3a 100644
--- a/src/test/java/teammates/test/driver/HtmlHelper.java
+++ b/src/test/java/teammates/test/driver/HtmlHelper.java
@@ -5,6 +5,7 @@
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.util.Locale;
 
 import org.jsoup.Jsoup;
 import org.jsoup.helper.W3CDom;
@@ -411,12 +412,12 @@ private static String suppressVariationsInInjectedValues(String content) {
      */
     private static String replaceUnpredictableValuesWithPlaceholders(String content) {
         LocalDate today = LocalDate.now();
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy, ");
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy, ", Locale.US);
         String dateToday = formatter.format(today);
         String dateYesterday = formatter.format(today.minusDays(1));
         String dateTomorrow = formatter.format(today.plusDays(1));
-        String dateTodayInIso8601 = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'").format(today);
-        String dateTodayInCoursesPageFormat = DateTimeFormatter.ofPattern("d MMM yyyy").format(today);
+        String dateTodayInIso8601 = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'", Locale.US).format(today);
+        String dateTodayInCoursesPageFormat = DateTimeFormatter.ofPattern("d MMM yyyy", Locale.US).format(today);
         return content // dev server admin absolute URLs (${teammates.url}/_ah/...)
                       .replace("\"" + TestProperties.TEAMMATES_URL + "/_ah", "\"/_ah")
                       // logout URL generated by Google

From 91899927c3342c24ae386870c18b7c3a07f36fd4 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Wed, 11 Jul 2018 15:18:34 +0800
Subject: [PATCH 64/76] Update locale for DecimalFormat

---
 .../FeedbackConstantSumQuestionDetails.java   |  8 +++--
 ...FeedbackNumericalScaleQuestionDetails.java |  5 +++
 .../FeedbackRubricQuestionDetails.java        | 32 ++++++++++++-------
 .../teammates/common/util/StringHelper.java   |  5 ++-
 4 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackConstantSumQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackConstantSumQuestionDetails.java
index ebd57b9f1c6..b7d20509c3d 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackConstantSumQuestionDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackConstantSumQuestionDetails.java
@@ -1,11 +1,13 @@
 package teammates.common.datatransfer.questions;
 
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
@@ -447,7 +449,8 @@ public String getQuestionResultStatisticsHtml(
 
         Map<String, List<Integer>> optionPoints = generateOptionPointsMapping(responses);
 
-        DecimalFormat df = new DecimalFormat("#.##");
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+        DecimalFormat df = new DecimalFormat("#.##", decimalFormatSymbols);
 
         Map<String, List<Integer>> sortedOptionPoints = new TreeMap<>();
 
@@ -509,7 +512,8 @@ public String getQuestionResultStatisticsCsv(
         List<String> options = constSumOptions;
         Map<String, List<Integer>> optionPoints = generateOptionPointsMapping(responses);
 
-        DecimalFormat df = new DecimalFormat("#.##");
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+        DecimalFormat df = new DecimalFormat("#.##", decimalFormatSymbols);
 
         Map<String, List<Integer>> sortedOptionPoints = new TreeMap<>();
 
diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleQuestionDetails.java
index 253f3edebef..a51bef40ad9 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleQuestionDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleQuestionDetails.java
@@ -2,10 +2,12 @@
 
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
@@ -211,6 +213,7 @@ private String getInstructorQuestionResultsStatisticsHtml(
         df.setMinimumFractionDigits(0);
         df.setMaximumFractionDigits(5);
         df.setRoundingMode(RoundingMode.DOWN);
+        df.setDecimalFormatSymbols(new DecimalFormatSymbols(Locale.US));
 
         StringBuilder fragmentHtml = new StringBuilder();
 
@@ -279,6 +282,7 @@ private String getStudentQuestionResultsStatisticsHtml(
         df.setMinimumFractionDigits(0);
         df.setMaximumFractionDigits(5);
         df.setRoundingMode(RoundingMode.DOWN);
+        df.setDecimalFormatSymbols(new DecimalFormatSymbols(Locale.US));
 
         boolean isRecipientTypeGeneral = question.recipientType == FeedbackParticipantType.NONE;
         boolean isRecipientTypeTeam = question.recipientType == FeedbackParticipantType.TEAMS
@@ -479,6 +483,7 @@ public String getQuestionResultStatisticsCsv(
         df.setMinimumFractionDigits(0);
         df.setMaximumFractionDigits(5);
         df.setRoundingMode(RoundingMode.DOWN);
+        df.setDecimalFormatSymbols(new DecimalFormatSymbols(Locale.US));
 
         String csvHeader = "Team, Recipient, Average, Minimum, Maximum"
                          + (showAvgExcludingSelf ? ", Average excluding self response" : "")
diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
index 1036662f97a..4a7439e6a18 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
@@ -1,11 +1,13 @@
 package teammates.common.datatransfer.questions;
 
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -376,7 +378,8 @@ private String getSubmissionFormMobileHtml(String questionNumberString, String r
     @Override
     public String getQuestionSpecificEditFormHtml(int questionNumber) {
         String questionNumberString = Integer.toString(questionNumber);
-        DecimalFormat weightFormat = new DecimalFormat("#.##");
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+        DecimalFormat weightFormat = new DecimalFormat("#.##", decimalFormatSymbols);
 
         // Create table row header fragments
         StringBuilder tableHeaderFragmentHtml = new StringBuilder();
@@ -561,7 +564,8 @@ private String getRecipientStatsHeaderFragmentHtml(String header) {
 
     public String getRecipientStatsHeaderHtml() {
         StringBuilder headerBuilder = new StringBuilder(100);
-        DecimalFormat dfWeight = new DecimalFormat("#.##");
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+        DecimalFormat dfWeight = new DecimalFormat("#.##", decimalFormatSymbols);
         StringBuilder choicesHtmlBuilder = new StringBuilder(100);
 
         for (int i = 0; i < rubricChoices.size(); i++) {
@@ -595,7 +599,8 @@ public String getQuestionResultStatisticsHtml(List<FeedbackResponseAttributes> r
         boolean isExcludingSelfOptionAvailable =
                 recipientType.equals(FeedbackParticipantType.OWN_TEAM_MEMBERS_INCLUDING_SELF);
 
-        DecimalFormat weightFormat = new DecimalFormat("#.##");
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+        DecimalFormat weightFormat = new DecimalFormat("#.##", decimalFormatSymbols);
 
         // Create table row header fragments
         StringBuilder tableHeaderFragmentHtml = new StringBuilder();
@@ -687,8 +692,9 @@ Slots.TABLE_HEADER_ROW_FRAGMENT_HTML, getRecipientStatsHeaderHtml(),
     private StringBuilder getQuestionResultsStatisticsBodyHtml(FeedbackRubricQuestionDetails fqd,
                                                                int[][] responseFrequency, float[][] rubricStats) {
 
-        DecimalFormat df = new DecimalFormat("#");
-        DecimalFormat dfAverage = new DecimalFormat("0.00");
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+        DecimalFormat df = new DecimalFormat("#", decimalFormatSymbols);
+        DecimalFormat dfAverage = new DecimalFormat("0.00", decimalFormatSymbols);
 
         String tableBodyFragmentTemplate = FormTemplates.RUBRIC_RESULT_STATS_BODY_FRAGMENT;
         String tableBodyTemplate = FormTemplates.RUBRIC_RESULT_STATS_BODY;
@@ -779,7 +785,8 @@ public String getQuestionResultStatisticsCsv(
         }
 
         StringBuilder csv = new StringBuilder();
-        DecimalFormat dfWeight = new DecimalFormat("#.##");
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+        DecimalFormat dfWeight = new DecimalFormat("#.##", decimalFormatSymbols);
 
         // table header
         for (int i = 0; i < rubricChoices.size(); i++) {
@@ -799,8 +806,8 @@ public String getQuestionResultStatisticsCsv(
         csv.append(System.lineSeparator());
 
         // table body
-        DecimalFormat df = new DecimalFormat("#");
-        DecimalFormat dfAverage = new DecimalFormat("0.00");
+        DecimalFormat df = new DecimalFormat("#", decimalFormatSymbols);
+        DecimalFormat dfAverage = new DecimalFormat("0.00", decimalFormatSymbols);
 
         int[][] responseFrequency = RubricStatistics.calculateResponseFrequency(responses, this);
         float[][] rubricStats = RubricStatistics.calculatePercentageFrequencyAndAverage(this,
@@ -886,7 +893,8 @@ public String getCsvHeader() {
 
     public String getRecipientStatsCsvHeader() {
         StringBuilder header = new StringBuilder(100);
-        DecimalFormat dfWeight = new DecimalFormat("#.##");
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+        DecimalFormat dfWeight = new DecimalFormat("#.##", decimalFormatSymbols);
         String headerFragment = "Team,Recipient Name,Recipient's Email,Sub Question,";
 
         header.append(headerFragment);
@@ -1128,7 +1136,8 @@ public String getHtmlForSubQuestion(int subQuestion) {
             String alphabeticalIndex = StringHelper.integerToLowerCaseAlphabeticalIndex(subQuestion + 1);
             String subQuestionString = SanitizationHelper.sanitizeForHtml(alphabeticalIndex + ") "
                     + getRubricSubQuestions().get(subQuestion));
-            DecimalFormat df = new DecimalFormat("0.00");
+            DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+            DecimalFormat df = new DecimalFormat("0.00", decimalFormatSymbols);
 
             List<String> cols = new ArrayList<>();
 
@@ -1180,7 +1189,8 @@ public String getCsvForSubQuestion(int subQuestion) {
             String alphabeticalIndex = StringHelper.integerToLowerCaseAlphabeticalIndex(subQuestion + 1);
             String subQuestionString = SanitizationHelper.sanitizeForCsv(alphabeticalIndex + ") "
                     + getRubricSubQuestions().get(subQuestion));
-            DecimalFormat df = new DecimalFormat("0.00");
+            DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+            DecimalFormat df = new DecimalFormat("0.00", decimalFormatSymbols);
 
             // Append recipient identification details and rubric subQuestion
             csv.append(recipientTeam).append(',')
diff --git a/src/main/java/teammates/common/util/StringHelper.java b/src/main/java/teammates/common/util/StringHelper.java
index 4e74832bb7e..1bcd56074f5 100644
--- a/src/main/java/teammates/common/util/StringHelper.java
+++ b/src/main/java/teammates/common/util/StringHelper.java
@@ -1,10 +1,12 @@
 package teammates.common.util;
 
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.regex.Pattern;
@@ -181,7 +183,8 @@ public static <T> String toString(List<T> list, String delimiter) {
     }
 
     public static String toDecimalFormatString(double doubleVal) {
-        DecimalFormat df = new DecimalFormat("0.###");
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
+        DecimalFormat df = new DecimalFormat("0.###", decimalFormatSymbols);
         return df.format(doubleVal);
     }
 

From 7427f70c35b233a23ab3bcf8003d632f10b60e56 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Sun, 15 Jul 2018 13:01:39 +0800
Subject: [PATCH 65/76] Remove unnecessary changes

---
 gradle.template.properties                                  | 3 ---
 src/test/java/teammates/test/cases/BaseTestCase.java        | 2 +-
 .../test/cases/BaseTestCaseWithMinimalGaeEnvironment.java   | 6 ++----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/gradle.template.properties b/gradle.template.properties
index b8207028427..de4eb1204ed 100644
--- a/gradle.template.properties
+++ b/gradle.template.properties
@@ -8,6 +8,3 @@ org.gradle.daemon=false
 # e.g org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home
 # e.g org.gradle.java.home=C:/Program Files/Java/jdk1.8.0_144
 # org.gradle.java.home=
-
-# The test environment REQUIRES the following locale. Do not change!
-org.gradle.jvmargs=-Duser.language=en -Duser.country=US
diff --git a/src/test/java/teammates/test/cases/BaseTestCase.java b/src/test/java/teammates/test/cases/BaseTestCase.java
index 24e98c5add0..8bf132f0098 100644
--- a/src/test/java/teammates/test/cases/BaseTestCase.java
+++ b/src/test/java/teammates/test/cases/BaseTestCase.java
@@ -45,7 +45,7 @@ public static void ______TS(String description) {
      */
     @BeforeSuite
     public void setLocale() {
-        Locale.setDefault(new Locale("en", "US"));
+        Locale.setDefault(Locale.US);
     }
 
     @BeforeClass
diff --git a/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java b/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
index 66f73cb3abd..c9f86ccab3a 100644
--- a/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
+++ b/src/test/java/teammates/test/cases/BaseTestCaseWithMinimalGaeEnvironment.java
@@ -2,7 +2,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Locale;
 
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -22,17 +21,16 @@ public class BaseTestCaseWithMinimalGaeEnvironment extends BaseTestCase {
     private LocalServiceTestHelper helper = new LocalServiceTestHelper();
 
     /**
-     * Sets the environment of SystemProperty based on the URL and default locale required for tests.
+     * Sets the environment of SystemProperty based on the URL.
      */
     @BeforeSuite
-    public void setUpEnvironmentAndLocale() throws MalformedURLException {
+    public void setUpEnvironment() throws MalformedURLException {
         if (new URL(TestProperties.TEAMMATES_URL).getHost().contains(".appspot.com")) {
             SystemProperty.environment.set(SystemProperty.Environment.Value.Production);
         } else {
             SystemProperty.environment.set(SystemProperty.Environment.Value.Development);
         }
 
-        Locale.setDefault(new Locale("en", "US"));
     }
 
     @BeforeClass

From 346fb860273488e7fcc5a81910826d7786a92771 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 16 Jul 2018 11:24:30 +0800
Subject: [PATCH 66/76] Standard style

---
 src/main/java/teammates/common/util/StringHelper.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/teammates/common/util/StringHelper.java b/src/main/java/teammates/common/util/StringHelper.java
index 1bcd56074f5..f476c63b78e 100644
--- a/src/main/java/teammates/common/util/StringHelper.java
+++ b/src/main/java/teammates/common/util/StringHelper.java
@@ -1,7 +1,7 @@
 package teammates.common.util;
 
 import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -183,8 +183,9 @@ public static <T> String toString(List<T> list, String delimiter) {
     }
 
     public static String toDecimalFormatString(double doubleVal) {
-        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-        DecimalFormat df = new DecimalFormat("0.###", decimalFormatSymbols);
+        NumberFormat nf = NumberFormat.getNumberInstance(Locale.US);
+        DecimalFormat df = (DecimalFormat) nf;
+        df.applyPattern("0.###");
         return df.format(doubleVal);
     }
 

From 985f512f0b730082b4fb793675cb684ac72dc014 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 16 Jul 2018 11:42:21 +0800
Subject: [PATCH 67/76] Remove setting locale in tests

---
 src/test/java/teammates/test/cases/BaseTestCase.java | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/test/java/teammates/test/cases/BaseTestCase.java b/src/test/java/teammates/test/cases/BaseTestCase.java
index 8bf132f0098..c1f1d46bd7f 100644
--- a/src/test/java/teammates/test/cases/BaseTestCase.java
+++ b/src/test/java/teammates/test/cases/BaseTestCase.java
@@ -40,14 +40,6 @@ public static void ______TS(String description) {
     }
     // CHECKSTYLE.ON:AbbreviationAsWordInName|MethodName
 
-    /**
-     * Set the required locale for tests.
-     */
-    @BeforeSuite
-    public void setLocale() {
-        Locale.setDefault(Locale.US);
-    }
-
     @BeforeClass
     public void printTestClassHeader() {
         print("[============================="

From ff8ea3474401c8434f40d7b3466d1ff3c30288ac Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 16 Jul 2018 11:50:45 +0800
Subject: [PATCH 68/76] SCA

---
 src/test/java/teammates/test/cases/BaseTestCase.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/test/java/teammates/test/cases/BaseTestCase.java b/src/test/java/teammates/test/cases/BaseTestCase.java
index c1f1d46bd7f..19d725fe822 100644
--- a/src/test/java/teammates/test/cases/BaseTestCase.java
+++ b/src/test/java/teammates/test/cases/BaseTestCase.java
@@ -3,13 +3,11 @@
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
-import java.util.Locale;
 
 import org.junit.Assert;
 import org.testng.AssertJUnit;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeSuite;
 
 import teammates.common.datatransfer.DataBundle;
 import teammates.common.util.FieldValidator;

From 39b3abd3e273860f5b64934528dde46e5d6d52e2 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 16 Jul 2018 11:56:02 +0800
Subject: [PATCH 69/76] Generalise method

---
 ...FeedbackNumericalScaleQuestionDetails.java | 20 +++++++++----------
 ...FeedbackNumericalScaleResponseDetails.java |  2 +-
 .../teammates/common/util/StringHelper.java   |  2 +-
 ...tructorFeedbackQuestionEditActionTest.java |  4 ++--
 ...rFeedbackSubmissionEditSaveActionTest.java |  4 ++--
 ...tFeedbackSubmissionEditSaveActionTest.java |  8 ++++----
 .../InstructorFeedbackEditPage.java           |  2 +-
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleQuestionDetails.java
index a51bef40ad9..d6e779ba3e1 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleQuestionDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleQuestionDetails.java
@@ -97,7 +97,7 @@ public String getQuestionWithExistingResponseSubmissionFormHtml(
                 Slots.RESPONSE_INDEX, Integer.toString(responseIdx),
                 Slots.MIN_SCALE, Integer.toString(minScale),
                 Slots.MAX_SCALE, Integer.toString(maxScale),
-                Slots.STEP, StringHelper.toDecimalFormatString(step),
+                Slots.STEP, StringHelper.toDecimalFormatString("0.###", step),
                 Slots.EXISTING_ANSWER, numscaleResponseDetails.getAnswerString(),
                 Slots.POSSIBLE_VALUES_STRING, getPossibleValuesStringSubmit(),
                 Slots.FEEDBACK_RESPONSE_TEXT, Const.ParamsNames.FEEDBACK_RESPONSE_TEXT,
@@ -117,7 +117,7 @@ public String getQuestionWithoutExistingResponseSubmissionFormHtml(
                 Slots.RESPONSE_INDEX, Integer.toString(responseIdx),
                 Slots.MIN_SCALE, Integer.toString(minScale),
                 Slots.MAX_SCALE, Integer.toString(maxScale),
-                Slots.STEP, StringHelper.toDecimalFormatString(step),
+                Slots.STEP, StringHelper.toDecimalFormatString("0.###", step),
                 Slots.EXISTING_ANSWER, "",
                 Slots.POSSIBLE_VALUES_STRING, getPossibleValuesStringSubmit(),
                 Slots.FEEDBACK_RESPONSE_TEXT, Const.ParamsNames.FEEDBACK_RESPONSE_TEXT,
@@ -133,7 +133,7 @@ public String getQuestionSpecificEditFormHtml(int questionNumber) {
                 Slots.QUESTION_NUMBER, Integer.toString(questionNumber),
                 Slots.MIN_SCALE, Integer.toString(minScale),
                 Slots.MAX_SCALE, Integer.toString(maxScale),
-                Slots.STEP, StringHelper.toDecimalFormatString(step),
+                Slots.STEP, StringHelper.toDecimalFormatString("0.###", step),
                 Slots.POSSIBLE_VALUES, getPossibleValuesStringEdit(),
                 Slots.NUMSCALE_MIN, Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN,
                 Slots.NUMSCALE_MAX, Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX,
@@ -698,17 +698,17 @@ private String getPossibleValuesString() {
         StringBuilder possibleValuesString = new StringBuilder();
         if (possibleValuesCount > 6) {
             possibleValuesString
-                .append(StringHelper.toDecimalFormatString(minScale)).append(", ")
-                .append(StringHelper.toDecimalFormatString(minScale + step)).append(", ")
-                .append(StringHelper.toDecimalFormatString(minScale + 2 * step)).append(", ..., ")
-                .append(StringHelper.toDecimalFormatString(maxScale - 2 * step)).append(", ")
-                .append(StringHelper.toDecimalFormatString(maxScale - step)).append(", ")
-                .append(StringHelper.toDecimalFormatString(maxScale));
+                .append(StringHelper.toDecimalFormatString("0.###", minScale)).append(", ")
+                .append(StringHelper.toDecimalFormatString("0.###", minScale + step)).append(", ")
+                .append(StringHelper.toDecimalFormatString("0.###", minScale + 2 * step)).append(", ..., ")
+                .append(StringHelper.toDecimalFormatString("0.###", maxScale - 2 * step)).append(", ")
+                .append(StringHelper.toDecimalFormatString("0.###", maxScale - step)).append(", ")
+                .append(StringHelper.toDecimalFormatString("0.###", maxScale));
         } else {
             possibleValuesString.append(Integer.toString(minScale));
             cur = minScale + step;
             while (maxScale - cur >= -1e-9) {
-                possibleValuesString.append(", ").append(StringHelper.toDecimalFormatString(cur));
+                possibleValuesString.append(", ").append(StringHelper.toDecimalFormatString("0.###", cur));
                 cur += step;
             }
         }
diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleResponseDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleResponseDetails.java
index 93cfa74ee39..963141f07e7 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleResponseDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleResponseDetails.java
@@ -34,7 +34,7 @@ public double getAnswer() {
 
     @Override
     public String getAnswerString() {
-        return StringHelper.toDecimalFormatString(answer);
+        return StringHelper.toDecimalFormatString("0.###", answer);
     }
 
     @Override
diff --git a/src/main/java/teammates/common/util/StringHelper.java b/src/main/java/teammates/common/util/StringHelper.java
index f476c63b78e..b6da2c71599 100644
--- a/src/main/java/teammates/common/util/StringHelper.java
+++ b/src/main/java/teammates/common/util/StringHelper.java
@@ -182,7 +182,7 @@ public static <T> String toString(List<T> list, String delimiter) {
                 .collect(Collectors.joining(delimiter));
     }
 
-    public static String toDecimalFormatString(double doubleVal) {
+    public static String toDecimalFormatString(String pattern, double doubleVal) {
         NumberFormat nf = NumberFormat.getNumberInstance(Locale.US);
         DecimalFormat df = (DecimalFormat) nf;
         df.applyPattern("0.###");
diff --git a/src/test/java/teammates/test/cases/action/InstructorFeedbackQuestionEditActionTest.java b/src/test/java/teammates/test/cases/action/InstructorFeedbackQuestionEditActionTest.java
index a262613e48d..e00605372c0 100644
--- a/src/test/java/teammates/test/cases/action/InstructorFeedbackQuestionEditActionTest.java
+++ b/src/test/java/teammates/test/cases/action/InstructorFeedbackQuestionEditActionTest.java
@@ -1179,7 +1179,7 @@ public void testExecuteAndPostProcessNumScale() {
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN, Integer.toString(numscaleDetails.getMinScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX, Integer.toString(numscaleDetails.getMaxScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP,
-                StringHelper.toDecimalFormatString(numscaleDetails.getStep()),
+                StringHelper.toDecimalFormatString("0.###", numscaleDetails.getStep()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMBEROFENTITIESTYPE, "max",
                 Const.ParamsNames.FEEDBACK_QUESTION_SHOWRESPONSESTO, FeedbackParticipantType.INSTRUCTORS.toString(),
                 Const.ParamsNames.FEEDBACK_QUESTION_SHOWGIVERTO, FeedbackParticipantType.INSTRUCTORS.toString(),
@@ -1218,7 +1218,7 @@ public void testExecuteAndPostProcessNumScale() {
                 Const.ParamsNames.FEEDBACK_QUESTION_DESCRIPTION, "more details",
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN, Integer.toString(1),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX, Integer.toString(10),
-                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP, StringHelper.toDecimalFormatString(1.0),
+                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP, StringHelper.toDecimalFormatString("0.###", 1.0),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMBEROFENTITIESTYPE, "max",
                 Const.ParamsNames.FEEDBACK_QUESTION_SHOWRESPONSESTO, FeedbackParticipantType.INSTRUCTORS.toString(),
                 Const.ParamsNames.FEEDBACK_QUESTION_SHOWGIVERTO, FeedbackParticipantType.INSTRUCTORS.toString(),
diff --git a/src/test/java/teammates/test/cases/action/InstructorFeedbackSubmissionEditSaveActionTest.java b/src/test/java/teammates/test/cases/action/InstructorFeedbackSubmissionEditSaveActionTest.java
index 6112a6c69b0..af6104d2f63 100644
--- a/src/test/java/teammates/test/cases/action/InstructorFeedbackSubmissionEditSaveActionTest.java
+++ b/src/test/java/teammates/test/cases/action/InstructorFeedbackSubmissionEditSaveActionTest.java
@@ -445,7 +445,7 @@ public void testExecuteAndPostProcess() {
                 Const.ParamsNames.FEEDBACK_RESPONSE_TEXT + "-1-0", "3.5",
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN + "-1-0", Integer.toString(fqd.getMinScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX + "-1-0", Integer.toString(fqd.getMaxScale()),
-                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString(fqd.getStep())
+                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString("0.###", fqd.getStep())
         };
 
         a = getAction(submissionParams);
@@ -472,7 +472,7 @@ public void testExecuteAndPostProcess() {
                 Const.ParamsNames.FEEDBACK_RESPONSE_TEXT + "-1-0", "",
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN + "-1-0", Integer.toString(fqd.getMinScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX + "-1-0", Integer.toString(fqd.getMaxScale()),
-                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString(fqd.getStep())
+                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString("0.###", fqd.getStep())
         };
 
         a = getAction(submissionParams);
diff --git a/src/test/java/teammates/test/cases/action/StudentFeedbackSubmissionEditSaveActionTest.java b/src/test/java/teammates/test/cases/action/StudentFeedbackSubmissionEditSaveActionTest.java
index c07c21695dd..c59d1d14494 100644
--- a/src/test/java/teammates/test/cases/action/StudentFeedbackSubmissionEditSaveActionTest.java
+++ b/src/test/java/teammates/test/cases/action/StudentFeedbackSubmissionEditSaveActionTest.java
@@ -606,7 +606,7 @@ public void testExecuteAndPostProcess() throws Exception {
                 Const.ParamsNames.FEEDBACK_RESPONSE_TEXT + "-1-0", "1",
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN + "-1-0", Integer.toString(fqd.getMinScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX + "-1-0", Integer.toString(fqd.getMaxScale()),
-                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString(fqd.getStep())
+                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString("0.###", fqd.getStep())
         };
 
         a = getAction(submissionParams);
@@ -637,7 +637,7 @@ public void testExecuteAndPostProcess() throws Exception {
                 Const.ParamsNames.FEEDBACK_RESPONSE_TEXT + "-1-0", "",
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN + "-1-0", Integer.toString(fqd.getMinScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX + "-1-0", Integer.toString(fqd.getMaxScale()),
-                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString(fqd.getStep())
+                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString("0.###", fqd.getStep())
         };
 
         a = getAction(submissionParams);
@@ -951,7 +951,7 @@ public void testExecuteAndPostProcess() throws Exception {
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN + "-1-0", Integer.toString(fqd.getMinScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX + "-1-0", Integer.toString(fqd.getMaxScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0",
-                        StringHelper.toDecimalFormatString(fqd.getStep()),
+                        StringHelper.toDecimalFormatString("0.###", fqd.getStep()),
                 Const.ParamsNames.SEND_SUBMISSION_EMAIL, "on",
 
                 Const.ParamsNames.REGKEY, studentKey,
@@ -999,7 +999,7 @@ public void testExecuteAndPostProcess() throws Exception {
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN + "-1-0", Integer.toString(fqd.getMinScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX + "-1-0", Integer.toString(fqd.getMaxScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0",
-                        StringHelper.toDecimalFormatString(fqd.getStep()),
+                        StringHelper.toDecimalFormatString("0.###", fqd.getStep()),
 
                 Const.ParamsNames.REGKEY, studentKey,
                 Const.ParamsNames.STUDENT_EMAIL, unregisteredStudent.email
diff --git a/src/test/java/teammates/test/pageobjects/InstructorFeedbackEditPage.java b/src/test/java/teammates/test/pageobjects/InstructorFeedbackEditPage.java
index 21a48848e65..f42c990a6c6 100644
--- a/src/test/java/teammates/test/pageobjects/InstructorFeedbackEditPage.java
+++ b/src/test/java/teammates/test/pageobjects/InstructorFeedbackEditPage.java
@@ -266,7 +266,7 @@ public void fillStepNumScaleBox(String step, int qnNumber) {
     }
 
     public void fillStepNumScaleBox(double step, int qnNumber) {
-        fillStepNumScaleBox(StringHelper.toDecimalFormatString(step), qnNumber);
+        fillStepNumScaleBox(StringHelper.toDecimalFormatString("0.###", step), qnNumber);
     }
 
     public void fillStepNumScaleBoxForNewQuestion(String step) {

From 3d63c321beb97a757ea8002a916b3ccea8f683e7 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 16 Jul 2018 12:23:22 +0800
Subject: [PATCH 70/76] Generalise method

---
 .../FeedbackConstantSumQuestionDetails.java   | 17 ++----
 .../FeedbackRubricQuestionDetails.java        | 52 ++++++-------------
 .../teammates/common/util/StringHelper.java   |  2 +-
 3 files changed, 20 insertions(+), 51 deletions(-)

diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackConstantSumQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackConstantSumQuestionDetails.java
index b7d20509c3d..2d36fab2ce0 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackConstantSumQuestionDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackConstantSumQuestionDetails.java
@@ -1,13 +1,10 @@
 package teammates.common.datatransfer.questions;
 
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
@@ -449,9 +446,6 @@ public String getQuestionResultStatisticsHtml(
 
         Map<String, List<Integer>> optionPoints = generateOptionPointsMapping(responses);
 
-        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-        DecimalFormat df = new DecimalFormat("#.##", decimalFormatSymbols);
-
         Map<String, List<Integer>> sortedOptionPoints = new TreeMap<>();
 
         Map<String, String> identifierMap = new HashMap<>();
@@ -478,14 +472,14 @@ public String getQuestionResultStatisticsHtml(
                         Slots.TEAM, SanitizationHelper.sanitizeForHtml(teamName),
                         Slots.CONSTSUM_POINTS_RECEIVED, pointsReceived,
                         Slots.CONSTSUM_TOTAL_POINTS, Integer.toString(total),
-                        Slots.CONSTSUM_AVERAGE_POINTS, df.format(average)));
+                        Slots.CONSTSUM_AVERAGE_POINTS, StringHelper.toDecimalFormatString("#.##", average)));
             } else {
 
                 fragments.append(Templates.populateTemplate(FormTemplates.CONSTSUM_RESULT_STATS_OPTIONFRAGMENT,
                         Slots.CONSTSUM_OPTION_VALUE, SanitizationHelper.sanitizeForHtml(option),
                         Slots.CONSTSUM_POINTS_RECEIVED, pointsReceived,
                         Slots.CONSTSUM_TOTAL_POINTS, Integer.toString(total),
-                        Slots.CONSTSUM_AVERAGE_POINTS, df.format(average)));
+                        Slots.CONSTSUM_AVERAGE_POINTS, StringHelper.toDecimalFormatString("#.##", average)));
             }
         });
 
@@ -512,9 +506,6 @@ public String getQuestionResultStatisticsCsv(
         List<String> options = constSumOptions;
         Map<String, List<Integer>> optionPoints = generateOptionPointsMapping(responses);
 
-        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-        DecimalFormat df = new DecimalFormat("#.##", decimalFormatSymbols);
-
         Map<String, List<Integer>> sortedOptionPoints = new TreeMap<>();
 
         Map<String, String> identifierMap = new HashMap<>();
@@ -542,8 +533,8 @@ public String getQuestionResultStatisticsCsv(
             double total = computeTotal(points);
 
             fragments.append(option)
-                    .append(',').append(df.format(average))
-                    .append(',').append(df.format(total))
+                    .append(',').append(StringHelper.toDecimalFormatString("#.##", average))
+                    .append(',').append(StringHelper.toDecimalFormatString("#.##", total))
                     .append(',').append(StringHelper.join(",", points))
                     .append(System.lineSeparator());
 
diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
index 4a7439e6a18..b6f989f5a85 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
@@ -1,13 +1,10 @@
 package teammates.common.datatransfer.questions;
 
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -378,8 +375,6 @@ private String getSubmissionFormMobileHtml(String questionNumberString, String r
     @Override
     public String getQuestionSpecificEditFormHtml(int questionNumber) {
         String questionNumberString = Integer.toString(questionNumber);
-        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-        DecimalFormat weightFormat = new DecimalFormat("#.##", decimalFormatSymbols);
 
         // Create table row header fragments
         StringBuilder tableHeaderFragmentHtml = new StringBuilder();
@@ -402,7 +397,8 @@ public String getQuestionSpecificEditFormHtml(int questionNumber) {
                     Templates.populateTemplate(tableWeightFragmentTemplate,
                             Slots.QUESTION_INDEX, questionNumberString,
                             Slots.COL, Integer.toString(i),
-                            Slots.RUBRIC_WEIGHT, hasAssignedWeights ? weightFormat.format(rubricWeights.get(i)) : "0",
+                            Slots.RUBRIC_WEIGHT,
+                                hasAssignedWeights ? StringHelper.toDecimalFormatString("#.##", rubricWeights.get(i)) : "0",
                             Slots.RUBRIC_PARAM_WEIGHT, Const.ParamsNames.FEEDBACK_QUESTION_RUBRIC_WEIGHT);
             tableWeightFragmentHtml.append(tableWeightCell).append(System.lineSeparator());
         }
@@ -564,12 +560,10 @@ private String getRecipientStatsHeaderFragmentHtml(String header) {
 
     public String getRecipientStatsHeaderHtml() {
         StringBuilder headerBuilder = new StringBuilder(100);
-        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-        DecimalFormat dfWeight = new DecimalFormat("#.##", decimalFormatSymbols);
         StringBuilder choicesHtmlBuilder = new StringBuilder(100);
 
         for (int i = 0; i < rubricChoices.size(); i++) {
-            String weight = dfWeight.format(rubricWeights.get(i));
+            String weight = StringHelper.toDecimalFormatString("#.##", rubricWeights.get(i));
             String html = getRecipientStatsHeaderFragmentHtml(rubricChoices.get(i) + " (Weight: " + weight + ")");
             choicesHtmlBuilder.append(html);
         }
@@ -599,8 +593,6 @@ public String getQuestionResultStatisticsHtml(List<FeedbackResponseAttributes> r
         boolean isExcludingSelfOptionAvailable =
                 recipientType.equals(FeedbackParticipantType.OWN_TEAM_MEMBERS_INCLUDING_SELF);
 
-        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-        DecimalFormat weightFormat = new DecimalFormat("#.##", decimalFormatSymbols);
 
         // Create table row header fragments
         StringBuilder tableHeaderFragmentHtml = new StringBuilder();
@@ -610,7 +602,7 @@ public String getQuestionResultStatisticsHtml(List<FeedbackResponseAttributes> r
             String header = SanitizationHelper.sanitizeForHtml(rubricChoices.get(i))
                           + (fqd.hasAssignedWeights
                             ? "<span style=\"font-weight:normal;\"> (Weight: "
-                              + weightFormat.format(rubricWeights.get(i)) + ")</span>"
+                              + StringHelper.toDecimalFormatString("#.##", rubricWeights.get(i)) + ")</span>"
                             : "");
 
             String tableHeaderCell =
@@ -692,10 +684,6 @@ Slots.TABLE_HEADER_ROW_FRAGMENT_HTML, getRecipientStatsHeaderHtml(),
     private StringBuilder getQuestionResultsStatisticsBodyHtml(FeedbackRubricQuestionDetails fqd,
                                                                int[][] responseFrequency, float[][] rubricStats) {
 
-        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-        DecimalFormat df = new DecimalFormat("#", decimalFormatSymbols);
-        DecimalFormat dfAverage = new DecimalFormat("0.00", decimalFormatSymbols);
-
         String tableBodyFragmentTemplate = FormTemplates.RUBRIC_RESULT_STATS_BODY_FRAGMENT;
         String tableBodyTemplate = FormTemplates.RUBRIC_RESULT_STATS_BODY;
 
@@ -707,7 +695,7 @@ private StringBuilder getQuestionResultsStatisticsBodyHtml(FeedbackRubricQuestio
 
             for (int j = 0; j < numOfRubricChoices; j++) {
                 String percentageFrequencyString = isSubQuestionRespondedTo
-                        ? df.format(rubricStats[i][j] * 100) + "%"
+                        ? StringHelper.toDecimalFormatString("#", rubricStats[i][j] * 100) + "%"
                         : STATISTICS_NO_VALUE_STRING;
                 String tableBodyCell = Templates.populateTemplate(tableBodyFragmentTemplate,
                         Slots.RUBRIC_PERCENTAGE_FREQUENCY_OR_AVERAGE,
@@ -718,7 +706,7 @@ private StringBuilder getQuestionResultsStatisticsBodyHtml(FeedbackRubricQuestio
 
             if (fqd.hasAssignedWeights) {
                 String averageString = isSubQuestionRespondedTo
-                        ? dfAverage.format(rubricStats[i][numOfRubricChoices])
+                        ? StringHelper.toDecimalFormatString("0.00", rubricStats[i][numOfRubricChoices])
                         : STATISTICS_NO_VALUE_STRING;
                 String tableBodyAverageCell = Templates.populateTemplate(tableBodyFragmentTemplate,
                         Slots.RUBRIC_PERCENTAGE_FREQUENCY_OR_AVERAGE, averageString);
@@ -785,15 +773,13 @@ public String getQuestionResultStatisticsCsv(
         }
 
         StringBuilder csv = new StringBuilder();
-        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-        DecimalFormat dfWeight = new DecimalFormat("#.##", decimalFormatSymbols);
 
         // table header
         for (int i = 0; i < rubricChoices.size(); i++) {
 
             String header = rubricChoices.get(i)
                           + (hasAssignedWeights
-                            ? " (Weight: " + dfWeight.format(rubricWeights.get(i)) + ")"
+                            ? " (Weight: " + StringHelper.toDecimalFormatString("#.##", rubricWeights.get(i)) + ")"
                             : "");
 
             csv.append(',').append(SanitizationHelper.sanitizeForCsv(header));
@@ -806,9 +792,6 @@ public String getQuestionResultStatisticsCsv(
         csv.append(System.lineSeparator());
 
         // table body
-        DecimalFormat df = new DecimalFormat("#", decimalFormatSymbols);
-        DecimalFormat dfAverage = new DecimalFormat("0.00", decimalFormatSymbols);
-
         int[][] responseFrequency = RubricStatistics.calculateResponseFrequency(responses, this);
         float[][] rubricStats = RubricStatistics.calculatePercentageFrequencyAndAverage(this,
                 responseFrequency);
@@ -819,14 +802,14 @@ public String getQuestionResultStatisticsCsv(
             boolean isSubQuestionRespondedTo = responseFrequency[i][numOfRubricChoices] > 0;
             for (int j = 0; j < rubricChoices.size(); j++) {
                 String percentageFrequencyString = isSubQuestionRespondedTo
-                                                 ? df.format(rubricStats[i][j] * 100) + "%"
+                                                 ? StringHelper.toDecimalFormatString("#", rubricStats[i][j] * 100) + "%"
                                                  : STATISTICS_NO_VALUE_STRING;
                 csv.append("," + percentageFrequencyString + " (" + responseFrequency[i][j] + ")");
             }
 
             if (hasAssignedWeights) {
                 String averageString = isSubQuestionRespondedTo
-                                     ? dfAverage.format(rubricStats[i][rubricWeights.size()])
+                                     ? StringHelper.toDecimalFormatString("0.00", rubricStats[i][rubricWeights.size()])
                                      : STATISTICS_NO_VALUE_STRING;
                 csv.append(',').append(averageString);
             }
@@ -893,8 +876,6 @@ public String getCsvHeader() {
 
     public String getRecipientStatsCsvHeader() {
         StringBuilder header = new StringBuilder(100);
-        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-        DecimalFormat dfWeight = new DecimalFormat("#.##", decimalFormatSymbols);
         String headerFragment = "Team,Recipient Name,Recipient's Email,Sub Question,";
 
         header.append(headerFragment);
@@ -905,7 +886,8 @@ public String getRecipientStatsCsvHeader() {
             rubricChoiceBuilder.append(rubricChoices.get(i));
 
             if (hasAssignedWeights) {
-                rubricChoiceBuilder.append(" (Weight: ").append(dfWeight.format(rubricWeights.get(i))).append(')');
+                rubricChoiceBuilder.append(" (Weight: ")
+                        .append(StringHelper.toDecimalFormatString("#.##", rubricWeights.get(i))).append(')');
             }
 
             header.append(SanitizationHelper.sanitizeForCsv(rubricChoiceBuilder.toString())).append(',');
@@ -1136,8 +1118,6 @@ public String getHtmlForSubQuestion(int subQuestion) {
             String alphabeticalIndex = StringHelper.integerToLowerCaseAlphabeticalIndex(subQuestion + 1);
             String subQuestionString = SanitizationHelper.sanitizeForHtml(alphabeticalIndex + ") "
                     + getRubricSubQuestions().get(subQuestion));
-            DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-            DecimalFormat df = new DecimalFormat("0.00", decimalFormatSymbols);
 
             List<String> cols = new ArrayList<>();
 
@@ -1152,9 +1132,9 @@ public String getHtmlForSubQuestion(int subQuestion) {
             }
 
             // <td> entries which display aggregate statistics
-            cols.add(df.format(totalPerSubQuestion[subQuestion]));
+            cols.add(StringHelper.toDecimalFormatString("0.00", totalPerSubQuestion[subQuestion]));
             cols.add(respondentsPerSubQuestion[subQuestion] == 0 ? "0.00"
-                    : df.format(totalPerSubQuestion[subQuestion] / respondentsPerSubQuestion[subQuestion]));
+                    : StringHelper.toDecimalFormatString("0.00", totalPerSubQuestion[subQuestion] / respondentsPerSubQuestion[subQuestion]));
 
             // Generate HTML for all <td> entries using template
             for (String col : cols) {
@@ -1189,8 +1169,6 @@ public String getCsvForSubQuestion(int subQuestion) {
             String alphabeticalIndex = StringHelper.integerToLowerCaseAlphabeticalIndex(subQuestion + 1);
             String subQuestionString = SanitizationHelper.sanitizeForCsv(alphabeticalIndex + ") "
                     + getRubricSubQuestions().get(subQuestion));
-            DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols(Locale.US);
-            DecimalFormat df = new DecimalFormat("0.00", decimalFormatSymbols);
 
             // Append recipient identification details and rubric subQuestion
             csv.append(recipientTeam).append(',')
@@ -1204,9 +1182,9 @@ public String getCsvForSubQuestion(int subQuestion) {
             }
 
             // Append aggregate statistics
-            csv.append(',').append(df.format(totalPerSubQuestion[subQuestion])).append(',')
+            csv.append(',').append(StringHelper.toDecimalFormatString("0.00", totalPerSubQuestion[subQuestion])).append(',')
                .append(respondentsPerSubQuestion[subQuestion] == 0 ? "0.00"
-                       : df.format(totalPerSubQuestion[subQuestion] / respondentsPerSubQuestion[subQuestion]))
+                       : StringHelper.toDecimalFormatString("0.00", totalPerSubQuestion[subQuestion] / respondentsPerSubQuestion[subQuestion]))
                .append(System.lineSeparator());
 
             return csv.toString();
diff --git a/src/main/java/teammates/common/util/StringHelper.java b/src/main/java/teammates/common/util/StringHelper.java
index b6da2c71599..7be45838f64 100644
--- a/src/main/java/teammates/common/util/StringHelper.java
+++ b/src/main/java/teammates/common/util/StringHelper.java
@@ -185,7 +185,7 @@ public static <T> String toString(List<T> list, String delimiter) {
     public static String toDecimalFormatString(String pattern, double doubleVal) {
         NumberFormat nf = NumberFormat.getNumberInstance(Locale.US);
         DecimalFormat df = (DecimalFormat) nf;
-        df.applyPattern("0.###");
+        df.applyPattern(pattern);
         return df.format(doubleVal);
     }
 

From bf4ac7ccf4cf5631a244db6ca0897cbec9581a4e Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 16 Jul 2018 12:49:53 +0800
Subject: [PATCH 71/76] Clean up

---
 .travis.yml                                                 | 6 ------
 .../InstructorFeedbackSubmissionEditSaveActionTest.java     | 6 ++++--
 .../action/StudentFeedbackSubmissionEditSaveActionTest.java | 6 ++++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 20492b841b4..72ebf27b551 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,9 +15,6 @@ dist: trusty
 
 addons:
   firefox: "46.0"
-  apt:
-      packages:
-      - language-pack-de
 
 before_install:
   - |
@@ -31,9 +28,6 @@ before_install:
   - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid \
     --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1440x900x16"
   - nvm install node
-  - export LANG=de_DE.UTF-8
-  - export LC_ALL=de_DE.UTF-8
-  - locale
 
 before_script:
   - export DISPLAY=:99.0
diff --git a/src/test/java/teammates/test/cases/action/InstructorFeedbackSubmissionEditSaveActionTest.java b/src/test/java/teammates/test/cases/action/InstructorFeedbackSubmissionEditSaveActionTest.java
index af6104d2f63..4ffd803111f 100644
--- a/src/test/java/teammates/test/cases/action/InstructorFeedbackSubmissionEditSaveActionTest.java
+++ b/src/test/java/teammates/test/cases/action/InstructorFeedbackSubmissionEditSaveActionTest.java
@@ -445,7 +445,8 @@ public void testExecuteAndPostProcess() {
                 Const.ParamsNames.FEEDBACK_RESPONSE_TEXT + "-1-0", "3.5",
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN + "-1-0", Integer.toString(fqd.getMinScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX + "-1-0", Integer.toString(fqd.getMaxScale()),
-                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString("0.###", fqd.getStep())
+                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0",
+                    StringHelper.toDecimalFormatString("0.###", fqd.getStep())
         };
 
         a = getAction(submissionParams);
@@ -472,7 +473,8 @@ public void testExecuteAndPostProcess() {
                 Const.ParamsNames.FEEDBACK_RESPONSE_TEXT + "-1-0", "",
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN + "-1-0", Integer.toString(fqd.getMinScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX + "-1-0", Integer.toString(fqd.getMaxScale()),
-                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString("0.###", fqd.getStep())
+                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0",
+                    StringHelper.toDecimalFormatString("0.###", fqd.getStep())
         };
 
         a = getAction(submissionParams);
diff --git a/src/test/java/teammates/test/cases/action/StudentFeedbackSubmissionEditSaveActionTest.java b/src/test/java/teammates/test/cases/action/StudentFeedbackSubmissionEditSaveActionTest.java
index c59d1d14494..8fa9ea70efb 100644
--- a/src/test/java/teammates/test/cases/action/StudentFeedbackSubmissionEditSaveActionTest.java
+++ b/src/test/java/teammates/test/cases/action/StudentFeedbackSubmissionEditSaveActionTest.java
@@ -606,7 +606,8 @@ public void testExecuteAndPostProcess() throws Exception {
                 Const.ParamsNames.FEEDBACK_RESPONSE_TEXT + "-1-0", "1",
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN + "-1-0", Integer.toString(fqd.getMinScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX + "-1-0", Integer.toString(fqd.getMaxScale()),
-                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString("0.###", fqd.getStep())
+                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0",
+                    StringHelper.toDecimalFormatString("0.###", fqd.getStep())
         };
 
         a = getAction(submissionParams);
@@ -637,7 +638,8 @@ public void testExecuteAndPostProcess() throws Exception {
                 Const.ParamsNames.FEEDBACK_RESPONSE_TEXT + "-1-0", "",
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MIN + "-1-0", Integer.toString(fqd.getMinScale()),
                 Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_MAX + "-1-0", Integer.toString(fqd.getMaxScale()),
-                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0", StringHelper.toDecimalFormatString("0.###", fqd.getStep())
+                Const.ParamsNames.FEEDBACK_QUESTION_NUMSCALE_STEP + "-1-0",
+                    StringHelper.toDecimalFormatString("0.###", fqd.getStep())
         };
 
         a = getAction(submissionParams);

From 268c8c62192da5011c79403d14c9f0f37418df03 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 16 Jul 2018 13:27:20 +0800
Subject: [PATCH 72/76] SCA

---
 .../questions/FeedbackRubricQuestionDetails.java          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
index b6f989f5a85..31f88827c4f 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
@@ -1133,8 +1133,8 @@ public String getHtmlForSubQuestion(int subQuestion) {
 
             // <td> entries which display aggregate statistics
             cols.add(StringHelper.toDecimalFormatString("0.00", totalPerSubQuestion[subQuestion]));
-            cols.add(respondentsPerSubQuestion[subQuestion] == 0 ? "0.00"
-                    : StringHelper.toDecimalFormatString("0.00", totalPerSubQuestion[subQuestion] / respondentsPerSubQuestion[subQuestion]));
+            cols.add(respondentsPerSubQuestion[subQuestion] == 0 ? "0.00" : StringHelper.toDecimalFormatString("0.00",
+                    totalPerSubQuestion[subQuestion] / respondentsPerSubQuestion[subQuestion]));
 
             // Generate HTML for all <td> entries using template
             for (String col : cols) {
@@ -1183,8 +1183,8 @@ public String getCsvForSubQuestion(int subQuestion) {
 
             // Append aggregate statistics
             csv.append(',').append(StringHelper.toDecimalFormatString("0.00", totalPerSubQuestion[subQuestion])).append(',')
-               .append(respondentsPerSubQuestion[subQuestion] == 0 ? "0.00"
-                       : StringHelper.toDecimalFormatString("0.00", totalPerSubQuestion[subQuestion] / respondentsPerSubQuestion[subQuestion]))
+               .append(respondentsPerSubQuestion[subQuestion] == 0 ? "0.00" : StringHelper.toDecimalFormatString("0.00",
+                       totalPerSubQuestion[subQuestion] / respondentsPerSubQuestion[subQuestion]))
                .append(System.lineSeparator());
 
             return csv.toString();

From 67277b1fdf8b790b30b7dfd8e9fe5b18a4ce19a8 Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 16 Jul 2018 14:09:28 +0800
Subject: [PATCH 73/76] SCA

---
 .../questions/FeedbackMcqQuestionDetails.java | 330 +++++++++---------
 1 file changed, 156 insertions(+), 174 deletions(-)

diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackMcqQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackMcqQuestionDetails.java
index 24d53ee78cf..41280417bf7 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackMcqQuestionDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackMcqQuestionDetails.java
@@ -1,6 +1,5 @@
 package teammates.common.datatransfer.questions;
 
-import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.LinkedHashMap;
@@ -21,6 +20,7 @@
 import teammates.common.util.HttpRequestHelper;
 import teammates.common.util.Logger;
 import teammates.common.util.SanitizationHelper;
+import teammates.common.util.StringHelper;
 import teammates.common.util.Templates;
 import teammates.common.util.Templates.FeedbackQuestion.FormTemplates;
 import teammates.common.util.Templates.FeedbackQuestion.Slots;
@@ -385,7 +385,6 @@ private List<String> generateOptionList(String courseId) {
     public String getQuestionSpecificEditFormHtml(int questionNumber) {
         StringBuilder optionListHtml = new StringBuilder();
         String optionFragmentTemplate = FormTemplates.MCQ_EDIT_FORM_OPTIONFRAGMENT;
-        DecimalFormat weightFormat = new DecimalFormat("#.##");
 
         // Create MCQ options
         for (int i = 0; i < numOfMcqChoices; i++) {
@@ -406,13 +405,15 @@ public String getQuestionSpecificEditFormHtml(int questionNumber) {
                     Templates.populateTemplate(weightFragmentTemplate,
                             Slots.QUESTION_NUMBER, Integer.toString(questionNumber),
                             Slots.ITERATOR, Integer.toString(i),
-                            Slots.MCQ_WEIGHT, hasAssignedWeights ? weightFormat.format(mcqWeights.get(i)) : "0",
+                            Slots.MCQ_WEIGHT,
+                                hasAssignedWeights ? StringHelper.toDecimalFormatString("#.##", mcqWeights.get(i)) : "0",
                             Slots.MCQ_PARAM_WEIGHT, Const.ParamsNames.FEEDBACK_QUESTION_MCQ_WEIGHT);
             weightFragmentHtml.append(weightFragment).append(System.lineSeparator());
         }
 
         // Create MCQ other weight value
-        String mcqOtherWeightValue = hasAssignedWeights && otherEnabled ? weightFormat.format(mcqOtherWeight) : "0";
+        String mcqOtherWeightValue =
+                hasAssignedWeights && otherEnabled ? StringHelper.toDecimalFormatString("#.##", mcqOtherWeight) : "0";
 
         return Templates.populateTemplate(
                 FormTemplates.MCQ_EDIT_FORM,
@@ -503,55 +504,53 @@ public String getQuestionAdditionalInfoHtml(int questionNumber, String additiona
     }
 
     @Override
-    public String getQuestionResultStatisticsHtml(List<FeedbackResponseAttributes> responses,
+    public String getQuestionResultStatisticsHtml(List<FeedbackResponseAttributes> unsortedResponses,
             FeedbackQuestionAttributes question,
             String studentEmail,
             FeedbackSessionResultsBundle bundle,
             String view) {
 
-        if ("student".equals(view) || responses.isEmpty()) {
+        if ("student".equals(view) || unsortedResponses.isEmpty()) {
             return "";
         }
 
         StringBuilder responseSummaryFragments = new StringBuilder();
 
-        MCQStatistics mcqStats = new MCQStatistics(this);
+        McqStatistics mcqStats = new McqStatistics(this);
+        // Sort the list of responseAttributes based on recipient team and recipient name.
+        List<FeedbackResponseAttributes> responses = mcqStats.getResponseAttributesSorted(unsortedResponses, bundle);
         Map<String, Integer> answerFrequency = mcqStats.collateAnswerFrequency(responses);
         // Do not calculate weighted percentage if weights are not enabled.
         Map<String, Double> weightedPercentagePerOption =
                 hasAssignedWeights ? mcqStats.calculateWeightedPercentagePerOption(answerFrequency)
                 : new LinkedHashMap<>();
 
-        DecimalFormat df = new DecimalFormat("#.##");
-
         for (String key : answerFrequency.keySet()) {
             int count = answerFrequency.get(key);
             // If weights are allowed, show the corresponding weights of a choice.
             String weightString = "";
             if ("Other".equals(key)) {
-                weightString = hasAssignedWeights ? df.format(mcqOtherWeight) : "-";
+                weightString = hasAssignedWeights ? StringHelper.toDecimalFormatString("#.##", mcqOtherWeight) : "-";
             } else {
-                weightString = hasAssignedWeights ? df.format(mcqWeights.get(mcqChoices.indexOf(key))) : "-";
+                weightString = hasAssignedWeights
+                        ? StringHelper.toDecimalFormatString("#.##", mcqWeights.get(mcqChoices.indexOf(key))) : "-";
             }
 
             responseSummaryFragments.append(Templates.populateTemplate(FormTemplates.MCQ_RESULT_STATS_OPTIONFRAGMENT,
                     Slots.MCQ_CHOICE_VALUE, SanitizationHelper.sanitizeForHtml(key),
                     Slots.MCQ_WEIGHT, weightString,
                     Slots.COUNT, Integer.toString(count),
-                    Slots.PERCENTAGE, df.format(100 * (double) count / responses.size()),
-                    Slots.WEIGHTED_PERCENTAGE,
-                            hasAssignedWeights ? df.format(weightedPercentagePerOption.get(key)) : "-"));
+                    Slots.PERCENTAGE, StringHelper.toDecimalFormatString("#.##", 100 * (double) count / responses.size()),
+                    Slots.WEIGHTED_PERCENTAGE, hasAssignedWeights
+                            ? StringHelper.toDecimalFormatString("#.##", weightedPercentagePerOption.get(key)) : "-"));
         }
 
         // If weights are assigned, create the per recipient statistics table,
         // otherwise pass an empty string in it's place.
         String recipientStatsHtml = "";
         if (hasAssignedWeights) {
-            // Sort the list of responseAttributes based on recipient team and recipient name.
-            List<FeedbackResponseAttributes> sortedResponses = mcqStats.getResponseAttributesSorted(responses, bundle);
             String header = mcqStats.getRecipientStatsHeaderHtml();
-            String body = mcqStats.getPerRecipientStatsBodyHtml(sortedResponses, bundle);
-
+            String body = mcqStats.getPerRecipientStatsBodyHtml(responses, bundle);
             recipientStatsHtml = Templates.populateTemplate(
                     FormTemplates.MCQ_RESULT_RECIPIENT_STATS,
                     Slots.TABLE_HEADER_ROW_FRAGMENT_HTML, header,
@@ -571,10 +570,9 @@ public String getQuestionResultStatisticsCsv(
             return "";
         }
         StringBuilder csv = new StringBuilder();
-        MCQStatistics mcqStats = new MCQStatistics(this);
-        Map<String, Integer> answerFrequency = mcqStats.collateAnswerFrequency(responses);
+        McqStatistics mcqStats = new McqStatistics(this);
         // Add the Response Summary Statistics to the CSV String.
-        csv.append(mcqStats.getResponseSummaryStatsCsv(answerFrequency, responses.size()));
+        csv.append(mcqStats.getResponseSummaryStatsCsv(responses, bundle));
 
         // If weights are assigned, add the 'Per Recipient Statistics' to the CSV string.
         if (hasAssignedWeights) {
@@ -674,42 +672,72 @@ public String validateGiverRecipientVisibility(FeedbackQuestionAttributes feedba
     }
 
     /**
-     * Class that contains methods which are used to calculate both MCQ and MSQ response statistics.
+     * Class to calculate result statistics of responses for MCQ questions.
      */
-    public abstract static class MultipleOptionStatistics {
-        protected boolean hasAssignedWeights;
-        protected List<String> choices;
-        protected List<Double> weights;
-        protected double otherWeight;
-        protected boolean otherEnabled;
-        protected int numOfChoices;
+    private static class McqStatistics {
+        boolean hasAssignedWeights;
+        List<String> mcqChoices;
+        List<Double> mcqWeights;
+        double mcqOtherWeight;
+        boolean otherEnabled;
+        int numOfMcqChoices;
+
+        McqStatistics(FeedbackMcqQuestionDetails mcqDetails) {
+            this.mcqChoices = mcqDetails.getMcqChoices();
+            this.numOfMcqChoices = mcqChoices.size();
+            this.mcqWeights = mcqDetails.getMcqWeights();
+            this.otherEnabled = mcqDetails.getOtherEnabled();
+            this.hasAssignedWeights = mcqDetails.hasAssignedWeights();
+            this.mcqOtherWeight = mcqDetails.getMcqOtherWeight();
+        }
 
         /**
-         * Calculates the answer frequency for each option based on the received responses for a question.
+         * Calculates the answer frequency for each option based on the received responses.
          */
-        protected abstract Map<String, Integer> collateAnswerFrequency(List<FeedbackResponseAttributes> responses);
+        private Map<String, Integer> collateAnswerFrequency(List<FeedbackResponseAttributes> responses) {
+            Map<String, Integer> answerFrequency = new LinkedHashMap<>();
+
+            for (String option : mcqChoices) {
+                answerFrequency.put(option, 0);
+            }
+
+            if (otherEnabled) {
+                answerFrequency.put("Other", 0);
+            }
+
+            for (FeedbackResponseAttributes response : responses) {
+                FeedbackResponseDetails responseDetails = response.getResponseDetails();
+                boolean isOtherOptionAnswer =
+                        ((FeedbackMcqResponseDetails) responseDetails).isOtherOptionAnswer();
+                String key = isOtherOptionAnswer ? "Other" : responseDetails.getAnswerString();
+
+                answerFrequency.put(key, answerFrequency.getOrDefault(key, 0) + 1);
+            }
+
+            return answerFrequency;
+        }
 
         /**
-         * Calculates the weighted percentage for each option.
+         * Calculates the weighted percentage for each option in a mcq question.
          * weighted percentage = (response count per option) * (weight of that option) / totalWeightedResponseCount<br>
          * where as, totalWeightedResponseCount is defined as:<br>
          * totalWeightedResponseCount += [response count of option i * weight of option i] for all options.
-         * @param answerFrequency Response count of each option.
+         * @param answerFrequency Response count of each option in a mcq question.
          */
-        public Map<String, Double> calculateWeightedPercentagePerOption(Map<String, Integer> answerFrequency) {
+        private Map<String, Double> calculateWeightedPercentagePerOption(Map<String, Integer> answerFrequency) {
             Map<String, Double> weightedPercentagePerOption = new LinkedHashMap<>();
 
             Assumption.assertTrue("Weights should be enabled when calling the function", hasAssignedWeights);
             double totalWeightedResponseCount = calculateTotalWeightedResponseCount(answerFrequency);
 
-            for (int i = 0; i < choices.size(); i++) {
-                String option = choices.get(i);
-                double weight = weights.get(i);
+            for (int i = 0; i < mcqChoices.size(); i++) {
+                String option = mcqChoices.get(i);
+                double weight = mcqWeights.get(i);
                 weightedPercentagePerOption.put(option, weight);
             }
 
             if (otherEnabled) {
-                weightedPercentagePerOption.put("Other", otherWeight);
+                weightedPercentagePerOption.put("Other", mcqOtherWeight);
             }
 
             for (String key : weightedPercentagePerOption.keySet()) {
@@ -728,10 +756,10 @@ public Map<String, Double> calculateWeightedPercentagePerOption(Map<String, Inte
          * Calculates the sum of the product of response count and weight of that option, for all options.
          * totalWeightedResponseCount += [(responseCount of option i) * (weight of option i)] for all options.
          */
-        public double calculateTotalWeightedResponseCount(Map<String, Integer> answerFrequency) {
+        private double calculateTotalWeightedResponseCount(Map<String, Integer> answerFrequency) {
             double totalWeightedResponseCount = 0;
             for (String choice : answerFrequency.keySet()) {
-                double weight = "Other".equals(choice) ? otherWeight : weights.get(choices.indexOf(choice));
+                double weight = "Other".equals(choice) ? mcqOtherWeight : mcqWeights.get(mcqChoices.indexOf(choice));
                 int responseCount = answerFrequency.get(choice);
                 totalWeightedResponseCount += responseCount * weight;
             }
@@ -770,7 +798,6 @@ public List<String> generateStatisticsForEachRecipient(String recipientEmail,
 
             Assumption.assertTrue("Weights should be enabled when calling the function", hasAssignedWeights);
             List<String> recipientStats = new ArrayList<>();
-            DecimalFormat df = new DecimalFormat("0.00");
 
             String recipientName = bundle.getNameForEmail(recipientEmail);
             String recipientTeam = bundle.getTeamNameForEmail(recipientEmail);
@@ -790,67 +817,70 @@ public List<String> generateStatisticsForEachRecipient(String recipientEmail,
 
                 // Get the weight of the choice.
                 if ("Other".equals(choice)) {
-                    weight = otherWeight;
+                    weight = mcqOtherWeight;
                 } else {
-                    weight = weights.get(choices.indexOf(choice));
+                    weight = mcqWeights.get(mcqChoices.indexOf(choice));
                 }
                 // Add the total weight of all responses of this choice to total.
                 total += responseCount * weight;
                 numOfResponsesForThisRecipient += responseCount;
             }
 
-            recipientStats.add(df.format(total));
+            recipientStats.add(StringHelper.toDecimalFormatString("0.00", total));
             average = numOfResponsesForThisRecipient == 0 ? 0 : total / numOfResponsesForThisRecipient;
-            recipientStats.add(df.format(average));
+            recipientStats.add(StringHelper.toDecimalFormatString("0.00", average));
 
             return recipientStats;
         }
 
-        private String getRecipientStatsHeaderFragmentHtml(String header) {
-            return Templates.populateTemplate(
-                    FormTemplates.MCQ_RESULT_RECIPIENT_STATS_HEADER_FRAGMENT,
-                    Slots.STATS_TITLE, header);
-        }
-
         /**
-         * Returns the html string for 'Per Recipient Statistics' table header.
+         * Returns a Map containing response counts for each option for every recipient.
          */
-        public String getRecipientStatsHeaderHtml() {
-            StringBuilder headerBuilder = new StringBuilder(100);
-            DecimalFormat df = new DecimalFormat("#.##");
-            StringBuilder choicesHtmlBuilder = new StringBuilder(100);
-
-            for (int i = 0; i < choices.size(); i++) {
-                String weight = df.format(weights.get(i));
-                String html = getRecipientStatsHeaderFragmentHtml(choices.get(i) + " [" + weight + "]");
-                choicesHtmlBuilder.append(html);
-            }
-            if (otherEnabled) {
-                String otherWeightString = df.format(otherWeight);
-                String html = getRecipientStatsHeaderFragmentHtml("Other" + " [" + otherWeightString + "]");
-                choicesHtmlBuilder.append(html);
-            }
+        private Map<String, Map<String, Integer>> calculatePerRecipientResponseCount(
+                List<FeedbackResponseAttributes> responses) {
+            Map<String, Map<String, Integer>> perRecipientResponse = new LinkedHashMap<>();
 
-            headerBuilder.append(getRecipientStatsHeaderFragmentHtml("Team"))
-                         .append(getRecipientStatsHeaderFragmentHtml("Recipient Name"))
-                         .append(choicesHtmlBuilder.toString())
-                         .append(getRecipientStatsHeaderFragmentHtml("Total"))
-                         .append(getRecipientStatsHeaderFragmentHtml("Average"));
+            responses.forEach(response -> {
+                perRecipientResponse.computeIfAbsent(response.recipient, key -> {
+                    // construct default value for responseCount
+                    Map<String, Integer> responseCountPerOption = new LinkedHashMap<>();
+                    for (String choice : mcqChoices) {
+                        responseCountPerOption.put(choice, 0);
+                    }
+                    if (otherEnabled) {
+                        responseCountPerOption.put("Other", 0);
+                    }
+                    return responseCountPerOption;
+                });
+                perRecipientResponse.computeIfPresent(response.recipient, (key, responseCountPerOption) -> {
+                    // update responseCount here
+                    FeedbackMcqResponseDetails frd = (FeedbackMcqResponseDetails) response.getResponseDetails();
+                    boolean isOtherAnswer = frd.isOtherOptionAnswer();
+                    String answer = isOtherAnswer ? "Other" : frd.getAnswerString();
 
-            return headerBuilder.toString();
+                    responseCountPerOption.computeIfPresent(answer, (choice, count) -> {
+                        return ++count;
+                    });
+                    return responseCountPerOption;
+                });
+            });
+            return perRecipientResponse;
         }
 
+        // Generate MCQ Recipient Response statistics for csv files.
+
         /**
          * Returns a String containing the Response Summary statistics for CSV files.
          */
-        public String getResponseSummaryStatsCsv(Map<String, Integer> answerFrequency, int totalResponseCount) {
+        public String getResponseSummaryStatsCsv(List<FeedbackResponseAttributes> responses,
+                FeedbackSessionResultsBundle bundle) {
 
             String header = "";
+            Map<String, Integer> answerFrequency = collateAnswerFrequency(responses);
 
             StringBuilder fragments = new StringBuilder();
-            DecimalFormat df = new DecimalFormat("#.##");
 
-            // If weights are assigned, CSV file should include 'Weight' and 'Weighted Percentage' column as well.
+            // If weights are assigned, CSV file should include 'weight' and 'average' column as well.
             if (hasAssignedWeights) {
                 header = "Choice, Weight, Response Count, Percentage (%), Weighted Percentage (%)";
                 Map<String, Double> weightedPercentagePerOption = calculateWeightedPercentagePerOption(answerFrequency);
@@ -859,40 +889,56 @@ public String getResponseSummaryStatsCsv(Map<String, Integer> answerFrequency, i
                     int responseCount = answerFrequency.get(key);
                     String weightString = "";
                     if ("Other".equals(key)) {
-                        weightString = df.format(otherWeight);
+                        weightString = StringHelper.toDecimalFormatString("#.##", mcqOtherWeight);
                     } else {
-                        weightString = df.format(weights.get(choices.indexOf(key)));
+                        weightString = StringHelper.toDecimalFormatString("#.##", mcqWeights.get(mcqChoices.indexOf(key)));
                     }
 
                     fragments.append(SanitizationHelper.sanitizeForCsv(key)).append(',')
                              .append(SanitizationHelper.sanitizeForCsv(weightString)).append(',')
                              .append(Integer.toString(responseCount)).append(',')
-                             .append(df.format(100 * (double) responseCount / totalResponseCount)).append(',')
-                             .append(df.format(weightedPercentagePerOption.get(key))).append(System.lineSeparator());
+                             .append(StringHelper.toDecimalFormatString("#.##",
+                                     100 * (double) responseCount / responses.size())).append(',')
+                             .append(StringHelper.toDecimalFormatString("#.##",
+                                     weightedPercentagePerOption.get(key))).append(System.lineSeparator());
                 }
             } else {
                 header = "Choice, Response Count, Percentage (%)";
 
                 answerFrequency.forEach((key, value) -> fragments.append(SanitizationHelper.sanitizeForCsv(key)).append(',')
                         .append(value.toString()).append(',')
-                        .append(df.format(100 * (double) value / totalResponseCount)).append(System.lineSeparator()));
+                        .append(StringHelper.toDecimalFormatString("#.##",
+                                100 * (double) value / responses.size())).append(System.lineSeparator()));
             }
 
             return header + System.lineSeparator() + fragments.toString();
         }
 
+        /**
+         * Returns a String containing the 'Per Recipient Statistics' stats for CSV files for all recipients.
+         */
+        public String getPerRecipientResponseStatsCsv(List<FeedbackResponseAttributes> responses,
+                FeedbackSessionResultsBundle bundle) {
+            String header = getPerRecipientResponseStatsHeaderCsv();
+            // Get the response attributes sorted based on Recipient Teamname and recipient name.
+            List<FeedbackResponseAttributes> sortedResponses = getResponseAttributesSorted(responses, bundle);
+            String body = getPerRecipientResponseStatsBodyCsv(sortedResponses, bundle);
+
+            return header + body;
+        }
+
         public String getPerRecipientResponseStatsHeaderCsv() {
             StringBuilder header = new StringBuilder(100);
-            DecimalFormat df = new DecimalFormat("#.##");
 
             header.append("Team, Recipient Name,");
 
-            for (int i = 0; i < numOfChoices; i++) {
-                String choiceString = choices.get(i) + " [" + df.format(weights.get(i)) + "]";
+            for (int i = 0; i < numOfMcqChoices; i++) {
+                String choiceString = mcqChoices.get(i) + " ["
+                        + StringHelper.toDecimalFormatString("#.##", mcqWeights.get(i)) + "]";
                 header.append(SanitizationHelper.sanitizeForCsv(choiceString)).append(',');
             }
             if (otherEnabled) {
-                String otherOptionString = "Other [" + df.format(otherWeight) + "]";
+                String otherOptionString = "Other [" + StringHelper.toDecimalFormatString("#.##", mcqOtherWeight) + "]";
                 header.append(SanitizationHelper.sanitizeForCsv(otherOptionString)).append(',');
             }
             header.append("Total, Average").append(System.lineSeparator());
@@ -904,7 +950,7 @@ public String getPerRecipientResponseStatsHeaderCsv() {
          * @param responses The response attribute list should be sorted first before passing as an argument.
          * @param bundle Feedback session results bundle
          */
-        protected String getPerRecipientResponseStatsBodyCsv(List<FeedbackResponseAttributes> responses,
+        public String getPerRecipientResponseStatsBodyCsv(List<FeedbackResponseAttributes> responses,
                 FeedbackSessionResultsBundle bundle) {
             StringBuilder bodyBuilder = new StringBuilder(100);
             Map<String, Map<String, Integer>> perRecipientResponses = calculatePerRecipientResponseCount(responses);
@@ -924,7 +970,7 @@ protected String getPerRecipientResponseStatsBodyCsv(List<FeedbackResponseAttrib
         /**
          * Returns a string containing a per recipient response stats for a single recipient.
          */
-        private String getPerRecipientResponseStatsBodyFragmentCsv(String recipientEmail,
+        public String getPerRecipientResponseStatsBodyFragmentCsv(String recipientEmail,
                 Map<String, Integer> recipientResponses, FeedbackSessionResultsBundle bundle) {
             StringBuilder fragments = new StringBuilder(100);
             List<String> statsForEachRecipient = generateStatisticsForEachRecipient(
@@ -935,105 +981,41 @@ private String getPerRecipientResponseStatsBodyFragmentCsv(String recipientEmail
             return fragments.toString();
         }
 
-        /**
-         * Returns a Map containing response counts for each option for every recipient.
-         */
-        protected abstract Map<String, Map<String, Integer>> calculatePerRecipientResponseCount(
-                List<FeedbackResponseAttributes> responses);
-
-    }
-
-    /**
-     * Class to calculate result statistics of responses for MCQ questions.
-     */
-    private static class MCQStatistics extends MultipleOptionStatistics {
+        // Generate MCQ Recipient Response statistics for result page.
 
-        MCQStatistics(FeedbackMcqQuestionDetails mcqDetails) {
-            this.choices = mcqDetails.getMcqChoices();
-            this.numOfChoices = choices.size();
-            this.weights = mcqDetails.getMcqWeights();
-            this.otherEnabled = mcqDetails.getOtherEnabled();
-            this.hasAssignedWeights = mcqDetails.hasAssignedWeights();
-            this.otherWeight = mcqDetails.getMcqOtherWeight();
+        private String getRecipientStatsHeaderFragmentHtml(String header) {
+            return Templates.populateTemplate(
+                    FormTemplates.MCQ_RESULT_RECIPIENT_STATS_HEADER_FRAGMENT,
+                    Slots.STATS_TITLE, header);
         }
 
         /**
-         * Calculates the answer frequency for each option based on the received responses.
+         * Returns the html string for 'Per Recipient Statistics' table header.
          */
-        protected Map<String, Integer> collateAnswerFrequency(List<FeedbackResponseAttributes> responses) {
-            Map<String, Integer> answerFrequency = new LinkedHashMap<>();
+        public String getRecipientStatsHeaderHtml() {
+            StringBuilder headerBuilder = new StringBuilder(100);
+            StringBuilder choicesHtmlBuilder = new StringBuilder(100);
 
-            for (String option : choices) {
-                answerFrequency.put(option, 0);
+            for (int i = 0; i < mcqChoices.size(); i++) {
+                String weight = StringHelper.toDecimalFormatString("#.##", mcqWeights.get(i));
+                String html = getRecipientStatsHeaderFragmentHtml(mcqChoices.get(i) + " [" + weight + "]");
+                choicesHtmlBuilder.append(html);
             }
-
             if (otherEnabled) {
-                answerFrequency.put("Other", 0);
-            }
-
-            for (FeedbackResponseAttributes response : responses) {
-                FeedbackResponseDetails responseDetails = response.getResponseDetails();
-                boolean isOtherOptionAnswer =
-                        ((FeedbackMcqResponseDetails) responseDetails).isOtherOptionAnswer();
-                String key = isOtherOptionAnswer ? "Other" : responseDetails.getAnswerString();
-
-                answerFrequency.put(key, answerFrequency.getOrDefault(key, 0) + 1);
+                String otherWeight = StringHelper.toDecimalFormatString("#.##", mcqOtherWeight);
+                String html = getRecipientStatsHeaderFragmentHtml("Other" + " [" + otherWeight + "]");
+                choicesHtmlBuilder.append(html);
             }
 
-            return answerFrequency;
-        }
-
-        /**
-         * Returns a Map containing response counts for each option for every recipient.
-         */
-        protected Map<String, Map<String, Integer>> calculatePerRecipientResponseCount(
-                List<FeedbackResponseAttributes> responses) {
-            Map<String, Map<String, Integer>> perRecipientResponse = new LinkedHashMap<>();
-
-            responses.forEach(response -> {
-                perRecipientResponse.computeIfAbsent(response.recipient, key -> {
-                    // construct default value for responseCount
-                    Map<String, Integer> responseCountPerOption = new LinkedHashMap<>();
-                    for (String choice : choices) {
-                        responseCountPerOption.put(choice, 0);
-                    }
-                    if (otherEnabled) {
-                        responseCountPerOption.put("Other", 0);
-                    }
-                    return responseCountPerOption;
-                });
-                perRecipientResponse.computeIfPresent(response.recipient, (key, responseCountPerOption) -> {
-                    // update responseCount here
-                    FeedbackMcqResponseDetails frd = (FeedbackMcqResponseDetails) response.getResponseDetails();
-                    boolean isOtherAnswer = frd.isOtherOptionAnswer();
-                    String answer = isOtherAnswer ? "Other" : frd.getAnswerString();
-
-                    responseCountPerOption.computeIfPresent(answer, (choice, count) -> {
-                        return ++count;
-                    });
-                    return responseCountPerOption;
-                });
-            });
-            return perRecipientResponse;
-        }
-
-        // Generate Recipient Response statistics for csv files.
-
-        /**
-         * Returns a String containing the 'Per Recipient Statistics' stats for CSV files for all recipients.
-         */
-        public String getPerRecipientResponseStatsCsv(List<FeedbackResponseAttributes> responses,
-                FeedbackSessionResultsBundle bundle) {
-            String header = getPerRecipientResponseStatsHeaderCsv();
-            // Get the response attributes sorted based on Recipient Team name and recipient name.
-            List<FeedbackResponseAttributes> sortedResponses = getResponseAttributesSorted(responses, bundle);
-            String body = getPerRecipientResponseStatsBodyCsv(sortedResponses, bundle);
+            headerBuilder.append(getRecipientStatsHeaderFragmentHtml("Team"))
+                         .append(getRecipientStatsHeaderFragmentHtml("Recipient Name"))
+                         .append(choicesHtmlBuilder.toString())
+                         .append(getRecipientStatsHeaderFragmentHtml("Total"))
+                         .append(getRecipientStatsHeaderFragmentHtml("Average"));
 
-            return header + body;
+            return headerBuilder.toString();
         }
 
-        // Generate Recipient Response statistics for result page.
-
         /**
          * Returns a HTML string which contains a sequence of "tr" tags.
          * The "tr" tags enclose a sequence of "td" tags which have data related to a sub question.
@@ -1060,7 +1042,7 @@ public String getPerRecipientStatsBodyHtml(List<FeedbackResponseAttributes> resp
          * The "td" tags have data related to a sub question.
          * The sequence of "td" tags are not enclosed in a "tr" tag.
          */
-        private String getPerRecipientStatsBodyFragmentHtml(String recipientEmail,
+        public String getPerRecipientStatsBodyFragmentHtml(String recipientEmail,
                 Map<String, Integer> recipientResponses, FeedbackSessionResultsBundle bundle) {
             StringBuilder html = new StringBuilder(100);
 

From bfe1c696bbeb1217fdda9f4309174d3d0a42e00e Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Mon, 16 Jul 2018 14:27:41 +0800
Subject: [PATCH 74/76] SCA

---
 .../datatransfer/questions/FeedbackRubricQuestionDetails.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
index 31f88827c4f..58f8ac74758 100644
--- a/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
+++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackRubricQuestionDetails.java
@@ -593,7 +593,6 @@ public String getQuestionResultStatisticsHtml(List<FeedbackResponseAttributes> r
         boolean isExcludingSelfOptionAvailable =
                 recipientType.equals(FeedbackParticipantType.OWN_TEAM_MEMBERS_INCLUDING_SELF);
 
-
         // Create table row header fragments
         StringBuilder tableHeaderFragmentHtml = new StringBuilder();
         String tableHeaderFragmentTemplate = FormTemplates.RUBRIC_RESULT_STATS_HEADER_FRAGMENT;

From 078889a8324ee27607011fe2d96336d4bdef930d Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Tue, 17 Jul 2018 11:39:00 +0800
Subject: [PATCH 75/76] Add TeammatesDateTimeFormatter

---
 .../common/util/LogMessageGenerator.java      |  3 +--
 .../util/TeammatesDateTimeFormatter.java      | 21 +++++++++++++++++++
 .../teammates/common/util/TimeHelper.java     | 11 +++++-----
 .../ui/pagedata/AdminActivityLogPageData.java |  7 +++----
 .../AdminActivityLogPageActionTest.java       |  7 +++----
 .../action/AdminEmailLogPageActionTest.java   |  4 ++--
 .../InstructorFeedbackSessionsPageUiTest.java |  4 ++--
 .../teammates/test/driver/HtmlHelper.java     |  8 +++----
 8 files changed, 41 insertions(+), 24 deletions(-)
 create mode 100644 src/main/java/teammates/common/util/TeammatesDateTimeFormatter.java

diff --git a/src/main/java/teammates/common/util/LogMessageGenerator.java b/src/main/java/teammates/common/util/LogMessageGenerator.java
index e33055b425e..92f3dea2592 100644
--- a/src/main/java/teammates/common/util/LogMessageGenerator.java
+++ b/src/main/java/teammates/common/util/LogMessageGenerator.java
@@ -2,7 +2,6 @@
 
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
-import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -21,7 +20,7 @@ public class LogMessageGenerator {
     public static final String PATTERN_ACTION_NAME_GROUP = "actionName";
 
     private static final DateTimeFormatter FORMATTER =
-            DateTimeFormatter.ofPattern(Const.ActivityLog.TIME_FORMAT_LOGID, Locale.US);
+            TeammatesDateTimeFormatter.ofPattern(Const.ActivityLog.TIME_FORMAT_LOGID);
 
     /**
      * Generates the log message for an *Action.
diff --git a/src/main/java/teammates/common/util/TeammatesDateTimeFormatter.java b/src/main/java/teammates/common/util/TeammatesDateTimeFormatter.java
new file mode 100644
index 00000000000..aa8ab09c263
--- /dev/null
+++ b/src/main/java/teammates/common/util/TeammatesDateTimeFormatter.java
@@ -0,0 +1,21 @@
+package teammates.common.util;
+
+import java.time.format.DateTimeFormatter;
+import java.util.Locale;
+
+/**
+ * DateTimeFormatter for TEAMMATES with default Locale.US settings.
+ */
+public class TeammatesDateTimeFormatter {
+
+    private TeammatesDateTimeFormatter() {
+        // Utility class
+    }
+
+    /**
+     * Returns DateTimeFormatter instance with Locale.US as default locale.
+     */
+    public static DateTimeFormatter ofPattern(String pattern) {
+        return DateTimeFormatter.ofPattern(pattern, Locale.US);
+    }
+}
diff --git a/src/main/java/teammates/common/util/TimeHelper.java b/src/main/java/teammates/common/util/TimeHelper.java
index 0bacb8bf0c0..e364542c4dd 100644
--- a/src/main/java/teammates/common/util/TimeHelper.java
+++ b/src/main/java/teammates/common/util/TimeHelper.java
@@ -17,7 +17,6 @@
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 
 import teammates.common.exception.TeammatesException;
@@ -230,7 +229,7 @@ private static String formatLocalDateTime(LocalDateTime localDateTime, String pa
         if (localDateTime.getHour() == 12 && localDateTime.getMinute() == 0) {
             processedPattern = pattern.replace("a", "'NOON'");
         }
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(processedPattern, Locale.US);
+        DateTimeFormatter formatter = TeammatesDateTimeFormatter.ofPattern(processedPattern);
         return localDateTime.format(formatter);
     }
 
@@ -339,7 +338,7 @@ private static String formatInstant(Instant instant, ZoneId timeZone, String pat
         if (zonedDateTime.getHour() == 12 && zonedDateTime.getMinute() == 0) {
             processedPattern = pattern.replace("a", "'NOON'");
         }
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(processedPattern, Locale.US);
+        DateTimeFormatter formatter = TeammatesDateTimeFormatter.ofPattern(processedPattern);
         return zonedDateTime.format(formatter);
     }
 
@@ -488,7 +487,7 @@ public static String convertToStandardDuration(Long timeInMilliseconds) {
      * @throws AssertionError if there is a parsing error
      */
     public static Instant parseInstant(String dateTimeString) {
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(SystemParams.DEFAULT_DATE_TIME_FORMAT, Locale.US);
+        DateTimeFormatter formatter = TeammatesDateTimeFormatter.ofPattern(SystemParams.DEFAULT_DATE_TIME_FORMAT);
         try {
             return ZonedDateTime.parse(dateTimeString, formatter).toInstant();
         } catch (DateTimeParseException e) {
@@ -509,7 +508,7 @@ public static LocalDateTime parseLocalDateTime(String dateTimeString, String pat
             return null;
         }
 
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern, Locale.US);
+        DateTimeFormatter formatter = TeammatesDateTimeFormatter.ofPattern(pattern);
         try {
             return LocalDateTime.parse(dateTimeString, formatter);
         } catch (DateTimeParseException e) {
@@ -529,7 +528,7 @@ public static LocalDate parseLocalDate(String dateString, String pattern) {
             return null;
         }
 
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern, Locale.US);
+        DateTimeFormatter formatter = TeammatesDateTimeFormatter.ofPattern(pattern);
         try {
             return LocalDate.parse(dateString, formatter);
         } catch (DateTimeParseException e) {
diff --git a/src/main/java/teammates/ui/pagedata/AdminActivityLogPageData.java b/src/main/java/teammates/ui/pagedata/AdminActivityLogPageData.java
index 0ec3a751b51..6d0cede6e7b 100644
--- a/src/main/java/teammates/ui/pagedata/AdminActivityLogPageData.java
+++ b/src/main/java/teammates/ui/pagedata/AdminActivityLogPageData.java
@@ -5,10 +5,8 @@
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import teammates.common.datatransfer.attributes.AccountAttributes;
 import teammates.common.exception.InvalidParametersException;
@@ -16,6 +14,7 @@
 import teammates.common.util.Assumption;
 import teammates.common.util.Const;
 import teammates.common.util.StringHelper;
+import teammates.common.util.TeammatesDateTimeFormatter;
 import teammates.common.util.TimeHelper;
 import teammates.ui.template.AdminActivityLogTableRow;
 
@@ -262,12 +261,12 @@ private QueryParameters parseQuery(String query) throws ParseException, InvalidP
                 }
 
             } else if ("from".equals(label)) {
-                fromDateValue = LocalDate.parse(values[0], DateTimeFormatter.ofPattern("dd/MM/yy", Locale.US))
+                fromDateValue = LocalDate.parse(values[0], TeammatesDateTimeFormatter.ofPattern("dd/MM/yy"))
                         .atStartOfDay(Const.SystemParams.ADMIN_TIME_ZONE).toInstant().toEpochMilli();
                 isFromDateSpecifiedInQuery = true;
 
             } else if ("to".equals(label)) {
-                toDateValue = LocalDate.parse(values[0], DateTimeFormatter.ofPattern("dd/MM/yy", Locale.US))
+                toDateValue = LocalDate.parse(values[0], TeammatesDateTimeFormatter.ofPattern("dd/MM/yy"))
                         .atTime(LocalTime.MAX).atZone(Const.SystemParams.ADMIN_TIME_ZONE).toInstant().toEpochMilli();
             } else {
                 q.add(label, values);
diff --git a/src/test/java/teammates/test/cases/action/AdminActivityLogPageActionTest.java b/src/test/java/teammates/test/cases/action/AdminActivityLogPageActionTest.java
index f0c2c5a039d..3647dc42245 100644
--- a/src/test/java/teammates/test/cases/action/AdminActivityLogPageActionTest.java
+++ b/src/test/java/teammates/test/cases/action/AdminActivityLogPageActionTest.java
@@ -4,10 +4,8 @@
 import java.lang.reflect.Type;
 import java.time.Instant;
 import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import org.testng.annotations.BeforeGroups;
 import org.testng.annotations.Test;
@@ -17,6 +15,7 @@
 import teammates.common.util.ActivityLogEntry;
 import teammates.common.util.Const;
 import teammates.common.util.JsonUtils;
+import teammates.common.util.TeammatesDateTimeFormatter;
 import teammates.common.util.TimeHelper;
 import teammates.test.driver.FileHelper;
 import teammates.test.driver.TestProperties;
@@ -85,13 +84,13 @@ private void loadLogMessages() {
 
     private String formatAdminDate(Instant instant) {
         return instant.atZone(Const.SystemParams.ADMIN_TIME_ZONE).toLocalDate()
-                .format(DateTimeFormatter.ofPattern("dd/MM/yy", Locale.US));
+                .format(TeammatesDateTimeFormatter.ofPattern("dd/MM/yy"));
     }
 
     private String formatActivityLogTimeTruncated(Instant instant, ZoneId zoneId) {
         // Some timings are adjusted slightly in the tests. Hence instead of testing for exact match,
         // we test matching up to the hour.
-        return DateTimeFormatter.ofPattern("dd/MM/yyyy HH", Locale.US).format(instant.atZone(zoneId));
+        return TeammatesDateTimeFormatter.ofPattern("dd/MM/yyyy HH").format(instant.atZone(zoneId));
     }
 
     private String getExpectedAjaxTimeString(Instant instant, ZoneId zoneId) {
diff --git a/src/test/java/teammates/test/cases/action/AdminEmailLogPageActionTest.java b/src/test/java/teammates/test/cases/action/AdminEmailLogPageActionTest.java
index 9cf7f0242da..9b6032f8f50 100644
--- a/src/test/java/teammates/test/cases/action/AdminEmailLogPageActionTest.java
+++ b/src/test/java/teammates/test/cases/action/AdminEmailLogPageActionTest.java
@@ -6,7 +6,6 @@
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import org.testng.annotations.BeforeGroups;
 import org.testng.annotations.Test;
@@ -16,6 +15,7 @@
 import teammates.common.util.Const;
 import teammates.common.util.EmailLogEntry;
 import teammates.common.util.JsonUtils;
+import teammates.common.util.TeammatesDateTimeFormatter;
 import teammates.common.util.TimeHelper;
 import teammates.test.driver.FileHelper;
 import teammates.test.driver.TestProperties;
@@ -52,7 +52,7 @@ public class AdminEmailLogPageActionTest extends BaseActionTest {
     // 130 seconds is chosen so that it will be around 50 logs within 2 hours before now.
     private static final int LOG_MESSAGE_INTERVAL_MANY_LOGS = 130;
 
-    private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("dd/MM/yyyy", Locale.US);
+    private static final DateTimeFormatter DATE_FORMATTER = TeammatesDateTimeFormatter.ofPattern("dd/MM/yyyy");
 
     private static final Instant TODAY = Instant.now();
     private static final Instant YESTERDAY = TimeHelper.getInstantDaysOffsetFromNow(-1);
diff --git a/src/test/java/teammates/test/cases/browsertests/InstructorFeedbackSessionsPageUiTest.java b/src/test/java/teammates/test/cases/browsertests/InstructorFeedbackSessionsPageUiTest.java
index 634edb8984d..0b0347bd24e 100644
--- a/src/test/java/teammates/test/cases/browsertests/InstructorFeedbackSessionsPageUiTest.java
+++ b/src/test/java/teammates/test/cases/browsertests/InstructorFeedbackSessionsPageUiTest.java
@@ -7,7 +7,6 @@
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import org.openqa.selenium.By;
 import org.testng.annotations.BeforeMethod;
@@ -20,6 +19,7 @@
 import teammates.common.util.AppUrl;
 import teammates.common.util.Const;
 import teammates.common.util.FieldValidator;
+import teammates.common.util.TeammatesDateTimeFormatter;
 import teammates.common.util.TimeHelper;
 import teammates.test.driver.AssertHelper;
 import teammates.test.driver.BackDoor;
@@ -722,7 +722,7 @@ private void testDatePickerScripts(LocalDate defaultStartDate) {
         feedbackPage.clickCustomVisibleTimeButton();
         feedbackPage.clickCustomPublishTimeButton();
 
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("EEE MMM dd yyyy", Locale.US);
+        DateTimeFormatter formatter = TeammatesDateTimeFormatter.ofPattern("EEE MMM dd yyyy");
 
         ______TS("validate visible date range before editing start date");
 
diff --git a/src/test/java/teammates/test/driver/HtmlHelper.java b/src/test/java/teammates/test/driver/HtmlHelper.java
index 805a4f6bf3a..b20b365da6f 100644
--- a/src/test/java/teammates/test/driver/HtmlHelper.java
+++ b/src/test/java/teammates/test/driver/HtmlHelper.java
@@ -5,7 +5,6 @@
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.Locale;
 
 import org.jsoup.Jsoup;
 import org.jsoup.helper.W3CDom;
@@ -17,6 +16,7 @@
 import teammates.common.util.Const;
 import teammates.common.util.SanitizationHelper;
 import teammates.common.util.StringHelper;
+import teammates.common.util.TeammatesDateTimeFormatter;
 import teammates.common.util.TimeHelper;
 
 /**
@@ -412,12 +412,12 @@ private static String suppressVariationsInInjectedValues(String content) {
      */
     private static String replaceUnpredictableValuesWithPlaceholders(String content) {
         LocalDate today = LocalDate.now();
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy, ", Locale.US);
+        DateTimeFormatter formatter = TeammatesDateTimeFormatter.ofPattern("EEE, dd MMM yyyy, ");
         String dateToday = formatter.format(today);
         String dateYesterday = formatter.format(today.minusDays(1));
         String dateTomorrow = formatter.format(today.plusDays(1));
-        String dateTodayInIso8601 = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'", Locale.US).format(today);
-        String dateTodayInCoursesPageFormat = DateTimeFormatter.ofPattern("d MMM yyyy", Locale.US).format(today);
+        String dateTodayInIso8601 = TeammatesDateTimeFormatter.ofPattern("yyyy-MM-dd'T'").format(today);
+        String dateTodayInCoursesPageFormat = TeammatesDateTimeFormatter.ofPattern("d MMM yyyy").format(today);
         return content // dev server admin absolute URLs (${teammates.url}/_ah/...)
                       .replace("\"" + TestProperties.TEAMMATES_URL + "/_ah", "\"/_ah")
                       // logout URL generated by Google

From b01051c35f8257d00054c68bba9ad21da1a0761a Mon Sep 17 00:00:00 2001
From: Shradheya Thakre <tshradheya@gmail.com>
Date: Tue, 17 Jul 2018 11:46:00 +0800
Subject: [PATCH 76/76] TeammatesDateTimeFormatter -> final class

---
 .../java/teammates/common/util/TeammatesDateTimeFormatter.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/teammates/common/util/TeammatesDateTimeFormatter.java b/src/main/java/teammates/common/util/TeammatesDateTimeFormatter.java
index aa8ab09c263..b7b0f7f80de 100644
--- a/src/main/java/teammates/common/util/TeammatesDateTimeFormatter.java
+++ b/src/main/java/teammates/common/util/TeammatesDateTimeFormatter.java
@@ -6,7 +6,7 @@
 /**
  * DateTimeFormatter for TEAMMATES with default Locale.US settings.
  */
-public class TeammatesDateTimeFormatter {
+public final class TeammatesDateTimeFormatter {
 
     private TeammatesDateTimeFormatter() {
         // Utility class