Commit 66a9238e authored by CardBook's avatar CardBook

version 26.5

parent 210b20bb
......@@ -56,12 +56,21 @@ if ("undefined" == typeof(cardbookDates)) {
return aDateString;
} else if (myDate.getFullYear() == "666") {
if (Services.vc.compare(Services.appinfo.version, "57") >= 0) {
if (aTargetDateFormat == "0") {
var formatter = Services.intl.createDateTimeFormat(undefined, { month: "long", day: "numeric", timeZone: "UTC"});
if (Services.vc.compare(Services.appinfo.version, "59") >= 0) {
if (aTargetDateFormat == "0") {
var formatter = new Services.intl.DateTimeFormat(undefined, { month: "long", day: "numeric", timeZone: "UTC"});
} else {
var formatter = new Services.intl.DateTimeFormat(undefined, { month: "short", day: "numeric", timeZone: "UTC"});
}
return formatter.format(myDate);
} else {
var formatter = Services.intl.createDateTimeFormat(undefined, { month: "short", day: "numeric", timeZone: "UTC"});
if (aTargetDateFormat == "0") {
var formatter = Services.intl.createDateTimeFormat(undefined, { month: "long", day: "numeric", timeZone: "UTC"});
} else {
var formatter = Services.intl.createDateTimeFormat(undefined, { month: "short", day: "numeric", timeZone: "UTC"});
}
return formatter.format(myDate);
}
return formatter.format(myDate);
} else {
if (aDateString.startsWith("--") && aSourceDateFormat == "YYYYMMDD") {
aDateString = aDateString.replace(/^--/, "");
......@@ -70,12 +79,21 @@ if ("undefined" == typeof(cardbookDates)) {
}
} else {
if (Services.vc.compare(Services.appinfo.version, "57") >= 0) {
if (aTargetDateFormat == "0") {
var formatter = Services.intl.createDateTimeFormat(undefined, {dateStyle: "long", timeZone: "UTC"});
if (Services.vc.compare(Services.appinfo.version, "59") >= 0) {
if (aTargetDateFormat == "0") {
var formatter = new Services.intl.DateTimeFormat(undefined, {dateStyle: "long", timeZone: "UTC"});
} else {
var formatter = new Services.intl.DateTimeFormat(undefined, {dateStyle: "short", timeZone: "UTC"});
}
return formatter.format(myDate);
} else {
var formatter = Services.intl.createDateTimeFormat(undefined, {dateStyle: "short", timeZone: "UTC"});
if (aTargetDateFormat == "0") {
var formatter = Services.intl.createDateTimeFormat(undefined, {dateStyle: "long", timeZone: "UTC"});
} else {
var formatter = Services.intl.createDateTimeFormat(undefined, {dateStyle: "short", timeZone: "UTC"});
}
return formatter.format(myDate);
}
return formatter.format(myDate);
} else {
var myDateService = Components.classes["@mozilla.org/intl/scriptabledateformat;1"].getService(Components.interfaces.nsIScriptableDateFormat);
if (aTargetDateFormat == "0") {
......
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<!-- needed for Thunderbird 59 -->
<?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
<?xml-stylesheet href="chrome://cardbook-config/skin/cardbookConfiguration.css" type="text/css"?>
<?xml-stylesheet href="chrome://cardbook/skin/cardbookCheckboxes.css" type="text/css"?>
<?xul-overlay href="chrome://cardbook/content/ovl_cardbookStringBundle.xul"?>
......
......@@ -90,7 +90,7 @@ if ("undefined" == typeof(ovl_synchro)) {
prefs.setCharPref("accountsShown", "all");
prefs.setCharPref("uncategorizedCards", "");
prefs.setCharPref("addonVersion", "26.3");
prefs.setCharPref("addonVersion", "26.5");
},
lEventTimerSync : { notify: function(lTimerSync) {
......
......@@ -2945,10 +2945,10 @@ if ("undefined" == typeof(wdw_cardbook)) {
// no need to refresh cards for others syncing dirprefid
if (aParams && aParams.search(/^syncaccountid:/) != -1) {
mySyncAccountId = aParams.replace(/^syncaccountid:/, "");
var mySyncAccountId = aParams.replace(/^syncaccountid:/, "");
var mySyncCondition = (mySyncAccountId == myAccountId || cardbookRepository.cardbookComplexSearchMode == "SEARCH");
} else {
mySyncCondition = true;
var mySyncCondition = true;
}
// for search mode the reselection is done inside their functions
......
......@@ -6,7 +6,7 @@
<Description about="urn:mozilla:install-manifest">
<em:id>cardbook@vigneau.philippe</em:id>
<em:name>CardBook</em:name>
<em:version>26.3</em:version>
<em:version>26.5</em:version>
<em:type>2</em:type>
<em:description>vCard Address Book</em:description>
<em:creator>Philippe Vigneau</em:creator>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment