Bug 1079189 - Provider for Google Calendar cannot sync tasks - strings only. r=mmecca/redDragon DONTBUILD CLOSED TREE AURORA_BASE_20141128
authorPhilipp Kewisch <mozilla@kewis.ch>
Fri, 28 Nov 2014 14:15:38 +0100
changeset 21376 256a13ac5eb5e9493e18b577e17740ba667936b3
parent 21375 86f1776a4553912b7e99d4411bb6fdd14d2bd171
child 21377 3d3ef8b6c3b38f1e3a69149e65fb672d36d33bfc
push id1274
push usermbanner@mozilla.com
push dateMon, 12 Jan 2015 19:54:49 +0000
treeherdercomm-beta@baea280adc1c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmmecca, redDragon
Bug 1079189 - Provider for Google Calendar cannot sync tasks - strings only. r=mmecca/redDragon DONTBUILD CLOSED TREE
--- a/calendar/locales/en-US/chrome/calendar/providers/gdata/gdata.dtd
+++ b/calendar/locales/en-US/chrome/calendar/providers/gdata/gdata.dtd
@@ -8,9 +8,15 @@
 <!ENTITY gdata.privacy.default.accesskey "D">
 <!ENTITY gdata.migration.title "Migrate read-only calendars">
 <!ENTITY gdata.migration.description "The Provider for Google Calendar has detected that you have existing calendars that are only capable of accessing Google Calendar in read-only mode. If you would like to upgrade any of these calendars, please select them below">
 <!ENTITY gdata.migration.upgrade.label "Upgrade">
 <!ENTITY gdata.migration.upgrade.accesskey "U">
 <!ENTITY gdata.migration.showagain.label "Always check ">
+<!ENTITY gdata.reminder.default "Default Reminder">
 <!ENTITY gdata.reminder.action.sms.label "Send a Text Message">
+<!ENTITY gdata.wizard.session.description "Please pick an existing session or enter your email address to create a new session. You only need one session per account.">
+<!ENTITY gdata.wizard.calendars.description "Please select the calendars and task lists you would like to subscribe to.">
+<!ENTITY gdata.wizard.nextstep.description "Please advance to the next step to set up your calendars.">
--- a/calendar/locales/en-US/chrome/calendar/providers/gdata/gdata.properties
+++ b/calendar/locales/en-US/chrome/calendar/providers/gdata/gdata.properties
@@ -11,10 +11,15 @@
 # *FOR* Google Calendar and not *BY* Google. Also, it was explicitly stated,
 # that the phrase "Google Calendar" should be localized just as it is on the
 # localized versions of the Google Calendar UI.
 # Extension Manager strings
 extensions.{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}.description=Allows bidirectional access to Google Calendar
 extensions.{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}.name=Provider for Google Calendar
-# Dialog strings
-loginDialogTitle=Google Calendar Login
+# Events with only free/busy access don't have a title. Use this instead:
+busyTitle=Busy (%1$S)
+quotaExceeded=The quota for %1$S has been exceeded, please try again later.
+providerOutdated=This version of the provider has expired, please update to the latest version.
+reminderOutOfRange=Google Calendar only allows reminders up to 4 weeks before the event starts.
--- a/calendar/providers/gdata/components/calGoogleUtils.js
+++ b/calendar/providers/gdata/components/calGoogleUtils.js
@@ -106,17 +106,17 @@ function getFormattedString(aBundleName,
  * @param   out aPassword       The password that belongs to the calendar.
  * @param   out aSavePassword   Should the password be saved?
  * @return  Could a password be retrieved?
 function getCalendarCredentials(aCalendarName,
                                 aSavePassword) {
-    return cal.auth.getCredentials(getFormattedString("gdata", "loginDialogTitle"),
+    return cal.auth.getCredentials("Google Calendar",
  * Gets the date and time that Google's http server last sent us. Note the