diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 10 | ||||
| -rw-r--r-- | calendar/calendar.error.xml | 3 | ||||
| -rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 4 | ||||
| -rw-r--r-- | calendar/gui/e-calendar-view.c | 2 |
4 files changed, 15 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 7b94fe8694..59dadce6cc 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,13 @@ +2008-02-10 Suman Manjunath <msuman@novell.com> + + ** Fix for bug #510642 + + * gui/dialogs/comp-editor.c: (prompt_and_save_changes), + (menu_file_save_cb): + * gui/e-calendar-view.c: (e_calendar_view_new_appointment_for): + * calendar.error.xml: Improved string for read-only-calendar + error-message. + 2008-02-08 Milan Crha <mcrha@redhat.com> ** Part of fixes for bug #395939 diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml index 95431369af..6a51831d4f 100644 --- a/calendar/calendar.error.xml +++ b/calendar/calendar.error.xml @@ -230,7 +230,8 @@ <error id="prompt-read-only-cal" type="error" default="GTK_RESPONSE_YES"> <_primary>Cannot create a new event</_primary> - <_secondary>You have a read-only calendar source selected. Change to Calendar View and highlight a calendar that can accept appointments.</_secondary> + <!-- For Translators: {0} is the name of the calendar source --> + <_secondary>'{0}' is a read-only calendar source. Switch to Calendar View and highlight a calendar that can accept appointments.</_secondary> <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/> </error> diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 28f2751295..b01667d6dd 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -921,7 +921,7 @@ prompt_and_save_changes (CompEditor *editor, gboolean send) switch (save_component_dialog (GTK_WINDOW(editor), priv->comp)) { case GTK_RESPONSE_YES: /* Save */ if (!e_cal_is_read_only (priv->client, &read_only, NULL) || read_only) { - e_error_run ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal", NULL); + e_error_run ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal", e_source_peek_name (e_cal_get_source (priv->client)), NULL); /* don't discard changes when selected readonly calendar */ return FALSE; } @@ -1296,7 +1296,7 @@ menu_file_save_cb (BonoboUIComponent *uic, } if (!e_cal_is_read_only (priv->client, &read_only, NULL) || read_only) { - e_error_run ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal", NULL); + e_error_run ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal", e_source_peek_name (e_cal_get_source (priv->client)), NULL); return; } diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 9f01ffa0b6..c1845eb992 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -1822,7 +1822,7 @@ e_calendar_view_new_appointment_for (ECalendarView *cal_view, if (e_cal_is_read_only (default_client, &readonly, NULL) && readonly) { GtkWidget *widget; - widget = e_error_new (NULL, "calendar:prompt-read-only-cal", NULL); + widget = e_error_new (NULL, "calendar:prompt-read-only-cal", e_source_peek_name (e_cal_get_source (default_client)), NULL); g_signal_connect ((GtkDialog *)widget, "response", G_CALLBACK (gtk_widget_destroy), widget); |