kallithea Changeset - ac3164ba8e13

Changeset - ac3164ba8e13

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Søren Løvborg - 11 years ago 2015-08-14 17:07:49
sorenl@unity3d.com

spelling: fix auth settings typo and improve brevity

2 files changed with 2 insertions and 2 deletions:

kallithea/i18n/kallithea.pot

kallithea/templates/admin/auth/auth_settings.html

0 comments (0 inline, 0 general)

kallithea/i18n/kallithea.pot

➞

Show inline comments

@@ @@ -2137,769 +2137,769 @@ msgstr "" @@
 #: kallithea/templates/index_base.html:6
 #: kallithea/templates/admin/my_account/my_account_repos.html:3
 #: kallithea/templates/admin/my_account/my_account_watched.html:3
 #: kallithea/templates/admin/repo_groups/repo_groups.html:9
 #: kallithea/templates/admin/repos/repos.html:9
 #: kallithea/templates/admin/user_groups/user_groups.html:9
 #: kallithea/templates/admin/users/users.html:9
 #: kallithea/templates/bookmarks/bookmarks.html:9
 #: kallithea/templates/branches/branches.html:9
 #: kallithea/templates/journal/journal.html:9
 #: kallithea/templates/journal/journal.html:48
 #: kallithea/templates/journal/journal.html:49
 #: kallithea/templates/tags/tags.html:9
 msgid "quick filter..."
 msgstr ""
 #: kallithea/templates/index_base.html:6
 msgid "repositories"
 msgstr ""
 #: kallithea/templates/index_base.html:20
 #: kallithea/templates/index_base.html:25
 #: kallithea/templates/admin/repos/repo_add.html:5
 #: kallithea/templates/admin/repos/repo_add.html:19
 #: kallithea/templates/admin/repos/repos.html:22
 msgid "Add Repository"
 msgstr ""
 #: kallithea/templates/index_base.html:22
 #: kallithea/templates/index_base.html:27
 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5
 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13
 #: kallithea/templates/admin/repo_groups/repo_groups.html:26
 msgid "Add Repository Group"
 msgstr ""
 #: kallithea/templates/index_base.html:32
 msgid "You have admin right to this group, and can edit it"
 msgstr ""
 #: kallithea/templates/index_base.html:32
 msgid "Edit Repository Group"
 msgstr ""
 #: kallithea/templates/index_base.html:45
 msgid "Group Name"
 msgstr ""
 #: kallithea/templates/index_base.html:46
 #: kallithea/templates/index_base.html:127
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:64
 #: kallithea/templates/admin/repo_groups/repo_group_add.html:42
 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17
 #: kallithea/templates/admin/repo_groups/repo_groups.html:47
 #: kallithea/templates/admin/repos/repo_add_base.html:28
 #: kallithea/templates/admin/repos/repo_edit_settings.html:74
 #: kallithea/templates/admin/repos/repos.html:48
 #: kallithea/templates/admin/user_groups/user_group_add.html:40
 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15
 #: kallithea/templates/admin/user_groups/user_groups.html:47
 #: kallithea/templates/admin/users/user_edit_api_keys.html:64
 #: kallithea/templates/email_templates/changeset_comment.html:18
 #: kallithea/templates/email_templates/pull_request.html:12
 #: kallithea/templates/forks/fork.html:38
 #: kallithea/templates/pullrequests/pullrequest.html:40
 #: kallithea/templates/pullrequests/pullrequest_show.html:38
 #: kallithea/templates/pullrequests/pullrequest_show.html:63
 #: kallithea/templates/summary/summary.html:85
 msgid "Description"
 msgstr ""
 #: kallithea/templates/index_base.html:125
 #: kallithea/templates/admin/my_account/my_account_repos.html:46
 #: kallithea/templates/admin/my_account/my_account_watched.html:46
 #: kallithea/templates/admin/repo_groups/repo_groups.html:46
 #: kallithea/templates/admin/repos/repo_add_base.html:9
 #: kallithea/templates/admin/repos/repo_edit_settings.html:7
 #: kallithea/templates/admin/repos/repos.html:47
 #: kallithea/templates/admin/user_groups/user_groups.html:46
 #: kallithea/templates/base/perms_summary.html:53
 #: kallithea/templates/bookmarks/bookmarks.html:49
 #: kallithea/templates/bookmarks/bookmarks_data.html:7
 #: kallithea/templates/branches/branches.html:49
 #: kallithea/templates/branches/branches_data.html:7
 #: kallithea/templates/files/files_browser.html:60
 #: kallithea/templates/journal/journal.html:187
 #: kallithea/templates/journal/journal.html:278
 #: kallithea/templates/tags/tags.html:49
 #: kallithea/templates/tags/tags_data.html:7
 msgid "Name"
 msgstr ""
 #: kallithea/templates/index_base.html:128
 msgid "Last Change"
 msgstr ""
 #: kallithea/templates/index_base.html:130
 #: kallithea/templates/admin/my_account/my_account_repos.html:48
 #: kallithea/templates/admin/my_account/my_account_watched.html:48
 #: kallithea/templates/admin/repos/repos.html:49
 #: kallithea/templates/journal/journal.html:189
 #: kallithea/templates/journal/journal.html:280
 msgid "Tip"
 msgstr ""
 #: kallithea/templates/index_base.html:132
 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10
 #: kallithea/templates/admin/repo_groups/repo_groups.html:49
 #: kallithea/templates/admin/repos/repo_edit_settings.html:62
 #: kallithea/templates/admin/repos/repos.html:50
 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8
 #: kallithea/templates/admin/user_groups/user_groups.html:50
 #: kallithea/templates/pullrequests/pullrequest_show.html:226
 #: kallithea/templates/summary/summary.html:134
 msgid "Owner"
 msgstr ""
 #: kallithea/templates/index_base.html:140
 #: kallithea/templates/admin/my_account/my_account_repos.html:57
 #: kallithea/templates/admin/my_account/my_account_watched.html:57
 #: kallithea/templates/base/root.html:44
 #: kallithea/templates/bookmarks/bookmarks.html:79
 #: kallithea/templates/branches/branches.html:79
 #: kallithea/templates/journal/journal.html:198
 #: kallithea/templates/journal/journal.html:289
 #: kallithea/templates/tags/tags.html:79
 msgid "Click to sort ascending"
 msgstr ""
 #: kallithea/templates/index_base.html:141
 #: kallithea/templates/admin/my_account/my_account_repos.html:58
 #: kallithea/templates/admin/my_account/my_account_watched.html:58
 #: kallithea/templates/base/root.html:45
 #: kallithea/templates/bookmarks/bookmarks.html:80
 #: kallithea/templates/branches/branches.html:80
 #: kallithea/templates/journal/journal.html:199
 #: kallithea/templates/journal/journal.html:290
 #: kallithea/templates/tags/tags.html:80
 msgid "Click to sort descending"
 msgstr ""
 #: kallithea/templates/index_base.html:142
 msgid "No repositories found."
 msgstr ""
 #: kallithea/templates/index_base.html:143
 #: kallithea/templates/admin/my_account/my_account_repos.html:60
 #: kallithea/templates/admin/my_account/my_account_watched.html:60
 #: kallithea/templates/base/root.html:47
 #: kallithea/templates/bookmarks/bookmarks.html:82
 #: kallithea/templates/branches/branches.html:82
 #: kallithea/templates/journal/journal.html:201
 #: kallithea/templates/journal/journal.html:292
 #: kallithea/templates/tags/tags.html:82
 msgid "Data error."
 msgstr ""
 #: kallithea/templates/index_base.html:144
 #: kallithea/templates/admin/my_account/my_account_repos.html:61
 #: kallithea/templates/admin/my_account/my_account_watched.html:61
 #: kallithea/templates/base/base.html:147 kallithea/templates/base/root.html:48
 #: kallithea/templates/bookmarks/bookmarks.html:83
 #: kallithea/templates/branches/branches.html:83
 #: kallithea/templates/journal/journal.html:202
 #: kallithea/templates/journal/journal.html:293
 #: kallithea/templates/tags/tags.html:83
 msgid "Loading..."
 msgstr ""
 #: kallithea/templates/login.html:5 kallithea/templates/login.html:15
 #: kallithea/templates/base/base.html:333
 msgid "Log In"
 msgstr ""
 #: kallithea/templates/login.html:13
 #, python-format
 msgid "Log In to %s"
 msgstr ""
 #: kallithea/templates/login.html:26 kallithea/templates/register.html:24
 #: kallithea/templates/admin/admin_log.html:5
 #: kallithea/templates/admin/my_account/my_account_profile.html:32
 #: kallithea/templates/admin/users/user_add.html:32
 #: kallithea/templates/admin/users/user_edit_profile.html:33
 #: kallithea/templates/admin/users/users.html:50
 #: kallithea/templates/base/base.html:309
 msgid "Username"
 msgstr ""
 #: kallithea/templates/login.html:33 kallithea/templates/register.html:33
 #: kallithea/templates/admin/my_account/my_account.html:37
 #: kallithea/templates/admin/users/user_add.html:41
 #: kallithea/templates/base/base.html:318
 msgid "Password"
 msgstr ""
 #: kallithea/templates/login.html:44
 msgid "Remember me"
 msgstr ""
 #: kallithea/templates/login.html:53
 msgid "Forgot your password ?"
 msgstr ""
 #: kallithea/templates/login.html:56 kallithea/templates/base/base.html:329
 msgid "Don't have an account ?"
 msgstr ""
 #: kallithea/templates/login.html:59
 msgid "Sign In"
 msgstr ""
 #: kallithea/templates/password_reset.html:5
 msgid "Password Reset"
 msgstr ""
 #: kallithea/templates/password_reset.html:12
 #, python-format
 msgid "Reset Your Password to %s"
 msgstr ""
 #: kallithea/templates/password_reset.html:14
 msgid "Reset Your Password"
 msgstr ""
 #: kallithea/templates/password_reset.html:25
 msgid "Email Address"
 msgstr ""
 #: kallithea/templates/password_reset.html:35
 #: kallithea/templates/register.html:79
 msgid "Captcha"
 msgstr ""
 #: kallithea/templates/password_reset.html:46
 msgid "Send Password Reset Email"
 msgstr ""
 #: kallithea/templates/password_reset.html:47
 msgid "Password reset link will be sent to the email address matching your username."
 msgstr ""
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:14
 #: kallithea/templates/register.html:90
 msgid "Sign Up"
 msgstr ""
 #: kallithea/templates/register.html:12
 #, python-format
 msgid "Sign Up to %s"
 msgstr ""
 #: kallithea/templates/register.html:42
 msgid "Re-enter password"
 msgstr ""
 #: kallithea/templates/register.html:51
 #: kallithea/templates/admin/my_account/my_account_profile.html:43
 #: kallithea/templates/admin/users/user_add.html:59
 #: kallithea/templates/admin/users/user_edit_profile.html:87
 #: kallithea/templates/admin/users/users.html:51
 msgid "First Name"
 msgstr ""
 #: kallithea/templates/register.html:60
 #: kallithea/templates/admin/my_account/my_account_profile.html:52
 #: kallithea/templates/admin/users/user_add.html:68
 #: kallithea/templates/admin/users/user_edit_profile.html:96
 #: kallithea/templates/admin/users/users.html:52
 msgid "Last Name"
 msgstr ""
 #: kallithea/templates/register.html:69
 #: kallithea/templates/admin/my_account/my_account_profile.html:61
 #: kallithea/templates/admin/settings/settings.html:31
 #: kallithea/templates/admin/users/user_add.html:77
 #: kallithea/templates/admin/users/user_edit_profile.html:42
 msgid "Email"
 msgstr ""
 #: kallithea/templates/register.html:92
 msgid "Registered accounts are ready to use and need no further action."
 msgstr ""
 #: kallithea/templates/register.html:94
 msgid "Please wait for an administrator to activate your account."
 msgstr ""
 #: kallithea/templates/switch_to_list.html:10
 #: kallithea/templates/branches/branches_data.html:69
 msgid "There are no branches yet"
 msgstr ""
 #: kallithea/templates/switch_to_list.html:16
 msgid "Closed Branches"
 msgstr ""
 #: kallithea/templates/switch_to_list.html:32
 #: kallithea/templates/tags/tags_data.html:44
 msgid "There are no tags yet"
 msgstr ""
 #: kallithea/templates/switch_to_list.html:45
 #: kallithea/templates/bookmarks/bookmarks_data.html:43
 msgid "There are no bookmarks yet"
 msgstr ""
 #: kallithea/templates/admin/admin.html:5
 #: kallithea/templates/admin/admin.html:13
 #: kallithea/templates/base/base.html:59
 msgid "Admin Journal"
 msgstr ""
 #: kallithea/templates/admin/admin.html:10
 msgid "journal filter..."
 msgstr ""
 #: kallithea/templates/admin/admin.html:12
 #: kallithea/templates/journal/journal.html:11
 msgid "Filter"
 msgstr ""
 #: kallithea/templates/admin/admin.html:13
 #: kallithea/templates/journal/journal.html:12
 #, python-format
 msgid "%s Entry"
 msgid_plural "%s Entries"
 msgstr[0] ""
 msgstr[1] ""
 #: kallithea/templates/admin/admin_log.html:6
 #: kallithea/templates/admin/my_account/my_account_repos.html:50
 #: kallithea/templates/admin/my_account/my_account_watched.html:50
 #: kallithea/templates/admin/repo_groups/repo_groups.html:50
 #: kallithea/templates/admin/repos/repo_edit_fields.html:8
 #: kallithea/templates/admin/repos/repos.html:52
 #: kallithea/templates/admin/user_groups/user_groups.html:51
 #: kallithea/templates/admin/users/users.html:57
 #: kallithea/templates/journal/journal.html:191
 #: kallithea/templates/journal/journal.html:282
 msgid "Action"
 msgstr ""
 #: kallithea/templates/admin/admin_log.html:7
 #: kallithea/templates/admin/permissions/permissions_globals.html:18
 msgid "Repository"
 msgstr ""
 #: kallithea/templates/admin/admin_log.html:8
 #: kallithea/templates/bookmarks/bookmarks.html:51
 #: kallithea/templates/bookmarks/bookmarks_data.html:9
 #: kallithea/templates/branches/branches.html:51
 #: kallithea/templates/branches/branches_data.html:9
 #: kallithea/templates/tags/tags.html:51
 #: kallithea/templates/tags/tags_data.html:9
 msgid "Date"
 msgstr ""
 #: kallithea/templates/admin/admin_log.html:9
 msgid "From IP"
 msgstr ""
 #: kallithea/templates/admin/admin_log.html:63
 msgid "No actions yet"
 msgstr ""
 #: kallithea/templates/admin/auth/auth_settings.html:5
 msgid "Authentication Settings"
 msgstr ""
 #: kallithea/templates/admin/auth/auth_settings.html:11
 #: kallithea/templates/base/base.html:65
 msgid "Authentication"
 msgstr ""
 #: kallithea/templates/admin/auth/auth_settings.html:28
 msgid "Authentication Plugins"
 msgstr ""
 #: kallithea/templates/admin/auth/auth_settings.html:31
 msgid "Enabled Plugins"
 msgstr ""
 #: kallithea/templates/admin/auth/auth_settings.html:33
