From 529a6ec2a64129afbea4301e897cfac4e4718121 Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Wed, 30 Apr 2003 19:04:12 +0000 Subject: [PATCH] Fix i18n problems. Patch from Mike Lei at Sun. 2003-04-30 Kjartan Maraas * mime-type-info.c: (mime_type_get_pretty_name_for_server), (get_lang_list): Fix i18n problems. Patch from Mike Lei at Sun. --- capplets/file-types/ChangeLog | 6 ++++++ capplets/file-types/mime-type-info.c | 21 ++++----------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/capplets/file-types/ChangeLog b/capplets/file-types/ChangeLog index e369a1fda..38b390ebc 100644 --- a/capplets/file-types/ChangeLog +++ b/capplets/file-types/ChangeLog @@ -1,3 +1,9 @@ +2003-04-30 Kjartan Maraas + + * mime-type-info.c: (mime_type_get_pretty_name_for_server), + (get_lang_list): Fix i18n problems. Patch from Mike Lei at Sun. + Fixes bug #105700. + 2003-04-29 Kjartan Maraas * mime-type-info.c: (mime_category_info_get_full_name), diff --git a/capplets/file-types/mime-type-info.c b/capplets/file-types/mime-type-info.c index 158bf99b1..e4b7cdcca 100644 --- a/capplets/file-types/mime-type-info.c +++ b/capplets/file-types/mime-type-info.c @@ -599,7 +599,7 @@ mime_type_get_pretty_name_for_server (Bonobo_ServerInfo *server) return display_name; } - return g_strdup_printf ("View as %s", view_as_name); + return g_strdup_printf (_("View as %s"), view_as_name); } static MimeTypeInfo * @@ -678,24 +678,11 @@ static GSList * get_lang_list (void) { GSList *retval; - const char *lang; - char *equal_char; + const GList *l; retval = NULL; - - lang = g_getenv ("LANGUAGE"); - - if (lang == NULL) - lang = g_getenv ("LANG"); - - - if (lang != NULL) { - equal_char = strchr (lang, '='); - if (equal_char != NULL) - lang = equal_char + 1; - - retval = g_slist_prepend (retval, g_strdup (lang)); - } + for (l = gnome_i18n_get_language_list ("LANG") ; l; l = l->next) + retval = g_slist_append (retval, g_strdup ((gchar *)l->data)); return retval; }