diff options
| -rw-r--r-- | widgets/misc/ChangeLog | 5 | ||||
| -rw-r--r-- | widgets/misc/e-calendar-item.c | 4 | ||||
| -rw-r--r-- | widgets/misc/e-dateedit.c | 20 |
3 files changed, 20 insertions, 9 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index a50bbd1dfd..d86cfd08eb 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,8 @@ +2000-09-30 Damon Chaplin <damon@helixcode.com> + + * e-calendar-item.c: + * e-dateedit.c: better i18n of strftime strings. + 2000-09-29 Ettore Perazzoli <ettore@helixcode.com> * e-title-bar.c: New member `pin_gtk_pixmap' in diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c index 78604716f2..e84f24329d 100644 --- a/widgets/misc/e-calendar-item.c +++ b/widgets/misc/e-calendar-item.c @@ -1036,7 +1036,7 @@ e_calendar_item_draw_month (ECalendarItem *calitem, gdk_gc_set_clip_rectangle (fg_gc, &clip_rect); /* This is a strftime() format. %B = Month name, %Y = Year. */ - strftime (buffer, 64, _("%B %Y"), &tmp_tm); + strftime (buffer, sizeof (buffer), _("%B %Y"), &tmp_tm); /* Ideally we place the text centered in the month, but we won't go to the left of the minimum x position. */ @@ -2668,7 +2668,7 @@ e_calendar_item_show_popup_menu (ECalendarItem *calitem, tmp_tm.tm_isdst = -1; mktime (&tmp_tm); /* This is a strftime() format. %B = Month name, %Y = Year. */ - strftime (buffer, 64, _("%B %Y"), &tmp_tm); + strftime (buffer, sizeof (buffer), _("%B %Y"), &tmp_tm); menuitem = gtk_menu_item_new_with_label (buffer); gtk_widget_show (menuitem); diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index 6e61e11e93..1c4617491e 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -632,9 +632,11 @@ e_date_edit_get_time (EDateEdit *dedit) time_text = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (priv->time_combo)->entry)); if (priv->use_24_hour_format) - format = "%H:%M"; + /* This is a strptime() format. %H = hour (0-23), %M = minute. */ + format = _("%H:%M"); else - format = "%I:%M %p"; + /* This is a strptime() format. %I = hour (1-12), %M = minute, %p = am/pm string. */ + format = _("%I:%M %p"); if (!strptime (time_text, format, &time_tm)) return -2; @@ -657,7 +659,7 @@ e_date_edit_parse_date (EDateEdit *dedit, struct tm *tmp_tm; time_t t; - /* This is a stpftime() format for a short date. %m = month, + /* This is a strptime() format for a short date. %m = month, %d = day of month, %Y = year (all digits). */ if (!strptime (date_text, _("%m/%d/%Y"), date_tm)) return FALSE; @@ -720,9 +722,11 @@ e_date_edit_set_time (EDateEdit *dedit, time_t the_time) /* Set the time */ if (priv->use_24_hour_format) - format = "%H:%M"; + /* This is a strftime() format. %H = hour (0-23), %M = minute. */ + format = _("%H:%M"); else - format = "%I:%M %p"; + /* This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string. */ + format = _("%I:%M %p"); strftime (buffer, sizeof (buffer), format, mytm); gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->time_combo)->entry), @@ -975,9 +979,11 @@ rebuild_time_popup (EDateEdit *dedit) tmp_tm.tm_min = min; if (priv->use_24_hour_format) - format = "%H:%M"; + /* This is a strftime() format. %H = hour (0-23), %M = minute. */ + format = _("%H:%M"); else - format = "%I:%M %p"; + /* This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string. */ + format = _("%I:%M %p"); strftime (buffer, sizeof (buffer), format, &tmp_tm); |