diff --git a/cps/admin.py b/cps/admin.py index 54742345..8e4f7df2 100644 --- a/cps/admin.py +++ b/cps/admin.py @@ -431,15 +431,15 @@ def delete_restriction(type): @admin_required def list_restriction(type): if type == 0: # Tags as template - restrict = [{'Element': x, 'type':_('deny'), 'id': 'd'+str(i) } + restrict = [{'Element': x, 'type':_('Deny'), 'id': 'd'+str(i) } for i,x in enumerate(config.list_denied_tags()) if x != '' ] - allow = [{'Element': x, 'type':_('allow'), 'id': 'a'+str(i) } + allow = [{'Element': x, 'type':_('Allow'), 'id': 'a'+str(i) } for i,x in enumerate(config.list_allowed_tags()) if x != ''] json_dumps = restrict + allow elif type == 1: # CustomC as template - restrict = [{'Element': x, 'type':_('deny'), 'id': 'd'+str(i) } + restrict = [{'Element': x, 'type':_('Deny'), 'id': 'd'+str(i) } for i,x in enumerate(config.list_denied_column_values()) if x != '' ] - allow = [{'Element': x, 'type':_('allow'), 'id': 'a'+str(i) } + allow = [{'Element': x, 'type':_('Allow'), 'id': 'a'+str(i) } for i,x in enumerate(config.list_allowed_column_values()) if x != ''] json_dumps = restrict + allow elif type == 2: # Tags per user @@ -448,9 +448,9 @@ def list_restriction(type): usr = ub.session.query(ub.User).filter(ub.User.id == usr_id).first() else: usr = current_user - restrict = [{'Element': x, 'type':_('deny'), 'id': 'd'+str(i) } + restrict = [{'Element': x, 'type':_('Deny'), 'id': 'd'+str(i) } for i,x in enumerate(usr.list_denied_tags()) if x != '' ] - allow = [{'Element': x, 'type':_('allow'), 'id': 'a'+str(i) } + allow = [{'Element': x, 'type':_('Allow'), 'id': 'a'+str(i) } for i,x in enumerate(usr.list_allowed_tags()) if x != ''] json_dumps = restrict + allow elif type == 3: # CustomC per user @@ -459,9 +459,9 @@ def list_restriction(type): usr = ub.session.query(ub.User).filter(ub.User.id==usr_id).first() else: usr = current_user - restrict = [{'Element': x, 'type':_('deny'), 'id': 'd'+str(i) } + restrict = [{'Element': x, 'type':_('Deny'), 'id': 'd'+str(i) } for i,x in enumerate(usr.list_denied_column_values()) if x != '' ] - allow = [{'Element': x, 'type':_('allow'), 'id': 'a'+str(i) } + allow = [{'Element': x, 'type':_('Allow'), 'id': 'a'+str(i) } for i,x in enumerate(usr.list_allowed_column_values()) if x != ''] json_dumps = restrict + allow else: diff --git a/cps/kobo_auth.py b/cps/kobo_auth.py index e37090a1..ed712980 100644 --- a/cps/kobo_auth.py +++ b/cps/kobo_auth.py @@ -127,7 +127,7 @@ def generate_auth_token(user_id): warning = _('PLease access calibre-web from non localhost to get valid api_endpoint for kobo device') return render_title_template( "generate_kobo_auth_url.html", - title=_(u"Kobo Set-up"), + title=_(u"Kobo Setup"), warning = warning ) else: @@ -147,7 +147,7 @@ def generate_auth_token(user_id): ub.session.commit() return render_title_template( "generate_kobo_auth_url.html", - title=_(u"Kobo Set-up"), + title=_(u"Kobo Setup"), kobo_auth_url=url_for( "kobo.TopLevelEndpoint", auth_token=auth_token.auth_token, _external=True ), diff --git a/cps/templates/email_edit.html b/cps/templates/email_edit.html index f5180921..2ac9d463 100644 --- a/cps/templates/email_edit.html +++ b/cps/templates/email_edit.html @@ -57,7 +57,7 @@ -