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

@@ @@ -2473,97 +2473,97 @@ msgstr[1] "" @@
 #: 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/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":

0 comments (0 inline, 0 general)