Merge lp:~victored/scratch/init-gettext into lp:~elementary-apps/scratch/scratch

[Victor Martinez]

Init Gettext so that Scratch can use its translations.

[Mario Guerriero (mefrio-g)]

Thank you very much for the fix but next time don't forget to make your merge request a bit more visible assigning your branch to the relative bug :)

review: Approve

[Victor Martinez (victored)]

Hey Mario, sorry about that. I was in a hurry when I submitted the proposal :P

=== modified file 'src/Scratch.vala'
--- src/Scratch.vala	2013-05-02 20:27:52 +0000
+++ src/Scratch.vala	2013-05-09 08:55:31 +0000
@@ -72,6 +72,12 @@
         }
 
         public ScratchApp () {
+            // Init internationalization support
+            Intl.setlocale (LocaleCategory.ALL, "");
+            string langpack_dir = Path.build_filename (Constants.INSTALL_PREFIX, "share", "locale");
+            Intl.bindtextdomain (Constants.GETTEXT_PACKAGE, langpack_dir);
+            Intl.bind_textdomain_codeset (Constants.GETTEXT_PACKAGE, "UTF-8");
+            Intl.textdomain (Constants.GETTEXT_PACKAGE);
 
             Logger.initialize ("Scratch");
             Logger.DisplayLevel = LogLevel.DEBUG;

=== modified file 'src/config.vala.cmake'
--- src/config.vala.cmake	2012-11-24 13:46:56 +0000
+++ src/config.vala.cmake	2013-05-09 08:55:31 +0000
@@ -7,6 +7,7 @@
    public const string VERSION = "@VERSION@";
    public const string VERSION_INFO = "@VERSION_INFO@";
    public const string PLUGINDIR = "@PLUGINDIR@";
+   public const string INSTALL_PREFIX = "@CMAKE_INSTALL_PREFIX@";
 
    /* Translatable launcher (.desktop) strings to be added to   */
    /* template (.pot) file. These strings should reflect any    */