Correctly setup the locales (#105)

elementary · Jul 20, 2023 · cea7ac6 · cea7ac6
1 parent 433c018
commit cea7ac6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 *~
 build/
+.flatpak-builder/
diff --git a/meson.build b/meson.build
@@ -9,8 +9,18 @@ i18n = import('i18n')
 
 add_global_arguments('-DGETTEXT_PACKAGE="captive-login"', '-DGCR_API_SUBJECT_TO_CHANGE', language:'c')
 
+config_data = configuration_data()
+config_data.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir'))
+config_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
+config_file = configure_file(
+    input: 'src/Config.vala.in',
+    output: '@BASENAME@',
+    configuration: config_data
+)
+
 executable(
     meson.project_name(),
+    config_file,
     'src/Application.vala',
     'src/CaptiveLogin.vala',
     'src/CertButton.vala',

diff --git a/src/Application.vala b/src/Application.vala
@@ -30,6 +30,13 @@ public class Captive.Application : Gtk.Application {
         settings = new Settings ("io.elementary.desktop.capnet-assist");
     }
 
+    construct {
+        Intl.setlocale (LocaleCategory.ALL, "");
+        Intl.bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+        Intl.bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+        Intl.textdomain (GETTEXT_PACKAGE);
+    }
+
     public override void activate () {
         if (!settings.get_boolean ("enabled")) {
             quit ();

diff --git a/src/Config.vala.in b/src/Config.vala.in
@@ -0,0 +1,2 @@
+public const string GETTEXT_PACKAGE = @GETTEXT_PACKAGE@;
+public const string LOCALEDIR = @LOCALEDIR@;