Revision 674f9a52 snf-astakos-app/astakos/im/views.py

b/snf-astakos-app/astakos/im/views.py
90 90
from astakos.im.tasks import request_billing
91 91
from astakos.im.api.callpoint import AstakosCallpoint
92 92

  
93
import astakos.im.messages as astakos_messages
94

  
93 95
logger = logging.getLogger(__name__)
94 96

  
95 97

  
......
229 231
                    email = form.cleaned_data.get('username')
230 232
                    realname = form.cleaned_data.get('realname')
231 233
                    inviter.invite(email, realname)
232
                    message = _('Invitation sent to %s' % email)
234
                    message = _(astakos_messages.INVITATION_SENT) % locals()
233 235
                    messages.success(request, message)
234 236
                except SendMailError, e:
235 237
                    message = e.message
236 238
                    messages.error(request, message)
237 239
                    transaction.rollback()
238 240
                except BaseException, e:
239
                    message = _('Something went wrong.')
241
                    message = _(astakos_messages.GENERIC_ERROR)
240 242
                    messages.error(request, message)
241 243
                    logger.exception(e)
242 244
                    transaction.rollback()
243 245
                else:
244 246
                    transaction.commit()
245 247
        else:
246
            message = _('No invitations left')
248
            message = _(astakos_messages.MAX_INVITATION_NUMBER_REACHED)
247 249
            messages.error(request, message)
