summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorniko <niko>2012-10-08 22:06:33 (GMT)
committerniko <niko>2012-10-08 22:06:33 (GMT)
commit727721ec6c6de686731bd08d197fcdc8e7fe174f (patch)
tree3d40ee58666b9ea4d6eada439a80eaa6288d116c
parent5c5c52da4c0d64721905ce14ecf8995ca4c399e3 (diff)
downloadsynckolab-727721ec6c6de686731bd08d197fcdc8e7fe174f.tar.gz
fix conflict dialog and working write to imap
-rw-r--r--build.xml2
-rw-r--r--src/chrome/content/synckolab/calendarTools.js10
-rw-r--r--src/chrome/content/synckolab/contactConflictDialog.xul2
-rw-r--r--src/chrome/locale/cs-CZ/synckolab.dtd1
-rw-r--r--src/chrome/locale/de/synckolab.dtd1
-rw-r--r--src/chrome/locale/en-US/synckolab.dtd1
-rw-r--r--src/chrome/locale/fr-FR/synckolab.dtd1
-rw-r--r--src/chrome/locale/hu-HU/synckolab.dtd1
-rw-r--r--src/chrome/locale/it/synckolab.dtd1
-rw-r--r--src/chrome/locale/ja-JP/synckolab.dtd1
-rw-r--r--src/chrome/locale/pl-PL/synckolab.dtd1
11 files changed, 15 insertions, 7 deletions
diff --git a/build.xml b/build.xml
index b7d8f29..7de833b 100644
--- a/build.xml
+++ b/build.xml
@@ -7,7 +7,7 @@
<description>
Sync your contacts with imap
</description>
- <property name="version" value="2.0.3" />
+ <property name="version" value="2.9.0" />
<!-- ================================= target: default ================================= -->
<target name="default" depends="depends" description="Sync your contacts with imap">
diff --git a/src/chrome/content/synckolab/calendarTools.js b/src/chrome/content/synckolab/calendarTools.js
index 4dae1cf..ac75edc 100644
--- a/src/chrome/content/synckolab/calendarTools.js
+++ b/src/chrome/content/synckolab/calendarTools.js
@@ -810,7 +810,7 @@ synckolab.calendarTools.json2event = function (jobj, calendar) {
if (jobj.startDate.dateTime.indexOf(":") === -1) {
// entry date and start date can be handled the same way
synckolab.tools.logMessage("setting all day: " + (syncTasks?"entryDate":"startDate"), synckolab.global.LOG_CAL + synckolab.global.LOG_DEBUG);
- this.setKolabItemProperty(event, syncTasks?"entryDate":"startDate", synckolab.tools.text.string2CalDate(jobj.startDate));
+ this.setKolabItemProperty(event, syncTasks?"entryDate":"startDate", synckolab.tools.text.string2CalDateTime(jobj.startDate));
} else {
// entry date and start date can be handled the same way
synckolab.tools.logMessage("setting: " + (syncTasks?"entryDate":"startDate"), synckolab.global.LOG_CAL + synckolab.global.LOG_DEBUG);
@@ -826,7 +826,7 @@ synckolab.calendarTools.json2event = function (jobj, calendar) {
}
if (jobj.endDate.dateTime.indexOf(":") === -1) {
- cDate = synckolab.tools.text.string2CalDate(jobj.endDate);
+ cDate = synckolab.tools.text.string2CalDateTime(jobj.endDate);
// Kolab uses for 1-day-event:
// startdate = day_x, enddate = day_x
// Sunbird uses for 1-day-event:
@@ -963,17 +963,17 @@ synckolab.calendarTools.json2event = function (jobj, calendar) {
if(jobj.recurrence.untilDate) {
if (recRule.endDate) {
- recRule.endDate = synckolab.tools.text.string2CalDate(jobj.recurrence.untilDate);
+ recRule.endDate = synckolab.tools.text.string2CalDateTime(jobj.recurrence.untilDate);
} else {
// new lighnting
- recRule.untilDate = synckolab.tools.text.string2CalDate(jobj.recurrence.untilDate);
+ recRule.untilDate = synckolab.tools.text.string2CalDateTime(jobj.recurrence.untilDate);
}
}
recInfo.insertRecurrenceItemAt(recRule, 0);
if(jobj.recurrence.exclusion && jobj.recurrence.exclusion.length > 0) {
for(i=0; i < jobj.recurrence.exclusion.length; i++) {
- var exclusionDate = synckolab.tools.text.string2CalDate(jobj.recurrence.exclusion[i]);
+ var exclusionDate = synckolab.tools.text.string2CalDateTime(jobj.recurrence.exclusion[i]);
recInfo.removeOccurrenceAt(exclusionDate);
var exclusion = recInfo.getOccurrenceFor(exclusionDate,true);
recInfo.modifyException(exclusion, true);
diff --git a/src/chrome/content/synckolab/contactConflictDialog.xul b/src/chrome/content/synckolab/contactConflictDialog.xul
index 6bf5580..d0f0823 100644
--- a/src/chrome/content/synckolab/contactConflictDialog.xul
+++ b/src/chrome/content/synckolab/contactConflictDialog.xul
@@ -85,7 +85,7 @@
<radiogroup id="PreferMailFormat" orient="horizontal"/>
</row>
<row id="aimScreenNameBox" hidden="true">
- <label value="&ScreenName.label;"/>
+ <label value="&synckolab.contactConflict.ScreenName.label;"/>
<radiogroup id="AimScreenName" orient="horizontal"/>
</row>
</rows>
diff --git a/src/chrome/locale/cs-CZ/synckolab.dtd b/src/chrome/locale/cs-CZ/synckolab.dtd
index 6ecfd76..f5c27ea 100644
--- a/src/chrome/locale/cs-CZ/synckolab.dtd
+++ b/src/chrome/locale/cs-CZ/synckolab.dtd
@@ -14,6 +14,7 @@
<!ENTITY synckolab.contactConflict.Other.box "Other">
<!ENTITY synckolab.contactConflict.Name.box "Name">
<!ENTITY synckolab.contactConflict.Work.box "Work">
+<!ENTITY synckolab.contactConflict.ScreenName.label "Scren Name">
<!ENTITY synckolab.settings.Account "Účet">
<!ENTITY synckolab.settings.abook "Adresář">
diff --git a/src/chrome/locale/de/synckolab.dtd b/src/chrome/locale/de/synckolab.dtd
index b940540..edfbea0 100644
--- a/src/chrome/locale/de/synckolab.dtd
+++ b/src/chrome/locale/de/synckolab.dtd
@@ -16,6 +16,7 @@
<!ENTITY synckolab.contactConflict.Other.box "Andere">
<!ENTITY synckolab.contactConflict.Name.box "Name">
<!ENTITY synckolab.contactConflict.Work.box "Arbeit">
+<!ENTITY synckolab.contactConflict.ScreenName.label "Chatname">
<!ENTITY synckolab.settings.Account "Konto">
<!ENTITY synckolab.settings.abook "Adressbuch">
diff --git a/src/chrome/locale/en-US/synckolab.dtd b/src/chrome/locale/en-US/synckolab.dtd
index a387a50..2e79a12 100644
--- a/src/chrome/locale/en-US/synckolab.dtd
+++ b/src/chrome/locale/en-US/synckolab.dtd
@@ -14,6 +14,7 @@
<!ENTITY synckolab.contactConflict.Other.box "Other">
<!ENTITY synckolab.contactConflict.Name.box "Name">
<!ENTITY synckolab.contactConflict.Work.box "Work">
+<!ENTITY synckolab.contactConflict.ScreenName.label "Scren Name">
<!ENTITY synckolab.settings.Account "Account">
<!ENTITY synckolab.settings.abook "Address Book">
diff --git a/src/chrome/locale/fr-FR/synckolab.dtd b/src/chrome/locale/fr-FR/synckolab.dtd
index ecf20ad..afaa963 100644
--- a/src/chrome/locale/fr-FR/synckolab.dtd
+++ b/src/chrome/locale/fr-FR/synckolab.dtd
@@ -14,6 +14,7 @@
<!ENTITY synckolab.contactConflict.Other.box "Other">
<!ENTITY synckolab.contactConflict.Name.box "Name">
<!ENTITY synckolab.contactConflict.Work.box "Work">
+<!ENTITY synckolab.contactConflict.ScreenName.label "Scren Name">
<!ENTITY synckolab.settings.Account "Compte">
<!ENTITY synckolab.settings.abook "Carnet d'adresse">
diff --git a/src/chrome/locale/hu-HU/synckolab.dtd b/src/chrome/locale/hu-HU/synckolab.dtd
index f9a9425..5098ce8 100644
--- a/src/chrome/locale/hu-HU/synckolab.dtd
+++ b/src/chrome/locale/hu-HU/synckolab.dtd
@@ -14,6 +14,7 @@
<!ENTITY synckolab.contactConflict.Other.box "Other">
<!ENTITY synckolab.contactConflict.Name.box "Name">
<!ENTITY synckolab.contactConflict.Work.box "Work">
+<!ENTITY synckolab.contactConflict.ScreenName.label "Scren Name">
<!ENTITY synckolab.settings.Account "Felhasználó">
<!ENTITY synckolab.settings.abook "Címjegyzék">
diff --git a/src/chrome/locale/it/synckolab.dtd b/src/chrome/locale/it/synckolab.dtd
index 9769548..bcf7891 100644
--- a/src/chrome/locale/it/synckolab.dtd
+++ b/src/chrome/locale/it/synckolab.dtd
@@ -14,6 +14,7 @@
<!ENTITY synckolab.contactConflict.Other.box "Other">
<!ENTITY synckolab.contactConflict.Name.box "Name">
<!ENTITY synckolab.contactConflict.Work.box "Work">
+<!ENTITY synckolab.contactConflict.ScreenName.label "Scren Name">
<!ENTITY synckolab.settings.Account "Account">
<!ENTITY synckolab.settings.abook "Rubrica">
diff --git a/src/chrome/locale/ja-JP/synckolab.dtd b/src/chrome/locale/ja-JP/synckolab.dtd
index f0bf9fc..995b754 100644
--- a/src/chrome/locale/ja-JP/synckolab.dtd
+++ b/src/chrome/locale/ja-JP/synckolab.dtd
@@ -14,6 +14,7 @@
<!ENTITY synckolab.contactConflict.Other.box "Other">
<!ENTITY synckolab.contactConflict.Name.box "Name">
<!ENTITY synckolab.contactConflict.Work.box "Work">
+<!ENTITY synckolab.contactConflict.ScreenName.label "Scren Name">
<!ENTITY synckolab.settings.Account "アカウント">
<!ENTITY synckolab.settings.abook "アドレス帳">
diff --git a/src/chrome/locale/pl-PL/synckolab.dtd b/src/chrome/locale/pl-PL/synckolab.dtd
index 60d660c..d38c56d 100644
--- a/src/chrome/locale/pl-PL/synckolab.dtd
+++ b/src/chrome/locale/pl-PL/synckolab.dtd
@@ -14,6 +14,7 @@
<!ENTITY synckolab.contactConflict.Other.box "Other">
<!ENTITY synckolab.contactConflict.Name.box "Name">
<!ENTITY synckolab.contactConflict.Work.box "Work">
+<!ENTITY synckolab.contactConflict.ScreenName.label "Scren Name">
<!ENTITY synckolab.settings.Account "Konto">
<!ENTITY synckolab.settings.abook "Książka adresowa">