Fix missing translatable strings

data/resources.gresource.xml

@@ -2,7 +2,6 @@
 <gresources>
   <gresource prefix="/org/gnome/Tour/">
       <file compressed="true" alias="style.css">resources/style.css</file>
-      <file alias="welcome.mp4">resources/assets/welcome.mp4</file>
       <file compressed="true" alias="activities.svg">resources/assets/activities.svg</file>
       <file compressed="true" alias="calendar.svg">resources/assets/calendar.svg</file>
       <file compressed="true" alias="search.svg">resources/assets/search.svg</file>

po/meson.build

-i18n.gettext(gettext_package, preset: 'glib')
+i18n.gettext(
+  gettext_package,
+  args: [
+    '--keyword=i18n_f'
+  ],
+  preset: 'glib'
+)

src/utils.rs

@@ -17,7 +17,7 @@ where
 pub fn i18n_f(format: &str, args: &[&str]) -> String {
     let s = gettext(format);
     let mut parts = s.split("{}");
-    let mut output = parts.next().unwrap_or("").to_string();
+    let mut output = parts.next().unwrap_or_default().to_string();
     for (p, a) in parts.zip(args.iter()) {
         output += &(a.to_string() + &p.to_string());
     }

src/widgets/pages/welcome.rs

 #[cfg(feature = "video")]
 use crate::config;
+use crate::utils::i18n_f;
 use gettextrs::gettext;
 #[cfg(feature = "video")]
 use gio::FileExt;
@@ -140,8 +141,8 @@ impl WelcomePageWidget {
 
         let name = glib::get_os_info("NAME").unwrap_or_else(|| "GNOME".into());
         let version = glib::get_os_info("VERSION").unwrap_or_else(|| "3.36".into());
-
-        let title = gtk::Label::new(Some(&gettext(format!("Welcome to {} {}", name, version))));
+        // Translators: The following string is formated as "Welcome to GNOME 3.36" for example
+        let title = gtk::Label::new(Some(&i18n_f("Welcome to {} {}", &[&name, &version])));
         title.set_margin_top(36);
         title.get_style_context().add_class("large-title");
         title.show();

src/widgets/window.rs

-use crate::utils;
+use crate::utils::i18n_f;
 use gettextrs::gettext;
 use gtk::prelude::*;
 use std::cell::RefCell;
@@ -97,7 +97,8 @@ impl Window {
         let name = glib::get_os_info("NAME").unwrap_or_else(|| "GNOME".into());
         let last_page = ImagePageWidget::new(
             "/org/gnome/Tour/ready-to-go.svg",
-            utils::i18n_f("That's it! We hope that you enjoy {}.", &[&name]),
+            // Translators: The following string is formated as "We hope that you enjoy GNOME"
+            i18n_f("That's it! We hope that you enjoy {}.", &[&name]),
             gettext("To get more advice and tips, see the Help app."),
         );
         last_page.widget.get_style_context().add_class("last-page");