diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2010-07-10 02:51:23 +0200 |
|---|---|---|
| committer | Robin Rosenberg <robin.rosenberg@dewire.com> | 2010-07-10 10:24:37 +0200 |
| commit | d787a82e509bfb908679777c3ad1d8a857470efb (patch) | |
| tree | 8e4aafe1968267851ecab86e7ba6cd49291f501c /org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java | |
| parent | a1492f192207bc20383de02f206a7bdf41064fbb (diff) | |
| download | jgit-d787a82e509bfb908679777c3ad1d8a857470efb.tar.gz jgit-d787a82e509bfb908679777c3ad1d8a857470efb.zip | |
Internationalize RepositoryState descriptions
Change-Id: I104cd62f3e89acf010b1d40a2b08e7f68f63bb85
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java index 0fa2db8e2c..2cf5225793 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java @@ -46,6 +46,7 @@ package org.eclipse.jgit.lib; +import org.eclipse.jgit.JGitText; /** * Important state of the repository that affects what can and cannot bed * done. This is things like unhandled conflicted merges and unfinished rebase. @@ -61,7 +62,7 @@ public enum RepositoryState { public boolean canCheckout() { return true; } public boolean canResetHead() { return true; } public boolean canCommit() { return true; } - public String getDescription() { return "Normal"; } + public String getDescription() { return JGitText.get().repositoryState_normal; } }, /** An unfinished merge. Must resole or reset before continuing normally @@ -70,7 +71,7 @@ public enum RepositoryState { public boolean canCheckout() { return false; } public boolean canResetHead() { return false; } public boolean canCommit() { return false; } - public String getDescription() { return "Conflicts"; } + public String getDescription() { return JGitText.get().repositoryState_conflicts; } }, /** @@ -81,7 +82,7 @@ public enum RepositoryState { public boolean canCheckout() { return true; } public boolean canResetHead() { return true; } public boolean canCommit() { return true; } - public String getDescription() { return "Merged"; } + public String getDescription() { return JGitText.get().repositoryState_merged; } }, /** @@ -91,7 +92,7 @@ public enum RepositoryState { public boolean canCheckout() { return false; } public boolean canResetHead() { return false; } public boolean canCommit() { return true; } - public String getDescription() { return "Rebase/Apply mailbox"; } + public String getDescription() { return JGitText.get().repositoryState_rebaseOrApplyMailbox; } }, /** @@ -101,7 +102,7 @@ public enum RepositoryState { public boolean canCheckout() { return false; } public boolean canResetHead() { return false; } public boolean canCommit() { return true; } - public String getDescription() { return "Rebase"; } + public String getDescription() { return JGitText.get().repositoryState_rebase; } }, /** @@ -111,7 +112,7 @@ public enum RepositoryState { public boolean canCheckout() { return false; } public boolean canResetHead() { return false; } public boolean canCommit() { return true; } - public String getDescription() { return "Apply mailbox"; } + public String getDescription() { return JGitText.get().repositoryState_applyMailbox; } }, /** @@ -121,7 +122,7 @@ public enum RepositoryState { public boolean canCheckout() { return false; } public boolean canResetHead() { return false; } public boolean canCommit() { return true; } - public String getDescription() { return "Rebase w/merge"; } + public String getDescription() { return JGitText.get().repositoryState_rebaseWithMerge; } }, /** @@ -131,7 +132,7 @@ public enum RepositoryState { public boolean canCheckout() { return false; } public boolean canResetHead() { return false; } public boolean canCommit() { return true; } - public String getDescription() { return "Rebase interactive"; } + public String getDescription() { return JGitText.get().repositoryState_rebaseInteractive; } }, /** @@ -147,7 +148,7 @@ public enum RepositoryState { /* Commit during bisect is useful */ public boolean canCommit() { return true; } - public String getDescription() { return "Bisecting"; } + public String getDescription() { return JGitText.get().repositoryState_bisecting; } }; /** |