Applications
/
ubl-settings-usergroups
10
0
Fork 1
Code Issues 8 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Search fix' (#257) from YanTheKaller/ubl-settings-usergroups:master into master

Browse Source 
Reviewed-on: #257
master v2.32
Dmitry Razumov 4 months ago
parent 9a6298b507 493e12a241
commit 7077226012
4 changed files with 74 additions and 49 deletions
Show Stats Download Patch File Download Diff File

37
locale/ubl-settings-usergroups.pot
Unescape View File

@ -941,40 +941,43 @@ msgstr ""
msgid "Unblock login with password"
msgstr ""
#: source/ubl-strings.h:282
msgid "User(-s)"
#: source/ubl-strings.h:283
msgid "The primary group"
msgstr ""
#: source/ubl-strings.h:282
msgid "is included into main group of users"
#: source/ubl-strings.h:283
msgid "of the deleted user"
msgstr ""
#: source/ubl-strings.h:282
msgid "which will be deleted"
#: source/ubl-strings.h:283
msgid "includes user(s)"
msgstr ""
#: source/ubl-strings.h:282
msgid "After reboot users"
#: source/ubl-strings.h:283
msgid "The group"
msgstr ""
#: source/ubl-strings.h:282
msgid "main group will be set to default group"
#: source/ubl-strings.h:283
msgid "will not be deleted and will be synchronized with the configuration"
msgstr ""
#: source/ubl-strings.h:283
#: source/ubl-strings.h:284
msgid ""
"Some of users, chosen for deletion, are included as main group for other "
"users. This users will get default main group after reboot"
"users. This groups will not be deleted and will be synchronized with the "
"configuration"
msgstr ""
#: source/ubl-strings.h:282
msgid "User auth with password is blocked for user.\nOther access methods are allowed (key auth, user switching etc)."
#: source/ubl-strings.h:286
msgid "User auth with password is allowed"
msgstr ""
#: source/ubl-strings.h:282
#: source/ubl-strings.h:287
msgid "User auth is forbidden"
msgstr ""
#: source/ubl-strings.h:282
msgid "User auth with password is allowed"
#: source/ubl-strings.h:288
msgid ""
"User auth with password is blocked for user.\n"
"Other access methods are allowed (key auth, user switching etc)."
msgstr ""

74
locale/ubl-settings-usergroups_ru.po
Unescape View File

@ -1006,47 +1006,67 @@ msgid "Block login with password"
msgstr "Заблокировать вход по паролю"
#: source/ubl-strings.h:280
#, fuzzy
msgid "Unblock login with password"
msgstr "Разблокировать вход по паролю"
#: source/ubl-strings.h:282
msgid "User(-s)"
msgstr "Пользователь(-ли)"
#: source/ubl-strings.h:282
msgid "is included into main group of users"
msgstr "включен(-ы) в основную группу"
#: source/ubl-strings.h:283
msgid "The primary group"
msgstr ""
"В основную группу"
#: source/ubl-strings.h:282
msgid "which will be deleted"
msgstr "которая будет удалена"
#: source/ubl-strings.h:283
msgid "of the deleted user"
msgstr "удаляемого пользователя"
#: source/ubl-strings.h:282
msgid "After reboot users"
msgstr "После перезагрузки пользователь(-ли)"
#: source/ubl-strings.h:283
msgid "includes user(s)"
msgstr "включен(-ы) пользователь(-ли)"
#: source/ubl-strings.h:282
msgid "main group will be set to default group"
msgstr "получит(-ат) основную группу по умолчанию"
#: source/ubl-strings.h:283
msgid "The group"
msgstr "Группа"
#: source/ubl-strings.h:283
msgid "will not be deleted and will be synchronized with the configuration"
msgstr "не будет удалена и будет синхронизирована с конфигурацией"
#: source/ubl-strings.h:284
msgid ""
"Some of users, chosen for deletion, are included as main group for other "
"users. This users will get default main group after reboot"
"users. This groups will not be deleted and will be synchronized with the "
"configuration"
msgstr ""
"Часть пользователей выбранных на удаление используются как основные группы "
"других пользователей. После перезагрузки эти пользователи получат основную "
"группу по умолчанию"
"других пользователей. После перезагрузки этигруппы не будут удалены и будут синхронизированы с конфигурацией."
#: source/ubl-strings.h:282
msgid "User auth with password is blocked for user.\nOther access methods are allowed (key auth, user switching etc)."
msgstr "Аутентификация с помощью пароля заблокирована для пользователя.\nОстальные методы входа разрешены (аутентификация на основе ключей, переключение на пользователя и т.д.)"
#: source/ubl-strings.h:286
msgid "User auth with password is allowed"
msgstr "Аутентификация пользователя разрешена"
#: source/ubl-strings.h:282
#: source/ubl-strings.h:287
msgid "User auth is forbidden"
msgstr "Аутентификация пользователя запрещена"
#: source/ubl-strings.h:282
msgid "User auth with password is allowed"
msgstr "Аутентификация пользователя разрешена"
#: source/ubl-strings.h:288
msgid ""
"User auth with password is blocked for user.\n"
"Other access methods are allowed (key auth, user switching etc)."
msgstr ""
"Аутентификация с помощью пароля заблокирована для пользователя.\n"
"Остальные методы входа разрешены (аутентификация на основе ключей, "
"переключение на пользователя и т.д.)"
#~ msgid "User(-s)"
#~ msgstr "Пользователь(-ли)"
#~ msgid "is included into main group of users"
#~ msgstr "включен(-ы) в основную группу"
#~ msgid "which will be deleted"
#~ msgstr "которая будет удалена"
#~ msgid "After reboot users"
#~ msgstr "После перезагрузки пользователь(-ли)"
#~ msgid "main group will be set to default group"
#~ msgstr "получит(-ат) основную группу по умолчанию"

6
source/ubl-settings-usergroups.c
Unescape View File

@ -671,6 +671,7 @@ void yon_delete_confirmation_save(GtkWidget *self, dictionary *dict){
GtkTreeIter iter;
GtkTreeModel *model = GTK_TREE_MODEL(window->list);
char *single_target = NULL;
char *main_group = NULL;
int founds = 0;
char *depends = NULL;
for_iter(model,&iter){
@ -683,6 +684,7 @@ void yon_delete_confirmation_save(GtkWidget *self, dictionary *dict){
depends = yon_user_check_groups(window->list,target);
if (!yon_char_is_empty(depends)) {
single_target = target;
main_group = group;
founds++;
}
}
@ -690,7 +692,7 @@ void yon_delete_confirmation_save(GtkWidget *self, dictionary *dict){
}
if (founds==1){
dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
data->action_text = CONFIRMATION_GROUP_DEPENDS_SINGLE_LABEL(single_target,depends);
data->action_text = CONFIRMATION_GROUP_DEPENDS_SINGLE_LABEL(single_target,depends,main_group);
if(yon_confirmation_dialog_call(window->Window,data)!=GTK_RESPONSE_ACCEPT){
return;
}
@ -1906,7 +1908,7 @@ gboolean on_filter(GtkTreeModel* model, GtkTreeIter *iter, main_window *widgets)
if (systemed)
gtk_tree_model_get(model,iter,id_col,&iuid,name_col,&target, login_col,&login,-1);
else
gtk_tree_model_get(model,iter,id_col,&uid,name_col,&target,-1);
gtk_tree_model_get(model,iter,id_col,&uid,name_col,&target,login_col,&login,-1);
char *search_text = (char*)gtk_entry_get_text(GTK_ENTRY(search));
int show_system = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check));
if (!target&&(search_text)) return 0;

6
source/ubl-strings.h
Unescape View File

@ -279,9 +279,9 @@
#define BLOCK_LOGIN_LABEL _("Block login with password")
#define UNBOCK_LOGIN_LABEL _("Unblock login with password")
#define CONFIRMATION_GROUP_DEPENDS_SINGLE_LABEL(target,depends) yon_char_unite(_("User(-s)")," <b>\"",target,"\"</b> ",_("is included into main group of users")," <b>\"",depends,"\"</b>, ",_("which will be deleted"),".\n",_("After reboot users")," <b>",depends,"</b> ",_("main group will be set to default group"),".",NULL)
// #define CONFIRMATION_GROUP_DEPENDS_SINGLE_LABEL(target,depends) yon_char_unite(_("Main group")," <b>\"",group,"\"</b> ",_("of deleted user")," <b>\"",target,"\"</b>, ",_("is including user(-s) "),depends,".\n",_("Group")," <b>",group,"</b> ",_("This group will be sinchronized with configuration "),".",NULL)
#define CONFIRMATION_GROUP_DEPENDS_MULTIPLE_LABEL _("Some of users, chosen for deletion, are included as main group for other users. This users will get default main group after reboot")
// #define CONFIRMATION_GROUP_DEPENDS_SINGLE_LABEL(target,depends) yon_char_unite(_("User(-s)")," <b>\"",target,"\"</b> ",_("is included into main group of users")," <b>\"",depends,"\"</b>, ",_("which will be deleted"),".\n",_("After reboot users")," <b>",depends,"</b> ",_("main group will be set to default group"),".",NULL)
#define CONFIRMATION_GROUP_DEPENDS_SINGLE_LABEL(target,depends,group) yon_char_unite(_("The primary group")," <b>\"",group,"\"</b> ",_("of the deleted user")," <b>\"",target,"\"</b> ",_("includes user(s)")," ",depends,".\n",_("The group")," <b>\"",group,"\"</b> ",_("will not be deleted and will be synchronized with the configuration"),".",NULL)
#define CONFIRMATION_GROUP_DEPENDS_MULTIPLE_LABEL _("Some of users, chosen for deletion, are included as main group for other users. This groups will not be deleted and will be synchronized with the configuration")
#define AUTH_ALLOWED_LABEL _("User auth with password is allowed")
#define AUTH_FORBIDDEN_LABEL _("User auth is forbidden")

Write Preview
Loading…
Cancel
Save