From 230688bf4eeddeef192902188225b3648b01aba6 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Wed, 13 Jan 2016 11:29:41 -0500 Subject: [PATCH] (fix) adjusted JS files regarding translation updates --- UI/WebServerResources/MailerUI.js | 4 ++-- UI/WebServerResources/SOGoRootPage.js | 4 ++-- UI/WebServerResources/SchedulerUI.js | 2 +- UI/WebServerResources/UIxCalViewPrint.js | 20 ++++++++++---------- UI/WebServerResources/UIxPreferences.js | 2 +- UI/WebServerResources/generic.js | 8 ++++---- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index d42e94c9c..d584729cb 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/UI/WebServerResources/MailerUI.js @@ -2414,7 +2414,7 @@ function saveFoldersStateCallback(http) { } function onMenuCreateFolder(event) { - showPromptDialog(_("New Folder..."), _("Name :"), onMenuCreateFolderConfirm); + showPromptDialog(_("New Folder..."), _("Name"), onMenuCreateFolderConfirm); } function onMenuCreateFolderConfirm(event) { @@ -2431,7 +2431,7 @@ function onMenuCreateFolderConfirm(event) { function onMenuRenameFolder(event) { var folderName = document.menuTarget.down('.nodeName').childNodes[0].nodeValue; - showPromptDialog(_("Rename Folder..."), _("Enter the new name of your folder :"), onMenuRenameFolderConfirm, folderName); + showPromptDialog(_("Rename Folder..."), _("Enter the new name of your folder"), onMenuRenameFolderConfirm, folderName); } function onMenuRenameFolderConfirm() { diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js index a2300ee62..5ad4e2961 100644 --- a/UI/WebServerResources/SOGoRootPage.js +++ b/UI/WebServerResources/SOGoRootPage.js @@ -220,7 +220,7 @@ function createPasswordChangeDialog() { createElement("span", "passwordError", null, null, null, fields); var fieldNames = [ "newPassword", "newPassword2" ]; - var fieldLabels = [ _("New password:"), _("Confirmation:") ]; + var fieldLabels = [ _("New password"), _("Confirmation") ]; for (var i = 0; i < fieldNames.length; i++) { var label = createElement("label", null, null, null, null, fields); label.appendChild(document.createTextNode(fieldLabels[i])); @@ -240,7 +240,7 @@ function createPasswordChangeDialog() { var dialog = createDialog("passwordChangeDialog", _("Change your Password"), - _("Your password has expired, please enter a new one below:"), + _("Your password has expired, please enter a new one below"), fields, "right"); diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index 88ad47735..eb6cdcb2f 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -2166,7 +2166,7 @@ function newEventDIV(eventRep, event) { var textDiv = inside.childNodesWithTag("div")[1]; textDiv.appendChild(createElement("br")); var span = createElement("span", null, "location"); - var text = _("Location:") + " " + event[7]; + var text = _("Location") + " " + event[7]; span.update(text); textDiv.appendChild(span); } diff --git a/UI/WebServerResources/UIxCalViewPrint.js b/UI/WebServerResources/UIxCalViewPrint.js index a90fd8803..a48692e98 100644 --- a/UI/WebServerResources/UIxCalViewPrint.js +++ b/UI/WebServerResources/UIxCalViewPrint.js @@ -415,7 +415,7 @@ function newEventDIV(eventRep, event, offset) { var textDiv = inside.childNodesWithTag("div")[1]; textDiv.appendChild(createElement("br")); var span = createElement("span", null, "location"); - var text = _("Location:") + " " + event[7]; + var text = _("Location") + " " + event[7]; span.update(text); textDiv.appendChild(span); } @@ -534,11 +534,11 @@ function appendStyleElement(folderPath, color) { function _parseEvent(event) { // Localized strings : - var start = _("Start:"); - var end = _("End:"); - var location = _("Location:"); - var calendar = _("Calendar:"); - var description = _("Description:"); + var start = _("Start"); + var end = _("End"); + var location = _("Location"); + var calendar = _("Calendar"); + var description = _("Description"); var newEvent = document.createElement("div"); var table = document.createElement("table"); Element.addClassName(newEvent, "divEventsPreview"); @@ -613,9 +613,9 @@ function _parseEvent(event) { function _parseTask(task) { // new code - var end = _("Due Date:"); - var calendar = _("Calendar:"); - var location = _("Location:"); + var end = _("Due Date"); + var calendar = _("Calendar"); + var location = _("Location"); var newTask = document.createElement("div"); var table = document.createElement("table"); @@ -865,7 +865,7 @@ function adjustMultiColumnCalendarHeaderDIV() { else { $("calendarHeader").remove(); $("daysView").remove(); - var htmlText = "
" + _("notice:") + ""+_("Please go ahead and select calendars")+"
"; + var htmlText = "
" + _("notice") + ""+_("Please go ahead and select calendars")+"
"; $("calendarContent").innerHTML = htmlText; } } diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js index 5131074f2..a15e1a933 100644 --- a/UI/WebServerResources/UIxPreferences.js +++ b/UI/WebServerResources/UIxPreferences.js @@ -686,7 +686,7 @@ function onMailIdentitySignatureClick(event) { var dialogId = "signatureDialog"; var dialog = dialogs[dialogId]; if (!dialog) { - var label = _("Please enter your signature below:"); + var label = _("Please enter your signature below"); var fields = createElement("p"); fields.appendChild(createElement("textarea", "signature")); fields.appendChild(createButton("okBtn", _("OK"), diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js index 3b11a8183..62fc3ef12 100644 --- a/UI/WebServerResources/generic.js +++ b/UI/WebServerResources/generic.js @@ -1464,21 +1464,21 @@ function showAlarmCallback(http) { if (http.responseText.length) { var url = http.callbackData; var data = http.responseText.evalJSON(true); - var msg = _("Reminder:") + " " + data["summary"] + "\n"; + var msg = _("Reminder") + " " + data["summary"] + "\n"; if (data["startDate"]) { - msg += _("Start:") + " " + data["startDate"]; + msg += _("Start") + " " + data["startDate"]; if (parseInt(data["isAllDay"]) == 0) msg += " - " + data["startTime"]; msg += "\n"; } if (data["dueDate"]) { - msg += _("Due Date:") + " " + data["dueDate"]; + msg += _("Due Date") + " " + data["dueDate"]; if (data["dueTime"]) msg += " - " + data["dueTime"]; msg += "\n"; } if (data["location"].length) - msg += "\n" + _("Location:") + " " + data["location"]; + msg += "\n" + _("Location") + " " + data["location"]; if (data["description"].length) msg += "\n\n" + data["description"];