Always running Selenium tests using locale=en

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/HostPage.java

@@ -22,12 +22,13 @@ public abstract class HostPage extends PageObject {
      */
     protected static final int DEFAULT_PAGE_LOAD_TIMEOUT = 120;
     
-    public static final String getGWTCodeServer() {
+    public static final String getGWTCodeServerAndLocale() {
+        StringBuilder queryBuilder = new StringBuilder("locale=en");
         String codeServer = System.getProperty(GWT_CODE_SERVER_PARAMETER_NAME);
-        if (codeServer == null) {
-            return NO_CODE_SERVER_PARAMTER_VALUE;
+        if (codeServer != null) {
+            queryBuilder.append("&").append(GWT_CODE_SERVER_PARAMETER_NAME).append("=").append(codeServer);
         }
-        return GWT_CODE_SERVER_PARAMETER_NAME + "=" + codeServer;
+        return queryBuilder.toString();
     }
     
     protected final static <T extends HostPage> T goToUrl(HostPageSupplier<T> supplier, WebDriver driver, String url) {
@@ -41,7 +42,7 @@ public abstract class HostPage extends PageObject {
     
     private static final void goToPage(WebDriver driver, URI uri) throws URISyntaxException {
         String scheme = uri.getScheme(), userInfo = uri.getUserInfo(), host = uri.getHost(); 
-        String path = uri.getPath(), query = getGWTCodeServer(), fragment = uri.getFragment();
+        String path = uri.getPath(), query = getGWTCodeServerAndLocale(), fragment = uri.getFragment();
         driver.get(new URI(scheme, userInfo, host, uri.getPort(), path, query, fragment).toString());
     }
     

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/autoplay/AutoPlayPage.java

@@ -34,7 +34,7 @@ public class AutoPlayPage extends HostPage {
      * @throws UnsupportedEncodingException 
      */
     public static AutoPlayPage goToPage(WebDriver driver, String root) {
-        driver.get(root + "gwt/AutoPlay.html?" + getGWTCodeServer()); //$NON-NLS-1$
+        driver.get(root + "gwt/AutoPlay.html?" + getGWTCodeServerAndLocale()); //$NON-NLS-1$
         
         return new AutoPlayPage(driver);
     }

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/leaderboard/LeaderboardPage.java

@@ -47,7 +47,7 @@ public class LeaderboardPage extends HostPage {
     
     public static LeaderboardPage goToPage(WebDriver driver, String root, String leaderboard, boolean raceDetails, Long autoRefreshIntervalInMillis) {
         driver.get(root + "gwt/Leaderboard.html?" + getLeaderboard(leaderboard) + //$NON-NLS-1$
-                "&" + getGWTCodeServer() + "&" + getShowRaceDeatails(raceDetails) +
+                "&" + getGWTCodeServerAndLocale() + "&" + getShowRaceDeatails(raceDetails) +
                 (autoRefreshIntervalInMillis==null ? "" : ("&" + getAutoRefreshIntervalMillis(autoRefreshIntervalInMillis)))); //$NON-NLS-1$
         
         return new LeaderboardPage(driver, leaderboard);

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/leaderboardedit/LeaderboardEditingPage.java

@@ -34,7 +34,7 @@ public class LeaderboardEditingPage extends HostPage {
      * @throws UnsupportedEncodingException 
      */
     public static LeaderboardEditingPage goToPage(String leaderboardName, WebDriver driver, String root) {
-        driver.get(root + "gwt/LeaderboardEditing.html?name=" + leaderboardName + "&" + getGWTCodeServer()); //$NON-NLS-1$
+        driver.get(root + "gwt/LeaderboardEditing.html?name=" + leaderboardName + "&" + getGWTCodeServerAndLocale()); //$NON-NLS-1$
         
         return new LeaderboardEditingPage(driver);
     }