From: Felix Dörre <felix@dogcraft.de>
Date: Wed, 15 Jun 2016 08:52:17 +0000 (+0200)
Subject: Merge "Rename Translations menu to Language"
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=3924e9f9524148a607126a59f7be94fa4db6aeee;hp=929352b2603bd011c48119d8d75a1a00a3889ca8

Merge "Rename Translations menu to Language"
---

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index b80f9c75..5fda72d0 100644
--- 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 4aa96a2c..912cab6f 100644
--- 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")));
     }
 }