hg/stx-libtool2: comparison Tools__InternationalLanguageTranslationEditor.st

equal deleted inserted replaced

-:37159708ecef
+:641467b2f522
 		languageTextModifiedHolder languageTextAcceptHolder
 		inSingleFileMode lastExtractedProject lastLanguage
 		lastSelectedKey autoAcceptHolder languageEditor
 		selectedColIndexHolder exampleLanguageSelectionHolder
 		exampleLanguageTextHolder pastePreviousTranslationEnableHolder
-		searchForSimilarTranslationEnableHolder alwaysWriteUTF8Holder'
+		searchForSimilarTranslationEnableHolder alwaysWriteUTF8Holder
+		lastNameSpace'
 	classVariableNames:'LastExtractedClass LastExtractedApplicationClass
 		LastExtractedProject'
 	poolDictionaries:''
 	category:'Interface-UIPainter'
 !
 window:
 (WindowSpec
 label: 'InternationalLanguageTranslationEditor'
 name: 'InternationalLanguageTranslationEditor'
 min: (Point 10 10)
-max: (Point 1024 768)
 bounds: (Rectangle 0 0 778 614)
 menu: mainMenu
 )
 component:
 (SpecCollection
 (SpecCollection
 collection: (
 (DataSetSpec
 name: 'KeyStringAndLanguageSelectionTable'
 model: selectedKeyRow
+menu: keyStringAndLanguageSelectionTableMenu
 hasHorizontalScrollBar: true
 hasVerticalScrollBar: true
 dataList: keyStringAndLanguageSelectionTable
 columnHolder: keyStringAndLanguageSelectionTableColumnDescriptionHolder
 beDependentOfRows: true
 )
 ! !
 !InternationalLanguageTranslationEditor class methodsFor:'menu specs'!
+keyStringAndLanguageSelectionTableMenu
+"This resource specification was automatically generated
+by the MenuEditor of ST/X."
+"Do not manually edit this!! If it is corrupted,
+the MenuEditor may not be able to read the specification."
+"
+MenuEditor new openOnClass:Tools::InternationalLanguageTranslationEditor andSelector:#keyStringAndLanguageSelectionTableMenu
+(Menu new fromLiteralArrayEncoding:(Tools::InternationalLanguageTranslationEditor keyStringAndLanguageSelectionTableMenu)) startUp
+"
+<resource: #menu>
+^
+#(Menu
+(
+(MenuItem
+label: 'Current NameSpace:'
+itemValue: changeLastNameSpace
+translateLabel: true
+)
+(MenuItem
+label: 'Search String in Current NameSpace:'
+itemValue: searchStringInLastNameSpace
+translateLabel: true
+)
+)
+nil
+nil
+)
+!
 mainMenu
 "This resource specification was automatically generated
 by the MenuEditor of ST/X."
 "Do not manually edit this!! If it is corrupted,
 translateLabel: true
 )
 (MenuItem
 label: 'Save Resource File As...'
 itemValue: menuSaveAs
+translateLabel: true
+)
+(MenuItem
+label: '-'
+)
+(MenuItem
+label: 'Current NameSpace:'
+itemValue: changeLastNameSpace
 translateLabel: true
 )
 (MenuItem
 label: '-'
 )
 translateLabel: true
 )
 (MenuItem
 label: 'Extract from Project...'
 itemValue: extractTranslationsFromProject
+translateLabel: true
+)
+(MenuItem
+label: 'Extract from NameSpace...'
+itemValue: extractTranslationsFromNameSpace
 translateLabel: true
 )
 (MenuItem
 label: '-'
 )
 !InternationalLanguageTranslationEditor methodsFor:'accessing'!
 newLanguageText
 "/   languageEditor accept
 ^self languageTextHolder value isNil
 ifTrue:['']
 ifFalse:[self languageTextHolder value asCollectionOfLines first.]
 !
 selectedKey
 "Returns the current selected key if there is one row seleted. Otherwise, returns nil"
 |rowSelectionIndex |
