{"thread":{"id":"18787","subject":"[EGIT PATCH 2/2] Externalize strings in GitPropertyPage","startedAt":"2009-04-08T15:49:40Z","lastAt":"2009-04-08T15:49:41Z","messageCount":2,"participants":["Robin Rosenberg"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"110838","messageId":"1239205781-28009-1-git-send-email-robin.rosenberg@dewire.com","threadId":"18787","inReplyTo":null,"subject":"[EGIT PATCH 1/2] Make Git property page cope with empty repositories and not yet born branches","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg@dewire.com","sentAt":"2009-04-08T15:49:40Z","receivedAt":"2009-04-08T15:49:40Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>\n---\n .../preferences/GitProjectPropertyPage.java        |    8 +++++++-\n 1 files changed, 7 insertions(+), 1 deletions(-)\n\ndiff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitProjectPropertyPage.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitProjectPropertyPage.java\nindex 4c97cc8..d3afd97 100644\n--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitProjectPropertyPage.java\n+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitProjectPropertyPage.java\n@@ -94,7 +94,13 @@ private void fillValues(Repository repository) throws IOException {\n \n \t\tfinal ObjectId objectId = repository\n \t\t\t\t.resolve(repository.getFullBranch());\n-\t\tid.setText(objectId.name());\n+\t\tif (objectId == null) {\n+\t\t\tif (repository.getAllRefs().size() == 0)\n+\t\t\t\tid.setText(\"None (empty repository)\");\n+\t\t\telse\n+\t\t\t\tid.setText(\"None (unborn branch)\");\n+\t\t} else\n+\t\t\tid.setText(objectId.name());\n \t}\n \n \t/**\n-- \n1.6.2.2.446.gfbdc0\n"},{"id":"110837","messageId":"1239205781-28009-2-git-send-email-robin.rosenberg@dewire.com","threadId":"18787","inReplyTo":"1239205781-28009-1-git-send-email-robin.rosenberg@dewire.com","subject":"[EGIT PATCH 2/2] Externalize strings in GitPropertyPage","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg@dewire.com","sentAt":"2009-04-08T15:49:41Z","receivedAt":"2009-04-08T15:49:41Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>\n---\n .../src/org/spearce/egit/ui/UIText.java            |   21 ++++++++++++++++++++\n .../preferences/GitProjectPropertyPage.java        |   15 +++++++------\n .../src/org/spearce/egit/ui/uitext.properties      |    7 ++++++\n 3 files changed, 36 insertions(+), 7 deletions(-)\n\ndiff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java\nindex 5a1e328..f14eada 100644\n--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java\n+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java\n@@ -98,6 +98,27 @@\n \tpublic static String GitCloneWizard_errorCannotCreate;\n \n \t/** */\n+\tpublic static String GitProjectPropertyPage_LabelBranch;\n+\n+\t/** */\n+\tpublic static String GitProjectPropertyPage_LabelGitDir;\n+\n+\t/** */\n+\tpublic static String GitProjectPropertyPage_LabelId;\n+\n+\t/** */\n+\tpublic static String GitProjectPropertyPage_LabelState;\n+\n+\t/** */\n+\tpublic static String GitProjectPropertyPage_LabelWorkdir;\n+\n+\t/** */\n+\tpublic static String GitProjectPropertyPage_ValueEmptyRepository;\n+\n+\t/** */\n+\tpublic static String GitProjectPropertyPage_ValueUnbornBranch;\n+\n+\t/** */\n \tpublic static String RepositorySelectionPage_sourceSelectionTitle;\n \n \t/** */\ndiff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitProjectPropertyPage.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitProjectPropertyPage.java\nindex d3afd97..79cf60e 100644\n--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitProjectPropertyPage.java\n+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitProjectPropertyPage.java\n@@ -21,6 +21,7 @@\n import org.eclipse.swt.widgets.Text;\n import org.eclipse.ui.dialogs.PropertyPage;\n import org.spearce.egit.core.project.RepositoryMapping;\n+import org.spearce.egit.ui.UIText;\n import org.spearce.jgit.lib.ObjectId;\n import org.spearce.jgit.lib.Repository;\n \n@@ -53,11 +54,11 @@ protected Control createContents(Composite parent) {\n \t\tlayout.verticalSpacing = 0;\n \t\tcomposite.setLayout(layout);\n \n-\t\tgitDir = createLabeledReadOnlyText(composite, \"Git directory:\");\n-\t\tworkDir = createLabeledReadOnlyText(composite, \"Working directory:\");\n-\t\tbranch = createLabeledReadOnlyText(composite, \"Branch:\");\n-\t\tid = createLabeledReadOnlyText(composite, \"Id:\");\n-\t\tstate = createLabeledReadOnlyText(composite, \"Current state:\");\n+\t\tgitDir = createLabeledReadOnlyText(composite, UIText.GitProjectPropertyPage_LabelGitDir);\n+\t\tworkDir = createLabeledReadOnlyText(composite, UIText.GitProjectPropertyPage_LabelWorkdir);\n+\t\tbranch = createLabeledReadOnlyText(composite, UIText.GitProjectPropertyPage_LabelBranch);\n+\t\tid = createLabeledReadOnlyText(composite, UIText.GitProjectPropertyPage_LabelId);\n+\t\tstate = createLabeledReadOnlyText(composite, UIText.GitProjectPropertyPage_LabelState);\n \n \t\t// Get the project that is the source of this property page\n \t\tIProject project = null;\n@@ -96,9 +97,9 @@ private void fillValues(Repository repository) throws IOException {\n \t\t\t\t.resolve(repository.getFullBranch());\n \t\tif (objectId == null) {\n \t\t\tif (repository.getAllRefs().size() == 0)\n-\t\t\t\tid.setText(\"None (empty repository)\");\n+\t\t\t\tid.setText(UIText.GitProjectPropertyPage_ValueEmptyRepository);\n \t\t\telse\n-\t\t\t\tid.setText(\"None (unborn branch)\");\n+\t\t\t\tid.setText(UIText.GitProjectPropertyPage_ValueUnbornBranch);\n \t\t} else\n \t\t\tid.setText(objectId.name());\n \t}\ndiff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties b/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties\nindex 692df5f..1e1a29d 100644\n--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties\n+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties\n@@ -46,6 +46,13 @@ GitCloneWizard_title=Import Git Repository\n GitCloneWizard_jobName=Cloning from {0}\n GitCloneWizard_failed=Git repository clone failed.\n GitCloneWizard_errorCannotCreate=Cannot create directory {0}.\n+GitProjectPropertyPage_LabelBranch=Branch:\n+GitProjectPropertyPage_LabelGitDir=Git directory:\n+GitProjectPropertyPage_LabelId=Id:\n+GitProjectPropertyPage_LabelState=Current state:\n+GitProjectPropertyPage_LabelWorkdir=Working directory:\n+GitProjectPropertyPage_ValueEmptyRepository=None (empty repository)\n+GitProjectPropertyPage_ValueUnbornBranch=None (unborn branch)\n \n RepositorySelectionPage_sourceSelectionTitle=Source Git Repository\n RepositorySelectionPage_sourceSelectionDescription=Enter the location of the source repository.\n-- \n1.6.2.2.446.gfbdc0\n"}]}