Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2005-05-31 14:54:35 +0000
committerMichael Valenta2005-05-31 14:54:35 +0000
commit43a9f86b28f85dfe846c8e227816bc870ed44f6e (patch)
tree0e33164603eaa84d765ef6afae0c35b338110fd4
parentfcbe7cb0c5d74dd64e152caefcd3182a00d9e253 (diff)
downloadeclipse.platform.team-43a9f86b28f85dfe846c8e227816bc870ed44f6e.tar.gz
eclipse.platform.team-43a9f86b28f85dfe846c8e227816bc870ed44f6e.tar.xz
eclipse.platform.team-43a9f86b28f85dfe846c8e227816bc870ed44f6e.zip
Bug 97490 Unexternalized Strings in SubscriberResourceMappingContext
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMessages.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProviderType.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Add.java6
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties1
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OpenChangeSetAction.java5
7 files changed, 13 insertions, 8 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMessages.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMessages.java
index cb0819222..bb90def87 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMessages.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMessages.java
@@ -250,4 +250,6 @@ public class CVSMessages extends NLS {
// load message values from bundle file
NLS.initializeMessages(BUNDLE_NAME, CVSMessages.class);
}
+
+ public static String CVSTeamProviderType_0;
} \ No newline at end of file
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProviderType.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProviderType.java
index 392ab11f1..5da822cdf 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProviderType.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProviderType.java
@@ -35,7 +35,7 @@ public class CVSTeamProviderType extends RepositoryProviderType {
List projectsToShare = new ArrayList();
AutoShareJob() {
- super("Auto-sharing imported CVS projects");
+ super(CVSMessages.CVSTeamProviderType_0);
}
public boolean isQueueEmpty() {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Add.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Add.java
index c5af1a8d5..874b4793e 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Add.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Add.java
@@ -15,10 +15,6 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.osgi.util.NLS;
import org.eclipse.team.internal.ccvs.core.*;
-import org.eclipse.team.internal.ccvs.core.CVSException;
-import org.eclipse.team.internal.ccvs.core.CVSStatus;
-import org.eclipse.team.internal.ccvs.core.ICVSFolder;
-import org.eclipse.team.internal.ccvs.core.ICVSResource;
import org.eclipse.team.internal.ccvs.core.client.listeners.ICommandOutputListener;
import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo;
import org.eclipse.team.internal.ccvs.core.syncinfo.MutableFolderSyncInfo;
@@ -90,7 +86,7 @@ public class Add extends Command {
String serverMessage = getServerMessage(line, location);
if (serverMessage != null) {
- if (serverMessage.indexOf("cvs commit") != -1 && serverMessage.indexOf("add") != -1 && serverMessage.indexOf("permanently") != -1) //$NON-NLS-1$
+ if (serverMessage.indexOf("cvs commit") != -1 && serverMessage.indexOf("add") != -1 && serverMessage.indexOf("permanently") != -1) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
return OK;
if (serverMessage.startsWith("scheduling file") && serverMessage.indexOf("for addition") != -1) //$NON-NLS-1$ //$NON-NLS-2$
return OK;
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
index 8323e89ca..7e827f9d9 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
@@ -61,6 +61,7 @@ CVSProvider_infoMismatch=Provided CVS information does not match that on disk fo
CVSTeamProvider_noFolderInfo=Project {0} does not contain CVS folder meta-information
CVSTeamProvider_invalidResource=Resource {0} is not a child of project {1}
CVSTeamProvider_typesDiffer=Error retrieving remote resource tree. Local and remote resource types differ for {0}
+CVSTeamProviderType_0=Auto-sharing imported CVS projects
CVSTeamProvider_settingKSubst=Setting keyword substitution mode
CVSTeamProvider_cleanLineDelimitersException=Exception occurred while cleaning line delimiters
CVSTeamProvider_changingKeywordComment=*** keyword substitution change ***
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java
index b5283a4ac..1b1c0db7d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java
@@ -982,4 +982,7 @@ public class CVSUIMessages extends NLS {
// load message values from bundle file
NLS.initializeMessages(BUNDLE_NAME, CVSUIMessages.class);
}
+
+ public static String OpenChangeSetAction_0;
+ public static String OpenChangeSetAction_1;
} \ No newline at end of file
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
index ecb96597e..4204ac0f9 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
@@ -818,6 +818,8 @@ CheckoutAsProjectSelectionPage_invalidFolderName=''{0}'' is not a valid folder n
WorkspaceChangeSetCapability_1=New Set
OpenCommitSetAction_20=Open Change in Compare Editor
OpenCommitSetAction_21=Could not determine the repository location of the selected resources
+OpenChangeSetAction_0=[{0}] ({1})
+OpenChangeSetAction_1=CVS Change
WorkspaceChangeSetCapability_2=New Change Set
WorkspaceChangeSetCapability_3=Enter the name and comment for the new change set
CVSChangeSetCollector_4=Retrieving revision histories
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OpenChangeSetAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OpenChangeSetAction.java
index ab2361cc0..bc2e2bfb2 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OpenChangeSetAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OpenChangeSetAction.java
@@ -18,6 +18,7 @@ import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.core.synchronize.*;
import org.eclipse.team.core.synchronize.FastSyncInfoFilter.*;
@@ -157,9 +158,9 @@ class OpenChangeSetAction extends SynchronizeModelAction {
if (set instanceof CheckedInChangeSet) {
CheckedInChangeSet cics = (CheckedInChangeSet)set;
String date = DateFormat.getDateTimeInstance().format(cics.getDate());
- return "[" + cics.getAuthor() + "] (" + date + ")";
+ return NLS.bind(CVSUIMessages.OpenChangeSetAction_0, new String[] {cics.getAuthor(), date});
}
- return "CVS Change";
+ return CVSUIMessages.OpenChangeSetAction_1;
}
private ICVSRepositoryLocation getLocation(SyncInfo info) {

Back to the top