Merge "Rename Translations menu to Language"

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index b80f9c7596808c63cdfe92213ea51897d14f72ba..5fda72d045597cb507ddace05197363c2b6893df 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -177,7 +177,7 @@ public final class Gigi extends HttpServlet {
             baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));
             rootMenu = new MenuCollector();
 
-            Menu languages = new Menu("Translations");
+            Menu languages = new Menu("Language");
             for (Locale l : Language.getSupportedLocales()) {
                 languages.addItem(new SimpleMenuItem("?lang=" + l.toString(), l.getDisplayName(l)));
             }

diff --git a/tests/org/cacert/gigi/TestLanguage.java b/tests/org/cacert/gigi/TestLanguage.java
index 4aa96a2c2a7cedf96bed21c4e91613fc248ffde2..912cab6ff9abd6df3674741ad1c6990a1fa5e32c 100644 (file)
--- a/tests/org/cacert/gigi/TestLanguage.java
+++ b/tests/org/cacert/gigi/TestLanguage.java
@@ -52,13 +52,13 @@ public class TestLanguage extends ManagedTest {
     @Test
     public void testSelectStandard() throws IOException {
         String content = IOUtils.readURL(get("cook", "/"));
-        assertThat(content, containsString("Translations"));
+        assertThat(content, containsString("Language"));
     }
 
     @Test
     public void testSelectGerman() throws IOException {
         String content = IOUtils.readURL(get("", "/?lang=de"));
-        assertThat(content, containsString(Language.getInstance(Locale.GERMAN).getTranslation("Translations")));
+        assertThat(content, containsString(Language.getInstance(Locale.GERMAN).getTranslation("Language")));
     }
 
     @Test
@@ -67,7 +67,7 @@ public class TestLanguage extends ManagedTest {
         User u = User.getById(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
         String cookie = login(u.getEmail(), TEST_PASSWORD);
         String content = IOUtils.readURL(get(cookie, "/"));
-        assertThat(content, containsString(Language.getInstance(Locale.GERMAN).getTranslation("Translations")));
+        assertThat(content, containsString(Language.getInstance(Locale.GERMAN).getTranslation("Language")));
     }
 
     @Test
@@ -77,6 +77,6 @@ public class TestLanguage extends ManagedTest {
         User u = User.getById(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
         String cookie = login(u.getEmail(), TEST_PASSWORD);
         String content = IOUtils.readURL(get(cookie, "/"));
-        assertThat(content, containsString(Language.getInstance(Locale.FRENCH).getTranslation("Translations")));
+        assertThat(content, containsString(Language.getInstance(Locale.FRENCH).getTranslation("Language")));
     }
 }