diff options
| author | Chyla Zbigniew <chyla@src.gnome.org> | 2001-09-01 05:44:24 +0800 |
|---|---|---|
| committer | Chyla Zbigniew <chyla@src.gnome.org> | 2001-09-01 05:44:24 +0800 |
| commit | 578b942b6a056c6d6e5d42e823b24dd8e5d400e1 (patch) | |
| tree | 42b32dd11d50f77484004213ac188425bba51da8 /shell/e-local-storage.c | |
| parent | 639173be602e469419a73760cdb9c696fdbf693c (diff) | |
| download | gsoc2013-evolution-578b942b6a056c6d6e5d42e823b24dd8e5d400e1.tar.gz gsoc2013-evolution-578b942b6a056c6d6e5d42e823b24dd8e5d400e1.tar.zst gsoc2013-evolution-578b942b6a056c6d6e5d42e823b24dd8e5d400e1.zip | |
Don't convert folder name to UTF-8 manually... (setup_stock_folders): ...
* 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_).
svn path=/trunk/; revision=12546
Diffstat (limited to 'shell/e-local-storage.c')
| -rw-r--r-- | shell/e-local-storage.c | 25 |
1 files changed, 11 insertions, 14 deletions
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"); } |