From c2b8e5ba2fbd8e8c5143a3aaabafd09e5d5de3c9 Mon Sep 17 00:00:00 2001 From: Alain Date: Mon, 14 Oct 2024 12:06:29 -0500 Subject: [PATCH 1/3] fix # --- ...generator.appdata.xml.in => app-generator.metainfo.xml.in} | 0 data/meson.build | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename data/{app-generator.appdata.xml.in => app-generator.metainfo.xml.in} (100%) diff --git a/data/app-generator.appdata.xml.in b/data/app-generator.metainfo.xml.in similarity index 100% rename from data/app-generator.appdata.xml.in rename to data/app-generator.metainfo.xml.in diff --git a/data/meson.build b/data/meson.build index 83921ab..8c1321c 100644 --- a/data/meson.build +++ b/data/meson.build @@ -29,8 +29,8 @@ i18n.merge_file( ) i18n.merge_file( - input: 'app-generator.appdata.xml.in', - output: meson.project_name() + '.appdata.xml', + input: 'app-generator.metainfo.xml.in', + output: meson.project_name() + '.metainfo.xml', po_dir: meson.project_source_root() / 'po' / 'extra', install: true, install_dir: get_option('datadir') / 'metainfo' From 3f0bfa091210d2efa94bf30011b81f5b89e133e2 Mon Sep 17 00:00:00 2001 From: Alain Date: Tue, 15 Oct 2024 17:54:44 -0500 Subject: [PATCH 2/3] fix po files --- po/extra/POTFILES | 2 +- src/Views/Form.vala | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/po/extra/POTFILES b/po/extra/POTFILES index fb735a4..86fb582 100644 --- a/po/extra/POTFILES +++ b/po/extra/POTFILES @@ -1,2 +1,2 @@ -data/app-generator.appdata.xml.in +data/app-generator.metainfo.xml.in data/app-generator.desktop.in \ No newline at end of file diff --git a/src/Views/Form.vala b/src/Views/Form.vala index 6b825f9..bff9787 100644 --- a/src/Views/Form.vala +++ b/src/Views/Form.vala @@ -213,8 +213,8 @@ public class Views.Form : Adw.Bin { set_file_content (new_flatpak_file, "{{PROJECT_NAME}}", project_name); // AppData Files - string appdata_file = GLib.Path.build_filename (project_folder, "data", "{{PROJECT_NAME}}.appdata.xml.in"); - string new_appdata_file = GLib.Path.build_filename (project_folder, "data", project_name + ".appdata.xml.in"); + string appdata_file = GLib.Path.build_filename (project_folder, "data", "{{PROJECT_NAME}}.metainfo.xml.in"); + string new_appdata_file = GLib.Path.build_filename (project_folder, "data", project_name + ".metainfo.xml.in"); rename_file (appdata_file, new_appdata_file); set_file_content (new_appdata_file, "{{APPLICATION_ID}}", application_id); set_file_content (new_appdata_file, "{{PROJECT_NAME}}", project_name); @@ -259,6 +259,10 @@ public class Views.Form : Adw.Bin { set_file_content (new_appdata_file, "{{DEVELOPER_NAME}}", developer_name); set_file_content (new_appdata_file, "{{DEVELOPER_EMAIL}}", developer_email); + // Set Po files + string po_extra_window_file = GLib.Path.build_filename (project_folder, "po", "extra", "POTFILES"); + set_file_content (po_extra_window_file, "{{PROJECT_NAME}}", project_name); + created (project_name_entry.text, location_entry.text); } From 6bc98c783e24660671809e9a03d8755a198ad410 Mon Sep 17 00:00:00 2001 From: Alain Date: Tue, 15 Oct 2024 17:55:54 -0500 Subject: [PATCH 3/3] fix lint --- src/Views/Form.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Views/Form.vala b/src/Views/Form.vala index bff9787..c55306e 100644 --- a/src/Views/Form.vala +++ b/src/Views/Form.vala @@ -262,7 +262,7 @@ public class Views.Form : Adw.Bin { // Set Po files string po_extra_window_file = GLib.Path.build_filename (project_folder, "po", "extra", "POTFILES"); set_file_content (po_extra_window_file, "{{PROJECT_NAME}}", project_name); - + created (project_name_entry.text, location_entry.text); }