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

See ChangeLog

Browse Source 
Monotone-Parent: 1d50284cefca6f8926df742321e4f938e6a5b91f
Monotone-Revision: bf61903ccf7c6cc0d2ac1b5e7741da7a1e6dd891

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2010-04-05T19:38:43
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2010-04-05 19:38:43 +00:00
parent b54ddf24e9
commit 6069996d9c
3 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+10
View File
@@ -1,3 +1,13 @@
2010-04-05 Ludovic Marcotte <lmarcotte@inverse.ca>
* UI/WebServerResources/SOGoRootPage.js
We now correctly use our rounded value for the
expire value when using ppolicy.
* UI/Contacts/UIxContactEditor.m
We now use URL: in cards w/o a home/work preferred
value as a home URL.
2010-04-02 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/Appointments/SOGoCalendarComponent.m
UI/Contacts/UIxContactEditor.m
+12
View File
@@ -439,6 +439,18 @@
to: [self _simpleValueForType: @"work" inArray: elements]];
[self _setSnapshotValue: @"homeURL"
to: [self _simpleValueForType: @"home" inArray: elements]];
// If we don't have a "work" or "home" URL but we still have
// an URL field present, let's add it to the "home" value
if ([[snapshot objectForKey: @"workURL"] length] == 0 &&
[[snapshot objectForKey: @"homeURL"] length] == 0 &&
[elements count] > 0)
{
[self _setSnapshotValue: @"homeURL"
to: [[elements objectAtIndex: 0] value: 0]];
}
[self _setSnapshotValue: @"calFBURL"
to: [[card uniqueChildWithTag: @"FBURL"] value: 0]];
UI/WebServerResources/SOGoRootPage.js
+4 -4
View File
@@ -302,15 +302,15 @@ function createPasswordExpirationDialog(expire) {
var value, string;
if (expire > 86400) {
value = expire/86400;
value = Math.round(expire/86400);
string = _("days");
}
else if (expire > 3600) {
value = expire/3600;
value = Math.round(expire/3600);
string = _("hours");
}
else if (expire > 60) {
value = expire/60;
value = Math.round(expire/60);
string = _("minutes");
}
else {
@@ -319,7 +319,7 @@ function createPasswordExpirationDialog(expire) {
}
return createDialog("passwordExpirationDialog",
_("Password about to expire"),
_("Your password is going to expire in %{0} %{1}.").formatted(expire, string),
_("Your password is going to expire in %{0} %{1}.").formatted(value, string),
button,
"right");
}