Mercurial > kallithea
changeset 5125:2aeaf6367929
spelling: more consistent casing of 'IP'
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 13 May 2015 01:27:50 +0200 |
| parents | e3aab61a9411 |
| children | 5c6cc20d224b |
| files | docs/installation_win_old.rst kallithea/controllers/admin/users.py kallithea/lib/recaptcha.py kallithea/lib/utils.py kallithea/model/user.py kallithea/templates/admin/permissions/permissions_ips.html kallithea/templates/admin/users/user_edit_ips.html |
| diffstat | 7 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/installation_win_old.rst Wed May 13 01:27:50 2015 +0200 +++ b/docs/installation_win_old.rst Wed May 13 01:27:50 2015 +0200 @@ -211,7 +211,7 @@ cd C:\Kallithea\Bin paster make-config Kallithea production.ini -Then, you must edit production.ini to fit your needs (ip address, ip +Then, you must edit production.ini to fit your needs (network address and port, mail settings, database, whatever). I recommend using NotePad++ (free) or similar text editor, as it handles well the EndOfLine character differences between Unix and Windows
--- a/kallithea/controllers/admin/users.py Wed May 13 01:27:50 2015 +0200 +++ b/kallithea/controllers/admin/users.py Wed May 13 01:27:50 2015 +0200 @@ -499,7 +499,7 @@ user_model = UserModel() user_model.delete_extra_ip(id, ip_id) Session().commit() - h.flash(_("Removed ip address from user whitelist"), category='success') + h.flash(_("Removed IP address from user whitelist"), category='success') if 'default_user' in request.POST: return redirect(url('admin_permissions_ips'))
--- a/kallithea/lib/recaptcha.py Wed May 13 01:27:50 2015 +0200 +++ b/kallithea/lib/recaptcha.py Wed May 13 01:27:50 2015 +0200 @@ -55,7 +55,7 @@ recaptcha_challenge_field -- The value of recaptcha_challenge_field from the form recaptcha_response_field -- The value of recaptcha_response_field from the form private_key -- your reCAPTCHA private key - remoteip -- the user's ip address + remoteip -- the user's IP address """ if not (recaptcha_response_field and recaptcha_challenge_field and
--- a/kallithea/lib/utils.py Wed May 13 01:27:50 2015 +0200 +++ b/kallithea/lib/utils.py Wed May 13 01:27:50 2015 +0200 @@ -161,7 +161,7 @@ easy translations :param repo: string name of repository or object containing repo_id, that action was made on - :param ipaddr: optional ip address from what the action was made + :param ipaddr: optional IP address from what the action was made :param sa: optional sqlalchemy session """
--- a/kallithea/model/user.py Wed May 13 01:27:50 2015 +0200 +++ b/kallithea/model/user.py Wed May 13 01:27:50 2015 +0200 @@ -447,7 +447,7 @@ def add_extra_ip(self, user, ip): """ - Adds ip address to UserIpMap + Adds IP address to UserIpMap :param user: :param ip: @@ -465,7 +465,7 @@ def delete_extra_ip(self, user, ip_id): """ - Removes ip address from UserIpMap + Removes IP address from UserIpMap :param user: :param ip_id:
--- a/kallithea/templates/admin/permissions/permissions_ips.html Wed May 13 01:27:50 2015 +0200 +++ b/kallithea/templates/admin/permissions/permissions_ips.html Wed May 13 01:27:50 2015 +0200 @@ -10,7 +10,7 @@ ${h.hidden('del_ip_id',ip.ip_id)} ${h.hidden('default_user', 'True')} <i class="icon-minus-circled" style="color:#FF4444"></i> ${h.submit('remove_',_('delete'),id="remove_ip_%s" % ip.ip_id, - class_="action_button", onclick="return confirm('"+_('Confirm to delete this ip: %s') % ip.ip_addr+"');")} + class_="action_button", onclick="return confirm('"+_('Confirm to delete this IP address: %s') % ip.ip_addr+"');")} ${h.end_form()} </td> </tr> @@ -27,7 +27,7 @@ <div class="fields"> <div class="field"> <div class="label"> - <label for="new_ip">${_('New ip address')}:</label> + <label for="new_ip">${_('New IP address')}:</label> </div> <div class="input"> ${h.hidden('default_user', 'True')}
--- a/kallithea/templates/admin/users/user_edit_ips.html Wed May 13 01:27:50 2015 +0200 +++ b/kallithea/templates/admin/users/user_edit_ips.html Wed May 13 01:27:50 2015 +0200 @@ -20,7 +20,7 @@ ${h.hidden('del_ip_id',ip.ip_id)} <i class="icon-minus-circled" style="color:#FF4444"></i> ${h.submit('remove_',_('delete'),id="remove_ip_%s" % ip.ip_id, - class_="action_button", onclick="return confirm('"+_('Confirm to delete this ip: %s') % ip.ip_addr+"');")} + class_="action_button", onclick="return confirm('"+_('Confirm to delete this IP address: %s') % ip.ip_addr+"');")} ${h.end_form()} </td> </tr> @@ -39,7 +39,7 @@ <div class="fields"> <div class="field"> <div class="label"> - <label for="new_ip">${_('New ip address')}:</label> + <label for="new_ip">${_('New IP address')}:</label> </div> <div class="input"> ${h.text('new_ip', class_='medium')}