#UI_ENHANCEMENT by mawalch
class: SourceCodeManagerUtilities
changed: #compareClassWithRepository:askForRevision:
Add string translation.
--- a/SourceCodeManagerUtilities.st Fri Sep 01 14:27:47 2017 +0200
+++ b/SourceCodeManagerUtilities.st Mon Sep 04 17:38:59 2017 +0200
@@ -2487,14 +2487,14 @@
"open a diff-textView comparing the current (in-image) version
against the newest or an asked-for version found in the repository."
- |classToCompare brwsr comparedSource currentSource rev revString thisRevString
+ |classToCompare brwsr comparedSource currentSource rev revString thisRevString
scmManager revisionInClass versionsAreTheSame revInfo revAuthor revDate revLabel |
classToCompare := aClass theNonMetaclass.
- comparedSource := self
- fetchSourceOf:classToCompare askForRevision:askForRevision
- into:[:revStringArg :revisionInClassArg :scmManagerArg|
+ comparedSource := self
+ fetchSourceOf:classToCompare askForRevision:askForRevision
+ into:[:revStringArg :revisionInClassArg :scmManagerArg|
revString := revStringArg.
revisionInClass := revisionInClassArg.
scmManager := scmManagerArg.
@@ -2531,7 +2531,7 @@
"/ "/ class in repository - ask for revision
"/ "/
"/ SourceCodeManagerError handle:[:ex |
-"/ Dialog warn:(resources
+"/ Dialog warn:(resources
"/ stringWithCRs:'Could not fetch revision info of "%1".\\Please check your sourcecode manager settings of %2 for package: "%3".\(and possibly the network for reachability of the repository)'
"/ with:classToCompare name
"/ with:classToCompare sourceCodeManager managerTypeName
@@ -2556,8 +2556,8 @@
"/ ].
"/
"/ rev := self
-"/ askForExistingRevision:msg
-"/ title:'Compare with repository'
+"/ askForExistingRevision:msg
+"/ title:'Compare with repository'
"/ class:classToCompare.
"/ ] ifFalse:[
"/ rev := newestRev.
@@ -2569,14 +2569,14 @@
"/ ] ifFalse:[
"/ msg := 'Could not figure out the newest revision of "%1".\\Notice that the class is actually maintained by %4, not %2.\Please check if this class is really in the %2 repository,\and also your sourcecode manager settings of %2 for package: "%3".\(and possibly the network for reachability of the repository)'
"/ ].
-"/ Dialog warn:(resources
+"/ Dialog warn:(resources
"/ stringWithCRs:msg
"/ with:classToCompare name
"/ with:mgr managerTypeName
"/ with:classToCompare package
"/ with:(classToCompare sourceCodeManager managerTypeName)).
"/ ^ self.
-"/
+"/
"/ ].
"/ rev withoutSpaces isEmpty ifTrue:[
"/ msg := 'extracting newest %1 (' , (newestRev ? '???') , ')'.
@@ -2655,8 +2655,8 @@
ChangeSet invalidChangeChunkError handle:[:ex |
|answer|
- answer := Dialog
- confirm:(resources
+ answer := Dialog
+ confirm:(resources
stringWithCRs:'An invalid change chunk was encountered when reading the source of %1.\This may be due to a currupted source file (or source file was modified/updated in the meantime, without recompilation).\\Proceed in debugger?'
with:aClass)
yesLabel:(resources string:'Debug')
@@ -2675,7 +2675,7 @@
ifSame:[versionsAreTheSame := true].
].
versionsAreTheSame ifFalse:[
- brwsr classChangeSet
+ brwsr classChangeSet
classBeingCompared:classToCompare;
versionA:revString;
versionB:thisRevString , 'mod'.
@@ -2684,13 +2684,13 @@
versionsAreTheSame ifTrue:[
(classToCompare hasUnsavedChanges) ifTrue:[
- (self confirm:(resources
+ (self confirm:(resources
stringWithCRs:'Versions of %1 are identical.\\Remove entries from changeSet ?'
with:classToCompare name allBold)) ifTrue:[
ChangeSet current condenseChangesForClass:classToCompare.
].
] ifFalse:[
- self information:'Versions are identical.'.
+ self information:(resources string:'Versions are identical.').
ChangeSet current unrememberChangedClasses.
].
revisionInClass isNil ifTrue:[
@@ -2719,6 +2719,7 @@
"
"Modified: / 24-07-2012 / 18:11:27 / cg"
+ "Modified (comment): / 04-09-2017 / 17:37:24 / mawalch"
!
comparePackages:packages askForRevision:askForRevision