diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nautilus-query-editor.c | 2 | ||||
| -rw-r--r-- | src/nautilus-search-popover.c | 4 | ||||
| -rw-r--r-- | src/nautilus-ui-utilities.c | 36 | ||||
| -rw-r--r-- | src/nautilus-ui-utilities.h | 3 |
4 files changed, 28 insertions, 17 deletions
diff --git a/src/nautilus-query-editor.c b/src/nautilus-query-editor.c index b909ea940..54f2a237b 100644 --- a/src/nautilus-query-editor.c +++ b/src/nautilus-query-editor.c @@ -493,7 +493,7 @@ search_popover_date_range_changed_cb (NautilusSearchPopover *popover, { g_autofree gchar *text_for_date_range = NULL; - text_for_date_range = get_text_for_date_range (date_range); + text_for_date_range = get_text_for_date_range (date_range, TRUE); gd_tagged_entry_tag_set_label (priv->date_range_tag, text_for_date_range); gd_tagged_entry_add_tag (GD_TAGGED_ENTRY (priv->entry), diff --git a/src/nautilus-search-popover.c b/src/nautilus-search-popover.c index d68bdda9f..db95a2b3f 100644 --- a/src/nautilus-search-popover.c +++ b/src/nautilus-search-popover.c @@ -443,7 +443,7 @@ fill_fuzzy_dates_listbox (NautilusSearchPopover *popover) date_range = g_ptr_array_new_full (2, (GDestroyNotify) g_date_time_unref); g_ptr_array_add (date_range, g_date_time_ref (current_date)); g_ptr_array_add (date_range, g_date_time_ref (now)); - label = get_text_for_date_range (date_range); + label = get_text_for_date_range (date_range, FALSE); row = create_row_for_label (label, normalized == 1); g_object_set_data_full (G_OBJECT (row), "date", @@ -620,7 +620,7 @@ update_date_label (NautilusSearchPopover *popover, end_date = g_ptr_array_index (date_range, 0); days = g_date_time_difference (end_date, initial_date) / G_TIME_SPAN_DAY; - label = get_text_for_date_range (date_range); + label = get_text_for_date_range (date_range, TRUE); gtk_entry_set_text (GTK_ENTRY (popover->date_entry), days < 1 ? label : ""); diff --git a/src/nautilus-ui-utilities.c b/src/nautilus-ui-utilities.c index e8fdab8b4..07aca02e8 100644 --- a/src/nautilus-ui-utilities.c +++ b/src/nautilus-ui-utilities.c @@ -369,32 +369,40 @@ nautilus_file_date_in_between (guint64 unix_file_time, } static const gchar * -get_text_for_days_ago (gint days) +get_text_for_days_ago (gint days, + gboolean prefix_with_since) { if (days < 7) { /* days */ - return ngettext ("%d day ago", "%d days ago", days); + return prefix_with_since ? + ngettext ("Since %d day ago", "Since %d days ago", days) : + ngettext ("%d day ago", "%d days ago", days); } - else if (days < 30) + if (days < 30) { /* weeks */ - return ngettext ("Last week", "%d weeks ago", days / 7); + return prefix_with_since ? + ngettext ("Since last week", "Since %d weeks ago", days / 7) : + ngettext ("Last week", "%d weeks ago", days / 7); } - else if (days < 365) + if (days < 365) { /* months */ - return ngettext ("Last month", "%d months ago", days / 30); - } - else - { - /* years */ - return ngettext ("Last year", "%d years ago", days / 365); + return prefix_with_since ? + ngettext ("Since last month", "Since %d months ago", days / 30) : + ngettext ("Last month", "%d months ago", days / 30); } + + /* years */ + return prefix_with_since ? + ngettext ("Since last year", "Since %d years ago", days / 365) : + ngettext ("Last year", "%d years ago", days / 365); } gchar * -get_text_for_date_range (GPtrArray *date_range) +get_text_for_date_range (GPtrArray *date_range, + gboolean prefix_with_since) { gint days; gint normalized; @@ -442,7 +450,9 @@ get_text_for_date_range (GPtrArray *date_range) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wformat-nonliteral" - label = g_strdup_printf (get_text_for_days_ago (days), normalized); + label = g_strdup_printf (get_text_for_days_ago (days, + prefix_with_since), + normalized); #pragma GCC diagnostic pop } diff --git a/src/nautilus-ui-utilities.h b/src/nautilus-ui-utilities.h index aa9042421..2f7436e90 100644 --- a/src/nautilus-ui-utilities.h +++ b/src/nautilus-ui-utilities.h @@ -46,6 +46,7 @@ void nautilus_ui_frame_video (GdkPixbuf **pixbuf); gboolean nautilus_file_date_in_between (guint64 file_unix_time, GDateTime *initial_date, GDateTime *end_date); -gchar* get_text_for_date_range (GPtrArray *date_range); +gchar* get_text_for_date_range (GPtrArray *date_range, + gboolean prefix_with_since); #endif /* NAUTILUS_UI_UTILITIES_H */ |