amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-26 08:32:44 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: d3bbadcce7472714c99e523e6d397a87aa65bf5b

Browse Source 
Monotone-Revision: 17441bc6502df80d7fa89d2f1beee98ac6e2c5d9

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-09-14T21:54:19
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-09-14 21:54:19 +00:00
parent e9c31c81c8
commit 321e9b964e
7 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
UI/WebServerResources/MailerUI.js
View File

@@ -207,7 +207,7 @@ function ctxFolderAdd(sender) {
}
function ctxFolderDelete(sender) {
if (!confirm("Delete current folder?").decodeEntities())
if (!confirm("Delete current folder?"))
return false;
// TODO: should use a form-POST or AJAX
@@ -306,10 +306,10 @@ function onMenuDeleteMessage(event) {
function onPrintCurrentMessage(event) {
var rowIds = $("messageList").getSelectedRowsId();
if (rowIds.length == 0) {
window.alert(labels["Please select a message to print."].decodeEntities());
window.alert(labels["Please select a message to print."]);
}
else if (rowIds.length > 1) {
window.alert(labels["Please select only one message to print."].decodeEntities());
window.alert(labels["Please select only one message to print."]);
}
else
window.print();
@@ -489,7 +489,7 @@ function quotasCallback(http) {
var used = mbQuotas["usedSpace"];
var max = mbQuotas["maxQuota"];
var percents = (Math.round(used * 10000 / max) / 100);
var format = labels["quotasFormat"].decodeEntities();
var format = labels["quotasFormat"];
var text = format.formatted(used, max, percents);
window.status = text;
}
@@ -1263,7 +1263,7 @@ function buildMailboxes(accountName, encoded) {
}
function onMenuCreateFolder(event) {
var name = window.prompt(labels["Name :"].decodeEntities(), "");
var name = window.prompt(labels["Name :"], "");
if (name && name.length > 0) {
var folderID = document.menuTarget.getAttribute("dataname");
var urlstr = URLForFolderID(folderID) + "/createFolder?name=" + name;
@@ -1273,7 +1273,7 @@ function onMenuCreateFolder(event) {
function onMenuRenameFolder(event) {
var name = window.prompt(labels["Enter the new name of your folder :"]
.decodeEntities(),
,
"");
if (name && name.length > 0) {
var folderID = document.menuTarget.getAttribute("dataname");
@@ -1283,7 +1283,7 @@ function onMenuRenameFolder(event) {
}
function onMenuDeleteFolder(event) {
var answer = window.confirm(labels["Do you really want to move this folder into the trash ?"].decodeEntities());
var answer = window.confirm(labels["Do you really want to move this folder into the trash ?"]);
if (answer) {
var folderID = document.menuTarget.getAttribute("dataname");
var urlstr = URLForFolderID(folderID) + "/deleteFolder";
@@ -1318,7 +1318,7 @@ function folderOperationCallback(http) {
&& http.status == 204)
initMailboxTree();
else
window.alert(labels["Operation failed"].decodeEntities());
window.alert(labels["Operation failed"]);
}
function folderRefreshCallback(http) {
@@ -1329,7 +1329,7 @@ function folderRefreshCallback(http) {
refreshCurrentFolder();
}
else
window.alert(labels["Operation failed"].decodeEntities());
window.alert(labels["Operation failed"]);
}
function getMenus() {

3
UI/WebServerResources/UIxAclEditor.js
View File

@@ -88,8 +88,7 @@ function subscribeToFolder(refreshCallback, refreshCallbackData) {
refreshCallbackData["folder"]);
}
else
refreshCallbackData["window"].alert(clabels["You cannot subscribe to a folder that you own!"]
.decodeEntities());
refreshCallbackData["window"].alert(clabels["You cannot subscribe to a folder that you own!"]);
}
function openRightsForUserID(userID) {

16
UI/WebServerResources/UIxAppointmentEditor.js
View File

@@ -43,36 +43,36 @@ function validateAptEditor() {
e = $('summary');
if (e.value.length == 0) {
if (!confirm(labels.validate_notitle.decodeEntities()))
if (!confirm(labels.validate_notitle))
return false;
}
e = $('startTime_date');
if (e.value.length != 10) {
alert(labels.validate_invalid_startdate.decodeEntities());
alert(labels.validate_invalid_startdate);
return false;
}
startdate = e.calendar.prs_date(e.value);
if (startdate == null) {
alert(labels.validate_invalid_startdate.decodeEntities());
alert(labels.validate_invalid_startdate);
return false;
}
e = $('endTime_date');
if (e.value.length != 10) {
alert(labels.validate_invalid_enddate.decodeEntities());
alert(labels.validate_invalid_enddate);
return false;
}
enddate = e.calendar.prs_date(e.value);
if (enddate == null) {
alert(labels.validate_invalid_enddate.decodeEntities());
alert(labels.validate_invalid_enddate);
return false;
}
// cuicui = '';
tmpdate = uixEarlierDate(startdate, enddate);
if (tmpdate == enddate) {
// window.alert(cuicui);
alert(labels.validate_endbeforestart.decodeEntities());
alert(labels.validate_endbeforestart);
return false;
}
else if (tmpdate == null /* means: same date */) {
@@ -83,14 +83,14 @@ function validateAptEditor() {
end = parseInt(document.forms[0]['endTime_time_hour'].value);
if (start > end) {
alert(labels.validate_endbeforestart.decodeEntities());
alert(labels.validate_endbeforestart);
return false;
}
else if (start == end) {
start = parseInt(document.forms[0]['startTime_time_minute'].value);
end = parseInt(document.forms[0]['endTime_time_minute'].value);
if (start > end) {
alert(labels.validate_endbeforestart.decodeEntities());
alert(labels.validate_endbeforestart);
return false;
}
}

2
UI/WebServerResources/UIxComponentEditor.js
View File

@@ -24,7 +24,7 @@ function onPopupUrlWindow(event) {
preventDefault(event);
var urlInput = document.getElementById("url");
var newUrl = window.prompt(labels["Target:"].decodeEntities(), urlInput.value);
var newUrl = window.prompt(labels["Target:"], urlInput.value);
if (newUrl != null) {
var documentHref = $("documentHref");
var documentLabel = $("documentLabel");

4
UI/WebServerResources/UIxContactEditor.js
View File

@@ -84,13 +84,13 @@ function validateContactEditor() {
if (e.value.length == 0)
return true;
if (uixEmailRegex.test(e.value) != true)
return confirm(labels.invalidemailwarn.decodeEntities());
return confirm(labels.invalidemailwarn);
e = $('homeMail');
if (e.value.length == 0)
return true;
if (uixEmailRegex.test(e.value) != true)
return confirm(labels.invalidemailwarn.decodeEntities());
return confirm(labels.invalidemailwarn);
return true;
}

3
UI/WebServerResources/UIxMailEditor.js
View File

@@ -133,8 +133,7 @@ function validateEditorInput(sender) {
errortext = errortext + labels.error_missingrecipients + "\n";
if (errortext.length > 0) {
alert(labels.error_validationfailed.decodeEntities() + ":\n"
+ errortext.decodeEntities());
alert(labels.error_validationfailed + ":\n" + errortext);
return false;
}
return true;

10
UI/WebServerResources/UIxTaskEditor.js
View File

@@ -24,7 +24,7 @@ function validateDate(date, label) {
dateValue = date.calendar.prs_date(date.value);
if (date.value.length != 10 || !dateValue) {
alert(label.decodeEntities());
alert(label);
result = false;
} else
result = dateValue;
@@ -37,7 +37,7 @@ function validateTaskEditor() {
e = document.getElementById('summary');
if (e.value.length == 0
&& !confirm(labels.validate_notitle.decodeEntities()))
&& !confirm(labels.validate_notitle))
return false;
e = document.getElementById('startTime_date');
@@ -58,7 +58,7 @@ function validateTaskEditor() {
tmpdate = uixEarlierDate(startdate, enddate);
if (tmpdate == enddate) {
// window.alert(cuicui);
alert(labels.validate_endbeforestart.decodeEntities());
alert(labels.validate_endbeforestart);
return false;
}
else if (tmpdate == null /* means: same date */) {
@@ -69,14 +69,14 @@ function validateTaskEditor() {
end = parseInt(document.forms[0]['dueTime_time_hour'].value);
if (start > end) {
alert(labels.validate_endbeforestart.decodeEntities());
alert(labels.validate_endbeforestart);
return false;
}
else if (start == end) {
start = parseInt(document.forms[0]['startTime_time_minute'].value);
end = parseInt(document.forms[0]['dueTime_time_minute'].value);
if (start > end) {
alert(labels.validate_endbeforestart.decodeEntities());
alert(labels.validate_endbeforestart);
return false;
}
}