Always translate literals instead of variables

Makes it much easier to find what needs to be translated.
This commit is contained in:
Samuel Mannehed 2016-10-28 15:38:34 +02:00
parent da88c28714
commit fdb02f8570
2 changed files with 10 additions and 8 deletions

View File

@ -365,7 +365,7 @@ var UI;
var msg;
switch (state) {
case 'connecting':
UI.showStatus("Connecting");
UI.showStatus(Util.Localisation.get("Connecting"));
break;
case 'connected':
UI.connected = true;
@ -377,11 +377,11 @@ var UI;
UI.showStatus(msg);
break;
case 'disconnecting':
UI.showStatus("Disconnecting");
UI.showStatus(Util.Localisation.get("Disconnecting"));
break;
case 'disconnected':
UI.connected = false;
UI.showStatus("Disconnected");
UI.showStatus(Util.Localisation.get("Disconnected"));
break;
default:
msg = "Invalid UI state";
@ -477,7 +477,7 @@ var UI;
break;
}
statusElem.innerHTML = Util.Localisation.get(text);
statusElem.innerHTML = text;
statusElem.classList.add("noVNC_open");
// If no time was specified, show the status for 1.5 seconds
@ -968,7 +968,7 @@ var UI;
}
if ((!host) || (!port)) {
var msg = "Must set host and port";
var msg = Util.Localisation.get("Must set host and port");
Util.Error(msg);
UI.showStatus(msg, 'error');
return;
@ -1234,8 +1234,9 @@ var UI;
// The browser is IE and we are in fullscreen mode.
// - We need to force clipping while in fullscreen since
// scrollbars doesn't work.
var msg = "Forcing clipping mode since scrollbars aren't" +
"supported by IE in fullscreen";
var msg = Util.Localisation.get("Forcing clipping mode since " +
"scrollbars aren't supported " +
"by IE in fullscreen");
Util.Debug(msg);
UI.showStatus(msg);
UI.rememberedClipSetting = UI.getSetting('clip');

View File

@ -265,7 +265,8 @@
this._rfb_path = (path !== undefined) ? path : "";
if (!this._rfb_host || !this._rfb_port) {
return this._fail("Must set host and port");
return this._fail(
Util.Localisation.get("Must set host and port"));
}
this._rfb_init_state = '';