Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2011-08-16 06:29:15 +0000
committerCode Review2011-08-16 06:29:15 +0000
commite17df54ee93c101302350df01cc5f8b13495aac6 (patch)
tree3b616c62dc1c6796e42ac7f3b7191f42a80fa818
parent521e41c93c6b601e8d1d465b9699986bc8608628 (diff)
parentf251d0bfe9020e038eac123f406f7c121775c63d (diff)
downloadegit-e17df54ee93c101302350df01cc5f8b13495aac6.tar.gz
egit-e17df54ee93c101302350df01cc5f8b13495aac6.tar.xz
egit-e17df54ee93c101302350df01cc5f8b13495aac6.zip
Merge "[reflogView] Externalize strings"
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java12
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/ReflogView.java10
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties4
3 files changed, 22 insertions, 4 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
index 6596541bd5..dea72c50fe 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
@@ -1135,6 +1135,18 @@ public class UIText extends NLS {
public static String RefContentProposal_unknownObject;
/** */
+ public static String ReflogView_ErrorOnOpenCommit;
+
+ /** */
+ public static String ReflogView_FromColumnHeader;
+
+ /** */
+ public static String ReflogView_MessageColumnHeader;
+
+ /** */
+ public static String ReflogView_ToColumnHeader;
+
+ /** */
public static String RefSpecDialog_AutoSuggestCheckbox;
/** */
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/ReflogView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/ReflogView.java
index 58ab77a57a..cec591374c 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/ReflogView.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/ReflogView.java
@@ -133,7 +133,8 @@ public class ReflogView extends ViewPart implements RefsChangedListener {
ColumnViewerToolTipSupport.enableFor(refLogTableTreeViewer);
- TreeViewerColumn fromColum = createColumn(layout, "From", 10, SWT.LEFT); //$NON-NLS-1$
+ TreeViewerColumn fromColum = createColumn(layout,
+ UIText.ReflogView_FromColumnHeader, 10, SWT.LEFT);
fromColum.setLabelProvider(new ColumnLabelProvider() {
@Override
@@ -154,7 +155,8 @@ public class ReflogView extends ViewPart implements RefsChangedListener {
}
});
- TreeViewerColumn toColumn = createColumn(layout, "To", 10, SWT.LEFT); //$NON-NLS-1$
+ TreeViewerColumn toColumn = createColumn(layout,
+ UIText.ReflogView_ToColumnHeader, 10, SWT.LEFT);
toColumn.setLabelProvider(new ColumnLabelProvider() {
@Override
@@ -176,7 +178,7 @@ public class ReflogView extends ViewPart implements RefsChangedListener {
});
TreeViewerColumn messageColumn = createColumn(layout,
- "Message", 50, SWT.LEFT); //$NON-NLS-1$
+ UIText.ReflogView_MessageColumnHeader, 50, SWT.LEFT);
messageColumn.setLabelProvider(new ColumnLabelProvider() {
private ResourceManager resourceManager = new LocalResourceManager(
@@ -232,7 +234,7 @@ public class ReflogView extends ViewPart implements RefsChangedListener {
walk.parseCommit(id)));
}
} catch (IOException e) {
- Activator.logError("Error opening commit", e); //$NON-NLS-1$
+ Activator.logError(UIText.ReflogView_ErrorOnOpenCommit, e);
} finally {
walk.release();
}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
index 4ddf9581e5..de434335a6 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
@@ -391,6 +391,10 @@ RefContentProposal_tag=tag
RefContentProposal_trackingBranch=tracking branch
RefContentProposal_tree=tree
RefContentProposal_unknownObject=locally unknown object
+ReflogView_ErrorOnOpenCommit=Error opening commit
+ReflogView_FromColumnHeader=From
+ReflogView_MessageColumnHeader=Message
+ReflogView_ToColumnHeader=To
RefSpecDialog_AutoSuggestCheckbox=&Automatically suggest a name for the remote tracking branch
RefSpecDialog_DestinationFetchLabel=&Tracking branch:
RefSpecDialog_DestinationPushLabel=&Remote branch:

Back to the top