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

[Jeremy Wootten]

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

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.

=== modified file 'libcore/gof-file.c'
--- libcore/gof-file.c	2016-04-14 17:32:32 +0000
+++ libcore/gof-file.c	2016-05-01 18:23:09 +0000
@@ -476,9 +476,10 @@
 
             /* read the display name from the .desktop file (will be overwritten later
              * if it's undefined here) */
-            gchar *custom_display_name = g_key_file_get_string (key_file,
+            gchar *custom_display_name = g_key_file_get_locale_string (key_file,
                                                                 G_KEY_FILE_DESKTOP_GROUP,
                                                                 G_KEY_FILE_DESKTOP_KEY_NAME,
+                                                                NULL,
                                                                 NULL);
 
             /* check if we have a display name now */