[gnome-clocks/bilelmoussaoui/timer/i18n] Timer: correctly translate the defaut timer name
- From: Bilal Elmoussaoui <bilelmoussaoui src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-clocks/bilelmoussaoui/timer/i18n] Timer: correctly translate the defaut timer name
- Date: Sat, 22 Feb 2020 19:24:27 +0000 (UTC)
commit b44c2048c1da93cdc0f3536e5879f72d0c8a2c17
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date: Sat Feb 22 20:17:24 2020 +0100
Timer: correctly translate the defaut timer name
Fixes #68 #63
src/timer.vala | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 71 insertions(+), 7 deletions(-)
---
diff --git a/src/timer.vala b/src/timer.vala
index 523029b..ceb0aff 100644
--- a/src/timer.vala
+++ b/src/timer.vala
@@ -374,19 +374,83 @@ public class Row : Gtk.ListBoxRow {
timer_name.label = item.name;
} else {
if (item.seconds != 0 && item.minutes == 0 && item.hours == 0) {
- timer_name.label = _("%i second timer".printf (item.seconds));
+ timer_name.label = ngettext("%i second timer".printf(item.seconds), "%i seconds
timer".printf(item.seconds), item.seconds);
} else if (item.seconds == 0 && item.minutes != 0 && item.hours == 0) {
- timer_name.label = _("%i minute timer".printf (item.minutes));
+ timer_name.label = ngettext("%i minute timer".printf(item.minutes), "%i minutes
timer".printf(item.minutes), item.minutes);
} else if (item.seconds == 0 && item.minutes == 0 && item.hours != 0) {
- timer_name.label = _("%i hour timer".printf (item.hours));
+ timer_name.label = ngettext("%i hour timer".printf(item.hours), "%i hours
timer".printf(item.hours), item.hours);
} else if (item.seconds != 0 && item.minutes != 0 && item.hours == 0) {
- timer_name.label = _("%i minute %i second timer".printf (item.minutes, item.seconds));
+ if (item.minutes == 1) {
+ if (item.seconds == 1) {
+ timer_name.label = _("%i minute %i second timer".printf (item.minutes,
item.seconds));
+ } else {
+ timer_name.label = _("%i minute %i seconds timer".printf (item.minutes,
item.seconds));
+ }
+ } else {
+ if (item.seconds == 1) {
+ timer_name.label = _("%i minutes %i second timer".printf (item.minutes,
item.seconds));
+ } else {
+ timer_name.label = _("%i minutes %i seconds timer".printf (item.minutes,
item.seconds));
+ }
+ }
} else if (item.seconds == 0 && item.minutes != 0 && item.hours != 0) {
- timer_name.label = _("%i hour %i minute timer".printf (item.hours, item.minutes));
+ if (item.hours == 1) {
+ if (item.minutes == 1) {
+ timer_name.label = _("%i hour %i minute timer".printf (item.hours, item.minutes));
+ } else {
+ timer_name.label = _("%i hour %i minutes timer".printf (item.hours, item.minutes));
+ }
+ } else {
+ if (item.minutes == 1) {
+ timer_name.label = _("%i hours %i minute timer".printf (item.hours, item.minutes));
+ } else {
+ timer_name.label = _("%i hours %i minutes timer".printf (item.hours, item.minutes));
+ }
+ }
} else if (item.seconds != 0 && item.minutes == 0 && item.hours != 0) {
- timer_name.label = _("%i hour %i second timer".printf (item.hours, item.seconds));
+ if (item.hours == 1) {
+ if (item.seconds == 1) {
+ timer_name.label = _("%i hour %i second timer".printf (item.hours, item.seconds));
+ } else {
+ timer_name.label = _("%i hour %i seconds timer".printf (item.hours, item.seconds));
+ }
+ } else {
+ if (item.seconds == 1) {
+ timer_name.label = _("%i hours %i second timer".printf (item.hours, item.seconds));
+ } else {
+ timer_name.label = _("%i hours %i seconds timer".printf (item.hours, item.seconds));
+ }
+ }
} else if (item.seconds != 0 && item.minutes != 0 && item.hours != 0) {
- timer_name.label = _("%i hour %i minute %i second timer".printf (item.hours, item.minutes,
item.seconds));
+ if (item.hours == 1) {
+ if (item.minutes == 1) {
+ if (item.seconds == 1) {
+ timer_name.label = _("%i hour %i minute %i second timer".printf (item.hours,
item.minutes, item.seconds));
+ } else {
+ timer_name.label = _("%i hour %i minute %i seconds timer".printf (item.hours,
item.minutes, item.seconds));
+ }
+ } else {
+ if (item.seconds == 1) {
+ timer_name.label = _("%i hour %i minutes %i second timer".printf (item.hours,
item.minutes, item.seconds));
+ } else {
+ timer_name.label = _("%i hour %i minutes %i seconds timer".printf (item.hours,
item.minutes, item.seconds));
+ }
+ }
+ } else {
+ if (item.minutes == 1) {
+ if (item.seconds == 1) {
+ timer_name.label = _("%i hours %i minute %i second timer".printf (item.hours,
item.minutes, item.seconds));
+ } else {
+ timer_name.label = _("%i hours %i minute %i seconds timer".printf (item.hours,
item.minutes, item.seconds));
+ }
+ } else {
+ if (item.seconds == 1) {
+ timer_name.label = _("%i hours %i minutes %i second timer".printf (item.hours,
item.minutes, item.seconds));
+ } else {
+ timer_name.label = _("%i hours %i minutes %i seconds timer".printf (item.hours,
item.minutes, item.seconds));
+ }
+ }
+ }
}
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]