[squeak-dev] The Trunk: System-mt.1290.mcz

commits at source.squeak.org commits at source.squeak.org
Wed Jan 19 10:45:47 UTC 2022


Marcel Taeumel uploaded a new version of System to project The Trunk:
http://source.squeak.org/trunk/System-mt.1290.mcz

==================== Summary ====================

Name: System-mt.1290
Author: mt
Time: 19 January 2022, 11:45:45.329855 am
UUID: f725cdfc-4615-9f41-baf9-6998e9c3fb3c
Ancestors: System-mt.1289

Fixes GetText export: "withCRs translated" -> "translated withCRs"

=============== Diff against System-mt.1289 ===============

Item was changed:
  ----- Method: Project>>okToChange (in category 'release') -----
  okToChange
  	"Answer whether the window in which the project is housed can be dismissed -- which is destructive. We never clobber a project without confirmation"
  
  	| answer |
  	(self isCurrentProject and: [self isTopProject]) ifTrue: [
  		self inform: 'You cannot close the top project.'.
  		^ false].
  	
  	((Preferences valueOfFlag: #checkForUnsavedProjects) ==>
+ 		[self confirm: ('Do you really want to delete the project\{1}\and all its content?' translated withCRs format:{self name})])
- 		[self confirm: ('Do you really want to delete the project\{1}\and all its content?' withCRs translated format:{self name})])
  		ifFalse: [^ false].
  
  	self subProjects ifNotEmpty: [:sp |
  		answer := Project uiManager
  			chooseFrom: #(
  				"1" 'Lift all sub-projects'
  				"2" 'Discard all sub-projects (NO UNDO!!)'
  				"3 or 0" 'Cancel')
  			lines: #(2)
+ 			title: ('The project {1}\contains {2} sub-project(s).' translated withCRs format:{self name. sp size}).
- 			title: ('The project {1}\contains {2} sub-project(s).' withCRs translated format:{self name. sp size}).
  		
  		(answer = 0 or: [answer = 3]) ifTrue: [^ false].
  		answer = 1 ifTrue: [self liftSubProjects. ^ true].
  		answer = 2 ifTrue: [^ sp allSatisfy: [:ea | 
  				[ea okToChange] valueSuppressingMessages: {'*delete the project*and all its content*'}]]].
  	
  	^ true!

Item was changed:
  ----- Method: SystemNavigation>>confirmAndRemoveSelector:class: (in category 'ui') -----
  confirmAndRemoveSelector: selector class: aClass
  
  	| method allCalls remove browse |
  	method := MethodReference class: aClass selector: selector environment: self environment.
  	allCalls := self allCallsOn: selector.
  	
  	(allCalls anySatisfy: [:ea | ea ~= method])
  		ifFalse: [remove := true. browse := false]
  		ifTrue: [ | allChoices yourChoice |
  
  			allChoices := OrderedDictionary new.
  			allChoices at: 'Yes, remove it' translated put: [remove := true. browse := false].
  			allChoices at: 'Yes, remove it, then browse senders' translated put: [remove := true. browse := true].
  			allChoices at: 'No, don''t remove it, but browse senders' translated put: [remove := false. browse := true].
  			allChoices at: 'No, don''t remove it' translated put: [remove := false. browse := false].
  	
  			yourChoice := Project uiManager
  				chooseFromLabeledValues: allChoices
+ 				title: ('Are you sure that you want to remove the message\{1} from {2}?\\The message has {3} senders.' translated withCRs asText format: {
- 				title: ('Are you sure that you want to remove the message\{1} from {2}?\\The message has {3} senders.' withCRs translated asText format: {
  					selector asText allBold.
  					aClass name asText allBold.
  					allCalls size asString asText allBold }).
  
  			remove := browse := false. "Defaults"
  			yourChoice value. "Supports nil because of defaults above."].
  	
  	remove ifTrue: [
  		aClass removeSelector: selector].
  	browse ifTrue: [
  		self headingAndAutoselectForLiteral: selector do: [ :label :autoSelect |
  			self
  				browseMessageList: allCalls
  				name: label
  				autoSelect: autoSelect]].
  	
  	^ remove!



More information about the Squeak-dev mailing list