0045733: The login page should match the language of the current client

diff --git a/src/org/openbravo/mobile/core/login/MobileCoreLoginUtilsServlet.java b/src/org/openbravo/mobile/core/login/MobileCoreLoginUtilsServlet.java
index da0bb0bc..ae0cb186 100644
--- a/src/org/openbravo/mobile/core/login/MobileCoreLoginUtilsServlet.java
+++ b/src/org/openbravo/mobile/core/login/MobileCoreLoginUtilsServlet.java
@@ -125,8 +125,8 @@ public class MobileCoreLoginUtilsServlet extends WebServiceAbstractServlet {
     JSONObject data = new JSONObject();
     JSONObject item = null;
 
-    data.put("labels", LabelsComponent.getLabels(null, getModuleId()));
-    data.put("lists", LabelsComponent.getLists(null, getModuleId()));
+    data.put("labels", LabelsComponent.getLabels(getLanguage(request), getModuleId()));
+    data.put("lists", LabelsComponent.getLists(getLanguage(request), getModuleId()));
 
     if (OBContext.getOBContext().getUser().getId().equals("0")) {
       data.put("activeSession", false);
@@ -146,6 +146,10 @@ public class MobileCoreLoginUtilsServlet extends WebServiceAbstractServlet {
   protected String getModuleId() {
     return MobileCoreConstants.MODULE_ID;
   }
+  
+  protected String getLanguage(HttpServletRequest request) {
+    return null;
+  }
 
   protected JSONObject getCompanyLogo(HttpServletRequest request) throws JSONException {
     JSONObject result = new JSONObject();

diff --git a/src/org/openbravo/retail/posterminal/LoginUtilsServlet.java b/src/org/openbravo/retail/posterminal/LoginUtilsServlet.java
index 64860cacf..bd460ceed 100644
--- a/src/org/openbravo/retail/posterminal/LoginUtilsServlet.java
+++ b/src/org/openbravo/retail/posterminal/LoginUtilsServlet.java
@@ -242,6 +242,31 @@ public class LoginUtilsServlet extends MobileCoreLoginUtilsServlet {
     }
     return result;
   }
+  
+  @Override
+  protected String getLanguage(HttpServletRequest request) {
+    if (!OBContext.getOBContext().getUser().getId().equals("0")) {
+      return null;
+    }
+    final String terminalName = request.getParameter("terminalName");
+    if (StringUtils.isBlank(terminalName)) {
+      return null;
+    }
+    OBQuery<OBPOSApplications> obq = OBDal.getInstance()
+        .createQuery(OBPOSApplications.class, "where searchKey = :terminalName");
+    obq.setNamedParameter("terminalName", terminalName);
+    obq.setFilterOnReadableClients(false);
+    obq.setFilterOnReadableOrganization(false);
+    List<OBPOSApplications> posApps = obq.list();
+    if (posApps.isEmpty()) {
+      return null;
+    }
+    OBPOSApplications obposApplications = posApps.get(0);
+    if (obposApplications != null && obposApplications.getClient().getLanguage() != null) {
+      return obposApplications.getClient().getLanguage().getId();
+    }
+    return null;
+  }
 
   @Override
   protected JSONObject preLogin(HttpServletRequest request) throws JSONException {