amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-09-21 13:18:34 +00:00
Code Issues Projects Releases Wiki Activity

merge of 'b5081fb240f719d3a1ce2583dff3738a9ceb9d93'

Browse Source 
and 'f3553f7157471c92e062fbcc05707ec8f12c2df5'

Monotone-Parent: b5081fb240f719d3a1ce2583dff3738a9ceb9d93
Monotone-Parent: f3553f7157471c92e062fbcc05707ec8f12c2df5
Monotone-Revision: a91fdc0311ce32c507f4f0c447904b80ca61e876

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-09-29T14:36:59
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2008-09-29 14:36:59 +00:00
parent 08ff1428cc e69d7b4125
commit 342a039ee7
16 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/MailerUI/Dutch.lproj/Localizable.strings
+1 -1
View File
@@ -209,7 +209,7 @@
"Operation failed" = "Operatie mislukt.";
"Quota" = "Quota";
"quotasFormat" = "%{0} van %{1} KB gebruikt (%{2}%)";
"quotasFormat" = "%{0}% van %{1} MB gebruikt";
"Please select a message." = "Selecteer een bericht.";
"Please select a message to print." = "Selecteer een bericht om af te drukken.";
UI/MailerUI/English.lproj/Localizable.strings
+2 -2
View File
@@ -223,8 +223,8 @@
= "Do you really want to move this folder into the trash ?";
"Operation failed" = "Operation failed";
"Quota" = "Quota";
"quotasFormat" = "%{0} used on %{1} Kb (%{2}%)";
"Quota" = "Quota:";
"quotasFormat" = "%{0}% used on %{1} MB";
"Please select a message." = "Please select a message.";
"Please select a message to print." = "Please select a message to print.";
UI/MailerUI/French.lproj/Localizable.strings
+1 -1
View File
@@ -226,7 +226,7 @@
"Operation failed" = "L'opération a échoué.";
"Quota" = "Quota";
"quotasFormat" = "%{0} Ko utilisés sur %{1} (%{2}%)";
"quotasFormat" = "%{0}% utilisé sur %{1} MO";
"Please select a message." = "Veuillez sélectionner un message.";
"Please select a message to print." = "Veuillez sélectionner un message à imprimer.";
UI/MailerUI/German.lproj/Localizable.strings
+1 -1
View File
@@ -209,7 +209,7 @@
"Operation failed" = "L'opération a échoué.";
"Quota" = "Quota";
"quotasFormat" = "%{0} von %{1} KB verwendet (%{2}%)";
"quotasFormat" = "%{0}% von %{1} MB verwendet";
"Please select a message." = "Sie müssen eine Nachricht auswählen.";
"Please select a message to print." = "Sie müssen eine Nachricht zum Drucken auswählen.";
UI/MailerUI/Italian.lproj/Localizable.strings
+1 -1
View File
@@ -232,7 +232,7 @@
"Operation failed" = "Operazione non riuscita";
"Quota" = "Spazio usato";
"quotasFormat" = "%{0} su %{1} Kb (%{2}%)";
"quotasFormat" = "%{0}% usato su %{1} MB";
"Please select a message." = "Per favore seleziona un messaggio.";
"Please select a message to print." = "Per favore seleziona un messaggio da stampare.";
UI/MailerUI/Spanish.lproj/Localizable.strings
+1 -1
View File
@@ -228,7 +228,7 @@
"Operation failed" = "Operación fallida";
"Quota" = "Quotas";
"quotasFormat" = "%{0} de %{1} Kb usados (%{2}%)";
"quotasFormat" = "%{0}% de %{1} MB usados";
"Please select a message." = "Seleccione un mensaje primero.";
"Please select a message to print." = "Seleccione el mensaje que desea imprimir.";
UI/MailerUI/UIxMailAccountActions.m
+11 -8
View File
@@ -134,7 +134,7 @@
NSString *inboxName;
NSUserDefaults *ud;
WOResponse *response;
int quota;
float quota;
ud = [NSUserDefaults standardUserDefaults];
co = [self clientObject];
@@ -143,18 +143,21 @@
folders = [self _jsonFolders: rawFolders];
// Retrieve INBOX quota
quota = [ud integerForKey: @"SOGoSoftQuota"];
quota = [ud floatForKey: @"SOGoSoftQuotaRatio"];
inbox = [co inboxFolderInContext: context];
inboxName = [NSString stringWithFormat: @"/%@", [inbox relativeImap4Name]];
client = [[inbox imap4Connection] client];
infos = [[client getQuotaRoot: [inbox relativeImap4Name]] objectForKey: @"quotas"];
inboxQuota = [infos objectForKey: inboxName];
if (quota > 0 && inboxQuota != nil)
// A soft quota is imposed for all users
inboxQuota = [NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithInt: quota], @"maxQuota",
[inboxQuota objectForKey: @"usedSpace"], @"usedSpace",
nil];
if (quota != 0 && inboxQuota != nil)
{
// A soft quota ration is imposed for all users
quota = quota * [(NSNumber*)[inboxQuota objectForKey: @"maxQuota"] intValue];
inboxQuota = [NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithFloat: (long)(quota+0.5)], @"maxQuota",
[inboxQuota objectForKey: @"usedSpace"], @"usedSpace",
nil];
}
data = [NSDictionary dictionaryWithObjectsAndKeys: folders, @"mailboxes",
inboxQuota, @"quotas",
nil];
UI/MailerUI/UIxMailMainFrame.m
+2 -3
View File
@@ -20,7 +20,6 @@
*/
#import <Foundation/NSEnumerator.h>
#import <Foundation/NSUserDefaults.h>
#import <Foundation/NSValue.h>
#import <NGCards/NGVCard.h>
@@ -150,8 +149,8 @@
- (id <WOActionResults>) composeAction
{
id <SOGoContactObject> contact;
NSArray *accounts, *contactsId;
NSString *firstAccount, *newLocation, *parameters, *folderId, *uid, *email, *n;
NSArray *accounts, *contactsId, *n;
NSString *firstAccount, *newLocation, *parameters, *folderId, *uid, *email;
NSMutableString *fn;
NSEnumerator *uids;
NSMutableArray *addresses;