248 250

  
249 251
    sent = [{'email': inv.username,
......
305 307
                next = request.POST.get('next')
306 308
                if next:
307 309
                    return redirect(next)
308
                msg = _('Profile has been updated successfully')
310
                msg = _(astakos_messages.PROFILE_UPDATED)
309 311
                messages.success(request, msg)
310 312
            except ValueError, ve:
311 313
                messages.success(request, ve)
......
397 399
                messages.error(request, message)
398 400
                transaction.rollback()
399 401
            except BaseException, e:
400
                message = _('Something went wrong.')
402
                message = _(astakos_messages.GENERIC_ERROR)
401 403
                messages.error(request, message)
402 404
                logger.exception(e)
403 405
                transaction.rollback()
......
452 454
            except SendMailError, e:
453 455
                messages.error(request, message)
454 456
            else:
455
                message = _('Feedback successfully sent')
457
                message = _(astakos_messages.FEEDBACK_SENT)
456 458
                messages.success(request, message)
457 459
    return render_response(template_name,
458 460
                           feedback_form=form,
......
481 483
        response['Location'] = LOGOUT_NEXT
482 484
        response.status_code = 301
483 485
        return response
484
    messages.success(request, _('You have successfully logged out.'))
486
    messages.success(request, _(astakos_messages.LOGOUT_SUCCESS))
485 487
    context = get_context(request, extra_context)
486 488
    response.write(
487 489
        template_loader.render_to_string(template, context_instance=context))
......
504 506
    try:
505 507
        user = AstakosUser.objects.get(auth_token=token)
506 508
    except AstakosUser.DoesNotExist:
507
        return HttpResponseBadRequest(_('No such user'))
509
        return HttpResponseBadRequest(_(astakos_messages.ACCOUNT_UNKNOWN))
508 510

  
509 511
    if user.is_active:
510
        message = _('Account already active.')
512
        message = _(astakos_messages.ACCOUNT_ALREADY_ACTIVE)
511 513
        messages.error(request, message)
512 514
        return index(request)
513 515

  
......
534 536
            transaction.rollback()
535 537
            return index(request)
536 538
        except BaseException, e:
537
            message = _('Something went wrong.')
539
            message = _(astakos_messages.GENERIC_ERROR)
538 540
            messages.error(request, message)
539 541
            logger.exception(e)
540 542
            transaction.rollback()
......
555 557
            transaction.rollback()
556 558
            return index(request)
557 559
        except BaseException, e:
558
            message = _('Something went wrong.')
560
            message = _(astakos_messages.GENERIC_ERROR)
559 561
            messages.error(request, message)
560 562
            logger.exception(e)
561 563
            transaction.rollback()
......
578 580
            pass
579 581

  
580 582
    if not term:
581
        messages.error(request, 'There are no approval terms.')
583
        messages.error(request, _(astakos_messages.NO_APPROVAL_TERMS))
582 584
        return HttpResponseRedirect(reverse('index'))
583 585
    f = open(term.location, 'r')
584 586
    terms = f.read()
......
626 628
        try:
627 629
            user = EmailChange.objects.change_email(activation_key)
628 630
            if request.user.is_authenticated() and request.user == user:
629
                msg = _('Email changed successfully.')
631
                msg = _(astakos_messages.EMAIL_CHANGED)
630 632
                messages.success(request, msg)
631 633
                auth_logout(request)
632 634
                response = prepare_response(request, user)
......
653 655
            messages.error(request, msg)
654 656
            transaction.rollback()
655 657
        except IntegrityError, e:
656
            msg = _('There is already a pending change email request.')
658
            msg = _(astakos_messages.PENDING_EMAIL_CHANGE_REQUEST)
657 659
            messages.error(request, msg)
658 660
        else:
659
            msg = _('Change email request has been registered succefully.\
660
                    You are going to receive a verification email in the new address.')
661
            msg = _(astakos_messages.EMAIL_CHANGE_REGISTERED)
661 662
            messages.success(request, msg)
662 663
            transaction.commit()
663 664
    return render_response(form_template_name,
......
744 745
    try:
745 746
        kind = GroupKind.objects.get(name=kind_name)
746 747
    except:
747
        return HttpResponseBadRequest(_('No such group kind'))
748
        return HttpResponseBadRequest(_(astakos_messages.GROUPKIND_UNKNOWN))
748 749
    
749 750
    
750 751

  
......
801 802
        result = callpoint.create_groups((d,)).next()
802 803
        if result.is_success:
803 804
            new_object = result.data[0]
804
            msg = _("The %(verbose_name)s was created successfully.") %\
805
            msg = _(astakos_messages.OBJECT_CREATED) %\
805 806
                {"verbose_name": model._meta.verbose_name}
806 807
            messages.success(request, msg, fail_silently=True)
807 808
            
......
820 821
            post_save_redirect = '/im/group/%(id)s/'
821 822
            return HttpResponseRedirect(post_save_redirect % new_object)
822 823
        else:
823
            msg = _("The %(verbose_name)s creation failed: %(reason)s.") %\
824
            msg = _(astakos_messages.OBJECT_CREATED_FAILED) %\
824 825
                {"verbose_name": model._meta.verbose_name,
825 826
                 "reason":result.reason}
826 827
            messages.error(request, msg, fail_silently=True)
......
1074 1075
        return HttpResponseRedirect(post_save_redirect)
1075 1076
    except IntegrityError, e:
1076 1077
        logger.exception(e)
1077
        msg = _('Failed to join group.')
1078
        msg = _(astakos_messages.GROUP_JOIN_FAILURE)
1078 1079
        messages.error(request, msg)
1079 1080
        return group_search(request)
1080 1081

  
......
1088 1089
            group__id=group_id,
1089 1090
            person=request.user)
1090 1091
    except Membership.DoesNotExist:
1091
        return HttpResponseBadRequest(_('Invalid membership.'))
1092
        return HttpResponseBadRequest(_(astakos_messages.NOT_A_MEMBER))
1092 1093
    if request.user in m.group.owner.all():
1093
        return HttpResponseForbidden(_('Owner can not leave the group.'))
1094
        return HttpResponseForbidden(_(astakos_messages.OWNER_CANNOT_LEAVE_GROUP))
1094 1095
    return delete_object(
1095 1096
        request,
1096 1097
        model=Membership,
......
1109 1110
                group__id=group_id,
1110 1111
                person__id=user_id)
1111 1112
        except Membership.DoesNotExist:
1112
            return HttpResponseBadRequest(_('Invalid membership.'))
1113
            return HttpResponseBadRequest(_(astakos_messages.NOT_MEMBER))
1113 1114
        else:
1114 1115
            if request.user not in m.group.owner.all():
1115
                return HttpResponseForbidden(_('User is not a group owner.'))
1116
                return HttpResponseForbidden(_(astakos_messages.NOT_OWNER))
1116 1117
            func(request, m)
1117 1118
            return group_detail(request, group_id)
1118 1119
    return wrapper
......
1127 1128
    try:
1128 1129
        membership.approve()
1129 1130
        realname = membership.person.realname
1130
        msg = _('%s has been successfully joined the group.' % realname)
1131
        msg = _(astakos_messages.MEMBER_JOINED_GROUP) % locals()
1131 1132
        messages.success(request, msg)
1132 1133
    except BaseException, e:
1133 1134
        logger.exception(e)
1134 1135
        realname = membership.person.realname
1135
        msg = _('Something went wrong during %s\'s approval.' % realname)
1136
        msg = _(astakos_messages.GENERIC_ERROR)
1136 1137
        messages.error(request, msg)
1137 1138

  
1138 1139

  
......
1143 1144
    try:
1144 1145
        membership.disapprove()
1145 1146
        realname = membership.person.realname
1146
        msg = _('%s has been successfully removed from the group.' % realname)
1147
        msg = MEMBER_REMOVED % realname
1147 1148
        messages.success(request, msg)
1148 1149
    except BaseException, e:
1149 1150
        logger.exception(e)
1150
        msg = _('Something went wrong during %s\'s disapproval.' % realname)
1151
        msg = _(astakos_messages.GENERIC_ERROR)
1151 1152
        messages.error(request, msg)
1152 1153

  
1153 1154

  
......
1237 1238
        status, data = r.result
1238 1239
        data = _clear_billing_data(data)
1239 1240
        if status != 200:
1240
            messages.error(request, _('Service response status: %d' % status))
1241
            messages.error(request, _(astakos_messages.BILLING_ERROR) % status)
1241 1242
    except:
1242 1243
        messages.error(request, r.result)
1243 1244

  

Also available in: Unified diff