Merge pull request #46 from ryonakano/setup-l10n

l10n: Fix translation not loaded in Flatpak
ChildishGiant · Dec 2, 2023 · 86045ca · 86045ca
2 parents eda445f + 8cec4e4
commit 86045ca
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/meson.build b/meson.build
@@ -19,6 +19,14 @@ add_project_arguments(
     language: 'vala'
 )
 
+config_data = configuration_data()
+config_data.set_quoted('LOCALEDIR', join_paths(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
+)
 
 # Listing dependencies
 dependencies = [
@@ -35,6 +43,7 @@ subdir ('src')
 # Executable
 executable (
     meson.project_name (),
+    config_file,
     sources,
     dependencies: dependencies,
     install: true

diff --git a/po/POTFILES b/po/POTFILES
@@ -1,3 +1,3 @@
-src/MainWindow.vala
 src/AlertView.vala
 src/Application.vala
+src/MainWindow.vala
diff --git a/src/Application.vala b/src/Application.vala
@@ -28,6 +28,11 @@ public class Mixer.App : Gtk.Application {
     };
 
     construct {
+        Intl.setlocale (LocaleCategory.ALL, "");
+        Intl.bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+        Intl.bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+        Intl.textdomain (GETTEXT_PACKAGE);
+
         add_main_option_entries (OPTIONS);
     }
 

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@;