-msgid "Comma separated list of plugins. Order of plugins is also order in which Kallithea will try to authenticate user"
+msgid "Comma-separated list of plugins; Kallithea will try user authentication in plugin order"
 msgstr ""
 #: kallithea/templates/admin/auth/auth_settings.html:34
 msgid "Available built-in plugins"
 msgstr ""
 #: kallithea/templates/admin/auth/auth_settings.html:51
 msgid "Plugin"
 msgstr ""
 #: kallithea/templates/admin/auth/auth_settings.html:101
 #: kallithea/templates/admin/defaults/defaults.html:82
 #: kallithea/templates/admin/my_account/my_account_password.html:33
 #: kallithea/templates/admin/my_account/my_account_profile.html:70
 #: kallithea/templates/admin/permissions/permissions_globals.html:112
 #: kallithea/templates/admin/repo_groups/repo_group_add.html:69
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114
 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42
 #: kallithea/templates/admin/repos/repo_edit_permissions.html:101
 #: kallithea/templates/admin/repos/repo_edit_settings.html:136
 #: kallithea/templates/admin/settings/settings_hooks.html:53
 #: kallithea/templates/admin/user_groups/user_group_add.html:57
 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104
 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60
 #: kallithea/templates/admin/users/user_add.html:96
 #: kallithea/templates/admin/users/user_edit_profile.html:122
 #: kallithea/templates/base/default_perms_box.html:64
 msgid "Save"
 msgstr ""
 #: kallithea/templates/admin/defaults/defaults.html:5
 #: kallithea/templates/admin/defaults/defaults.html:11
 #: kallithea/templates/base/base.html:66
 msgid "Repository Defaults"
 msgstr ""
 #: kallithea/templates/admin/defaults/defaults.html:33
 #: kallithea/templates/admin/repos/repo_add_base.html:55
 #: kallithea/templates/admin/repos/repo_edit_fields.html:7
 msgid "Type"
 msgstr ""
 #: kallithea/templates/admin/defaults/defaults.html:42
 #: kallithea/templates/admin/repos/repo_add_base.html:73
 #: kallithea/templates/admin/repos/repo_edit_settings.html:84
 #: kallithea/templates/data_table/_dt_elements.html:72
 msgid "Private repository"
 msgstr ""
 #: kallithea/templates/admin/defaults/defaults.html:46
 #: kallithea/templates/admin/repos/repo_add_base.html:77
 #: kallithea/templates/admin/repos/repo_edit_settings.html:88
 #: kallithea/templates/forks/fork.html:72
 msgid "Private repositories are only visible to people explicitly added as collaborators."
 msgstr ""
 #: kallithea/templates/admin/defaults/defaults.html:53
 #: kallithea/templates/admin/repos/repo_edit_settings.html:93
 msgid "Enable statistics"
 msgstr ""
 #: kallithea/templates/admin/defaults/defaults.html:57
 #: kallithea/templates/admin/repos/repo_edit_settings.html:97
 msgid "Enable statistics window on summary page."
 msgstr ""
 #: kallithea/templates/admin/defaults/defaults.html:63
 #: kallithea/templates/admin/repos/repo_edit_settings.html:102
 msgid "Enable downloads"
 msgstr ""
 #: kallithea/templates/admin/defaults/defaults.html:67
 #: kallithea/templates/admin/repos/repo_edit_settings.html:106
 msgid "Enable download menu on summary page."
 msgstr ""
 #: kallithea/templates/admin/defaults/defaults.html:73
 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34
 #: kallithea/templates/admin/repos/repo_edit_settings.html:111
 msgid "Enable locking"
 msgstr ""
 #: kallithea/templates/admin/defaults/defaults.html:77
 #: kallithea/templates/admin/repos/repo_edit_settings.html:115
 msgid "Enable lock-by-pulling on repository."
 msgstr ""
 #: kallithea/templates/admin/gists/edit.html:5
 #: kallithea/templates/admin/gists/edit.html:18
 msgid "Edit Gist"
 msgstr ""
 #: kallithea/templates/admin/gists/edit.html:36
 #, python-format
 msgid "Gist was update since you started editing. Copy your changes and click %(here)s to reload new version."
 msgstr ""
 #: kallithea/templates/admin/gists/edit.html:55
 #: kallithea/templates/admin/gists/new.html:39
 msgid "Gist description ..."
 msgstr ""
 #: kallithea/templates/admin/gists/edit.html:57
 #: kallithea/templates/admin/gists/new.html:41
 msgid "Gist lifetime"
 msgstr ""
 #: kallithea/templates/admin/gists/edit.html:61
 #: kallithea/templates/admin/gists/edit.html:63
 #: kallithea/templates/admin/gists/index.html:57
 #: kallithea/templates/admin/gists/index.html:59
 #: kallithea/templates/admin/gists/show.html:47
 #: kallithea/templates/admin/gists/show.html:49
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:8
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:27
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:32
 #: kallithea/templates/admin/users/user_edit_api_keys.html:8
 #: kallithea/templates/admin/users/user_edit_api_keys.html:27
 #: kallithea/templates/admin/users/user_edit_api_keys.html:32
 msgid "Expires"
 msgstr ""
 #: kallithea/templates/admin/gists/edit.html:61
 #: kallithea/templates/admin/gists/index.html:57
 #: kallithea/templates/admin/gists/show.html:47
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:8
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:27
 #: kallithea/templates/admin/users/user_edit_api_keys.html:8
 #: kallithea/templates/admin/users/user_edit_api_keys.html:27
 msgid "Never"
 msgstr ""
 #: kallithea/templates/admin/gists/edit.html:145
 msgid "Update Gist"
 msgstr ""
 #: kallithea/templates/admin/gists/edit.html:146
 #: kallithea/templates/changeset/changeset_file_comment.html:79
 msgid "Cancel"
 msgstr ""
 #: kallithea/templates/admin/gists/index.html:6
 #: kallithea/templates/admin/gists/index.html:16
 #, python-format
 msgid "Private Gists for User %s"
 msgstr ""
 #: kallithea/templates/admin/gists/index.html:8
 #: kallithea/templates/admin/gists/index.html:18
 #, python-format
 msgid "Public Gists for User %s"
 msgstr ""
 #: kallithea/templates/admin/gists/index.html:10
 #: kallithea/templates/admin/gists/index.html:20
 msgid "Public Gists"
 msgstr ""
 #: kallithea/templates/admin/gists/index.html:37
 #: kallithea/templates/admin/gists/show.html:25
 #: kallithea/templates/base/base.html:244
 msgid "Create New Gist"
 msgstr ""
 #: kallithea/templates/admin/gists/index.html:54
 #: kallithea/templates/data_table/_dt_elements.html:141
 msgid "Created"
 msgstr ""
 #: kallithea/templates/admin/gists/index.html:74
 msgid "There are no gists yet"
 msgstr ""
 #: kallithea/templates/admin/gists/new.html:5
 #: kallithea/templates/admin/gists/new.html:18
 msgid "New Gist"
 msgstr ""
 #: kallithea/templates/admin/gists/new.html:47
 msgid "name this file..."
 msgstr ""
 #: kallithea/templates/admin/gists/new.html:56
 msgid "Create Private Gist"
 msgstr ""
 #: kallithea/templates/admin/gists/new.html:57
 msgid "Create Public Gist"
 msgstr ""
 #: kallithea/templates/admin/gists/new.html:58
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:15
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:70
 #: kallithea/templates/admin/my_account/my_account_emails.html:46
 #: kallithea/templates/admin/my_account/my_account_password.html:34
 #: kallithea/templates/admin/my_account/my_account_profile.html:71
 #: kallithea/templates/admin/permissions/permissions_globals.html:113
 #: kallithea/templates/admin/permissions/permissions_ips.html:39
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115
 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43
 #: kallithea/templates/admin/repos/repo_edit_fields.html:59
 #: kallithea/templates/admin/repos/repo_edit_permissions.html:102
 #: kallithea/templates/admin/repos/repo_edit_settings.html:137
 #: kallithea/templates/admin/settings/settings_global.html:57
 #: kallithea/templates/admin/settings/settings_vcs.html:81
 #: kallithea/templates/admin/settings/settings_visual.html:117
 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105
 #: kallithea/templates/admin/users/user_edit_api_keys.html:15
 #: kallithea/templates/admin/users/user_edit_api_keys.html:70
 #: kallithea/templates/admin/users/user_edit_emails.html:46
 #: kallithea/templates/admin/users/user_edit_ips.html:50
 #: kallithea/templates/admin/users/user_edit_profile.html:123
 #: kallithea/templates/base/default_perms_box.html:65
 #: kallithea/templates/files/files_add.html:65
 #: kallithea/templates/files/files_delete.html:44
 #: kallithea/templates/files/files_edit.html:68
 #: kallithea/templates/pullrequests/pullrequest.html:89
 msgid "Reset"
 msgstr ""
 #: kallithea/templates/admin/gists/show.html:5
 #: kallithea/templates/admin/gists/show.html:9
 msgid "Gist"
 msgstr ""
 #: kallithea/templates/admin/gists/show.html:10
 #: kallithea/templates/email_templates/changeset_comment.html:15
 #: kallithea/templates/email_templates/pull_request.html:10
 #: kallithea/templates/email_templates/pull_request_comment.html:15
 msgid "URL"
 msgstr ""
 #: kallithea/templates/admin/gists/show.html:37
 msgid "Public Gist"
 msgstr ""
 #: kallithea/templates/admin/gists/show.html:39
 msgid "Private Gist"
 msgstr ""
 #: kallithea/templates/admin/gists/show.html:56
 #: kallithea/templates/admin/my_account/my_account_emails.html:19
 #: kallithea/templates/admin/permissions/permissions_ips.html:12
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:75
 #: kallithea/templates/admin/repos/repo_edit_fields.html:18
 #: kallithea/templates/admin/settings/settings_hooks.html:36
 #: kallithea/templates/admin/users/user_edit_emails.html:19
 #: kallithea/templates/admin/users/user_edit_ips.html:22
 #: kallithea/templates/changeset/changeset_file_comment.html:30
 #: kallithea/templates/data_table/_dt_elements.html:129
 #: kallithea/templates/data_table/_dt_elements.html:157
 #: kallithea/templates/data_table/_dt_elements.html:173
 #: kallithea/templates/data_table/_dt_elements.html:189
 #: kallithea/templates/files/files_source.html:39
 #: kallithea/templates/files/files_source.html:42
 #: kallithea/templates/files/files_source.html:45
 msgid "Delete"
 msgstr ""
 #: kallithea/templates/admin/gists/show.html:56
 msgid "Confirm to delete this Gist"
 msgstr ""
 #: kallithea/templates/admin/gists/show.html:63
 #: kallithea/templates/admin/repos/repo_edit_settings.html:27
 #: kallithea/templates/base/perms_summary.html:43
 #: kallithea/templates/base/perms_summary.html:79
 #: kallithea/templates/base/perms_summary.html:81
 #: kallithea/templates/changeset/changeset_file_comment.html:81
 #: kallithea/templates/changeset/changeset_file_comment.html:191
 #: kallithea/templates/data_table/_dt_elements.html:122
 #: kallithea/templates/data_table/_dt_elements.html:123
 #: kallithea/templates/data_table/_dt_elements.html:150
 #: kallithea/templates/data_table/_dt_elements.html:151
 #: kallithea/templates/data_table/_dt_elements.html:165
 #: kallithea/templates/data_table/_dt_elements.html:167
 #: kallithea/templates/data_table/_dt_elements.html:181
 #: kallithea/templates/data_table/_dt_elements.html:183
 #: kallithea/templates/files/diff_2way.html:56
 #: kallithea/templates/files/files_source.html:41
 #: kallithea/templates/files/files_source.html:44
 #: kallithea/templates/pullrequests/pullrequest_show.html:41
 msgid "Edit"
 msgstr ""
 #: kallithea/templates/admin/gists/show.html:65
 #: kallithea/templates/files/files_edit.html:49
 #: kallithea/templates/files/files_source.html:34
 msgid "Show as Raw"
 msgstr ""
 #: kallithea/templates/admin/gists/show.html:73
 msgid "created"
 msgstr ""
 #: kallithea/templates/admin/gists/show.html:86
 #: kallithea/templates/files/files_source.html:73
 msgid "Show as raw"
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account.html:5
 #: kallithea/templates/admin/my_account/my_account.html:9
 #: kallithea/templates/base/base.html:350
 msgid "My Account"
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account.html:35
 #: kallithea/templates/admin/users/user_edit.html:29
 msgid "Profile"
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account.html:36
 msgid "Email Addresses"
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account.html:38
 #: kallithea/templates/admin/users/user_edit.html:31
 msgid "API Keys"
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account.html:39
 msgid "Owned Repositories"
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account.html:40
 #: kallithea/templates/journal/journal.html:53
 msgid "Watched Repositories"
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account.html:41
 #: kallithea/templates/admin/permissions/permissions.html:30
 #: kallithea/templates/admin/user_groups/user_group_edit.html:32
 #: kallithea/templates/admin/users/user_edit.html:34
 msgid "Show Permissions"
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:6
 #: kallithea/templates/admin/users/user_edit_api_keys.html:6
 msgid "Built-in"
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:14
 #: kallithea/templates/admin/users/user_edit_api_keys.html:14
 #, python-format
 msgid "Confirm to reset this API key: %s"
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:30
 #: kallithea/templates/admin/users/user_edit_api_keys.html:30
 msgid "Expired"
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:40
 #: kallithea/templates/admin/users/user_edit_api_keys.html:40
 #, python-format
 msgid "Confirm to remove this API key: %s"
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:42
 #: kallithea/templates/admin/users/user_edit_api_keys.html:42
 msgid "Remove"
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:49
 #: kallithea/templates/admin/users/user_edit_api_keys.html:49
 msgid "No additional API keys specified"
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:61
 #: kallithea/templates/admin/users/user_edit_api_keys.html:61
 msgid "New API key"
 msgstr ""
 #: kallithea/templates/admin/my_account/my_account_api_keys.html:69
 #: kallithea/templates/admin/my_account/my_account_emails.html:45
 #: kallithea/templates/admin/permissions/permissions_ips.html:38
 #: kallithea/templates/admin/repos/repo_add_base.html:81
 #: kallithea/templates/admin/repos/repo_edit_fields.html:58
 #: kallithea/templates/admin/users/user_edit_api_keys.html:69
 #: kallithea/templates/admin/users/user_edit_emails.html:45
 #: kallithea/templates/admin/users/user_edit_ips.html:49
 msgid "Add"
 msgstr ""

