aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/itip-formatter/ChangeLog9
-rw-r--r--plugins/itip-formatter/itip-formatter.c4
-rw-r--r--plugins/itip-formatter/itip-view.c72
3 files changed, 48 insertions, 37 deletions
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index 535a805b23..5dcf189e70 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,12 @@
+2005-01-26 JP Rosevear <jpr@novell.com>
+
+ Fixes #71485
+
+ * itip-formatter.c (update_attendee_status): fix message paste-o
+
+ * itip-view.c (format_date_and_time_x): improve translator
+ comments
+
2005-01-25 JP Rosevear <jpr@novell.com>
* itip-formatter.c (pitip_free): actually destroy the client
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index a11efc561f..52351ff8d6 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -826,14 +826,14 @@ update_attendee_status (FormatItipPObject *pitip)
goto cleanup;
} else {
change_status (icalcomp, itip_strip_mailto (a->value), a->status);
- e_cal_component_rescan (comp);
+ e_cal_component_rescan (comp);
}
}
}
if (!e_cal_modify_object (pitip->current_ecal, icalcomp, CALOBJ_MOD_ALL, &error)) {
itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
- _("Unable to update attendee statusAttendee status updated. %s"), error->message);
+ _("Unable to update attendee. %s"), error->message);
g_error_free (error);
} else {
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 1a0397bb6a..e531a4201f 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -146,21 +146,21 @@ format_date_and_time_x (struct tm *date_tm,
format = _("Today");
} else if (use_24_hour_format) {
if (!show_zero_seconds && date_tm->tm_sec == 0)
- /* strftime format of a weekday, a date and a
- time, in 24-hour format, without seconds. */
+ /* strftime format of a time,
+ in 24-hour format, without seconds. */
format = _("Today %H:%M");
else
- /* strftime format of a weekday, a date and a
- time, in 24-hour format. */
+ /* strftime format of a time,
+ in 24-hour format. */
format = _("Today %H:%M:%S");
} else {
if (!show_zero_seconds && date_tm->tm_sec == 0)
- /* strftime format of a weekday, a date and a
- time, in 12-hour format, without seconds. */
+ /* strftime format of a time,
+ in 12-hour format, without seconds. */
format = _("Today %l:%M %p");
else
- /* strftime format of a weekday, a date and a
- time, in 12-hour format. */
+ /* strftime format of a time,
+ in 12-hour format. */
format = _("Today %l:%M:%S %p");
}
@@ -169,49 +169,49 @@ format_date_and_time_x (struct tm *date_tm,
if (!show_midnight && date_tm->tm_hour == 0
&& date_tm->tm_min == 0 && date_tm->tm_sec == 0) {
/* strftime format of a weekday and a date. */
- format = _("%A, %B %e");
+ format = _("Tomorrow");
} else if (use_24_hour_format) {
if (!show_zero_seconds && date_tm->tm_sec == 0)
- /* strftime format of a weekday, a date and a
- time, in 24-hour format, without seconds. */
- format = _("%A, %B %e %H:%M");
+ /* strftime format of a time,
+ in 24-hour format, without seconds. */
+ format = _("Tomorrow %H:%M");
else
- /* strftime format of a weekday, a date and a
- time, in 24-hour format. */
- format = _("%A, %B %e %H:%M:%S");
+ /* strftime format of a time,
+ in 24-hour format. */
+ format = _("Tomorrow %H:%M:%S");
} else {
if (!show_zero_seconds && date_tm->tm_sec == 0)
- /* strftime format of a weekday, a date and a
- time, in 12-hour format, without seconds. */
- format = _("%A, %B %e %l:%M %p");
+ /* strftime format of a time,
+ in 12-hour format, without seconds. */
+ format = _("Tomorrow %l:%M %p");
else
- /* strftime format of a weekday, a date and a
- time, in 12-hour format. */
- format = _("%A, %B %e %l:%M:%S %p");
+ /* strftime format of a time,
+ in 12-hour format. */
+ format = _("Tomorrow %l:%M:%S %p");
}
/* Within 7 days */
} else if (date_tm->tm_year == current_tm->tm_year) {
if (!show_midnight && date_tm->tm_hour == 0
&& date_tm->tm_min == 0 && date_tm->tm_sec == 0) {
- /* strftime format of a weekday and a date. */
+ /* strftime format of a weekday. */
format = _("%A");
} else if (use_24_hour_format) {
if (!show_zero_seconds && date_tm->tm_sec == 0)
- /* strftime format of a weekday, a date and a
+ /* strftime format of a weekday and a
time, in 24-hour format, without seconds. */
format = _("%A %H:%M");
else
- /* strftime format of a weekday, a date and a
+ /* strftime format of a weekday and a
time, in 24-hour format. */
format = _("%A %H:%M:%S");
} else {
if (!show_zero_seconds && date_tm->tm_sec == 0)
- /* strftime format of a weekday, a date and a
+ /* strftime format of a weekday and a
time, in 12-hour format, without seconds. */
format = _("%A %l:%M %p");
else
- /* strftime format of a weekday, a date and a
+ /* strftime format of a weekday and a
time, in 12-hour format. */
format = _("%A %l:%M:%S %p");
}
@@ -220,25 +220,27 @@ format_date_and_time_x (struct tm *date_tm,
} else if (date_tm->tm_year == current_tm->tm_year) {
if (!show_midnight && date_tm->tm_hour == 0
&& date_tm->tm_min == 0 && date_tm->tm_sec == 0) {
- /* strftime format of a weekday and a date. */
+ /* strftime format of a weekday and a date
+ without a year. */
format = _("%A, %B %e");
} else if (use_24_hour_format) {
if (!show_zero_seconds && date_tm->tm_sec == 0)
- /* strftime format of a weekday, a date and a
- time, in 24-hour format, without seconds. */
+ /* strftime format of a weekday, a date
+ without a year and a time,
+ in 24-hour format, without seconds. */
format = _("%A, %B %e %H:%M");
else
- /* strftime format of a weekday, a date and a
- time, in 24-hour format. */
+ /* strftime format of a weekday, a date without a year
+ and a time, in 24-hour format. */
format = _("%A, %B %e %H:%M:%S");
} else {
if (!show_zero_seconds && date_tm->tm_sec == 0)
- /* strftime format of a weekday, a date and a
- time, in 12-hour format, without seconds. */
+ /* strftime format of a weekday, a date without a year
+ and a time, in 12-hour format, without seconds. */
format = _("%A, %B %e %l:%M %p");
else
- /* strftime format of a weekday, a date and a
- time, in 12-hour format. */
+ /* strftime format of a weekday, a date without a year
+ and a time, in 12-hour format. */
format = _("%A, %B %e %l:%M:%S %p");
}
} else {
generated by cgit (git 2.34.1) at 2024-11-13 21:05:22 +0800