diff --git a/toontown/login/AvatarChoice.py b/toontown/login/AvatarChoice.py index 0418936b..faf3665a 100755 --- a/toontown/login/AvatarChoice.py +++ b/toontown/login/AvatarChoice.py @@ -165,9 +165,7 @@ class AvatarChoice(DirectButton): self.verifyDeleteWithPassword() def verifyDeleteWithPassword(self): - deleteText = TTLocalizer.AvatarChoiceDeleteConfirmText % { - 'name': self.name, - 'confirm': TTLocalizer.AvatarChoiceDeleteConfirmUserTypes} + deleteText = TTLocalizer.AvatarChoiceDeleteConfirmText % {'name': self.name} if self.deleteWithPasswordFrame == None: buttons = loader.loadModel('phase_3/models/gui/dialog_box_buttons_gui') nameBalloon = loader.loadModel('phase_3/models/props/chatbox_input') @@ -190,13 +188,12 @@ class AvatarChoice(DirectButton): return def __handleDeleteWithConfirmOK(self, *args): - if self.passwordEntry.get().lower() == TTLocalizer.AvatarChoiceDeleteConfirmUserTypes: + if self.passwordEntry.get().lower() == self.name.lower(): self.deleteWithPasswordFrame.hide() base.transitions.noTransitions() messenger.send(self.doneEvent, ['delete', self.position]) else: - self.deleteWithPasswordFrame['text'] = TTLocalizer.AvatarChoiceDeleteWrongConfirm % {'name': self.name, - 'confirm': TTLocalizer.AvatarChoiceDeleteConfirmUserTypes} + self.deleteWithPasswordFrame['text'] = TTLocalizer.AvatarChoiceDeleteWrongConfirm % {'name': self.name} self.passwordEntry['focus'] = 1 self.passwordEntry.enterText('') diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py index 3b57f788..95e3639a 100755 --- a/toontown/toonbase/TTLocalizerEnglish.py +++ b/toontown/toonbase/TTLocalizerEnglish.py @@ -3262,12 +3262,11 @@ AvatarChoiceNameRejected = 'Name\nRejected' AvatarChoiceNameApproved = 'Name\nApproved!' AvatarChoiceNameReview = 'Under\nReview' AvatarChoiceNameYourToon = 'Name\nYour Toon!' -AvatarChoiceDeleteConfirmText = 'Careful! This will delete %(name)s forever. If you are sure you want to do this, type "%(confirm)s" and click OK.' -AvatarChoiceDeleteConfirmUserTypes = 'delete' +AvatarChoiceDeleteConfirmText = "Careful! This will delete %(name)s forever. If you are sure you want to do this, type your toon's name and click OK." AvatarChoiceDeletePasswordTitle = 'Delete Toon?' AvatarChoiceDeletePasswordOK = lOK AvatarChoiceDeletePasswordCancel = lCancel -AvatarChoiceDeleteWrongConfirm = 'You didn\'t type the right thing. To delete %(name)s, type "%(confirm)s" and click OK. Do not type the quotation marks. Click Cancel if you have changed your mind.' +AvatarChoiceDeleteWrongConfirm = "You didn\'t type the right thing. To delete %(name)s, type your toon's name and click OK. Do not type the quotation marks. Click Cancel if you have changed your mind." AvatarChooserPickAToon = 'Pick A Toon To Play' AvatarChooserQuit = lQuit DateOfBirthEntryMonths = ['Jan',