+keyStringsToLanguageMappings isNil ifTrue:[^nil].
+self selectedKeyRow value isNil ifTrue:[^nil].
 rowSelectionIndex := self selectedKeyRow value.
 rowSelectionIndex == 0 ifTrue:[^nil].
 ^ keyStringsToLanguageMappings keyAt:rowSelectionIndex.
 ! !
 !InternationalLanguageTranslationEditor methodsFor:'additionalFuncionalities'!
 searchForSimilarTranslation
 "Looks for a quite similar translation for the key and display a dialog with available options"
 |similarTranslationsAssociations selectedTranslation|
 self shouldSearchForSimilarTranslation ifFalse:[^self].
 similarTranslationsAssociations := keyStringsToLanguageMappings searchForSimilarTranslation: self selectedKey in: self currentLanguage.
 similarTranslationsAssociations isEmpty ifTrue:[^self].
 similarTranslationsAssociations := similarTranslationsAssociations associations inject: OrderedCollection new into:[:collection :association |
 collection detect:[:selectedAssociation |
 selectedAssociation value sameAs: association value] ifNone:[collection add: association].
 collection].
 selectedTranslation := Dialog
 choose:'Choose one if you consider it�s usefull to translate:
 ',
-'<', self selectedKey, '>  ',
+'<', self selectedKey, '>  ', (self currentExampleLanguageText ifNil:[''])
-self currentExampleLanguageText
+fromList: (similarTranslationsAssociations collect:[:each |  '<', each key, '>  ', each value])
-fromList: (similarTranslationsAssociations collect:[:each |  '<', each key, '>  ', each value])
+values: (similarTranslationsAssociations collect:[:each | each value])
-values: (similarTranslationsAssociations collect:[:each | each value])
+lines:10
-lines:10
+cancel: nil.
-cancel: nil.
+selectedTranslation notNil ifTrue:[self languageTextHolderValue: selectedTranslation].
-selectedTranslation notNil ifTrue:[self languageTextHolderValue: selectedTranslation].
 ! !
 !InternationalLanguageTranslationEditor methodsFor:'aspects'!
 alwaysWriteUTF8Holder
 !InternationalLanguageTranslationEditor methodsFor:'change & update'!
 languageTextHolderValue: aString
 self languageTextHolder value: aString.
 self languageTextModifiedHolder value:true.
 !
 update:something with:aParameter from:changedObject
 changedObject == shownLanguages ifTrue:[
 self shownLanguagesChanged.
 ].
 !
 updateCopyPreviousTranslationButtonEnabled
 self pastePreviousTranslationEnableHolder value: self shouldCopyPreviousTranslationButtonBeEnabled
 !
 updateExampleLanguageText
 self selectedKeyRow value isNil ifTrue:[^ self].
 ].
 !
 updateOriginalTextModification
 |answer|
 self originalTextModifiedHolder value ifTrue:[
 answer := OptionBox
 request:'Accept changed original text (key) ?'
 label:'Original text (key) changed'
 image:(WarningBox iconBitmap)
 buttonLabels:#('Cancel' 'Accept' 'Accept As New')
 values:#(nil #accept #acceptAsNew)
 default:#acceptAsNew.
 answer isNil ifTrue:[^ self originalTextModifiedHolder value:false. ].
 answer == #accept ifTrue:[
 self halt.        ].
 answer == #acceptAsNew ifTrue:[
 self halt.        ].
 ].
 ! !
 !InternationalLanguageTranslationEditor methodsFor:'dialogs'!
 requestEncoderDialog
 addTranslation
 |key index|
 key := Dialog request:'New Key:'.
 key isEmpty ifTrue:[^self].
-(keyStringsToLanguageMappings includesKey:key) ifFalse:[
+(self includesKey:key) ifFalse:[
 keyStringsToLanguageMappings addKey:key.
 modified := true.
 ].
 index := keyStringsToLanguageMappings indexOfKey:key.
 self selectedKeyRow value:index
+!
+changeLastNameSpace
+|nameSpace defaultNameSpace|
+lastNameSpace notNil ifTrue:[defaultNameSpace := lastNameSpace name].
+nameSpace := Dialog requestNameSpace:'NameSpace:' title:'Search String in Name Space:' initialAnswer:defaultNameSpace.
+nameSpace isNil ifTrue:[^self].
+nameSpace := Smalltalk at:nameSpace asSymbol.
+nameSpace isNil ifTrue:[
+^Dialog information:(resources string:'No such nameSpace exists.?')
+].
+lastNameSpace := nameSpace.
 !
 extractTranslationsFromClass
 |aClass newTranslations|
 aClass isNil ifTrue:[^ self ].
 lastExtractedClass := LastExtractedClass := aClass.
 newTranslations := self extractTranslationsFromClass:aClass.
+self addAllTranslations:newTranslations.
+!
+extractTranslationsFromNameSpace
+|newTranslations|
+self changeLastNameSpace.
+lastNameSpace isNil ifTrue:[^self.].
+newTranslations := OrderedCollection new.
+lastNameSpace allClassesDo:[:eachClass |
+newTranslations addAll:( self extractTranslationsFromClass:eachClass theNonMetaclass).
+].
 self addAllTranslations:newTranslations.
 !
 extractTranslationsFromProject
 |box projectID newTranslations|
 ].
 self addAllTranslations:newTranslations.
 !
