Initial machinery to have friendly strings respecting plurals

Author: teamcons

src/Objects/Reminder.vala

@@ -22,34 +22,25 @@ namespace Reminduck {
         EVERY_MONTH,
         NONE;
 
-        public string to_friendly_string (int? interval = null) {
+        public string to_friendly_string (int? interval = 0) {
             switch (this) {
                 case NONE: return _("Don't Repeat");
-
-                case EVERY_X_MINUTES:
-                    if (interval == null || interval == 0) {
-                        return _("Minutes");
-                    } else {
-                        return GLib.ngettext ("Every minute", "Every %d minutes", interval).printf (interval);
-                    }
-
-                case EVERY_X_HOURS: return _("Hour");
-                case EVERY_DAY: return _("Day");
-                case EVERY_WEEK: return _("Week");
-                case EVERY_MONTH: return _("Month");
-
-                default:
-                    assert_not_reached ();
+                case EVERY_X_MINUTES: return GLib.ngettext ("Minute", "Minutes", interval);
+                case EVERY_X_HOURS: return GLib.ngettext ("Hour", "Hours", interval);
+                case EVERY_DAY: return GLib.ngettext ("Day", "Days", interval);
+                case EVERY_WEEK: return GLib.ngettext ("Week", "Weeks", interval);
+                case EVERY_MONTH: return GLib.ngettext ("Month", "Months", interval);
+                default: assert_not_reached ();
             }
         }
 
-        public static string[] choices () {
+        public static string[] choices (int? interval = 0) {
             return {
-                RecurrencyType.EVERY_X_MINUTES.to_friendly_string (),
-                RecurrencyType.EVERY_X_HOURS.to_friendly_string (),
-                RecurrencyType.EVERY_DAY.to_friendly_string (),
-                RecurrencyType.EVERY_WEEK.to_friendly_string (),
-                RecurrencyType.EVERY_MONTH.to_friendly_string ()
+                RecurrencyType.EVERY_X_MINUTES.to_friendly_string (interval),
+                RecurrencyType.EVERY_X_HOURS.to_friendly_string (interval),
+                RecurrencyType.EVERY_DAY.to_friendly_string (interval),
+                RecurrencyType.EVERY_WEEK.to_friendly_string (interval),
+                RecurrencyType.EVERY_MONTH.to_friendly_string (interval)
             };
         }
     }

src/Widgets/RepeatBox.vala

@@ -51,7 +51,7 @@ public class Reminduck.Repeatbox : Gtk.Box {
         };
         every_label.add_css_class (Granite.STYLE_CLASS_H4_LABEL);
 
-        dropdown = new Gtk.DropDown.from_strings (RecurrencyType.choices ());
+        dropdown = new Gtk.DropDown.from_strings (RecurrencyType.choices (1));
         dropdown.set_selected (RecurrencyType.EVERY_DAY); // Enums are fucking magic
 
         // 60 minutes * 24  hrs = Maximum 1440 minutes. Next up may as well use days
@@ -83,6 +83,14 @@ public class Reminduck.Repeatbox : Gtk.Box {
 
         on_selected_change ();
         dropdown.notify["selected"].connect (on_selected_change);
+        interval_spin.notify["value"].connect (on_spin_changed);
+    }
+
+    private void on_spin_changed () {
+        debug ("Spin changed!");
+        //  print ("SPIN");
+        //  dropdown = new Gtk.DropDown.from_strings (
+        //      RecurrencyType.choices ((int)interval_spin.value));
     }
 
     private void on_selected_change () {