[536658] Servers View tooltip typo - plural "1 modules" when single
module
Change-Id: I68ea2a74ad054e584571b129ec800b2a4cbd6943
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/GeneralToolTip.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/GeneralToolTip.java
index 405ca6a..4acc502 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/GeneralToolTip.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/GeneralToolTip.java
@@ -1,5 +1,5 @@
/**********************************************************************
- * Copyright (c) 2007,2012 IBM Corporation and others.
+ * Copyright (c) 2007,2019 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -32,7 +32,11 @@
String s = "";
if (server.getRuntime() != null)
s += server.getRuntime().getName() + " - ";
- s += NLS.bind(Messages.modules, server.getModules().length + "");
+ if (server.getModules().length > 1) {
+ s += NLS.bind(Messages.modules, server.getModules().length + "");
+ } else {
+ s += NLS.bind(Messages.module, server.getModules().length + "");
+ }
text.setText(s);
}
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.java
index dcfc83c..681e7e3 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.java
@@ -1,5 +1,5 @@
/**********************************************************************
- * Copyright (c) 2005, 2016 IBM Corporation and others.
+ * Copyright (c) 2005, 2019 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -352,6 +352,7 @@
public static String clientDefaultDescription;
public static String moduleDecoratorProject;
public static String minutes;
+ public static String module;
public static String modules;
public static String errorStartingMonitor;
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.properties b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.properties
index 2dace5f..158d61e 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.properties
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.properties
@@ -437,6 +437,7 @@
# Used for displaying time (so far only used in tooltip)
minutes={0} minutes
+module={0} module
modules={0} modules
# --------------- Editor support ---------------