kallithea/templates/admin/auth/auth_settings.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%block name="title">
     ${_('Authentication Settings')}
 </%block>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${_('Authentication')}
 </%def>
 <%block name="header_menu">
     ${self.menu('admin')}
 </%block>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('auth_settings'))}
     <div class="form">
     ## enabled auth plugins
     <h1>${_('Authentication Plugins')}</h1>
     <div class="fields">
        <div class="field">
            <div class="label"><label for="auth_plugins">${_("Enabled Plugins")}</label></div>
            <div class="input">${h.text("auth_plugins", class_='large')}
-           <span class="help-block">${_('Comma separated list of plugins. Order of plugins is also order in which Kallithea will try to authenticate user')}</span>
+           <span class="help-block">${_('Comma-separated list of plugins; Kallithea will try user authentication in plugin order')}</span>
                <div style="padding:10px 0px 10px 0px;font-weight: bold">${_('Available built-in plugins')}</div>
                <ul>
                %for plugin_path in c.available_plugins:
                     <li>
                       <div style="padding:3px 0px 3px 0px">
                           <span style="margin: 0px 10px 0px 0px" plugin_id="${plugin_path}" class="toggle-plugin btn btn-mini ${'btn-success' if plugin_path in c.enabled_plugins else ''}">
                           ${_('Enabled') if plugin_path in c.enabled_plugins else _('Disabled')}</span>${plugin_path}
                       </div>
                     </li>
                %endfor
                </ul>
            </div>
        </div>
     </div>
     %for cnt, module in enumerate(c.enabled_plugins):
         <% pluginName = c.plugin_shortnames[module] %>
         <h1>${_('Plugin')}: ${pluginName}</h1>
         <div class="fields">
         ## autoform generation, based on plugin definition from it's settings
         %for setting in c.plugin_settings[module]:
             <% fullsetting = "auth_%s_%s" % (pluginName, setting["name"]) %>
             <% displayname = (setting["formname"] if ("formname" in setting) else setting["name"]) %>
             %if setting["type"] == "password":
             <div class="field">
                 <div class="label"><label for="${fullsetting}">${_(displayname)}</label></div>
                 <div class="input">
                     ${h.password(fullsetting,class_='small')}
                     <span class="help-block">${setting["description"]}</span>
                 </div>
             </div>
             %elif setting["type"] in ["string", "int"]:
             <div class="field">
                 <div class="label"><label for="${fullsetting}">${_(displayname)}</label></div>
                 <div class="input">
                     ${h.text(fullsetting,class_='small')}
                     <span class="help-block">${setting["description"]}</span>
                 </div>
             </div>
             %elif setting["type"] == "bool":
             <div class="field">
                 <div class="label label-checkbox"><label for="${fullsetting}">${_(displayname)}</label></div>
                 <div class="checkboxes">
                     <div class="checkbox">${h.checkbox(fullsetting,True,class_='small')}</div>
                     <span class="help-block">${setting["description"]}</span>
                 </div>
             </div>
             %elif setting["type"] == "select":
             <div class="field">
                 <div class="label"><label for="${fullsetting}">${_(displayname)}</label></div>
                 <div class="select">
                     ${h.select(fullsetting,setting['values'][0],setting['values'],class_='small')}
                     <span class="help-block">${setting["description"]}</span>
                 </div>
             </div>
             %else:
             <div class="field">
                 <div class="label"><label for="${fullsetting}">${_(displayname)}</label></div>
                 <div class="input">This field is of type ${setting['type']}, which cannot be displayed. Must be one of [string|int|bool|select].</div>
                 <span class="help-block">${setting["description"]}</span>
             </div>
             %endif
         %endfor
         </div>
     %endfor
         <div class="fields">
             <div class="buttons">
                 ${h.submit('save',_('Save'),class_="btn")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 <script>
     $('.toggle-plugin').click(function(e){
         var $auth_plugins_input = $('#auth_plugins');
         var notEmpty = function(element, index, array) {
             return (element != "");
+        }
         var elems = $auth_plugins_input.val().split(',').filter(notEmpty);
         var $cur_button = $(e.currentTarget);
         var plugin_id = $cur_button.attr('plugin_id');
         if($cur_button.hasClass('btn-success')){
             elems.splice(elems.indexOf(plugin_id), 1);
             $auth_plugins_input.val(elems.join(','));
             $cur_button.removeClass('btn-success');
             $cur_button.html(_TM['disabled']);
+        }
         else{
             if(elems.indexOf(plugin_id) == -1){
                 elems.push(plugin_id);
+            }
             $auth_plugins_input.val(elems.join(','));
             $cur_button.addClass('btn-success');
             $cur_button.html(_TM['enabled']);
+        }
     });
 </script>
 </%def>

0 comments (0 inline, 0 general)