Move l10n-stuff to own package.

diff --git a/src/org/cacert/gigi/EmailAddress.java b/src/org/cacert/gigi/EmailAddress.java
index 8f4e2efd000a32c7e090bcb96c9901089693e4f6..480da6f49b70b2f8f625afcb8773e31ddf9ba9a4 100644 (file)
--- a/src/org/cacert/gigi/EmailAddress.java
+++ b/src/org/cacert/gigi/EmailAddress.java
@@ -7,6 +7,7 @@ import java.sql.SQLException;
 
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.email.EmailProvider;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.util.RandomToken;
 import org.cacert.gigi.util.ServerConstants;
 

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index f7a82d6632e95b123398404a088a6f73b7aadc3f..af0e222b031c42a6005abb99adc9b203f63a386c 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -15,6 +15,7 @@ import javax.servlet.http.HttpSession;
 
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.email.EmailProvider;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form.CSRFException;
 import org.cacert.gigi.output.Menu;
 import org.cacert.gigi.output.MenuItem;

diff --git a/src/org/cacert/gigi/GigiApiException.java b/src/org/cacert/gigi/GigiApiException.java
index 430c199befb11bc916c3d84fb7e98247fd04923e..8851ec4412efaf4f848a4ed142de11344bbc1291 100644 (file)
--- a/src/org/cacert/gigi/GigiApiException.java
+++ b/src/org/cacert/gigi/GigiApiException.java
@@ -4,6 +4,8 @@ import java.io.PrintWriter;
 import java.sql.SQLException;
 import java.util.LinkedList;
 