+inspectCanvasMissingStrings
+|spec nameSpace missingStrings|
+missingStrings := OrderedCollection new.
+nameSpace := Dialog requestNameSpace:'NameSpace:' title:'Specify NameSpace to look for missing strings' initialAnswer:nil.
+nameSpace := Smalltalk at:nameSpace asSymbol.
+nameSpace isNil ifTrue:[
+^Dialog information:(resources string:'No such nameSpace exists.?')
+].
+nameSpace allClassesDo:[:cls |
+cls theMetaclass methodsDo:[:m |
+m hasResource ifTrue:[
+(m resources includesKey:#canvas) ifTrue:[
+spec := (cls perform:m selector) decodeAsLiteralArray.
+spec do:[:eachComponent |
+eachComponent translationKeysDo:[:k |
+(self includesKey: k) ifFalse:[
+missingStrings add: k.
+Transcript showCR: k storeString, '                         ', m printString]]
+]
+]
+]
+]
+].
+missingStrings asSet inspect
+!
 menuNew
 modified ifTrue:[
 (Dialog
 confirm:(resources stringWithCRs:'Modified translations have not been changed.\\Create new translations set anyway ?')
 default:false) ifFalse:[^ self].
 !
 menuOpen
 |aFilename|
-aFilename := self requestFilename.
+self withWaitCursorDo:[
-aFilename isNil ifTrue:[^ self ].
+aFilename := self requestFilename.
-self readResourceFile:aFilename
+aFilename isNil ifTrue:[^ self ].
+self readResourceFile:aFilename.
+]
 !
 menuSave
 "Saves the language selected in the fileName from where the language resource was obtained."
 |lang|
 removeTranslation
 |rowSelectionIndex selectedKey|
 rowSelectionIndex := self selectedKeyRow value.
+rowSelectionIndex isNil ifTrue:[^self].
 rowSelectionIndex ~~ 0 ifTrue:[
 selectedKey := keyStringsToLanguageMappings keyAt:rowSelectionIndex ifAbsent:nil.
+selectedKey isNil ifTrue:[^self].
 (Dialog confirm:(resources string:'Really remove key %1' with:selectedKey)) ifTrue:[
 keyStringsToLanguageMappings removeKey:selectedKey.
 ].
 ].
 !
 app closeRequest.
 self stopApplicationIconVisibleHolder value:false.
 monitoredApplication := nil.
 ].
 ] fork.
+!
+searchStringInLastNameSpace
+|selectedKey browser|
+selectedKey := self selectedKey.
+selectedKey isNil ifTrue:[^Dialog information: 'No selected key'].
+browser := NewSystemBrowser new "open".
+browser allButOpen.
+browser lastSearchPatterns first = selectedKey ifFalse:[
+browser lastSearchPatterns addFirst: selectedKey
+].
+lastNameSpace isNil ifTrue:[
+self changeLastNameSpace.
+].
+lastNameSpace notNil ifTrue:[
+"/        browser navigationState selectedClasses value: lastNameSpace allClasses.
+browser navigationState nameSpaceFilter value: (OrderedCollection with:lastNameSpace name).
+browser navigationState selectedNamespaces value: (OrderedCollection with:lastNameSpace name).
+].
+self withWaitCursorDo:[
+browser browseMenuMethodsWithString
+].
 ! !
 !InternationalLanguageTranslationEditor methodsFor:'menus dynamic'!
 disableLanguageDisplayFor:lang
 ^self languageTextFromSelectedKeyFor: self exampleLanguageSelectionHolder value
 !
 currentLanguage
 |colSelectionIndex |
 colSelectionIndex := dataSetView selectedColIndex.
 ^colSelectionIndex > 1 ifTrue:[ shownLanguages at:colSelectionIndex-1 ] ifFalse:nil.
 !
 exampleLanguageByDefault
 ^self shownLanguages isEmpty
 ifTrue:[nil]
 ifFalse:[self shownLanguages first]
 !
 hasFirstRowSelection
 self selectedKeyRow isNil ifTrue:[^false].
 ^ self selectedKeyRow value > 1
 hasUnsavedChanges
 ^ modified
 !
