From 1ae7e9d18d0e5799ad3ad10ba2505aab00844d2e Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 18 Aug 2009 01:55:49 +0000 Subject: [PATCH] Added confirmation message when activating synchronization for a calendar Monotone-Parent: b5a68a922e7dfe7ff0ee88a40ce86bf257337314 Monotone-Revision: 973efc6b7800601981d13f7968d2b1ff1e7e5858 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-08-18T01:55:49 Monotone-Branch: ca.inverse.sogo --- .../BrazilianPortuguese.lproj/Localizable.strings | 1 + UI/Scheduler/Czech.lproj/Localizable.strings | 1 + UI/Scheduler/Dutch.lproj/Localizable.strings | 1 + UI/Scheduler/English.lproj/Localizable.strings | 1 + UI/Scheduler/French.lproj/Localizable.strings | 1 + UI/Scheduler/German.lproj/Localizable.strings | 1 + UI/Scheduler/Hungarian.lproj/Localizable.strings | 1 + UI/Scheduler/Italian.lproj/Localizable.strings | 1 + UI/Scheduler/Russian.lproj/Localizable.strings | 1 + UI/Scheduler/Spanish.lproj/Localizable.strings | 1 + UI/Scheduler/Welsh.lproj/Localizable.strings | 1 + UI/WebServerResources/UIxCalendarProperties.js | 9 ++++++--- 12 files changed, 17 insertions(+), 3 deletions(-) diff --git a/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings b/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings index 9f78b23e6..418ddfdd7 100644 --- a/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings @@ -520,4 +520,5 @@ vtodo_class2 = "(Tarefa Confidencial)"; "tagNotDefined" = "You must specify a tag if you want to synchronize this calendar."; "tagAlreadyExists" = "The tag you specified is already associated to another calendar."; "tagHasChanged" = "If you change your calendar's tag, you'll need to reload the data on your mobile device.\nContinue?"; +"tagWasAdded" = "If you want to synchronize this calendar, you'll need to reload the data on your mobile device.\nContinue?"; "tagWasRemoved" = "If you remove this calendar from synchronization, you'll need to reload the data on your mobile device.\nContinue?"; \ No newline at end of file diff --git a/UI/Scheduler/Czech.lproj/Localizable.strings b/UI/Scheduler/Czech.lproj/Localizable.strings index ad112ee46..573545b2a 100644 --- a/UI/Scheduler/Czech.lproj/Localizable.strings +++ b/UI/Scheduler/Czech.lproj/Localizable.strings @@ -520,4 +520,5 @@ vtodo_class2 = "(Důvěrný úkol)"; "tagNotDefined" = "You must specify a tag if you want to synchronize this calendar."; "tagAlreadyExists" = "The tag you specified is already associated to another calendar."; "tagHasChanged" = "If you change your calendar's tag, you'll need to reload the data on your mobile device.\nContinue?"; +"tagWasAdded" = "If you want to synchronize this calendar, you'll need to reload the data on your mobile device.\nContinue?"; "tagWasRemoved" = "If you remove this calendar from synchronization, you'll need to reload the data on your mobile device.\nContinue?"; \ No newline at end of file diff --git a/UI/Scheduler/Dutch.lproj/Localizable.strings b/UI/Scheduler/Dutch.lproj/Localizable.strings index f1a92d718..54cc80b95 100644 --- a/UI/Scheduler/Dutch.lproj/Localizable.strings +++ b/UI/Scheduler/Dutch.lproj/Localizable.strings @@ -520,4 +520,5 @@ vtodo_class2 = "(Vertrouwelijke taak)"; "tagNotDefined" = "You must specify a tag if you want to synchronize this calendar."; "tagAlreadyExists" = "The tag you specified is already associated to another calendar."; "tagHasChanged" = "If you change your calendar's tag, you'll need to reload the data on your mobile device.\nContinue?"; +"tagWasAdded" = "If you want to synchronize this calendar, you'll need to reload the data on your mobile device.\nContinue?"; "tagWasRemoved" = "If you remove this calendar from synchronization, you'll need to reload the data on your mobile device.\nContinue?"; \ No newline at end of file diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings index 4c7386855..1ef8b5f60 100644 --- a/UI/Scheduler/English.lproj/Localizable.strings +++ b/UI/Scheduler/English.lproj/Localizable.strings @@ -520,4 +520,5 @@ vtodo_class2 = "(Confidential task)"; "tagNotDefined" = "You must specify a tag if you want to synchronize this calendar."; "tagAlreadyExists" = "The tag you specified is already associated to another calendar."; "tagHasChanged" = "If you change your calendar's tag, you'll need to reload the data on your mobile device.\nContinue?"; +"tagWasAdded" = "If you want to synchronize this calendar, you'll need to reload the data on your mobile device.\nContinue?"; "tagWasRemoved" = "If you remove this calendar from synchronization, you'll need to reload the data on your mobile device.\nContinue?"; \ No newline at end of file diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings index 380130e87..32aedd766 100644 --- a/UI/Scheduler/French.lproj/Localizable.strings +++ b/UI/Scheduler/French.lproj/Localizable.strings @@ -520,4 +520,5 @@ vtodo_class2 = "(Tâche confidentielle)"; "tagNotDefined" = "You must specify a tag if you want to synchronize this calendar."; "tagAlreadyExists" = "The tag you specified is already associated to another calendar."; "tagHasChanged" = "If you change your calendar's tag, you'll need to reload the data on your mobile device.\nContinue?"; +"tagWasAdded" = "If you want to synchronize this calendar, you'll need to reload the data on your mobile device.\nContinue?"; "tagWasRemoved" = "If you remove this calendar from synchronization, you'll need to reload the data on your mobile device.\nContinue?"; \ No newline at end of file diff --git a/UI/Scheduler/German.lproj/Localizable.strings b/UI/Scheduler/German.lproj/Localizable.strings index 516e6035c..024eaf4c5 100644 --- a/UI/Scheduler/German.lproj/Localizable.strings +++ b/UI/Scheduler/German.lproj/Localizable.strings @@ -520,4 +520,5 @@ vtodo_class2 = "(Vertrauliche Aufgabe)"; "tagNotDefined" = "You must specify a tag if you want to synchronize this calendar."; "tagAlreadyExists" = "The tag you specified is already associated to another calendar."; "tagHasChanged" = "If you change your calendar's tag, you'll need to reload the data on your mobile device.\nContinue?"; +"tagWasAdded" = "If you want to synchronize this calendar, you'll need to reload the data on your mobile device.\nContinue?"; "tagWasRemoved" = "If you remove this calendar from synchronization, you'll need to reload the data on your mobile device.\nContinue?"; \ No newline at end of file diff --git a/UI/Scheduler/Hungarian.lproj/Localizable.strings b/UI/Scheduler/Hungarian.lproj/Localizable.strings index 568d78d58..58d4814ab 100644 --- a/UI/Scheduler/Hungarian.lproj/Localizable.strings +++ b/UI/Scheduler/Hungarian.lproj/Localizable.strings @@ -520,4 +520,5 @@ vtodo_class2 = "(Bizalmas feladat)"; "tagNotDefined" = "You must specify a tag if you want to synchronize this calendar."; "tagAlreadyExists" = "The tag you specified is already associated to another calendar."; "tagHasChanged" = "If you change your calendar's tag, you'll need to reload the data on your mobile device.\nContinue?"; +"tagWasAdded" = "If you want to synchronize this calendar, you'll need to reload the data on your mobile device.\nContinue?"; "tagWasRemoved" = "If you remove this calendar from synchronization, you'll need to reload the data on your mobile device.\nContinue?"; \ No newline at end of file diff --git a/UI/Scheduler/Italian.lproj/Localizable.strings b/UI/Scheduler/Italian.lproj/Localizable.strings index e025a4092..e3037b2e4 100644 --- a/UI/Scheduler/Italian.lproj/Localizable.strings +++ b/UI/Scheduler/Italian.lproj/Localizable.strings @@ -520,4 +520,5 @@ vtodo_class2 = "(Attività confidenziale)"; "tagNotDefined" = "You must specify a tag if you want to synchronize this calendar."; "tagAlreadyExists" = "The tag you specified is already associated to another calendar."; "tagHasChanged" = "If you change your calendar's tag, you'll need to reload the data on your mobile device.\nContinue?"; +"tagWasAdded" = "If you want to synchronize this calendar, you'll need to reload the data on your mobile device.\nContinue?"; "tagWasRemoved" = "If you remove this calendar from synchronization, you'll need to reload the data on your mobile device.\nContinue?"; \ No newline at end of file diff --git a/UI/Scheduler/Russian.lproj/Localizable.strings b/UI/Scheduler/Russian.lproj/Localizable.strings index 586826f58..16c7647f4 100644 --- a/UI/Scheduler/Russian.lproj/Localizable.strings +++ b/UI/Scheduler/Russian.lproj/Localizable.strings @@ -520,4 +520,5 @@ vtodo_class2 = "(Confidential task)"; "tagNotDefined" = "You must specify a tag if you want to synchronize this calendar."; "tagAlreadyExists" = "The tag you specified is already associated to another calendar."; "tagHasChanged" = "If you change your calendar's tag, you'll need to reload the data on your mobile device.\nContinue?"; +"tagWasAdded" = "If you want to synchronize this calendar, you'll need to reload the data on your mobile device.\nContinue?"; "tagWasRemoved" = "If you remove this calendar from synchronization, you'll need to reload the data on your mobile device.\nContinue?"; \ No newline at end of file diff --git a/UI/Scheduler/Spanish.lproj/Localizable.strings b/UI/Scheduler/Spanish.lproj/Localizable.strings index 0e9f684d2..31e5ea2c5 100644 --- a/UI/Scheduler/Spanish.lproj/Localizable.strings +++ b/UI/Scheduler/Spanish.lproj/Localizable.strings @@ -520,4 +520,5 @@ vtodo_class2 = "(Tarea confidencial)"; "tagNotDefined" = "You must specify a tag if you want to synchronize this calendar."; "tagAlreadyExists" = "The tag you specified is already associated to another calendar."; "tagHasChanged" = "If you change your calendar's tag, you'll need to reload the data on your mobile device.\nContinue?"; +"tagWasAdded" = "If you want to synchronize this calendar, you'll need to reload the data on your mobile device.\nContinue?"; "tagWasRemoved" = "If you remove this calendar from synchronization, you'll need to reload the data on your mobile device.\nContinue?"; \ No newline at end of file diff --git a/UI/Scheduler/Welsh.lproj/Localizable.strings b/UI/Scheduler/Welsh.lproj/Localizable.strings index ef56ada63..00128aca7 100644 --- a/UI/Scheduler/Welsh.lproj/Localizable.strings +++ b/UI/Scheduler/Welsh.lproj/Localizable.strings @@ -520,4 +520,5 @@ vtodo_class2 = "(Tasg gyhoeddus)"; "tagNotDefined" = "You must specify a tag if you want to synchronize this calendar."; "tagAlreadyExists" = "The tag you specified is already associated to another calendar."; "tagHasChanged" = "If you change your calendar's tag, you'll need to perform a slow sync on your mobile device.\nContinue?"; +"tagWasAdded" = "If you want to synchronize this calendar, you'll need to reload the data on your mobile device.\nContinue?"; "tagWasRemoved" = "If you remove this calendar from synchronization, you'll need to perform a slow sync on your mobile device.\nContinue?"; \ No newline at end of file diff --git a/UI/WebServerResources/UIxCalendarProperties.js b/UI/WebServerResources/UIxCalendarProperties.js index d0206a455..12f0c023a 100644 --- a/UI/WebServerResources/UIxCalendarProperties.js +++ b/UI/WebServerResources/UIxCalendarProperties.js @@ -40,9 +40,12 @@ function onOKClick(event) { save = false; } else if (originalTag - && !originalTag.value.blank() - && tag != originalTag.value) - save = confirm(labels["tagHasChanged"]); + && !originalTag.value.blank()) { + if (tag != originalTag.value) + save = confirm(labels["tagHasChanged"]); + } + else + save = confirm(labels["tagWasAdded"]); } else if (originalTag && !originalTag.value.blank())