diff options
| author | Didier Roche <didier.roche@canonical.com> | 2010-09-30 16:33:52 +0200 |
|---|---|---|
| committer | Didier Roche <didier.roche@canonical.com> | 2010-09-30 16:33:52 +0200 |
| commit | 6711dd0a91a65766e62a3c6353a59ecbbe1cd3d1 (patch) | |
| tree | 9055ec0859eae2758117b0b0baf2d5febb666ee2 | |
| parent | ee4d3490ddac50817e8a987b8f93809f79292067 (diff) | |
* Cherry pick from upstream:
- Finally load the right translations from .place files for "Applications" and "Files & Folders" tooltips (LP: #644215) Fixes LP: #644215 (bzr r55.3.206)
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | unity-private/places/places-place.vala | 8 |
2 files changed, 13 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 20c21fc59..448388d46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +unity (0.2.46-0ubuntu3) UNRELEASED; urgency=low + + * Cherry pick from upstream: + - Finally load the right translations from .place files for + "Applications" and "Files & Folders" tooltips (LP: #644215) + + -- Didier Roche <didrocks@ubuntu.com> Thu, 30 Sep 2010 16:11:27 +0200 + unity (0.2.46-0ubuntu2) maverick; urgency=low * Cherry pick from upstream: diff --git a/unity-private/places/places-place.vala b/unity-private/places/places-place.vala index cfafdd14f..c0e02735e 100644 --- a/unity-private/places/places-place.vala +++ b/unity-private/places/places-place.vala @@ -377,9 +377,11 @@ namespace Unity.Places return null; } - name = file.get_locale_string (group, "Name", null); - icon = file.get_locale_string (group, "Icon", null); - desc = file.get_locale_string (group, "Description", null); + var domain = file.get_string (KeyFileDesktop.GROUP, + "X-Ubuntu-Gettext-Domain"); + name = dgettext (domain, file.get_string (group, "Name")); + icon = file.get_string (group, "Icon"); + desc = dgettext (domain, file.get_string (group, "Description")); } catch (Error e) { warning (@"Cannot load entry '$group': %s", e.message); return null; |