Mailer patch looks good, feel free to commit.
Thanks,
Jeff
On Mon, 2001-09-10 at 19:32, Zbigniew Chyla wrote:
>
>
> Just to let you know. I've just commited the attached simple patches.
>
>
> Zbigniew
> ----
>
> Index: components/html-editor/ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/gtkhtml/components/html-editor/ChangeLog,v
> retrieving revision 1.264
> diff -u -r1.264 ChangeLog
> --- components/html-editor/ChangeLog 2001/08/27 19:41:25 1.264
> +++ components/html-editor/ChangeLog 2001/09/10 23:06:08
> @@ -0,0 +1,7 @@
> +2001-09-10 Zbigniew Chyla <[EMAIL PROTECTED]>
> +
> + Fixes #9522
> +
> + * search.c (search_cb): Use e_utf8_gtk_entry_get_text instead of
> + gtk_entry_get_text (we need UTF-8 string).
> +
> Index: components/html-editor/search.c
> ===================================================================
> RCS file: /cvs/gnome/gtkhtml/components/html-editor/search.c,v
> retrieving revision 1.8
> diff -u -r1.8 search.c
> --- components/html-editor/search.c 2001/08/10 22:00:17 1.8
> +++ components/html-editor/search.c 2001/09/10 23:06:08
> @@ -21,6 +21,7 @@
> */
>
> #include <config.h>
> +#include <gal/widgets/e-unicode.h>
> #include "search.h"
> #include "dialog.h"
> #include "htmlengine-search.h"
> @@ -38,9 +39,13 @@
> static void
> search_cb (GtkWidget *but, GtkHTMLSearchDialog *d)
> {
> - html_engine_search (d->html->engine, gtk_entry_get_text (GTK_ENTRY (d->entry)),
> + char *text;
> +
> + text = e_utf8_gtk_entry_get_text (GTK_ENTRY (d->entry));
> + html_engine_search (d->html->engine, text,
> GTK_TOGGLE_BUTTON (d->case_sensitive)->active,
> GTK_TOGGLE_BUTTON (d->backward)->active == 0, d->regular);
> + g_free (text);
> }
>
> static void
> ----
>
> diff -rup --exclude=intl --exclude=po evolution.clean/calendar/ChangeLog
>evolution.my/calendar/ChangeLog
> --- evolution.clean/calendar/ChangeLog Thu Sep 6 10:52:20 2001
> +++ evolution.my/calendar/ChangeLog Sat Sep 8 12:35:51 2001
> @@ -0,0 +1,11 @@
> +2001-09-10 Zbigniew Chyla <[EMAIL PROTECTED]>
> +
> + * gui/print.c
> + (format_date): Convert string generated by strftime to UTF-8.
> + (print_week_view_background): Ditto.
> + (print_month_summary): Ditto.
> + (print_month_small): Use U_() instead of _().
> + (print_day_background): Ditto.
> + (print_todo_details): Ditto.
> + (print_date_label): Convert generated string to UTF-8.
> +
> diff -rup --exclude=intl --exclude=po evolution.clean/calendar/gui/print.c
>evolution.my/calendar/gui/print.c
> --- evolution.clean/calendar/gui/print.c Fri Aug 10 11:22:25 2001
> +++ evolution.my/calendar/gui/print.c Fri Sep 7 12:43:53 2001
> @@ -43,6 +43,7 @@
> #include <libgnomeprint/gnome-printer-dialog.h>
> #include <e-util/e-dialog-widgets.h>
> #include <e-util/e-time-utils.h>
> +#include <e-util/e-unicode-i18n.h>
> #include <gal/widgets/e-unicode.h>
> #include <cal-util/timeutil.h>
> #include "calendar-commands.h"
> @@ -437,6 +438,7 @@ format_date(time_t time, int flags, char
> icaltimezone *zone = get_timezone ();
> char fmt[64];
> struct tm tm;
> + char *utf_str;
>
> tm = *convert_timet_to_struct_tm (time, zone);
>
> @@ -462,6 +464,10 @@ format_date(time_t time, int flags, char
> strcat(fmt, "%Y");
> }
> strftime(buffer, bufflen, fmt, &tm);
> + utf_str = e_utf8_from_locale_string (buffer);
> + strncpy (buffer, utf_str, bufflen - 1);
> + buffer[bufflen - 1] = '\0';
> + g_free (utf_str);
> return buffer;
> }
>
> @@ -546,7 +552,7 @@ print_month_small (GnomePrintContext *pc
> week_start_day = calendar_config_get_week_start_day ();
> weekday = week_start_day;
> for (x = 0; x < 7; x++) {
> - print_text (pc, font_bold, _(daynames[weekday]), ALIGN_CENTER,
> + print_text (pc, font_bold, U_(daynames[weekday]), ALIGN_CENTER,
> left + x * col_width, left + (x + 1) * col_width,
> top, top - row_height * 1.4);
> weekday = (weekday + 1) % 7;
> @@ -756,9 +762,9 @@ print_day_background (GnomePrintContext
> minute = "00";
> } else {
> if (i < 12)
> - minute = _("am");
> + minute = U_("am");
> else
> - minute = _("pm");
> + minute = U_("pm");
>
> hour = i % 12;
> if (hour == 0)
> @@ -1406,7 +1412,7 @@ print_week_view_background (GnomePrintCo
> int day, day_x, day_y, day_h;
> double x1, x2, y1, y2, font_size, fillcolor;
> struct tm tm;
> - char *format_string, buffer[128];
> + char *format_string, buffer[128], *utf_str;
>
> font_size = gnome_font_get_size (font);
>
> @@ -1454,8 +1460,10 @@ print_week_view_background (GnomePrintCo
> }
>
> strftime (buffer, sizeof (buffer), format_string, &tm);
> - print_text (pc, font, buffer, ALIGN_RIGHT,
> + utf_str = e_utf8_from_locale_string (buffer);
> + print_text (pc, font, utf_str, ALIGN_RIGHT,
> x1, x2 - 4, y1 - 2, y1 - 2 - font_size);
> + g_free (utf_str);
> }
> }
>
> @@ -1656,6 +1664,8 @@ print_month_summary (GnomePrintContext *
> y2 = top - font_size * 1.5;
>
> for (col = 0; col < columns; col++) {
> + char *utf_str;
> +
> if (tm.tm_wday == 6 && compress_weekend) {
> strftime (buffer, sizeof (buffer), "%a/", &tm);
> len = strlen (buffer);
> @@ -1671,7 +1681,9 @@ print_month_summary (GnomePrintContext *
> x2 = x1 + cell_width;
>
> print_border (pc, x1, x2, y1, y2, 1.0, -1.0);
> - print_text (pc, font, buffer, ALIGN_CENTER, x1, x2, y1, y2);
> + utf_str = e_utf8_from_locale_string (buffer);
> + print_text (pc, font, utf_str, ALIGN_CENTER, x1, x2, y1, y2);
> + g_free (utf_str);
>
> tm.tm_mday++;
> tm.tm_wday = (tm.tm_wday + 1) % 7;
> @@ -1704,7 +1716,7 @@ print_todo_details (GnomePrintContext *p
> gnome_print_setrgbcolor (pc, 0, 0, 0);
> gnome_print_setlinewidth (pc, 0.0);
>
> - titled_box (pc, _("Tasks"), font_summary, ALIGN_CENTER | ALIGN_BORDER,
> + titled_box (pc, U_("Tasks"), font_summary, ALIGN_CENTER | ALIGN_BORDER,
> &left, &right, &top, &bottom, 1.0);
>
> y = top - 3;
> @@ -2084,7 +2096,7 @@ print_date_label (GnomePrintContext *pc,
> icaltimezone *zone = get_timezone ();
> CalComponentDateTime datetime;
> time_t start = 0, end = 0, complete = 0, due = 0;
> - static char buffer[1024];
> + static char buffer[1024], *utf_text;
>
> cal_component_get_dtstart (comp, &datetime);
> if (datetime.value)
> @@ -2129,8 +2141,10 @@ print_date_label (GnomePrintContext *pc,
> write_label_piece (due, buffer, 1024, _("Due "), NULL);
> }
>
> - print_text_size (pc, 12, buffer, ALIGN_LEFT,
> + utf_text = e_utf8_from_locale_string (buffer);
> + print_text_size (pc, 12, utf_text, ALIGN_LEFT,
> left, right, top, top - 15);
> + g_free (utf_text);
> }
>
> static void
> ----
>
> diff -rup --exclude=intl --exclude=po evolution.clean/mail/ChangeLog
>evolution.my/mail/ChangeLog
> --- evolution.clean/mail/ChangeLog Thu Sep 6 10:52:21 2001
> +++ evolution.my/mail/ChangeLog Sat Sep 8 12:36:06 2001
> @@ -0,0 +1,10 @@
> +2001-09-10 Zbigniew Chyla <[EMAIL PROTECTED]>
> +
> + * mail-config.c
> + (add_shortcut_entry): Marked string for translation.
> + (new_source_created): Ditto.
> +
> + * mail-send-recv.c
> + (format_url): Marked strings for translation.
> + (build_dialogue): Ditto.
> +
> diff -rup --exclude=intl --exclude=po evolution.clean/mail/mail-config.c
>evolution.my/mail/mail-config.c
> --- evolution.clean/mail/mail-config.c Thu Sep 6 10:52:21 2001
> +++ evolution.my/mail/mail-config.c Sat Sep 8 20:04:57 2001
> @@ -48,6 +48,7 @@
> #include <gal/unicode/gunicode.h>
> #include <e-util/e-html-utils.h>
> #include <e-util/e-url.h>
> +#include <e-util/e-unicode-i18n.h>
> #include "mail.h"
> #include "mail-config.h"
> #include "mail-mt.h"
> @@ -1453,6 +1454,7 @@ add_shortcut_entry (const char *name, co
> GNOME_Evolution_Shortcuts_Group *the_group;
> GNOME_Evolution_Shortcuts_Shortcut *the_shortcut;
> int i, group_num;
> + const char *group_name = U_("Evolution Shortcuts");
>
> if (!global_shell_client)
> return;
> @@ -1480,7 +1482,7 @@ add_shortcut_entry (const char *name, co
> GNOME_Evolution_Shortcuts_Group *iter;
>
> iter = groups->_buffer + i;
> - if (!strcmp (iter->name, "Evolution Shortcuts")) {
> + if (!strcmp (iter->name, group_name)) {
> the_group = iter;
> group_num = i;
> break;
> @@ -1493,7 +1495,7 @@ add_shortcut_entry (const char *name, co
>
> GNOME_Evolution_Shortcuts_addGroup (shortcuts_interface,
> group_num,
> - "Evolution Shortcuts",
> + group_name,
> &ev);
>
> if (ev._major != CORBA_NO_EXCEPTION) {
> @@ -1584,7 +1586,7 @@ new_source_created (MailConfigAccount *a
> * what shortcut to insert?
> */
>
> - name = g_strdup_printf (_("%s: Inbox"), account->name);
> + name = g_strdup_printf (U_("%s: Inbox"), account->name);
> url = g_strdup_printf ("evolution:/%s/INBOX", account->name);
> add_shortcut_entry (name, url, "mail");
> g_free (name);
> diff -rup --exclude=intl --exclude=po evolution.clean/mail/mail-send-recv.c
>evolution.my/mail/mail-send-recv.c
> --- evolution.clean/mail/mail-send-recv.c Tue Sep 4 21:53:02 2001
> +++ evolution.my/mail/mail-send-recv.c Fri Sep 7 14:32:06 2001
> @@ -226,11 +226,11 @@ format_url(const char *internal_url)
>
> url = camel_url_new(internal_url, NULL);
> if (url->host)
> - pretty_url = g_strdup_printf("Server: %s, Type: %s", url->host,
>url->protocol);
> + pretty_url = g_strdup_printf(_("Server: %s, Type: %s"), url->host,
>url->protocol);
> else if (url->path)
> - pretty_url = g_strdup_printf("Path: %s, Type: %s", url->path,
>url->protocol);
> + pretty_url = g_strdup_printf(_("Path: %s, Type: %s"), url->path,
>url->protocol);
> else
> - pretty_url = g_strdup_printf("Type: %s", url->protocol);
> + pretty_url = g_strdup_printf(_("Type: %s"), url->protocol);
>
> camel_url_free(url);
>
> @@ -256,7 +256,7 @@ build_dialogue (GSList *sources, CamelFo
> data = setup_send_data ();
>
> gd = (GnomeDialog *)gnome_dialog_new (_("Send & Receive Mail"), NULL);
> - gnome_dialog_append_button_with_pixmap (gd, "Cancel All",
>GNOME_STOCK_BUTTON_CANCEL);
> + gnome_dialog_append_button_with_pixmap (gd, _("Cancel All"),
>GNOME_STOCK_BUTTON_CANCEL);
>
> gtk_window_set_policy (GTK_WINDOW (gd), FALSE, FALSE, FALSE);
> gnome_window_icon_set_from_file (GTK_WINDOW (gd), EVOLUTION_ICONSDIR
>"/send-receive.xpm");
_______________________________________________
evolution-hackers maillist - [EMAIL PROTECTED]
http://lists.ximian.com/mailman/listinfo/evolution-hackers
