Files

Merge lp:~jeremywootten/pantheon-files/fix-1217214-translate-desktop-files into lp:~elementary-apps/pantheon-files/trunk

  1. fix-1217214-translate-desktop-files
  2. Merge into trunk
Proposed by Jeremy Wootten
Status: Merged
Approved by: Cody Garver
Approved revision: 2133
Merged at revision: 2133
Proposed branch: lp:~jeremywootten/pantheon-files/fix-1217214-translate-desktop-files
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 15 lines (+2/-1)
1 file modified
libcore/gof-file.c (+2/-1)
To merge this branch: bzr merge lp:~jeremywootten/pantheon-files/fix-1217214-translate-desktop-files
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+293484@code.launchpad.net

Commit message

Show translated name for .desktop files if present (lp:1217214)

Description of the change

This branch fixes the custom display name for .desktop files so that the name in the current locale is returned (if the .desktop file contains translated names). Note: At present, the Pantheon Files .desktop file does not contain translations.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libcore/gof-file.c'
2--- libcore/gof-file.c 2016-04-14 17:32:32 +0000
3+++ libcore/gof-file.c 2016-05-01 18:23:09 +0000
4@@ -476,9 +476,10 @@
5
6 /* read the display name from the .desktop file (will be overwritten later
7 * if it's undefined here) */
8- gchar *custom_display_name = g_key_file_get_string (key_file,
9+ gchar *custom_display_name = g_key_file_get_locale_string (key_file,
10 G_KEY_FILE_DESKTOP_GROUP,
11 G_KEY_FILE_DESKTOP_KEY_NAME,
12+ NULL,
13 NULL);
14
15 /* check if we have a display name now */

Subscribers

People subscribed via source and target branches

to all changes: