diff options
3 files changed, 25 insertions, 11 deletions
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java index 06b38d128..dfe4dbc44 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java @@ -1051,7 +1051,8 @@ public class BugzillaClient { if (title.indexOf(languageSettings.getLogin()) != -1 || (title.indexOf(languageSettings.getInvalid()) != -1 && title.indexOf(languageSettings.getPassword()) != -1) - || title.indexOf(languageSettings.getCheckEmail()) != -1) { + || title.indexOf(languageSettings.getCheckEmail()) != -1 + || (languageSettings.getLogin2() != null && title.indexOf(languageSettings.getLogin2()) != -1)) { authenticated = false; throw new CoreException(new BugzillaStatus(Status.ERROR, BugzillaCorePlugin.PLUGIN_ID, RepositoryStatus.ERROR_REPOSITORY_LOGIN, repositoryUrl.toString(), title)); diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaCorePlugin.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaCorePlugin.java index 30a788e37..af73a4e4d 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaCorePlugin.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaCorePlugin.java @@ -380,8 +380,11 @@ public class BugzillaCorePlugin extends Plugin { private static void setDefaultBugzillaLanguageSettings() { bugzillaLanguageSettings.clear(); - bugzillaLanguageSettings.put("en", new BugzillaLanguageSettings("en", "check e-mail", "comment required", - "invalid", "logged out", "login", "collision", "password", "processed")); + BugzillaLanguageSettings english = new BugzillaLanguageSettings("en", "check e-mail", "comment required", + "invalid", "logged out", "login", "collision", "password", "processed"); + english.setLogin2("log in"); + + bugzillaLanguageSettings.put("en", english); bugzillaLanguageSettings.put("de", new BugzillaLanguageSettings("de", "check e-mail", "Kommentar erforderlich", "UngŸltig", "logged out", "login", "Kollision", "password", "bearbeitet")); diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaLanguageSettings.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaLanguageSettings.java index e751271e2..2d6e5a588 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaLanguageSettings.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaLanguageSettings.java @@ -20,24 +20,26 @@ import java.io.Serializable; public class BugzillaLanguageSettings implements Serializable { - private static final long serialVersionUID = 5181964115189805497L; + private static final long serialVersionUID = 5181964115189805498L; private String languageName = "<unknown>"; private String login; - + + private String login2; + private String invalid; - + private String password; - + private String checkEmail; - + private String midairCollision; - + private String commentRequired; - + private String loggedOut; - + private String processed; public BugzillaLanguageSettings(String languageName, String checkEmail, String commentRequired, String invalid, @@ -125,4 +127,12 @@ public class BugzillaLanguageSettings implements Serializable { public void setProcessed(String processed) { this.processed = processed; } + + public String getLogin2() { + return login2; + } + + public void setLogin2(String login2) { + this.login2 = login2; + } } |