merge of '36df3bcfd6c56f483f2676ceb6b6757a6506dbb7'

and 'f12c75a72aac13edc9728fe5a656c622487836dd'

Monotone-Parent: 36df3bcfd6c56f483f2676ceb6b6757a6506dbb7
Monotone-Parent: f12c75a72aac13edc9728fe5a656c622487836dd
Monotone-Revision: 0c622c14bea584c75539ec4bf9d8ca29899745ef

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-09-14T22:05:54
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-09-14 22:05:54 +00:00
80 changed files with 1299 additions and 1111 deletions
+9 -9
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();
@@ -492,7 +492,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;
}
@@ -1265,7 +1265,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;
@@ -1275,7 +1275,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");
@@ -1285,7 +1285,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";
@@ -1320,7 +1320,7 @@ function folderOperationCallback(http) {
&& http.status == 204)
initMailboxTree();
else
window.alert(labels["Operation failed"].decodeEntities());
window.alert(labels["Operation failed"]);
}
function folderRefreshCallback(http) {
@@ -1331,7 +1331,7 @@ function folderRefreshCallback(http) {
refreshCurrentFolder();
}
else
window.alert(labels["Operation failed"].decodeEntities());
window.alert(labels["Operation failed"]);
}
function getMenus() {