+includesKey: aKey
+keyStringsToLanguageMappings isNil ifTrue:[^false].
+^keyStringsToLanguageMappings includesKey:aKey
+!
 isSearchForSimilarTranslationEnabled
 ^self searchForSimilarTranslationEnableHolder value
 !
 languageTextFromKey: aKeyIndex for: language
 "Returns the language text corresponding for the aKeyIndex and the received language"
 and:[self hasFirstRowSelection]
 !
 shouldSearchForSimilarTranslation
 self isSearchForSimilarTranslationEnabled ifFalse:[^false].
 (self languageTextHolder value notNil and:[self languageTextHolder value notEmpty]) ifTrue:[^false].
 (self hasLanguageSelection and:[self selectedKeyRow notNil]) ifFalse:[^false].
 ^true
 ! !
 !InternationalLanguageTranslationEditor methodsFor:'read/write resourceFile'!
 encoderAt: lang
 self alwaysWriteUTF8Holder value ifTrue:[^CharacterEncoder encoderForUTF8].
 ^keyStringsToLanguageMappings encoderAt: lang.
 !
 printEditingWarningOn: aStream
 aStream nextPutAll: ';';
 cr;
 nextPutAll: '; WARNING:';
 cr;
 nextPutAll: '; this file contains national characters';
 cr;
 nextPutAll: '; DONT EDIT this file with an old vi !!';
 cr;
 nextPutAll: ';';
 cr;
 cr.
 !
 printEncoderFor: lang on: aStream
 |characterEncoder encoderString|
 characterEncoder := self encoderAt: lang.
 encoderString := characterEncoder isNil
 ifTrue:[self requestEncoderStringFor: lang]
 ifFalse:[characterEncoder nameOfEncoding printString].
 aStream nextPutAll: '#encoding';
 space;
 nextPutAll: encoderString;
 cr;
 cr.
 !
 printLanguage: lang on: aStream
 self printEncoderFor: lang on: aStream.
 self printEditingWarningOn: aStream.
 self printLanguageMappingsFor: lang on: aStream.
 !
 printLanguageMappingsFor: lang on: aStream
 |orderedAssociations maxKeySize characterEncoder|
 characterEncoder := self encoderAt: lang.
 characterEncoder isNil ifTrue:[ characterEncoder := CharacterEncoder::NullEncoder ].
 orderedAssociations := keyStringsToLanguageMappings orderedLanguageMappingsAssociationsFor: lang.
 maxKeySize := keyStringsToLanguageMappings maxKeySizeForLanguage: lang.
 orderedAssociations do:[:association |
 aStream nextPutAll: (association key storeString paddedTo: maxKeySize) ;
 nextPutAll: (String new: 10);
 nextPutAll: (characterEncoder encodeString: association value) storeString;
 cr.
 ].
 !
 readResourceFile:aFilename asLanguage:lang
 |resourcePack inStream lineString encoding decoder sortedKeys remainingKeys|
 self saveResourceFile:aFilename for:lang asSymbol
 !
 saveResourceFile: aFilename for: lang
 |aStream |
 keyStringsToLanguageMappings atLanguage: lang putFilename: aFilename.
 aStream := FileStream newFileNamed: aFilename.
 self printLanguage: lang on: aStream.
 aStream flush;
 close.
 DialogBox information: 'The resource file for the language ', lang printString storeString, ' was saved in the file: ', aFilename nameString
 ! !
 !InternationalLanguageTranslationEditor methodsFor:'specs-dynamic'!
 columnInRow:row at:colIndex
 self updateExampleLanguageText.
 !
 languageTextAccepted
 |nextRowIndex|
 keyStringsToLanguageMappings size = self selectedKeyRow value
 ifTrue:[ self updateLanguageTextModification.]
 ifFalse:[
 nextRowIndex := self selectedKeyRow value + 1.
 self selectedKeyRow value: nextRowIndex].
 !
 pastePreviousTranslationInLanguageText
 "Obtain the text from the previous translation and paste it into the languageTextEditor"

changeset 2163	641467b2f522
parent 2053	8440fcd83b7b
child 2323	9b257cbd0ea9