[squeak-dev] The Trunk: Monticello-mt.769.mcz

commits at source.squeak.org commits at source.squeak.org
Wed Jan 19 10:41:18 UTC 2022


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

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

Name: Monticello-mt.769
Author: mt
Time: 19 January 2022, 11:41:18.281855 am
UUID: 775ed52f-773f-dd43-972f-e738894fb52d
Ancestors: Monticello-mt.768

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

=============== Diff against Monticello-mt.768 ===============

Item was changed:
  ----- Method: MCTool>>answer: (in category 'morphic ui') -----
  answer: anObject
  	self wasInterrupted
+ 		ifTrue: [^ self inform: 'This modal dialog was interrupted\and thus cannot proceed.\\Please close it or cancel the operation.' translated withCRs].
- 		ifTrue: [^ self inform: 'This modal dialog was interrupted\and thus cannot proceed.\\Please close it or cancel the operation.' withCRs translated].
  	modalValue := anObject.
  	self close.!

Item was changed:
  ----- Method: MCWorkingCopyBrowser>>checkForNewerVersions (in category 'actions') -----
  checkForNewerVersions
  	"Answer true if there are no newer versions preventing us from saving a version."
  
  	| newer |
  	newer := workingCopy possiblyNewerVersionsIn: self repository.
  	
  	newer ifEmpty: [^ true].
  	
+ 	^ self confirm: ('CAUTION!! {1}:\\	{2}\\Do you really want to save this version?' translated withCRs format: {
- 	^ self confirm: ('CAUTION!! {1}:\\	{2}\\Do you really want to save this version?' withCRs translated format: {
  		newer size = 1
  			ifTrue: ['This version in the repository may be newer' translated]
  			ifFalse: ['These {1} versions in the repository may be newer' translated format: {newer size}].
  		newer asCommaString withNoLineLongerThan: 150})!

Item was changed:
  ----- Method: MCWorkingCopyBrowser>>viewChanges (in category 'actions') -----
  viewChanges
  	| patch |
  	self canSave ifTrue:
  		[patch := workingCopy changesRelativeToRepository: self repository withCache.
  		patch isNil ifTrue: [ ^self ].
  		patch isEmpty
  			ifTrue: [ workingCopy modified: false.
+ 				self inform: ('No changes between your working copy of the package\\	{1}\\ and the repository at location\\	{2}' translated withCRs asText format: { workingCopy packageName asText allBold. self repository description asText allBold })]
- 				self inform: ('No changes between your working copy of the package\\	{1}\\ and the repository at location\\	{2}' withCRs translated asText format: { workingCopy packageName asText allBold. self repository description asText allBold })]
  			ifFalse:
  				[ workingCopy modified: true.
  				(MCPatchBrowser forPatch: patch)
  					label: ('Patch Browser: {1}' translated format: {workingCopy description});
  					environmentInDisplayingImage: workingCopy environment;
  					show ] ]!



More information about the Squeak-dev mailing list