Исправил локализация в утилите

pull/24/head
Igor Belitskiy 2 years ago
parent 3dd8c3740e
commit 78a1ba3bef

@ -20,16 +20,16 @@ void table_u_g_set_fill_user_group() {
gtk_list_store_clear(table_widgets->liststoreUsersGroups); gtk_list_store_clear(table_widgets->liststoreUsersGroups);
gboolean active1 = !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(table_widgets->chkActivUsersGroup)); gboolean active1 = !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(table_widgets->chkActivUsersGroup));
if (strcmp(flag_u_g, "grpquota")==0) { if (strcmp(flag_u_g, "grpquota")==0) {
gtk_button_set_label(GTK_BUTTON(table_widgets->chkActivUsersGroup), _("Withdraw all groups")); gtk_button_set_label(GTK_BUTTON(table_widgets->chkActivUsersGroup), STR_CHK_LABEL_WRITE_ALL_GROUPS);
gtk_label_set_label(GTK_LABEL(table_widgets->lblHeadQuotaUsersGroups), _("Groups")); gtk_label_set_label(GTK_LABEL(table_widgets->lblHeadQuotaUsersGroups), STR_GROUPS);
char** array_groups = philos_list_group(&size,active1); char** array_groups = philos_list_group(&size,active1);
table_u_g_fill_tree_view(array_groups, size); table_u_g_fill_tree_view(array_groups, size);
GtkTreeViewColumn* column = gtk_tree_view_get_column(GTK_TREE_VIEW(table_widgets->treeViewCheckUsersGroups), 1); GtkTreeViewColumn* column = gtk_tree_view_get_column(GTK_TREE_VIEW(table_widgets->treeViewCheckUsersGroups), 1);
gtk_tree_view_column_set_title(column, _("Groups")); gtk_tree_view_column_set_title(column, STR_GROUPS);
} }
else if (strcmp(flag_u_g, "usrquota") == 0) { else if (strcmp(flag_u_g, "usrquota") == 0) {
gtk_button_set_label(GTK_BUTTON(table_widgets->chkActivUsersGroup), _("Withdraw all users")); gtk_button_set_label(GTK_BUTTON(table_widgets->chkActivUsersGroup), STR_CHK_LABEL_WRITE_ALL_USERS);
gtk_label_set_label(GTK_LABEL(table_widgets->lblHeadQuotaUsersGroups), _("Users")); gtk_label_set_label(GTK_LABEL(table_widgets->lblHeadQuotaUsersGroups), STR_USERS);
char** array_user = philos_list_user(&size, active1); char** array_user = philos_list_user(&size, active1);
table_u_g_fill_tree_view(array_user, size); table_u_g_fill_tree_view(array_user, size);
} }

@ -54,13 +54,13 @@ view_device_set_window *view_device_setup_window_custom(view_device_set_window*
obj_view_device_widgets->lblHeadQuotasEditDeviceWindow = yon_gtk_builder_get_widget(builder,"lblHeadQuotasEditDeviceWindow"); obj_view_device_widgets->lblHeadQuotasEditDeviceWindow = yon_gtk_builder_get_widget(builder,"lblHeadQuotasEditDeviceWindow");
obj_view_device_widgets->boxBlockGuiAddEditDevice = yon_gtk_builder_get_widget(builder,"boxBlockGuiAddEditDevice"); obj_view_device_widgets->boxBlockGuiAddEditDevice = yon_gtk_builder_get_widget(builder,"boxBlockGuiAddEditDevice");
if (strcmp(view_device_set_add_edit, "add") == 0) { if (strcmp(view_device_set_add_edit, "add") == 0) {
gtk_label_set_label(GTK_LABEL(obj_view_device_widgets->lblHeadQuotasEditDeviceWindow), _("Settings quotas - Addition")); gtk_label_set_label(GTK_LABEL(obj_view_device_widgets->lblHeadQuotasEditDeviceWindow), STR_TITLE_ADD_QUOTAS);
gtk_widget_hide(obj_view_device_widgets->lblNameDevice); gtk_widget_hide(obj_view_device_widgets->lblNameDevice);
device_fill_disk(obj_view_device_widgets->DeviceCombo,vec_device); device_fill_disk(obj_view_device_widgets->DeviceCombo,vec_device);
gtk_combo_box_set_active(GTK_COMBO_BOX(obj_view_device_widgets->cmbDeviceSetStatus),-1); gtk_combo_box_set_active(GTK_COMBO_BOX(obj_view_device_widgets->cmbDeviceSetStatus),-1);
} }
else { else {
gtk_label_set_label(GTK_LABEL(obj_view_device_widgets->lblHeadQuotasEditDeviceWindow), _("Settings quotas - Editing")); gtk_label_set_label(GTK_LABEL(obj_view_device_widgets->lblHeadQuotasEditDeviceWindow), STR_TITLE_EDIT_QUOTAS);
gtk_widget_hide(obj_view_device_widgets->DeviceCombo); gtk_widget_hide(obj_view_device_widgets->DeviceCombo);
} }
view_device_fill_gui(); view_device_fill_gui();

@ -635,13 +635,14 @@ int check_save_project() {
else if (!strlen(project_name)) { else if (!strlen(project_name)) {
show_warning_no_fill(STR_ERROR_PROJECT_NAME_VALUE_NULL); show_warning_no_fill(STR_ERROR_PROJECT_NAME_VALUE_NULL);
} }
else if(stat(file_dir, &buf) < 0) { else if(error_file < 0) {
show_warning_no_fill(STR_ERROR_MESS_NOT_DIR); // Если отработало условие то
} // Нет такого файла или каталога
else if (error_file < 0) {
show_warning_no_fill(STR_ERROR_MESS_NOT_DIR); show_warning_no_fill(STR_ERROR_MESS_NOT_DIR);
} }
else if (!S_ISDIR(buf.st_mode)) { else if (!S_ISDIR(buf.st_mode)) {
// Если отработало условие то
// Это файл, а не каталога
show_warning_no_fill(STR_ERROR_MESS_NOT_DIR); show_warning_no_fill(STR_ERROR_MESS_NOT_DIR);
} }
return 0; return 0;

Loading…
Cancel
Save