hg/stx-libbasic3: comparison SourceCodeManagerUtilities.st

equal deleted inserted replaced

-:7b49d530a850
+:4adaffbd7ab0
 (YesToAllNotification notNil and:[YesToAllNotification isHandled]) ifTrue:[
 answer := OptionBox
 request:msg withCRs
 label:'Really checkIn ?'
 form:(InfoBox iconBitmap)
-buttonLabels:#('yes' 'yes to all' 'no' 'no to all')
+buttonLabels:#('Yes' 'Yes to all' 'No' 'No to all')
 values:#(true #yesToAll false #noToAll)
 default:#yesToAll
 onCancel:false.
 answer == #yesToAll ifTrue:[
 YesToAllNotification queryWith:true.
 answer doCheckinWithoutAsking forceCheckIn resources rslt note
 requiredPackage|
 resources := ResourcePack for:self.
 aClass isLoaded ifFalse:[
-self warn:'please load the class first'.
+self warn:(resources string:'Please load the %1-class first' with:aClass name).
 ^ false.
 ].
 className := aClass name.
 Do you want to change it or check right into that container ?'
 with:className
 with:module
 with:package
 with:fileName)
-labels:(resources array:#('cancel' 'check in' 'change')).
+labels:(resources array:#('Cancel' 'Check in' 'Change')).
 answer isNil ifTrue:[AbortSignal raise].
 answer ifTrue:[
 doCheckinWithoutAsking := false.
 oldModule := module.
 oldPackage := package.
 creatingNew ifFalse:[
 doCheckinWithoutAsking ifFalse:[
 (Dialog
 confirm:(resources string:'The repository already contains a container named "%3" in "%1/%2" !!\\Checkin %4 anyway ? (DANGER - be careful)'
 withArgs:(Array with:module with:package with:fileName with:className)) withCRs
-noLabel:'cancel')
+noLabel:'Cancel')
 ifFalse:[
 ^ false
 ].
 ]
 ].
 true "doCheckinWithoutAsking" ifFalse:[
 answer := Dialog
 confirmWithCancel:(resources string:'%1 does not have any (usable) revision info (#version method)\\Shall I create one ?' with:className) withCRs
-labels:(resources array:#( 'cancel' 'no' 'yes')).
+labels:(resources array:#( 'Cancel' 'No' 'Yes')).
 answer isNil ifTrue:[^ false].
 ] ifTrue:[
 answer := true.
 ].
 answer ifTrue:[
 "/
 "/ check for the module
 "/
 (mgr checkForExistingModule:module) ifFalse:[
 (createDirs or:[creatingNew]) ifFalse:[
-self warn:(resources string:'a module named %1 does not exist in the source code management' with:module).
+self warn:(resources string:'A module named %1 does not exist in the source code management' with:module).
 ^ false
 ].
 (Dialog
 confirm:(resources string:'%1 is a new module.\\create it ?' with:module) withCRs
-noLabel:'cancel')
+noLabel:'Cancel')
 ifFalse:[
 ^ false.
 ].
 (mgr createModule:module) ifFalse:[
-self warn:(resources string:'cannot create new module: %1' with:module).
+self warn:(resources string:'Cannot create new module: %1' with:module).
 ^ false.
 ]
 ].
 LastModule := module.
 self warn:(resources string:'a package named %1 does not exist module %2' with:module with:package).
 ^ false
 ].
 (Dialog
 confirm:(resources string:'%1 is a new package (in module %2).\\create it ?' with:package with:module) withCRs
-noLabel:'cancel')
+noLabel:'Cancel')
 ifFalse:[
 ^ false.
 ].
 (mgr createModule:module package:package) ifFalse:[
-self warn:(resources string:'cannot create new package: %1 (in module %2)' with:package with:module).
+self warn:(resources string:'Cannot create new package: %1 (in module %2)' with:package with:module).
 ^ false.
 ]
 ].
 LastPackage := package.
 "/
 "/ check for the container itself
 "/
 (mgr checkForExistingContainerInModule:module package:package container:fileName) ifTrue:[
 creatingNew ifTrue:[
-self warn:(resources string:'container for %1 already exists in %2/%3.' with:fileName with:module with:package) withCRs.
+self warn:(resources string:'Container for %1 already exists in %2/%3.' with:fileName with:module with:package) withCRs.
 ].
 "/            (oldModule notNil
 "/            and:[(oldModule ~= module)
 "/                 or:[oldPackage ~= package
 %2 / %3 / %4  ?'
 with:className
 with:module
 with:package
 with:fileName) withCRs
-noLabel:'cancel')
+noLabel:'Cancel')
 ifFalse:[
 ^ false.
 ].
 ].
 module:module
 logMessage:msg)
 ifFalse:[
 doCheckinWithoutAsking ifFalse:[
 (Dialog
-confirm:'no easy merge seems possible; force checkin (no merge) ?'
+confirm:'No easy merge seems possible; force checkin (no merge) ?'
-noLabel:'cancel')
+noLabel:'Cancel')
 ifFalse:[
 ^ false.
 ].
 ].
 forceCheckIn := true.
 directory:package
 module:module
 logMessage:msg
 force:true)
 ifFalse:[
-self warn:(resources string:'failed to check into existing container.').
+self warn:(resources string:'Failed to check into existing container.').
 ^ false.
 ].
 ].
 ^ true
 ] ifFalse:[
 (createContainer or:[creatingNew]) ifFalse:[
 (Dialog
-confirm:(resources string:'no container exists for %1 in %2/%3\\create ?'
+confirm:(resources string:'No container exists for %1 in %2/%3\\create ?'
 with:fileName with:module with:package) withCRs
-noLabel:'cancel') ifFalse:[
+noLabel:'Cancel') ifFalse:[
 ^ false
 ]
 ]
 ].
 (mgr
 createContainerFor:aClass
 inModule:module
 package:package
 container:fileName) ifFalse:[
-self warn:(resources string:'failed to create container.').
+self warn:(resources string:'Failed to create container.').
 ^ false.
 ].
 ^ true
 !
 ! !
 !SourceCodeManagerUtilities class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.64 2001-09-10 14:12:24 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.65 2001-10-04 17:26:38 cg Exp $'
 ! !

changeset 1076	4adaffbd7ab0
parent 1070	3f87ae65a554
child 1077	6b1bcfd27521