gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-11-05 16:04:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

files-view: Fix comma placement in a floating bar

Browse source 
When files are selected the floating bar appears with info about their types,
count, and size. In certain cases, there is an extra space character before the
comma when the folder item count is not known. Also, there is an extra space
character at the end when the size for other files is not known. To fix those
issues, let's handle those cases differently.

Fixes: https://gitlab.gnome.org/GNOME/nautilus/-/issues/1867
This commit is contained in:
Nick Montalbano 2021-07-10 17:48:08 -04:00 committed by Ondrej Holy
parent 3ad2de33da
commit 0c103a20b7
1 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/nautilus-files-view.c
View file

@ -3372,8 +3372,10 @@ nautilus_files_view_display_selection_info (NautilusFilesView *view)
char *first_item_name;
char *non_folder_count_str;
char *non_folder_item_count_str;
char *non_folder_counts_str;
char *folder_count_str;
char *folder_item_count_str;
char *folder_counts_str;
char *primary_status;
char *detail_status;
NautilusFile *file;
@ -3391,8 +3393,10 @@ nautilus_files_view_display_selection_info (NautilusFilesView *view)
first_item_name = NULL;
folder_count_str = NULL;
folder_item_count_str = NULL;
folder_counts_str = NULL;
non_folder_count_str = NULL;
non_folder_item_count_str = NULL;
non_folder_counts_str = NULL;
for (p = selection; p != NULL; p = p->next)
{
@ -3535,6 +3539,23 @@ nautilus_files_view_display_selection_info (NautilusFilesView *view)
}
else
{
if (folder_item_count_known)
{
folder_counts_str = g_strconcat (folder_count_str, " ", folder_item_count_str, NULL);
}
else
{
folder_counts_str = g_strdup (folder_count_str);
}
if (non_folder_size_known)
{
non_folder_counts_str = g_strconcat (non_folder_count_str, " ", non_folder_item_count_str, NULL);
}
else
{
non_folder_counts_str = g_strdup (non_folder_count_str);
}
/* This is marked for translation in case a localizer
* needs to change ", " to something else. The comma
* is between the message about the number of folders
@ -3542,19 +3563,19 @@ nautilus_files_view_display_selection_info (NautilusFilesView *view)
* message about the number of other items and the
* total size of those items.
*/
primary_status = g_strdup_printf (_("%s %s, %s %s"),
folder_count_str,
folder_item_count_str,
non_folder_count_str,
non_folder_item_count_str);
primary_status = g_strdup_printf (_("%s, %s"),
folder_counts_str,
non_folder_counts_str);
detail_status = NULL;
}
g_free (first_item_name);
g_free (folder_count_str);
g_free (folder_item_count_str);
g_free (folder_counts_str);
g_free (non_folder_count_str);
g_free (non_folder_item_count_str);
g_free (non_folder_counts_str);
set_floating_bar_status (view, primary_status, detail_status);