+import org.cacert.gigi.localisation.Language;
+
 public class GigiApiException extends Exception {
 
     SQLException e;

diff --git a/src/org/cacert/gigi/Name.java b/src/org/cacert/gigi/Name.java
index 0c919dab4da4057a66c2437a6ad3763ece1ce2b0..6f3c09f19a9b85e0697288d01902caec5968843a 100644 (file)
--- a/src/org/cacert/gigi/Name.java
+++ b/src/org/cacert/gigi/Name.java
@@ -3,6 +3,7 @@ package org.cacert.gigi;
 import java.io.PrintWriter;
 import java.util.Map;
 
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Outputable;
 
 public class Name implements Outputable {

diff --git a/src/org/cacert/gigi/Language.java b/src/org/cacert/gigi/localisation/Language.java
similarity index 94%
rename from src/org/cacert/gigi/Language.java
rename to src/org/cacert/gigi/localisation/Language.java
index 64831ebd13b8816d8321f463398f3fffbe2602cb..dc99d9a8a6ace810037a99881f8a28a26436e55c 100644 (file)
--- a/src/org/cacert/gigi/Language.java
+++ b/src/org/cacert/gigi/localisation/Language.java
@@ -1,4 +1,4 @@
-package org.cacert.gigi;
+package org.cacert.gigi.localisation;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -23,7 +23,7 @@ public class Language {
 
     Locale l;
 
-    private Language(String language) throws ParserConfigurationException, IOException, SAXException {
+    protected Language(String language) throws ParserConfigurationException, IOException, SAXException {
         if (language.contains("_")) {
             String[] parts = language.split("_");
             l = new Locale(parts[0], parts[1]);

diff --git a/src/org/cacert/gigi/output/CertificateIterable.java b/src/org/cacert/gigi/output/CertificateIterable.java
index 5108e1c8e7808384ebba999877f4d420e1802ef3..11c4a507ec2bd0c95792b97c71b3b436931dc6ff 100644 (file)
--- a/src/org/cacert/gigi/output/CertificateIterable.java
+++ b/src/org/cacert/gigi/output/CertificateIterable.java
@@ -4,7 +4,7 @@ import java.sql.SQLException;
 import java.util.Map;
 
 import org.cacert.gigi.Certificate;
-import org.cacert.gigi.Language;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.IterableDataset;
 
 public class CertificateIterable implements IterableDataset {

diff --git a/src/org/cacert/gigi/output/DateSelector.java b/src/org/cacert/gigi/output/DateSelector.java
index 45697fe0cd2be63ad081d2074cc4e83a652a2fff..cf42c220abc782dab32240a4f3846f6287af1dfc 100644 (file)
--- a/src/org/cacert/gigi/output/DateSelector.java
+++ b/src/org/cacert/gigi/output/DateSelector.java
@@ -9,7 +9,7 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.cacert.gigi.Language;
+import org.cacert.gigi.localisation.Language;
 
 public class DateSelector implements Outputable {
 

diff --git a/src/org/cacert/gigi/output/Form.java b/src/org/cacert/gigi/output/Form.java
index e5d05cb6c0e294fe80129aa19baf4e0f9c5211db..176c7046995a57147b5066a85f45cc1f577b5b26 100644 (file)
--- a/src/org/cacert/gigi/output/Form.java
+++ b/src/org/cacert/gigi/output/Form.java
@@ -8,7 +8,7 @@ import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-import org.cacert.gigi.Language;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.RandomToken;
 

diff --git a/src/org/cacert/gigi/output/Menu.java b/src/org/cacert/gigi/output/Menu.java
index 6e75eb900e97661d4901bd36498f5e57237805aa..b30badb7f79fea5dfe6b65fcfa52e457b65e2bd8 100644 (file)
--- a/src/org/cacert/gigi/output/Menu.java
+++ b/src/org/cacert/gigi/output/Menu.java
@@ -3,7 +3,7 @@ package org.cacert.gigi.output;
 import java.io.PrintWriter;
 import java.util.Map;
 
-import org.cacert.gigi.Language;
+import org.cacert.gigi.localisation.Language;
 
 public class Menu implements Outputable {
 

diff --git a/src/org/cacert/gigi/output/MenuItem.java b/src/org/cacert/gigi/output/MenuItem.java
index a0c1ed807d427ff8bd7e82d703fcc389dcf416d1..f307e3351ea657e1d9cbf2b80f90f2cedc2235c1 100644 (file)
--- a/src/org/cacert/gigi/output/MenuItem.java
+++ b/src/org/cacert/gigi/output/MenuItem.java
@@ -3,7 +3,7 @@ package org.cacert.gigi.output;
 import java.io.PrintWriter;
 import java.util.Map;
 
-import org.cacert.gigi.Language;
+import org.cacert.gigi.localisation.Language;
 
 public class MenuItem implements Outputable {
 

diff --git a/src/org/cacert/gigi/output/Outputable.java b/src/org/cacert/gigi/output/Outputable.java
index d228b33d42513a4997bd712e2e3f4f75f1a79ee2..9d1530c6acfcf7f6d72a27747309c1a3aac4b905 100644 (file)
--- a/src/org/cacert/gigi/output/Outputable.java
+++ b/src/org/cacert/gigi/output/Outputable.java
@@ -3,7 +3,7 @@ package org.cacert.gigi.output;
 import java.io.PrintWriter;
 import java.util.Map;
 
-import org.cacert.gigi.Language;
+import org.cacert.gigi.localisation.Language;
 
 public interface Outputable {
 

diff --git a/src/org/cacert/gigi/output/template/ForeachStatement.java b/src/org/cacert/gigi/output/template/ForeachStatement.java
index 6cd1e0388809272a1808e43de2cc032aa4ad2ee8..4a368cc9ac097e5390bca5452e4d53b0af7945a1 100644 (file)
--- a/src/org/cacert/gigi/output/template/ForeachStatement.java
+++ b/src/org/cacert/gigi/output/template/ForeachStatement.java
@@ -4,7 +4,7 @@ import java.io.PrintWriter;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.cacert.gigi.Language;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Outputable;
 
 public final class ForeachStatement implements Outputable {

diff --git a/src/org/cacert/gigi/output/template/HashAlgorithms.java b/src/org/cacert/gigi/output/template/HashAlgorithms.java
index 24e71f7faf1e2ae133f5bf2e13ed87cc2ced2898..37b1ca705511e15d93a9db96e9c72238f5db89bf 100644 (file)
--- a/src/org/cacert/gigi/output/template/HashAlgorithms.java
+++ b/src/org/cacert/gigi/output/template/HashAlgorithms.java
@@ -3,7 +3,7 @@ package org.cacert.gigi.output.template;
 import java.util.Map;
 
 import org.cacert.gigi.Digest;
-import org.cacert.gigi.Language;
+import org.cacert.gigi.localisation.Language;
 
 public class HashAlgorithms implements IterableDataset {
 

diff --git a/src/org/cacert/gigi/output/template/IfStatement.java b/src/org/cacert/gigi/output/template/IfStatement.java
index bed559ed41a2ad0144440155eac444d7225afba0..adb9099251038215f21c6f8a6e1bf11cb6acf42c 100644 (file)
--- a/src/org/cacert/gigi/output/template/IfStatement.java
+++ b/src/org/cacert/gigi/output/template/IfStatement.java
@@ -3,7 +3,7 @@ package org.cacert.gigi.output.template;
 import java.io.PrintWriter;
 import java.util.Map;
 
-import org.cacert.gigi.Language;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Outputable;
 
 public final class IfStatement implements Outputable {

diff --git a/src/org/cacert/gigi/output/template/IterableDataset.java b/src/org/cacert/gigi/output/template/IterableDataset.java
index 3357be0916f67ef947333481d1cfec3b7971e0dc..e95dce8f07a4eff86c4319e4e5619e822af4fd46 100644 (file)
--- a/src/org/cacert/gigi/output/template/IterableDataset.java
+++ b/src/org/cacert/gigi/output/template/IterableDataset.java
@@ -2,7 +2,7 @@ package org.cacert.gigi.output.template;
 
 import java.util.Map;
 
-import org.cacert.gigi.Language;
+import org.cacert.gigi.localisation.Language;
 
 /**
  * Represents some kind of data, that may be iterated over in a template.

diff --git a/src/org/cacert/gigi/output/template/OutputVariableCommand.java b/src/org/cacert/gigi/output/template/OutputVariableCommand.java
index 1247891a91b5a305cde48a66343e16bc46b024c2..382d0597ddd5991a40961c72f3a00eb1219496aa 100644 (file)
--- a/src/org/cacert/gigi/output/template/OutputVariableCommand.java
+++ b/src/org/cacert/gigi/output/template/OutputVariableCommand.java
@@ -3,7 +3,7 @@ package org.cacert.gigi.output.template;
 import java.io.PrintWriter;
 import java.util.Map;
 
-import org.cacert.gigi.Language;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Outputable;
 
 public final class OutputVariableCommand implements Outputable {

diff --git a/src/org/cacert/gigi/output/template/SprintfCommand.java b/src/org/cacert/gigi/output/template/SprintfCommand.java
index f0a3f35917368cc05e1c929cda9c549050a11eea..9cafef4787f58fd9f7451cdf1ceae85e455e09db 100644 (file)
--- a/src/org/cacert/gigi/output/template/SprintfCommand.java
+++ b/src/org/cacert/gigi/output/template/SprintfCommand.java
@@ -4,7 +4,7 @@ import java.io.PrintWriter;
 import java.util.LinkedList;
 import java.util.Map;
 
-import org.cacert.gigi.Language;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Outputable;
 import org.cacert.gigi.util.HTMLEncoder;
 

diff --git a/src/org/cacert/gigi/output/template/Template.java b/src/org/cacert/gigi/output/template/Template.java
index 1949d5c665a133ed652756af1ef70205ac194603..c7d9a066c6b0ab1a45381e9e950199db1dcfe44a 100644 (file)
--- a/src/org/cacert/gigi/output/template/Template.java
+++ b/src/org/cacert/gigi/output/template/Template.java
@@ -15,7 +15,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.cacert.gigi.DevelLauncher;
-import org.cacert.gigi.Language;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Outputable;
 import org.cacert.gigi.util.HTMLEncoder;
 

diff --git a/src/org/cacert/gigi/output/template/TemplateBlock.java b/src/org/cacert/gigi/output/template/TemplateBlock.java
index 2a7f452002e10daa41de4b14676b71b896931b98..2eb87e7b2e35f7fa4684407ea579449f2adee1cd 100644 (file)
--- a/src/org/cacert/gigi/output/template/TemplateBlock.java
+++ b/src/org/cacert/gigi/output/template/TemplateBlock.java
@@ -3,7 +3,7 @@ package org.cacert.gigi.output.template;
 import java.io.PrintWriter;
 import java.util.Map;
 
-import org.cacert.gigi.Language;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Outputable;
 
 class TemplateBlock implements Outputable {

diff --git a/src/org/cacert/gigi/output/template/TranslateCommand.java b/src/org/cacert/gigi/output/template/TranslateCommand.java
index 0dad247335b1b874689c25c94511253f270bf25d..eca7c845d8cf4685475eda367664e46bcc5a8c73 100644 (file)
--- a/src/org/cacert/gigi/output/template/TranslateCommand.java
+++ b/src/org/cacert/gigi/output/template/TranslateCommand.java
@@ -3,7 +3,7 @@ package org.cacert.gigi.output.template;
 import java.io.PrintWriter;
 import java.util.Map;
 
-import org.cacert.gigi.Language;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Outputable;
 import org.cacert.gigi.util.HTMLEncoder;
 

diff --git a/src/org/cacert/gigi/pages/Page.java b/src/org/cacert/gigi/pages/Page.java
index a1309c9f74e497aaf077efe9c5dfb2580ecc5eb0..540969f3f2ede26eec5edf32aa8afa5860178391 100644 (file)
--- a/src/org/cacert/gigi/pages/Page.java
+++ b/src/org/cacert/gigi/pages/Page.java
@@ -7,8 +7,8 @@ import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.Template;
 
 /**

diff --git a/src/org/cacert/gigi/pages/account/CertificateIssueForm.java b/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
index aee6cddf2f6bc61920e45abb65d3b65d529e1789..82abb21aeb940ad5cfddd8935a597cab98cc7676 100644 (file)
--- a/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
+++ b/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
@@ -20,9 +20,9 @@ import org.cacert.gigi.CertificateProfile;
 import org.cacert.gigi.Digest;
 import org.cacert.gigi.EmailAddress;
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
 import org.cacert.gigi.crypto.SPKAC;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.HashAlgorithms;
 import org.cacert.gigi.output.template.IterableDataset;

diff --git a/src/org/cacert/gigi/pages/account/ChangeForm.java b/src/org/cacert/gigi/pages/account/ChangeForm.java
index c678cf1f14032cf5c5d6e52694bcb9278c440d7f..8a7689079f0023767f6def090411f02a9fb5d144 100644 (file)
--- a/src/org/cacert/gigi/pages/account/ChangeForm.java
+++ b/src/org/cacert/gigi/pages/account/ChangeForm.java
@@ -6,8 +6,8 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;

diff --git a/src/org/cacert/gigi/pages/account/DomainAddForm.java b/src/org/cacert/gigi/pages/account/DomainAddForm.java
index 1a2b61a015b9daa30f428ed59573896f37df1bb5..55fcbbecbe3fd062b33962ef5951b52e66500b35 100644 (file)
--- a/src/org/cacert/gigi/pages/account/DomainAddForm.java
+++ b/src/org/cacert/gigi/pages/account/DomainAddForm.java
@@ -7,8 +7,8 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.Domain;
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;

diff --git a/src/org/cacert/gigi/pages/account/DomainManagementForm.java b/src/org/cacert/gigi/pages/account/DomainManagementForm.java
index 675c6041e20b364ce993a9e1a3ee3befe39b13fd..1ffa33d35816c6d089334ceb6b18cdc89413480b 100644 (file)
--- a/src/org/cacert/gigi/pages/account/DomainManagementForm.java
+++ b/src/org/cacert/gigi/pages/account/DomainManagementForm.java
@@ -7,8 +7,8 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.Domain;
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;

diff --git a/src/org/cacert/gigi/pages/account/MailAddForm.java b/src/org/cacert/gigi/pages/account/MailAddForm.java
index 99af485d7802f1d0dfe20024833cca4d4036e146..44634de1ea575cddc100a6708b2570d22e563a1c 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailAddForm.java
+++ b/src/org/cacert/gigi/pages/account/MailAddForm.java
@@ -6,8 +6,8 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.EmailAddress;
-import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;

diff --git a/src/org/cacert/gigi/pages/account/MailManagementForm.java b/src/org/cacert/gigi/pages/account/MailManagementForm.java
index 41900314659b9ff0eeeacd6b2ac6d5468b4e7903..204bb927a46a3db8ae4b783511fb8ef968ae6245 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailManagementForm.java
+++ b/src/org/cacert/gigi/pages/account/MailManagementForm.java
@@ -7,8 +7,8 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.EmailAddress;
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;

diff --git a/src/org/cacert/gigi/pages/account/MailOverview.java b/src/org/cacert/gigi/pages/account/MailOverview.java
index 298c132b29404f2235cef80b4d3a8b6a37641a4c..3261ca8d5f87a46e0da34f6326c772874ffe1bdd 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailOverview.java
+++ b/src/org/cacert/gigi/pages/account/MailOverview.java
@@ -7,8 +7,8 @@ import java.util.HashMap;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.pages.Page;
 

diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java
index 9a76f8723ee99573a712a7ad852c1a45b0be694c..e956aa436eb59b4597ea62413dc5973a6187d348 100644 (file)
--- a/src/org/cacert/gigi/pages/main/Signup.java
+++ b/src/org/cacert/gigi/pages/main/Signup.java
@@ -12,10 +12,10 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.EmailAddress;
-import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.email.EmailProvider;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.DateSelector;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.Template;

diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.java b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
index 6e51ae9763b6426ce01a13be5d331a8a42b34a30..3d68716ec293670302669ed4181459b1b9ad5d56 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.java
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
@@ -10,8 +10,8 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;

diff --git a/tests/org/cacert/gigi/pages/account/TestMailManagement.java b/tests/org/cacert/gigi/pages/account/TestMailManagement.java
index 2adbf106ed0f9635ae8a6121099fb801c2962a3e..09bd98cee5c838976468bfd508531d1cfa037bcb 100644 (file)
--- a/tests/org/cacert/gigi/pages/account/TestMailManagement.java
+++ b/tests/org/cacert/gigi/pages/account/TestMailManagement.java
@@ -9,8 +9,8 @@ import java.net.URLEncoder;
 
 import org.cacert.gigi.EmailAddress;
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Test;
 

diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index 661d3644b003f4352e0d00d45974b22fea29d809..563017876efe509fcb558761cfac70cd885724d5 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -42,9 +42,9 @@ import javax.net.ssl.X509KeyManager;
 import org.cacert.gigi.DevelLauncher;
 import org.cacert.gigi.EmailAddress;
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.pages.account.MyDetails;
 import org.cacert.gigi.testUtils.TestEmailReciever.TestMail;
 import org.cacert.gigi.util.DatabaseManager;