--- a/FileOperation.st Fri Nov 17 13:26:04 2017 +0100
+++ b/FileOperation.st Fri Nov 17 13:48:16 2017 +0100
@@ -273,9 +273,9 @@
destType := oldFileIsDirectory ifTrue:'directory' ifFalse:'file'.
sameContents ifTrue:[
- msg := 'Overwrite existing destination %7:\\ %1\ size: %3 of %2\\with %8 source (same contents):\\ %4\ size: %6 of %5'.
+ msg := 'Overwrite existing destination ',destType,':\\ %1\ size: %3 of %2\\with %8 source (same contents):\\ %4\ size: %6 of %5'.
] ifFalse:[
- msg := 'Overwrite existing destination %7:\\ %1\ size: %3 of %2\\with %8 source (%9):\\ %4\ size: %6 of %5'.
+ msg := 'Overwrite existing destination ',destType,':\\ %1\ size: %3 of %2\\with %8 source (%9):\\ %4\ size: %6 of %5'.
].
newFileTime := newFile modificationTime ? Timestamp now.
@@ -287,11 +287,11 @@
newFileSize := newFile fileSize.
oldFileSize := oldFile fileSize.
smallerOrLarger := newFileSize < oldFileSize
- ifTrue:[ 'smaller' ]
+ ifTrue:[ 'larger' ]
ifFalse:[
newFileSize = oldFileSize
ifTrue:['same size']
- ifFalse:['larger' ]].
+ ifFalse:['smaller' ]].
msg := resources
stringWithCRs:msg
@@ -302,7 +302,7 @@
with:oldFile asString allBold
with:(oldFileTime printStringFormat:'%(Day)-%(mon)-%(year) %h:%m:%s')
with:oldSize
- with:destType
+ with:destType "/ file or directory - no longer used in template
with:(resources string:olderOrNewer)
with:(resources string:smallerOrLarger) ).
@@ -330,7 +330,7 @@
box addVerticalSpace:10.
box verticalPanel
add:(CheckBox
- label:'Same action for all'
+ label:(resources string:'Same action for all')
model:forAllHolder).
].
] do:[
@@ -349,7 +349,7 @@
^ answer
"Created: / 20-03-2012 / 11:44:34 / cg"
- "Modified: / 17-11-2017 / 12:54:34 / cg"
+ "Modified: / 17-11-2017 / 13:28:04 / cg"
! !
!FileOperation methodsFor:'queries'!