[squeak-dev] The Trunk: SMBase-ct.146.mcz

commits at source.squeak.org commits at source.squeak.org
Wed May 18 17:29:28 UTC 2022


Christoph Thiede uploaded a new version of SMBase to project The Trunk:
http://source.squeak.org/trunk/SMBase-ct.146.mcz

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

Name: SMBase-ct.146
Author: ct
Time: 18 May 2022, 7:29:27.534874 pm
UUID: e0aa203f-bb34-d942-8f8b-f8f3ebd212be
Ancestors: SMBase-tpr.145

Improves multilingual support and moves from UIManager default to Project uiManager.

=============== Diff against SMBase-tpr.145 ===============

Item was changed:
  ----- Method: SMSimpleInstaller>>fileIntoChangeSetNamed:fromStream: (in category 'services') -----
  fileIntoChangeSetNamed: aString fromStream: stream
  	"We let the user confirm filing into an existing ChangeSet
  	or specify another ChangeSet name if
  	the name derived from the filename already exists."
  	
  	| changeSet newName oldChanges global |
  	newName := aString.
  	changeSet := SMInstaller changeSetNamed: newName.
  	changeSet ifNotNil: [
+ 		newName := self silent ifNil: [Project uiManager
+ 									request: 'ChangeSet already present, just confirm to overwrite or enter a new name:' translated
- 		newName := self silent ifNil: [UIManager default
- 									request: 'ChangeSet already present, just confirm to overwrite or enter a new name:' 
  									initialAnswer: newName]
  						ifNotNil: [newName].
  		newName isEmpty ifTrue:[self error: 'Cancelled by user'].
  		changeSet := SMInstaller changeSetNamed: newName].
  		changeSet ifNil:[changeSet := SMInstaller basicNewChangeSet: newName].
  		changeSet ifNil:[self error: 'User did not specify a valid ChangeSet name'].
  		oldChanges := (SystemVersion current highestUpdate < 5302)
  						ifFalse: [global := ChangeSet. ChangeSet current]
  						ifTrue: [global := Smalltalk. Smalltalk changes].
   		[global newChanges: changeSet.
+ 		stream fileInAnnouncing: ('Loading {1} into change set {2}' translated format: {newName. newName}).
- 		stream fileInAnnouncing: 'Loading ', newName, ' into change set ''', newName, ''''.
  		stream close] ensure: [global newChanges: oldChanges]!

Item was changed:
  ----- Method: SMUtilities class>>mailUserName (in category 'private') -----
  mailUserName
  	"Answer the mail user's name, but deal with some historical mail senders."
  
  	| mailSender |
  	mailSender := (Smalltalk at: #MailSender ifAbsent: [ Smalltalk at: #Celeste ifAbsent: []]).
  	^mailSender
+ 		ifNil: [ Project uiManager request: 'What is your email address?' translated ]
- 		ifNil: [ UIManager default request: 'What is your email address?' ]
  		ifNotNil: [ mailSender userName ]!

Item was changed:
  ----- Method: SMUtilities class>>sendMail: (in category 'utilities') -----
  sendMail: aString
  	"Send the given mail message, but check for modern mail senders."
  
  	
  
  	Smalltalk at: #MailSender ifPresent: [ :mailSender |
  		^mailSender sendMessage: ((Smalltalk at: #MailMessage) from: aString).
  	].
  
  	Smalltalk at: #MailComposition ifPresent: [ :mailComposition |
  		^mailComposition new
  			messageText:  aString;
  			open
  	].
  	
  	Smalltalk at: #Celeste ifPresent: [ :celeste |
  		celeste isSmtpServerSet ifTrue: [
  			Smalltalk at: #CelesteComposition ifPresent: [ :celesteComposition |
  				^celesteComposition
  					openForCeleste: celeste current 
  					initialText: aString
  			]
  		]
  	].
  
  	Smalltalk at: #AdHocComposition ifPresent: [ :adHocComposition | | server |
+ 		server := Project uiManager request: 'What is your mail server for outgoing mail?' translated.
- 		server := UIManager default request: 'What is your mail server for outgoing mail?'.
  		^adHocComposition 
  			openForCeleste: server
  			initialText: aString
  	].
  
+ 	^self inform: 'Sorry, no known way to send the message' translated!
- 	^self inform: 'Sorry, no known way to send the message'.
- 	 	!



More information about the Squeak-dev mailing list