Alexander Wels has uploaded a new change for review. Change subject: userportal,webadmin: fix locale detection documentation ......................................................................
userportal,webadmin: fix locale detection documentation - Fixed issue with locale detection using the URL path. Change-Id: Iecb2708a201d94119db14521708bf53e42b6384d Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=885823 Signed-off-by: Alexander Wels <[email protected]> --- M backend/manager/modules/root/src/main/java/org/ovirt/engine/core/DocsServlet.java M backend/manager/modules/root/src/test/java/org/ovirt/engine/core/DocsServletTest.java 2 files changed, 25 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/34/14734/1 diff --git a/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/DocsServlet.java b/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/DocsServlet.java index 200e36d..07d5f59 100644 --- a/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/DocsServlet.java +++ b/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/DocsServlet.java @@ -136,7 +136,7 @@ //Check to make sure the file doesn't exist, and if it does, that it is a directory. //This excludes anything like /docs/menu.css if (!localeFile.exists() || localeFile.isDirectory()) { - result = pathElements[0]; + result = pathElements[0].replaceAll("\\-", "_"); } } return result; diff --git a/backend/manager/modules/root/src/test/java/org/ovirt/engine/core/DocsServletTest.java b/backend/manager/modules/root/src/test/java/org/ovirt/engine/core/DocsServletTest.java index 523f838..ed6e8c8 100644 --- a/backend/manager/modules/root/src/test/java/org/ovirt/engine/core/DocsServletTest.java +++ b/backend/manager/modules/root/src/test/java/org/ovirt/engine/core/DocsServletTest.java @@ -238,6 +238,19 @@ } /** + * Test method for {@link org.ovirt.engine.core.DocsServlet# + * getLocaleFromRequest(javax.servlet.http.HttpServletRequest)}. + */ + @Test + public void testGetLocaleFromRequest_withHash() { + Locale result = testServlet.getLocaleFromRequest(mockRequest); + assertEquals("The locale should be en-US", Locale.US, result); + when(mockRequest.getHeader(DocsServlet.REFERER)).thenReturn("http://127.0.0.1:8700/webadmin/webadmin/WebAdmin.html?locale=fr#basic";); + result = testServlet.getLocaleFromRequest(mockRequest); + assertEquals("The locale should be fr", Locale.FRENCH, result); + } + + /** * Test method for {@link org.ovirt.engine.core.DocsServlet#getLocaleFromRequest(javax.servlet.http.HttpServletRequest)}. */ @Test @@ -256,7 +269,17 @@ public void testGetLocaleFromRequest_Path() { when(mockRequest.getPathInfo()).thenReturn("/ja/index.html"); Locale result = testServlet.getLocaleFromRequest(mockRequest); - assertEquals("The locale should be fr", Locale.JAPANESE, result); + assertEquals("The locale should be ja", Locale.JAPANESE, result); + } + + /** + * Test method for {@link org.ovirt.engine.core.DocsServlet#getLocaleFromRequest(javax.servlet.http.HttpServletRequest)}. + */ + @Test + public void testGetLocaleFromRequest_Path_Underscore() { + when(mockRequest.getPathInfo()).thenReturn("/ja-JP/index.html"); + Locale result = testServlet.getLocaleFromRequest(mockRequest); + assertEquals("The locale should be ja_JP", Locale.JAPAN, result); } /** -- To view, visit http://gerrit.ovirt.org/14734 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iecb2708a201d94119db14521708bf53e42b6384d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
