From 9afa6379424bcd394ade3056fcdc67e85e6e6be8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josip=20Antoli=C5=A1?= <josip.antolis@protonmail.com>
Date: Sun, 5 Dec 2021 00:37:56 +0100
Subject: [PATCH] Various small fixes

Add temp files created by elementary OS' Code editor to gitignore. Fix Colors.vala file name and add the generated config to executable in meson build. Add missing quotes in Application.vala. Rename the Config.vala template file. Fix path typo in POTFILES.
---
 .gitignore                                             | 3 +++
 template/.gitignore                                    | 3 +++
 template/meson.build                                   | 3 ++-
 template/po/POTFILES                                   | 2 +-
 template/src/Application.vala                          | 2 +-
 template/src/Constants/{Config.vala => Config.vala.in} | 0
 6 files changed, 10 insertions(+), 3 deletions(-)
 rename template/src/Constants/{Config.vala => Config.vala.in} (100%)

diff --git a/.gitignore b/.gitignore
index 41eb75d..c5336ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 build/
 builddir/
 .flatpak-builder/
+
+# temp files created by elementary OS code
+*~
diff --git a/template/.gitignore b/template/.gitignore
index 41eb75d..c5336ab 100644
--- a/template/.gitignore
+++ b/template/.gitignore
@@ -1,3 +1,6 @@
 build/
 builddir/
 .flatpak-builder/
+
+# temp files created by elementary OS code
+*~
diff --git a/template/meson.build b/template/meson.build
index 04cacac..908814e 100644
--- a/template/meson.build
+++ b/template/meson.build
@@ -31,7 +31,8 @@ executable(
     'src' / 'Application.vala',
     'src' / 'MainWindow.vala',
     'src' / 'Widgets' / 'HeaderBar.vala',
-    'src' / 'Constants' / 'Colours.vala',
+    'src' / 'Constants' / 'Colors.vala',
+    config_header,
     dependencies: [
       dependency('granite', version: '>=5.2.4'),
       dependency('gtk+-3.0'),
diff --git a/template/po/POTFILES b/template/po/POTFILES
index 37e4aa3..a273afb 100644
--- a/template/po/POTFILES
+++ b/template/po/POTFILES
@@ -1,4 +1,4 @@
 src/Application.vala
-sr/MainWindow.vala
+src/MainWindow.vala
 data/{GITHUB.APP}.desktop.in
 data/{GITHUB.APP}.appdata.xml.in
diff --git a/template/src/Application.vala b/template/src/Application.vala
index 091733a..4a7dece 100644
--- a/template/src/Application.vala
+++ b/template/src/Application.vala
@@ -26,7 +26,7 @@ namespace {APP.NAMESPACE} {
             // Display the app description as the option context summary.
             // The option context summary is displayed above the set of options
             // on the --help screen.
-            set_option_context_summary (_({APP.DESCRIPTION}));
+            set_option_context_summary (_("{APP.DESCRIPTION}"));
 
             // Display the copyright notice as the option context description.
             // The option context description is displayed below the set of options
diff --git a/template/src/Constants/Config.vala b/template/src/Constants/Config.vala.in
similarity index 100%
rename from template/src/Constants/Config.vala
rename to template/src/Constants/Config.vala.in