zontreck/ToonTownRewritten
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

localization: Pass in a 'place' argument to GetPossesive method to tell the localizer where it's being called from.

Browse source
This commit is contained in:
Harvir 2014-05-14 21:15:29 +01:00
parent bb8f4318c6
commit a6cc9682de
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
toontown/estate/DistributedHouse.py
View file

@ -167,7 +167,7 @@ class DistributedHouse(DistributedObject.DistributedObject):
if self.name == '':
return
else:
houseName = TTLocalizer.AvatarsHouse % TTLocalizer.GetPossesive(self.name)
houseName = TTLocalizer.AvatarsHouse % TTLocalizer.GetPossesive(self.name, 'house')
nameText.setText(houseName)
self.nameText = nameText
textHeight = nameText.getHeight() - 2
@ -207,7 +207,7 @@ class DistributedHouse(DistributedObject.DistributedObject):
if self.name == '':
return
else:
houseName = TTLocalizer.AvatarsHouse % TTLocalizer.GetPossesive(self.name)
houseName = TTLocalizer.AvatarsHouse % TTLocalizer.GetPossesive(self.name, 'house')
matText.setText(houseName)
self.matText = matText
textHeight = matText.getHeight() - 2
@ -230,7 +230,7 @@ class DistributedHouse(DistributedObject.DistributedObject):
if self.name == '':
houseName = ''
else:
houseName = TTLocalizer.AvatarsHouse % TTLocalizer.GetPossesive(self.name)
houseName = TTLocalizer.AvatarsHouse % TTLocalizer.GetPossesive(self.name, 'house')
self.nametag = NametagGroup()
self.nametag.setFont(ToontownGlobals.getBuildingNametagFont())
if TTLocalizer.BuildingNametagShadow:
@ -357,7 +357,7 @@ class DistributedHouse(DistributedObject.DistributedObject):
if self.name == '':
return
else:
houseName = TTLocalizer.AvatarsHouse % TTLocalizer.GetPossesive(self.name)
houseName = TTLocalizer.AvatarsHouse % TTLocalizer.GetPossesive(self.name, 'house')
nameText.setText(houseName)
self.nameText = nameText
textHeight = nameText.getHeight() - 2

2
toontown/hood/PartyHood.py
View file

@ -62,7 +62,7 @@ class PartyHood(Hood.Hood):
msg = TTLocalizer.PartyOverWarningNoName
if hasattr(base, 'distributedParty') and base.distributedParty:
name = base.distributedParty.hostName
msg = TTLocalizer.PartyOverWarningWithName % TTLocalizer.GetPossesive(name)
msg = TTLocalizer.PartyOverWarningWithName % TTLocalizer.GetPossesive(name, 'party')
self.__popupKickoutMessage(msg)
base.localAvatar.setTeleportAvailable(0)
if retCode == 1:

2
toontown/parties/DistributedParty.py
View file

@ -563,7 +563,7 @@ class DistributedParty(DistributedObject.DistributedObject):
def spawnTitleText(self):
if not self.hostName:
return
partyText = TTLocalizer.PartyTitleText % TTLocalizer.GetPossesive(self.hostName)
partyText = TTLocalizer.PartyTitleText % TTLocalizer.GetPossesive(self.hostName, 'party')
self.doSpawnTitleText(partyText)
def doSpawnTitleText(self, text):

2
toontown/parties/InviteVisual.py
View file

@ -55,7 +55,7 @@ class InviteVisual(DirectFrame):
def updateInvitation(self, hostsName, partyInfo):
self.partyInfo = partyInfo
hostsName = TTLocalizer.GetPossesive(hostsName)
hostsName = TTLocalizer.GetPossesive(hostsName, 'party')
self.whosePartyLabel['text'] = TTLocalizer.PartyPlannerInvitationWhoseSentence % hostsName
if self.partyInfo.isPrivate:
publicPrivateText = TTLocalizer.PartyPlannerPrivate.lower()

2
toontown/shtiker/MapPage.py
View file

@ -179,7 +179,7 @@ class MapPage(ShtikerPage.ShtikerPage):
avatar = base.cr.identifyAvatar(base.cr.playGame.hood.loader.estateOwnerId)
if avatar:
avName = avatar.getName()
self.hoodLabel['text'] = TTLocalizer.MapPageYouAreAtSomeonesHome % TTLocalizer.GetPossesive(avName)
self.hoodLabel['text'] = TTLocalizer.MapPageYouAreAtSomeonesHome % TTLocalizer.GetPossesive(avName, 'book')
self.hoodLabel.show()
elif zone:
hoodName = ToontownGlobals.hoodNameMap.get(ZoneUtil.getCanonicalHoodId(zone), ('',))[-1]

2
toontown/toonbase/TTLocalizerEnglish.py
View file

@ -8238,7 +8238,7 @@ FlowerGuiCancel = lCancel
FlowerGuiOk = 'Sell All'
FlowerBasketValue = '%(name)s, you have %(num)s flowers in your basket worth a total of %(value)s jellybeans. Do you want to sell them all?'
def GetPossesive(name):
def GetPossesive(name, place):
if name[-1:] == 's':
possesive = name + "'"
else: