diff options
| -rw-r--r-- | shell/ChangeLog | 14 | ||||
| -rw-r--r-- | shell/e-local-storage.c | 25 | ||||
| -rw-r--r-- | shell/e-storage-set-view.c | 9 | ||||
| -rw-r--r-- | shell/e-summary-storage.c | 4 |
4 files changed, 33 insertions, 19 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 61b4d54dcc..5cede21be0 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,17 @@ +2001-08-31 Zbigniew Chyla <cyba@gnome.pl> + + * e-local-storage.c + (setup_folder_as_stock): Don't convert folder name to UTF-8 manually... + (setup_stock_folders): ... just use U_() here. + (impl_get_display_name): Marked string for translation (with U_). + + * e-storage-set-view.c + (storage_sort_callback): s/strcasecmp/g_utf8_collate/ + (folder_sort_callback): ditto + + * e-summary-storage.c (impl_get_display_name): + Marked string for translation (with U_). + 2001-08-29 Iain Holmes <iain@ximian.com> * e-local-storage.c (notify_listener): Function to create CORBAany diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c index 0006be090d..c3c73954c8 100644 --- a/shell/e-local-storage.c +++ b/shell/e-local-storage.c @@ -49,6 +49,7 @@ #include <gal/util/e-util.h> #include <gal/widgets/e-unicode.h> #include "e-util/e-path.h" +#include "e-util/e-unicode-i18n.h" #include "e-local-folder.h" #include "evolution-storage.h" @@ -154,16 +155,12 @@ setup_folder_as_stock (ELocalStorage *local_storage, const char *name) { EFolder *folder; - char *utf8_name; folder = e_storage_get_folder (E_STORAGE (local_storage), path); if (folder == NULL) return FALSE; - utf8_name = e_utf8_from_locale_string (name); - e_folder_set_name (folder, utf8_name); - g_free (utf8_name); - + e_folder_set_name (folder, name); e_folder_set_is_stock (folder, TRUE); return TRUE; @@ -172,14 +169,14 @@ setup_folder_as_stock (ELocalStorage *local_storage, static void setup_stock_folders (ELocalStorage *local_storage) { - setup_folder_as_stock (local_storage, "/Calendar", _("Calendar")); - setup_folder_as_stock (local_storage, "/Contacts", _("Contacts")); - setup_folder_as_stock (local_storage, "/Drafts", _("Drafts")); - setup_folder_as_stock (local_storage, "/Inbox", _("Inbox")); - setup_folder_as_stock (local_storage, "/Outbox", _("Outbox")); - setup_folder_as_stock (local_storage, "/Sent", _("Sent")); - setup_folder_as_stock (local_storage, "/Tasks", _("Tasks")); - setup_folder_as_stock (local_storage, "/Trash", _("Trash")); + setup_folder_as_stock (local_storage, "/Calendar", U_("Calendar")); + setup_folder_as_stock (local_storage, "/Contacts", U_("Contacts")); + setup_folder_as_stock (local_storage, "/Drafts", U_("Drafts")); + setup_folder_as_stock (local_storage, "/Inbox", U_("Inbox")); + setup_folder_as_stock (local_storage, "/Outbox", U_("Outbox")); + setup_folder_as_stock (local_storage, "/Sent", U_("Sent")); + setup_folder_as_stock (local_storage, "/Tasks", U_("Tasks")); + setup_folder_as_stock (local_storage, "/Trash", U_("Trash")); } static gboolean @@ -623,7 +620,7 @@ impl_get_name (EStorage *storage) static const char * impl_get_display_name (EStorage *storage) { - return _("Local Folders"); + return U_("Local Folders"); } diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c index 928ebfaf9c..3ebeb14f06 100644 --- a/shell/e-storage-set-view.c +++ b/shell/e-storage-set-view.c @@ -36,6 +36,7 @@ #include <gal/e-table/e-tree-memory-callbacks.h> #include <gal/e-table/e-cell-tree.h> #include <gal/e-table/e-cell-text.h> +#include <gal/unicode/gunicode.h> #include <libgnome/gnome-util.h> @@ -162,15 +163,15 @@ storage_sort_callback (ETreeMemory *etmm, if (path2_local) return 1; - return strcasecmp (e_tree_model_value_at (E_TREE_MODEL (etmm), node1, 0), - e_tree_model_value_at (E_TREE_MODEL (etmm), node2, 0)); + return g_utf8_collate (e_tree_model_value_at (E_TREE_MODEL (etmm), node1, 0), + e_tree_model_value_at (E_TREE_MODEL (etmm), node2, 0)); } static int folder_sort_callback (ETreeMemory *etmm, ETreePath path1, ETreePath path2, gpointer closure) { - return g_strcasecmp (e_tree_model_value_at (E_TREE_MODEL (etmm), path1, 0), - e_tree_model_value_at (E_TREE_MODEL (etmm), path2, 0)); + return g_utf8_collate (e_tree_model_value_at (E_TREE_MODEL (etmm), path1, 0), + e_tree_model_value_at (E_TREE_MODEL (etmm), path2, 0)); } diff --git a/shell/e-summary-storage.c b/shell/e-summary-storage.c index de58b470f5..6d127f8f91 100644 --- a/shell/e-summary-storage.c +++ b/shell/e-summary-storage.c @@ -29,6 +29,8 @@ #include "e-folder.h" +#include "e-util/e-unicode-i18n.h" + #include <gal/util/e-util.h> #include <gtk/gtktypeutils.h> @@ -75,7 +77,7 @@ impl_get_name (EStorage *storage) static const char * impl_get_display_name (EStorage *storage) { - return _("Summary"); + return U_("Summary"); } |