Skip to content

Commit e5cc46c

Browse files
committed
Localize error text in conflict checking strategy
1 parent bb9ab19 commit e5cc46c

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

source/Sagan-Core/CriteriaBasedConflictCheckingStrategy.class.st

+2-5
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,8 @@ Class {
2323
{ #category : 'instance creation' }
2424
CriteriaBasedConflictCheckingStrategy class >> accordingTo: aBlockOrMatchingCriteria [
2525

26-
^ self
27-
accordingTo: aBlockOrMatchingCriteria
28-
explainingConflictWith: [ :objectInMemory |
29-
'Something is in conflict with <1p>' expandMacrosWith:
30-
objectInMemory ]
26+
^ self accordingTo: aBlockOrMatchingCriteria explainingConflictWith: [ :objectInMemory |
27+
'Something is in conflict with {1}' localizedWithAll: { objectInMemory printString } ]
3128
]
3229

3330
{ #category : 'instance creation' }

0 commit comments

Comments
 (0)