diff options
author | Milan Crha <mcrha@redhat.com> | 2009-01-22 03:30:36 +0800 |
---|---|---|
committer | Milan Crha <mcrha@src.gnome.org> | 2009-01-22 03:30:36 +0800 |
commit | 4b2e8a5ec5ac91f0209a83587c8b81787fff9875 (patch) | |
tree | 81e74ee894b2479e49ed64cb0e2bdc2d98a24bee /addressbook | |
parent | cd893ae5616862e9ecb725408fcadb64c486d823 (diff) | |
download | gsoc2013-evolution-4b2e8a5ec5ac91f0209a83587c8b81787fff9875.tar.gz gsoc2013-evolution-4b2e8a5ec5ac91f0209a83587c8b81787fff9875.tar.zst gsoc2013-evolution-4b2e8a5ec5ac91f0209a83587c8b81787fff9875.zip |
** Fix for bug #362754
2009-01-21 Milan Crha <mcrha@redhat.com>
** Fix for bug #362754
* addressbook/gui/component/addressbook-component.c: (ensure_sources):
* calendar/gui/tasks-component.c: (ensure_sources):
* calendar/gui/memos-component.c: (ensure_sources):
* calendar/gui/calendar-component.c: (ensure_sources):
Ensure to show default groups and sources with actual
localized name, not the one it was stored last time.
svn path=/trunk/; revision=37117
Diffstat (limited to 'addressbook')
-rw-r--r-- | addressbook/ChangeLog | 8 | ||||
-rw-r--r-- | addressbook/gui/component/addressbook-component.c | 13 |
2 files changed, 19 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 2255936197..a47ad53c04 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,11 @@ +2009-01-21 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #362754 + + * gui/component/addressbook-component.c: (ensure_sources): + Ensure to show default groups and sources with actual + localized name, not the one it was stored last time. + 2009-01-11 Matthew Barnes <mbarnes@redhat.com> * gui/widgets/eab-contact-display.c (eab_uri_popup_link_open), diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index bd522b97d3..13c386fbba 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -137,6 +137,9 @@ ensure_sources (AddressbookComponent *component) and too late to prevent user seeing "Can not Open ... because of invalid uri" error.*/ e_source_list_sync (source_list,NULL); } + + /* ensure the group name is in current locale, not read from configuration */ + e_source_group_set_name (on_this_computer, _("On This Computer")); } else { /* create the local source group */ @@ -146,7 +149,10 @@ ensure_sources (AddressbookComponent *component) on_this_computer = group; } - if (!personal_source) { + if (personal_source) { + /* ensure the source name is in current locale, not read from configuration */ + e_source_set_name (personal_source, _("Personal")); + } else { /* Create the default Person addressbook */ ESource *source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI); e_source_group_add_source (on_this_computer, source, -1); @@ -157,7 +163,10 @@ ensure_sources (AddressbookComponent *component) personal_source = source; } - if (!on_ldap_servers) { + if (on_ldap_servers) { + /* ensure the group name is in current locale, not read from configuration */ + e_source_group_set_name (on_ldap_servers, _("On LDAP Servers")); + } else { /* Create the LDAP source group */ group = e_source_group_new (_("On LDAP Servers"), LDAP_BASE_URI); e_source_list_add_group (source_list, group, -1); |