summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorMaciej Bendkowski2012-07-09 05:06:57 (EDT)
committer Mark Macdonald2012-07-10 10:50:09 (EDT)
commit91d7f699cad5c8b871e511bb7ece41c090c0304d (patch)
tree7dd9664457defd0bc290ef0b357f1f70497fa5d2
parent6595fd60247e825214c3475b9512cc6385cfd336 (diff)
downloadorg.eclipse.orion.client-91d7f699cad5c8b871e511bb7ece41c090c0304d.zip
org.eclipse.orion.client-91d7f699cad5c8b871e511bb7ece41c090c0304d.tar.gz
org.eclipse.orion.client-91d7f699cad5c8b871e511bb7ece41c090c0304d.tar.bz2
Bug 381932 - A few strings on Site Status page unexternalized
-rw-r--r--bundles/org.eclipse.orion.client.core/web/orion/sites/nls/root/messages.js6
-rw-r--r--bundles/org.eclipse.orion.client.core/web/orion/widgets/SiteEditor.js9
-rw-r--r--bundles/org.eclipse.orion.client.core/web/orion/widgets/templates/SiteEditor.html4
3 files changed, 13 insertions, 6 deletions
diff --git a/bundles/org.eclipse.orion.client.core/web/orion/sites/nls/root/messages.js b/bundles/org.eclipse.orion.client.core/web/orion/sites/nls/root/messages.js
index 6ff6d3e..a36950a 100644
--- a/bundles/org.eclipse.orion.client.core/web/orion/sites/nls/root/messages.js
+++ b/bundles/org.eclipse.orion.client.core/web/orion/sites/nls/root/messages.js
@@ -63,5 +63,9 @@ define({
"Move Down": "Move Down",
"HostHint": "HostHint",
"Start": "Start",
- "Stop": "Stop"
+ "Stop": "Stop",
+ "Optional; used to determine the URL where a started site can be accessed." : "Optional; used to determine the URL where a started site can be accessed.",
+ "Changes you make here won't affect the running site." : "Changes you make here won't affect the running site.",
+ "Stopped" : "Stopped",
+ "Started at " : "Started at "
});
diff --git a/bundles/org.eclipse.orion.client.core/web/orion/widgets/SiteEditor.js b/bundles/org.eclipse.orion.client.core/web/orion/widgets/SiteEditor.js
index e617868..b7fd5ee 100644
--- a/bundles/org.eclipse.orion.client.core/web/orion/widgets/SiteEditor.js
+++ b/bundles/org.eclipse.orion.client.core/web/orion/widgets/SiteEditor.js
@@ -70,6 +70,9 @@ dojo.declare("orion.widgets.SiteEditor", [dijit.layout.ContentPane, dijit._Templ
this.mappingsLabelText = messages["Mappings:"];
this.hostHintLabelText = messages["Hostname hint:"];
this.hostingStatusLabelText = messages["Status:"];
+
+ this.hostHintEm = messages["Optional; used to determine the URL where a started site can be accessed."];
+ this.siteStartedWarningEm = messages["Changes you make here won't affect the running site."];
},
postCreate: function() {
@@ -321,11 +324,11 @@ dojo.declare("orion.widgets.SiteEditor", [dijit.layout.ContentPane, dijit._Templ
var hostStatus = this._siteConfiguration.HostingStatus;
if (hostStatus && hostStatus.Status === "started") { //$NON-NLS-0$
dojo.style(this.siteStartedWarning, {display: "block"}); //$NON-NLS-0$
- this.hostingStatus.innerHTML = mUtil.safeText(hostStatus.Status[0].toLocaleUpperCase() + hostStatus.Status.substr(1) + " at "); //$NON-NLS-0$
+ this.hostingStatus.innerHTML = mUtil.safeText(messages["Started at "]);
dojo.create("a", {href: hostStatus.URL, innerHTML: mUtil.safeText(hostStatus.URL), target: "_new"}, this.hostingStatus, "last"); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
- } else {
+ } else if (hostStatus && hostStatus.Status === "stopped") {
dojo.style(this.siteStartedWarning, {display: "none"}); //$NON-NLS-0$
- mUtil.setText(this.hostingStatus, hostStatus.Status[0].toLocaleUpperCase() + hostStatus.Status.substr(1));
+ mUtil.setText(this.hostingStatus, messages["Stopped"]);
}
setTimeout(dojo.hitch(this, function() {
diff --git a/bundles/org.eclipse.orion.client.core/web/orion/widgets/templates/SiteEditor.html b/bundles/org.eclipse.orion.client.core/web/orion/widgets/templates/SiteEditor.html
index 230323f..35254e8 100644
--- a/bundles/org.eclipse.orion.client.core/web/orion/widgets/templates/SiteEditor.html
+++ b/bundles/org.eclipse.orion.client.core/web/orion/widgets/templates/SiteEditor.html
@@ -22,7 +22,7 @@
<td>
<input dojoType="dijit.form.ValidationTextBox" dojoAttachPoint="hostHint" id="${id}_hostHint"
required="false" value="">
- <em>Optional; used to determine the URL where a started site can be accessed.</em>
+ <em>${hostHintEm}</em>
</td>
</tr>
@@ -33,7 +33,7 @@
<td>
<span dojoAttachPoint="hostingStatus"></span>
<span dojoAttachPoint="siteStartedWarning">
- <em>Changes you make here won't affect the running site.</em>
+ <em>${siteStartedWarningEm}</em>
</span>
</td>
</tr>