Changeset 12664 for main


Ignore:
Timestamp:
5 Mar 2015, 09:01:43 (10 years ago)
Author:
Henrik Bettermann
Message:

Replace adjective by adverb.

Location:
main/waeup.kofa/trunk/src/waeup/kofa/applicants
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py

    r12395 r12664  
    808808    manage_applications = True
    809809    pnav = 3
    810     display_actions = [[_('Save'), _('Final Submit')],
     810    display_actions = [[_('Save'), _('Finally Submit')],
    811811        [_('Add online payment ticket'),_('Remove selected tickets')]]
    812812
     
    993993                [_('Add online payment ticket'),_('Remove selected tickets')]]
    994994        elif self.context.special and state == PAID:
    995             actions = [[_('Save'), _('Final Submit')],
     995            actions = [[_('Save'), _('Finally Submit')],
    996996                [_('Add online payment ticket'),_('Remove selected tickets')]]
    997997        elif state == PAID:
    998             actions = [[_('Save'), _('Final Submit')],
     998            actions = [[_('Save'), _('Finally Submit')],
    999999                [_('Remove selected tickets')]]
    10001000        return actions
     
    10541054        return
    10551055
    1056     @action(_('Final Submit'), warning=WARNING)
     1056    @action(_('Finally Submit'), warning=WARNING)
    10571057    def finalsubmit(self, **data):
    10581058        if self.upload_success is False:  # False is not None!
  • main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py

    r12395 r12664  
    916916        file_ctrl.add_file(image, filename='myphoto.jpg')
    917917        self.browser.getControl(name="confirm_passport").value = True
    918         self.browser.getControl("Final Submit").click()
     918        self.browser.getControl("Finally Submit").click()
    919919        self.browser.open(self.view_path + '/' + payment_id)
    920920        self.browser.getLink("Download payment slip").click()
     
    10421042        file_ctrl.add_file(image, filename='myphoto.jpg')
    10431043        self.browser.getControl(name="confirm_passport").value = True
    1044         self.browser.getControl("Final Submit").click()
     1044        self.browser.getControl("Finally Submit").click()
    10451045        self.browser.open(applicant_path + '/' + payment_id)
    10461046        self.browser.getLink("Download payment slip").click()
     
    10681068        self.login()
    10691069        self.browser.getLink("Edit application record").click()
    1070         self.assertFalse('Final Submit' in self.browser.contents)
     1070        self.assertFalse('Finally Submit' in self.browser.contents)
    10711071        IWorkflowInfo(self.applicant).fireTransition('pay')
    10721072        self.browser.open(self.edit_path)
    1073         self.assertTrue('Final Submit' in self.browser.contents)
     1073        self.assertTrue('Finally Submit' in self.browser.contents)
    10741074        self.fill_correct_values() # fill other fields with correct values
    10751075        self.browser.getControl("Save").click()
    1076         self.browser.getControl("Final Submit").click()
     1076        self.browser.getControl("Finally Submit").click()
    10771077        # We forgot to upload a passport picture
    10781078        self.assertTrue(
     
    10831083        file_ctrl = ctrl.mech_control
    10841084        file_ctrl.add_file(image, filename='myphoto.jpg')
    1085         self.browser.getControl("Final Submit").click() # (finally) submit form
     1085        self.browser.getControl("Finally Submit").click() # (finally) submit form
    10861086        # The picture has been uploaded but the form cannot be submitted
    10871087        # since the passport confirmation box was not ticked
     
    11051105        self.browser.open(self.edit_path)
    11061106        self.browser.getControl(name="confirm_passport").value = True
    1107         self.browser.getControl("Final Submit").click()
     1107        self.browser.getControl("Finally Submit").click()
    11081108        self.assertTrue(
    11091109            'Application submitted' in self.browser.contents)
     
    11141114        self.browser.open(self.edit_path)
    11151115        self.browser.getControl(name="confirm_passport").value = True
    1116         self.browser.getControl("Final Submit").click()
     1116        self.browser.getControl("Finally Submit").click()
    11171117        self.assertTrue(
    11181118            'Application submitted' in self.browser.contents)
     
    11241124            'The requested form is locked' in self.browser.contents)
    11251125        self.browser.goBack(count=1)
    1126         self.browser.getControl("Final Submit").click()
     1126        self.browser.getControl("Finally Submit").click()
    11271127        self.assertTrue(
    11281128            'The requested form is locked' in self.browser.contents)
Note: See TracChangeset for help on using the changeset viewer.