Squeak-dev March 2022

squeak-dev@lists.squeakfoundation.org

33 participants
304 discussions

The Trunk: System-mt.1319.mcz
by commits＠source.squeak.org 10 Mar '22

10 Mar '22

Marcel Taeumel uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-mt.1319.mcz ==================== Summary ==================== Name: System-mt.1319 Author: mt Time: 10 March 2022, 3:13:06.127178 pm UUID: e5f1e939-bfff-3c4a-897f-4474209980e6 Ancestors: System-mt.1318 Locale and localization clean-up. Complements Multilingual-mt.269 and System-mt.1318 =============== Diff against System-mt.1318 =============== Item was changed: + ----- Method: Clipboard>>clearInterpreter (in category 'initialize') ----- - ----- Method: Clipboard>>clearInterpreter (in category 'accessing') ----- clearInterpreter interpreter := nil. ! Item was changed: + ----- Method: Clipboard>>setInterpreter (in category 'initialize') ----- - ----- Method: Clipboard>>setInterpreter (in category 'accessing') ----- setInterpreter + interpreter := Locale currentPlatform clipboardInterpreter.! - interpreter := LanguageEnvironment defaultClipboardInterpreter. - interpreter ifNil: [ - "Should never be reached, but just in case." - interpreter := NoConversionClipboardInterpreter new]. - ! Item was removed: - ----- Method: GetTextTranslator class>>newForLocaleID: (in category 'instance creation') ----- - newForLocaleID: id - ^self new localeID: id! Item was changed: ----- Method: GetTextTranslator class>>privateStartUp (in category 'class initialization') ----- privateStartUp + self setSystemDefaultLocaleDirs. + self availableLanguageLocaleIDs + do: [ :localeID | self ensureForLocaleID: localeID ].! - self availableLanguageLocaleIDs do: [ :localeID | - NaturalLanguageTranslator translators - at: localeID - put: (self newForLocaleID: localeID). - ]! Item was changed: NaturalLanguageTranslator subclass: #InternalTranslator instanceVariableNames: 'generics' + classVariableNames: 'AllKnownPhrases' - classVariableNames: 'AllKnownPhrases CachedTranslations' poolDictionaries: '' category: 'System-Localization'! !InternalTranslator commentStamp: 'tak 10/19/2007 11:12' prior: 0! An InternalTranslator is used a translation dictionary in a image. You can use it without any external translation file. Structure: generics Dictionary -- msgid -> msgstr ! Item was removed: - ----- Method: InternalTranslator class>>availableLanguageLocaleIDs (in category 'accessing') ----- - availableLanguageLocaleIDs - "Return locale ids for the internal translation dictionary." - "InternalTranslator availableLanguageLocaleIDs" - ^ self cachedTranslations values collect:[:each | each localeID]! Item was removed: - ----- Method: InternalTranslator class>>cachedTranslations (in category 'private') ----- - cachedTranslations - "CachedTranslations := nil" - ^CachedTranslations ifNil: [CachedTranslations := Dictionary new]! Item was changed: ----- Method: InternalTranslator class>>loadForLocaleIsoString:fromGzippedMimeLiteral: (in category 'file-services') ----- loadForLocaleIsoString: localeString fromGzippedMimeLiteral: mimeString "merge the translation from the mime literal." + | stream localeID translator gs rbStream s | - | stream localeID translator gs rbStream s currentPlatform | s := Base64MimeConverter mimeDecodeToBytes: mimeString readStream. gs := GZipReadStream on: s. rbStream := MultiByteBinaryOrTextStream with: gs contents asString. rbStream converter: UTF8TextConverter new. rbStream reset. localeID := LocaleID isoString: localeString. + Locale + currentPlatform: (Locale localeID: localeID) + during: [stream := ReadStream on: rbStream contents]. - currentPlatform := Locale currentPlatform. - [Locale - currentPlatform: (Locale localeID: localeID). - stream := ReadStream on: rbStream contents] - ensure: [Locale currentPlatform: currentPlatform]. translator := self localeID: localeID. + translator loadFromStream: stream.! - translator loadFromStream: stream. - LanguageEnvironment resetKnownEnvironments! Item was changed: ----- Method: InternalTranslator class>>loadTranslatorForIsoLanguage:isoCountry: (in category 'private loading') ----- loadTranslatorForIsoLanguage: isoLanguage isoCountry: isoCountry "private - load the translations from <prefs>/locale/ directory the procedure is to assure the existence of a translator for the given language/country and then load the external translations for this translator" | translator | + translator := self ensureForLocaleID: (LocaleID isoLanguage: isoLanguage isoCountry: isoCountry). - translator := self newLocaleID: (LocaleID isoLanguage: isoLanguage isoCountry: isoCountry). self loadExternalTranslationsFor: translator! Item was removed: - ----- Method: InternalTranslator class>>localeID: (in category 'accessing') ----- - localeID: localeID - "For backward compatibility, see NaturalLanguageTranslator >> fileOutHeaderOn:." - ^ self newLocaleID: localeID! Item was removed: - ----- Method: InternalTranslator class>>mergeLegacyTranslators (in category 'accessing') ----- - mergeLegacyTranslators - self availableLanguageLocaleIDs - do: [:localeID | (NaturalLanguageTranslator translators includesKey: localeID) - ifFalse: [NaturalLanguageTranslator translators - at: localeID - put: (self newLocaleID: localeID)]]! Item was changed: ----- Method: InternalTranslator class>>mergeTranslationFileNamed: (in category 'file-services') ----- mergeTranslationFileNamed: fileFullNameString "merge the translation in the file named fileFullNameString" | stream localeID translator | stream := FileStream readOnlyFileNamed: fileFullNameString. [localeID := LocaleID isoString: stream localName sansPeriodSuffix. + translator := self ensureForLocaleID: localeID. - translator := self localeID: localeID. translator loadFromStream: stream] + ensure: [stream close].! - ensure: [stream close]. - LanguageEnvironment resetKnownEnvironments. - - ! Item was changed: + ----- Method: InternalTranslator class>>newLocaleID: (in category 'instance creation') ----- - ----- Method: InternalTranslator class>>newLocaleID: (in category 'accessing') ----- newLocaleID: localeID + + self flag: #deprecated. + ^ self ensureForLocaleID: localeID! - ^ self cachedTranslations - at: localeID - ifAbsentPut: [self new localeID: localeID]! Item was changed: ----- Method: InternalTranslator class>>privateStartUp (in category 'class initialization') ----- privateStartUp + + self loadAvailableExternalLocales.! - self loadAvailableExternalLocales. - self mergeLegacyTranslators. - ! Item was removed: - ----- Method: InternalTranslator class>>removeLocaleID: (in category 'accessing') ----- - removeLocaleID: localeID - "self removeLocaleID: (LocaleID isoString: 'ja-kids')" - self cachedTranslations - removeKey: localeID - ifAbsent: []. - NaturalLanguageTranslator privateStartUp! Item was removed: - ----- Method: InternalTranslator class>>resetCaches (in category 'class initialization') ----- - resetCaches - CachedTranslations := nil. - ! Item was removed: - ----- Method: InternalTranslator>>checkPhrase:translation: (in category 'translation') ----- - checkPhrase: phrase translation: translation! Item was changed: ----- Method: InternalTranslator>>scanFrom:environment: (in category 'fileIn/fileOut') ----- scanFrom: aStream environment: anEnvironment "Read a definition of dictionary. Make sure current locale corresponds my locale id" + | aString newTranslations assoc | - | aString newTranslations assoc currentPlatform | newTranslations := Dictionary new. + Locale + currentPlatform: (Locale localeID: id) + during: [ + [aString := aStream nextChunk withSqueakLineEndings. + aString size > 0] whileTrue: + [assoc := Compiler evaluate: aString environment: anEnvironment. + assoc value = '' + ifTrue: [self class registerPhrase: assoc key] + ifFalse: [newTranslations add: assoc]] ]. - currentPlatform := Locale currentPlatform. - [Locale - currentPlatform: (Locale localeID: id). - [aString := aStream nextChunk withSqueakLineEndings. - aString size > 0] whileTrue: - [assoc := Compiler evaluate: aString environment: anEnvironment. - assoc value = '' - ifTrue: [self class registerPhrase: assoc key] - ifFalse: [newTranslations add: assoc]]] - ensure: [Locale currentPlatform: currentPlatform]. self mergeTranslations: newTranslations! Item was changed: ----- Method: InternalTranslator>>translate:inDomain: (in category 'translation') ----- translate: aString inDomain: aDomainName + | translator | ^ self generics at: aString ifAbsent: [self localeID hasParent + ifTrue: [translator := self class + forLocaleID: self localeID parent - ifTrue: [translator := self class cachedTranslations - at: self localeID parent ifAbsent: [^ aString]. translator translate: aString inDomain: aDomainName] ifFalse: [aString]]! Item was changed: ----- Method: MOFile>>translatedString: (in category 'private') ----- translatedString: index + - "KNOWN PROBLEM: conversion is executed everytimes this method called" | str | str := translatedStrings at: index. + self flag: #performance. "KNOWN PROBLEM: conversion is executed everytimes this method called" + ^str utf8ToSqueak applyLanguageInformation: (Locale localeID: localeID) - ^str utf8ToSqueak applyLanguageInformation: (Locale localeID: localeID) languageEnvironment. ! Item was changed: Object subclass: #NaturalLanguageTranslator instanceVariableNames: 'id' + classVariableNames: 'Current Translators' - classVariableNames: 'Translators' poolDictionaries: '' category: 'System-Localization'! + NaturalLanguageTranslator class + instanceVariableNames: 'translators'! !NaturalLanguageTranslator commentStamp: '<historical>' prior: 0! abstract class of natural language translator. Class side manages and holds loaded instances of concrete classes.! + NaturalLanguageTranslator class + instanceVariableNames: 'translators'! Item was changed: ----- Method: NaturalLanguageTranslator class>>availableForLocaleID: (in category 'accessing') ----- availableForLocaleID: localeID + + self deprecated. + ^ self forLocaleID: localeID! - "Answer available locale ID. - If translator is not found for correct locale ID, then isoLanguage is - attempted for the key." - ^ self translators - at: localeID - ifAbsentPut: [localeID hasParent - ifTrue: [self translators - at: localeID parent - ifAbsent: [self default]] - ifFalse: [self default]]! Item was changed: ----- Method: NaturalLanguageTranslator class>>availableLanguageLocaleIDs (in category 'accessing') ----- availableLanguageLocaleIDs + "Return the locale ids for the currently available languages. Meaning those which either internally or externally have translations available." - "Return the locale ids for the currently available languages. - Meaning those which either internally or externally have - translations available." "NaturalLanguageTranslator availableLanguageLocaleIDs" + + ^ (Array streamContents: [:stream | + GetTextTranslator translators valuesDo: [:each | stream nextPut: each localeID]. + InternalTranslator translators valuesDo: [:each | stream nextPut: each localeID]]) + ifEmpty: [{LocaleID default "Developer-English from the source code :-)"}] + ifNotEmpty: [:ids | ids asSet asArray]! - ^ self translators values collect:[:each | each localeID]! Item was changed: ----- Method: NaturalLanguageTranslator class>>current (in category 'accessing') ----- current + + ^ Current ifNil: [Current := LocaleID current languageTranslator]! - ^ self availableForLocaleID: LocaleID current! Item was added: + ----- Method: NaturalLanguageTranslator class>>current: (in category 'accessing') ----- + current: aTranslator + + Current := aTranslator.! Item was changed: ----- Method: NaturalLanguageTranslator class>>default (in category 'accessing') ----- default "Answer translator for backstop" "self default translate: 'test'" + + ^ self newForLocaleID: LocaleID default! - ^ (self == NaturalLanguageTranslator ifTrue: [InternalTranslator] ifFalse: [self]) new - localeID: (LocaleID isoLanguage: 'en')! Item was added: + ----- Method: NaturalLanguageTranslator class>>defaultClass (in category 'accessing') ----- + defaultClass + + ^ self == NaturalLanguageTranslator + ifTrue: [InternalTranslator] + ifFalse: [self "< InternalTranslator | GetTextTranslator >"]! Item was changed: + ----- Method: NaturalLanguageTranslator class>>domainRegistered: (in category 'updates') ----- - ----- Method: NaturalLanguageTranslator class>>domainRegistered: (in category 'accessing') ----- domainRegistered: aDomainName "notify that new TextDomain is registered" self translators do: [:each | each domainRegistered: aDomainName]! Item was changed: + ----- Method: NaturalLanguageTranslator class>>domainUnregistered: (in category 'updates') ----- - ----- Method: NaturalLanguageTranslator class>>domainUnregistered: (in category 'accessing') ----- domainUnregistered: aDomainName "notify that new TextDomain is unregistered" self translators do: [:each | each domainUnregistered: aDomainName]! Item was added: + ----- Method: NaturalLanguageTranslator class>>ensureForLocaleID: (in category 'instance creation') ----- + ensureForLocaleID: localeID + + ^ self translators + at: localeID + ifAbsentPut: [self newForLocaleID: localeID]! Item was changed: ----- Method: NaturalLanguageTranslator class>>forLocaleID: (in category 'accessing') ----- forLocaleID: localeID + "Answer a translator available for localeID. If no translator can be found, try the localeID's generic parent. Otherwise, evaluate aBlock." + + ^ self forLocaleID: localeID ifAbsent: [self default]! - - ^ self localeID: localeID! Item was changed: ----- Method: NaturalLanguageTranslator class>>forLocaleID:ifAbsent: (in category 'accessing') ----- forLocaleID: localeID ifAbsent: aBlock + "Answer a translator available for localeID. If no translator can be found, try the localeID's generic parent. Otherwise, evaluate aBlock." + + ^ self translators + at: localeID + ifAbsent: [localeID hasParent + ifTrue: [self translators at: localeID parent ifAbsent: aBlock] + ifFalse: [aBlock value]]! - - ^ self localeID: localeID! Item was changed: ----- Method: NaturalLanguageTranslator class>>isoLanguage:isoCountry: (in category 'accessing') ----- isoLanguage: isoLanguage isoCountry: isoCountry + + ^ (LocaleID isoLanguage: isoLanguage isoCountry: isoCountry) languageTranslator! - ^self localeID: (LocaleID isoLanguage: isoLanguage isoCountry: isoCountry)! Item was added: + ----- Method: NaturalLanguageTranslator class>>isoString: (in category 'accessing') ----- + isoString: aString + + ^ (LocaleID isoString: aString) languageTranslator! Item was changed: ----- Method: NaturalLanguageTranslator class>>loadForLocaleIsoString:fromGzippedMimeLiteral: (in category 'file-services') ----- loadForLocaleIsoString: localeString fromGzippedMimeLiteral: mimeString "merge the translation from the mime literal." + | stream localeID translator gs rbStream s | - | stream localeID translator gs rbStream s currentPlatform | s := Base64MimeConverter mimeDecodeToBytes: mimeString readStream. gs := GZipReadStream on: s. rbStream := MultiByteBinaryOrTextStream with: gs contents asString. rbStream converter: UTF8TextConverter new. rbStream reset. localeID := LocaleID isoString: localeString. + Locale + currentPlatform: (Locale localeID: localeID) + during: [stream := ReadStream on: rbStream contents]. - currentPlatform := Locale currentPlatform. - [Locale - currentPlatform: (Locale localeID: localeID). - stream := ReadStream on: rbStream contents] - ensure: [Locale currentPlatform: currentPlatform]. translator := self localeID: localeID. + translator loadFromStream: stream.! - translator loadFromStream: stream. - LanguageEnvironment resetKnownEnvironments! Item was changed: + ----- Method: NaturalLanguageTranslator class>>localeChanged (in category 'updates') ----- - ----- Method: NaturalLanguageTranslator class>>localeChanged (in category 'accessing') ----- localeChanged + "Notify some project starts to use this locale. This facility may use the event to load translation data dynamically." + - "notify some project starts to use this locale. - this facility may use the event to load translation data dynamically" self current localeChanged. + self current: nil. "Use locale-specific translator again."! - ! Item was changed: + ----- Method: NaturalLanguageTranslator class>>localeID: (in category 'instance creation') ----- - ----- Method: NaturalLanguageTranslator class>>localeID: (in category 'accessing') ----- localeID: localeID + "For backward compatibility, see NaturalLanguageTranslator >> fileOutHeaderOn:." + + self flag: #deprecated. + ^ self ensureForLocaleID: localeID! - ^ self cachedTranslations - at: localeID - ifAbsentPut: [self new localeID: localeID]! Item was changed: ----- Method: NaturalLanguageTranslator class>>mergeTranslationFileNamed: (in category 'file-services') ----- mergeTranslationFileNamed: fileFullNameString "merge the translation in the file named fileFullNameString" FileStream readOnlyFileNamed: fileFullNameString do: [:stream | + (self isoString: stream localName sansPeriodSuffix) + loadFromStream: stream].! - | localeID translator | - localeID := LocaleID isoString: stream localName sansPeriodSuffix. - translator := self localeID: localeID. - translator loadFromStream: stream]. - LanguageEnvironment resetKnownEnvironments. - - ! Item was added: + ----- Method: NaturalLanguageTranslator class>>newForLocaleID: (in category 'instance creation') ----- + newForLocaleID: localeID + "Create a new translator. Do not cache it." + + ^ self defaultClass new localeID: localeID! Item was changed: ----- Method: NaturalLanguageTranslator class>>privateStartUp (in category 'class initialization') ----- privateStartUp + + GetTextTranslator resetCaches; privateStartUp. + InternalTranslator resetCaches; privateStartUp.! - self resetCaches. - GetTextTranslator privateStartUp. - InternalTranslator privateStartUp. - self localeChanged.! Item was changed: ----- Method: NaturalLanguageTranslator class>>resetCaches (in category 'class initialization') ----- resetCaches + translators := nil.! - Translators := nil.! Item was changed: ----- Method: NaturalLanguageTranslator class>>translate:toLocaleID: (in category 'translation') ----- translate: aString toLocaleID: localeID + "Find a translator for localeID and translate aString in the default domain." + + ^ localeID languageTranslator translate: aString! - "translate for default domain" - ^ (self availableForLocaleID: localeID) - translate: aString! Item was changed: ----- Method: NaturalLanguageTranslator class>>translate:toLocaleID:inDomain: (in category 'translation') ----- translate: aString toLocaleID: localeID inDomain: aDomainName + + ^ localeID languageTranslator translate: aString inDomain: aDomainName! - ^ (self availableForLocaleID: localeID) - translate: aString inDomain: aDomainName! Item was changed: ----- Method: NaturalLanguageTranslator class>>translateWithoutLoading:toLocaleID: (in category 'translation') ----- translateWithoutLoading: aString toLocaleID: localeID "translate for default domain" + + self deprecated. + ^ self translate: aString toLocaleID: localeID inDomain: TextDomainManager defaultDomain! - ^self translateWithoutLoading: aString toLocaleID: localeID inDomain: TextDomainManager defaultDomain. - ! Item was changed: ----- Method: NaturalLanguageTranslator class>>translateWithoutLoading:toLocaleID:inDomain: (in category 'translation') ----- translateWithoutLoading: aString toLocaleID: localeID inDomain: aDomainName + + self deprecated. + ^ self translate: aString toLocaleID: localeID inDomain: aDomainName! - "try to translate with small footprint: - if GetTextTranslator hasn't loaded MO, try to use InternalTranslator. - if InternalTranslator isn't available, then actually load MO and use it" - | translator | - translator := self availableForLocaleID: localeID. - (translator isDomainLoaded: aDomainName) ifFalse: [ - (InternalTranslator availableLanguageLocaleIDs includes: localeID) - ifTrue: [translator := InternalTranslator localeID: localeID]. - ]. - ^translator translate: aString inDomain: aDomainName! Item was changed: ----- Method: NaturalLanguageTranslator class>>translators (in category 'accessing') ----- translators + + ^ self == NaturalLanguageTranslator + ifTrue: [InternalTranslator translators] + ifFalse: [translators ifNil: [translators := Dictionary new]]! - ^ Translators ifNil: [Translators := Dictionary new] ! Item was changed: ----- Method: NaturalLanguageTranslator>>checkPhrase:translation: (in category 'translation') ----- + checkPhrase: phrase translation: translation + "Check the translation. Answer a string with a comment or empty meaning no-comments." + + ^ ''! - checkPhrase: phrase translation: translation! Item was changed: ----- Method: NaturalLanguageTranslator>>scanFrom:environment: (in category 'fileIn/fileOut') ----- scanFrom: aStream environment: anEnvironment "Read a definition of dictionary. Make sure current locale corresponds my locale id" + + | newTranslations | - | newTranslations currentPlatform | newTranslations := Dictionary new. + Locale + currentPlatform: (Locale localeID: id) + during: [ | aString assoc | + [aString := aStream nextChunk withSqueakLineEndings. + aString size > 0] whileTrue: + [assoc := Compiler evaluate: aString environment: anEnvironment. + assoc value = '' + ifTrue: [self class registerPhrase: assoc key] + ifFalse: [newTranslations add: assoc]] ]. - currentPlatform := Locale currentPlatform. - [| aString assoc | - Locale currentPlatform: (Locale localeID: id). - [aString := aStream nextChunk withSqueakLineEndings. - aString size > 0] whileTrue: - [assoc := Compiler evaluate: aString environment: anEnvironment. - assoc value = '' - ifTrue: [self class registerPhrase: assoc key] - ifFalse: [newTranslations add: assoc]]] - ensure: [Locale currentPlatform: currentPlatform]. self mergeTranslations: newTranslations! Item was changed: ----- Method: Project>>storeAttributesOn: (in category 'file in/out') ----- storeAttributesOn: aStream | details | self storeAttributeKey: 'Squeak-Version' value: SystemVersion current version on: aStream. self storeAttributeKey: 'Squeak-LatestUpdate' value: SystemVersion current highestUpdate printString on: aStream. + self storeAttributeKey: 'File-Name-Encoding' value: Locale currentPlatform fileNameEncodingName on: aStream. - self storeAttributeKey: 'File-Name-Encoding' value: LanguageEnvironment defaultFileNameConverter class encodingNames first on: aStream. details := self world valueOfProperty: #ProjectDetails ifAbsent: [Dictionary new]. details associationsDo: [:assoc | self storeAttributeKey: assoc key asString value: assoc value asString on: aStream.]. ! Item was changed: ----- Method: Project>>updateLocaleDependents (in category 'language') ----- updateLocaleDependents "Set the project's natural language as indicated" + Locale localeChanged.! - LanguageEnvironment localeChanged.! Item was changed: ----- Method: String>>translated (in category '*System-Localization') ----- translated "Note that we cannot call #translatedTo: because the sender context encodes the domain name." + ^ self translatedInDomain: (TextDomainManager domainOfMethod: thisContext sender method)! - ^ self - translatedTo: LocaleID current - inDomain: (TextDomainManager domainOfMethod: thisContext sender method)! Item was changed: ----- Method: String>>translatedInDomain: (in category '*System-Localization') ----- translatedInDomain: aDomainName + "Answer the receiver translated to the given locale id in the textdomain. If no translation can be found, try to lookup all domains for a translation." + | translator translation | + translator := NaturalLanguageTranslator current. + translation := translator translate: self inDomain: aDomainName. + translation == self ifTrue: [^ translator translateInAllDomains: self]. + ^ translation! - ^ self - translatedTo: LocaleID current - inDomain: aDomainName! Item was changed: ----- Method: String>>translatedTo:inDomain: (in category '*System-Localization') ----- translatedTo: localeID inDomain: aDomainName + "Answer the receiver translated to the given locale id in the textdomain. If no translation can be found, try to lookup all domains for a translation. NOTE THAT this is about 20 times slower than #translatedInDomain:, which uses the system's default translator." - "Answer the receiver translated to the given locale id in the textdomain. If no translation can be found, try to lookup all domains for a translation." | translator translation | + translator := localeID languageTranslator. - translator := NaturalLanguageTranslator availableForLocaleID: localeID. translation := translator translate: self inDomain: aDomainName. translation == self ifTrue: [^ translator translateInAllDomains: self]. ^ translation! Item was changed: Object subclass: #TextDomainManager instanceVariableNames: '' classVariableNames: 'ClassCategories Classes DefaultDomain DomainInfos LoneClasses Packages' poolDictionaries: '' category: 'System-Localization'! - TextDomainManager class - instanceVariableNames: 'defaultDomain'! !TextDomainManager commentStamp: 'fbs 5/12/2013 13:04' prior: 0! I manage mapping from class category to textdomain. Class variables: ClassCategories IdentityDictionary -- classCategory -> domainName Classes IdentityDictionary -- class name (a Symbol) -> domainName (a cache only!!) DefaultDomain String -- the default domain name DomainInfos Dictionary -- domainName -> a TextDomainInfo LoneClasses IdentityDictionary -- class name (a Symbol) -> domainName. For classes whose entire category are not all in the same domain (BookMorph and QuickGuideMorph) TextDomainManager registerCategoryPrefix: 'DrGeoII' domain: 'DrGeoII'. TextDomainManager unregisterDomain: 'DrGeoII'. TextDomainManager registerClass: #QuickGuideMorph domain: 'quickguides'. TextDomainManager registerClass: #QuickGuideHolderMorph domain: 'quickguides'. ! - TextDomainManager class - instanceVariableNames: 'defaultDomain'! Item was changed: ----- Method: TextDomainManager class>>defaultDomain (in category 'accessing') ----- defaultDomain + + ^ '.default'! - "I'm not sure we still need a default domain. AFAIK the default domain will only be used when no domain is found. In that case, wouldn't it be better to just look for a translation in all domains?" - ^defaultDomain! Item was removed: - ----- Method: TextDomainManager class>>defaultDomain: (in category 'accessing') ----- - defaultDomain: aDomainName - defaultDomain := aDomainName! Item was removed: - ----- Method: TextDomainManager class>>initialize (in category 'class initialization') ----- - initialize - " TextDomainManager initialize " - self defaultDomain: 'Etoys'! Item was changed: ----- Method: TranslatedReceiverFinder class>>makeJapaneseTranslationFile (in category 'japanese locale') ----- makeJapaneseTranslationFile | t n | + InternalTranslator initializeKnownPhrases. - NaturalLanguageTranslator initializeKnownPhrases. t := TranslatedReceiverFinder new senders. + n := InternalTranslator newForLocaleID: (LocaleID isoLanguage: 'ja'). - n := NaturalLanguageTranslator - localeID: (LocaleID isoLanguage: 'ja'). t do: [:w | + InternalTranslator registerPhrase: w. - NaturalLanguageTranslator registerPhrase: w. self at: w ifPresent: [:k | n phrase: w translation: k]]. n saveToFileNamed: 'ja.translation'!

1 0

The Trunk: Graphics-mt.495.mcz
by commits＠source.squeak.org 10 Mar '22

10 Mar '22

Marcel Taeumel uploaded a new version of Graphics to project The Trunk: http://source.squeak.org/trunk/Graphics-mt.495.mcz ==================== Summary ==================== Name: Graphics-mt.495 Author: mt Time: 10 March 2022, 2:22:36.399707 pm UUID: 4b352929-0269-7a4e-9b57-ea3af124988e Ancestors: Graphics-mt.494 Complements MorphicExtras-mt.309 =============== Diff against Graphics-mt.494 =============== Item was changed: ----- Method: AbstractFont class>>localeChanged (in category 'fallback') ----- localeChanged + ! - self setupDefaultFallbackTextStyle.!

1 0

The Trunk: MorphicExtras-mt.309.mcz
by commits＠source.squeak.org 10 Mar '22

10 Mar '22

Marcel Taeumel uploaded a new version of MorphicExtras to project The Trunk: http://source.squeak.org/trunk/MorphicExtras-mt.309.mcz ==================== Summary ==================== Name: MorphicExtras-mt.309 Author: mt Time: 10 March 2022, 2:22:01.731707 pm UUID: 68de7aaa-c4d1-6b43-bf28-08925f08a1d3 Ancestors: MorphicExtras-mt.308 Complements System-mt.1318 =============== Diff against MorphicExtras-mt.308 =============== Item was changed: - SystemOrganization addCategory: #'MorphicExtras-WebCam'! SystemOrganization addCategory: #'MorphicExtras-AdditionalMorphs'! SystemOrganization addCategory: #'MorphicExtras-AdditionalSupport'! SystemOrganization addCategory: #'MorphicExtras-AdditionalWidgets'! SystemOrganization addCategory: #'MorphicExtras-Books'! SystemOrganization addCategory: #'MorphicExtras-Demo'! SystemOrganization addCategory: #'MorphicExtras-EToy-Download'! SystemOrganization addCategory: #'MorphicExtras-Exceptions'! SystemOrganization addCategory: #'MorphicExtras-Flaps'! SystemOrganization addCategory: #'MorphicExtras-GeeMail'! SystemOrganization addCategory: #'MorphicExtras-Leds'! SystemOrganization addCategory: #'MorphicExtras-Navigators'! SystemOrganization addCategory: #'MorphicExtras-Obsolete'! SystemOrganization addCategory: #'MorphicExtras-Palettes'! SystemOrganization addCategory: #'MorphicExtras-PartsBin'! SystemOrganization addCategory: #'MorphicExtras-Postscript Canvases'! SystemOrganization addCategory: #'MorphicExtras-Postscript Filters'! SystemOrganization addCategory: #'MorphicExtras-SoundInterface'! SystemOrganization addCategory: #'MorphicExtras-SqueakPage'! SystemOrganization addCategory: #'MorphicExtras-Support'! SystemOrganization addCategory: #'MorphicExtras-Text Support'! SystemOrganization addCategory: #'MorphicExtras-Undo'! + SystemOrganization addCategory: #'MorphicExtras-WebCam'! SystemOrganization addCategory: #'MorphicExtras-Widgets'! Item was removed: - ----- Method: Locale class>>migrateSystem (in category '*MorphicExtras-private') ----- - migrateSystem - "Locale migrateSystem" - "Do all the necessary operations to switch to the new Locale environment." - - LocaleChangeListeners := nil. - self - addLocalChangedListener: HandMorph; - addLocalChangedListener: Clipboard; - addLocalChangedListener: Vocabulary; - addLocalChangedListener: PartsBin; - addLocalChangedListener: Project; - addLocalChangedListener: PaintBoxMorph; - yourself!

1 0

The Trunk: System-mt.1318.mcz
by commits＠source.squeak.org 10 Mar '22

10 Mar '22

Marcel Taeumel uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-mt.1318.mcz ==================== Summary ==================== Name: System-mt.1318 Author: mt Time: 10 March 2022, 2:21:31.981707 pm UUID: 1d4fe2d0-df8a-804b-88e7-c8315c0f238e Ancestors: System-mt.1317 Clean up LocaleID and Locale. Fixes the isse where the locale's "country" somehow stored the language name. =============== Diff against System-mt.1317 =============== Item was changed: ----- Method: ISOLanguageDefinition class>>extraCountryDefinitions (in category 'private') ----- extraCountryDefinitions ^{ + {'KIDS'. 'KIDS'. 'KIDS'.}. - {'Kids'. 'KIDS'. 'KIDS'.}. }! Item was changed: ----- Method: ISOLanguageDefinition class>>extraISO3Definitions (in category 'private') ----- extraISO3Definitions ^self readISOLanguagesFrom: 'jpk Japanese (Kids) ' readStream! Item was changed: ----- Method: ISOLanguageDefinition class>>initISOCountries (in category 'private') ----- initISOCountries "ISOLanguageDefinition initISOCountries" | iso3166Table | iso3166Table := ISOLanguageDefinition buildIso3166CodesTables. ISO2Countries := Dictionary new. ISO3Countries := Dictionary new. iso3166Table do: [:entry | + (entry at: 2) ifNotEmpty: [:iso2 | ISO2Countries at: iso2 put: (entry at: 1)]. + (entry at: 3) ifNotEmpty: [:iso3 | ISO3Countries at: iso3 put: (entry at: 1)]]. - ISO2Countries at: (entry at: 2) put: (entry at: 1). - ISO3Countries at: (entry at: 3) put: (entry at: 1)]. self extraCountryDefinitions do: [:entry | ISO2Countries at: (entry at: 2) put: (entry at: 1). ISO3Countries at: (entry at: 3) put: (entry at: 1)]! Item was changed: ----- Method: ISOLanguageDefinition class>>initialize (in category 'class initialization') ----- initialize "ISOLanguageDefinition initialize" ISO3Table := nil. + ISO2Table := nil. + ISO2Countries := nil. + ISO3Countries := nil.! - ISO2Table := nil! Item was changed: ----- Method: ISOLanguageDefinition class>>iso2LanguageTable (in category 'private') ----- iso2LanguageTable "ISOLanguageDefinition iso2LanguageTable" ISO2Table ifNotNil: [^ISO2Table]. ISO2Table := Dictionary new: self iso3LanguageTable basicSize. + self iso3LanguageTable do: [:entry | entry iso2 ifNotEmpty: [:iso2 | + ISO2Table at: iso2 put: entry]]. - self iso3LanguageTable do: [:entry | - ISO2Table at: entry iso2 put: entry]. ^ISO2Table! Item was changed: + ----- Method: ISOLanguageDefinition class>>iso3166Codes (in category 'private - raw') ----- - ----- Method: ISOLanguageDefinition class>>iso3166Codes (in category 'private') ----- (excessive size, no diff calculated) Item was changed: + ----- Method: ISOLanguageDefinition class>>isoLanguages (in category 'private - raw') ----- - ----- Method: ISOLanguageDefinition class>>isoLanguages (in category 'private') ----- isoLanguages + "ISO 639: 3-letter codes, http://www.loc.gov/standards/iso639-2/php/code_list.php" - "ISO 639: 3-letter codes" ^'aar aa Afar abk ab Abkhazian ace Achinese ach Acoli ada Adangme ady Adyghe; Adygei afa Afro-Asiatic languages afh Afrihili afr af Afrikaans ain Ainu aka ak Akan akk Akkadian alb/sqi sq Albanian ale Aleut alg Algonquian languages alt Southern Altai amh am Amharic ang English, Old (ca.450-1100) anp Angika apa Apache languages ara ar Arabic arc Official Aramaic (700-300 BCE); Imperial Aramaic (700-300 BCE) arg an Aragonese arm/hye hy Armenian arn Mapudungun; Mapuche arp Arapaho art Artificial languages arw Arawak asm as Assamese ast Asturian; Bable; Leonese; Asturleonese ath Athapascan languages aus Australian languages ava av Avaric ave ae Avestan awa Awadhi aym ay Aymara aze az Azerbaijani bad Banda languages bai Bamileke languages bak ba Bashkir bal Baluchi bam bm Bambara ban Balinese baq/eus eu Basque bas Basa bat Baltic languages bej Beja; Bedawiyet bel be Belarusian bem Bemba ben bn Bengali ber Berber languages) bho Bhojpuri bih bh Bihari bik Bikol bin Bini; Edo bis bi Bislama bla Siksika bnt Bantu languages bos bs Bosnian bra Braj bre br Breton btk Batak languages bua Buriat bug Buginese bul bg Bulgarian bur/mya my Burmese byn Blin; Bilin cad Caddo cai Central American Indian languages car Galibi Carib cat ca Catalan; Valencian cau Caucasian languages ceb Cebuano cel Celtic languages cha ch Chamorro chb Chibcha che ce Chechen chg Chagatai chi/zho zh Chinese chk Chuukese chm Mari chn Chinook jargon cho Choctaw chp Chipewyan; Dene Suline chr Cherokee chu cu Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic chv cv Chuvash chy Cheyenne cmc Chamic languages cop Coptic cor kw Cornish cos co Corsican cpe Creoles and pidgins, English based cpf Creoles and pidgins, French-based cpp Creoles and pidgins, Portuguese-based cre cr Cree crh Crimean Tatar; Crimean Turkish crp Creoles and pidgins csb Kashubian cus Cushitic languages cze/ces cs Czech dak Dakota dan da Danish dar Dargwa day Land Dayak languages del Delaware den Slave (Athapascan) dgr Dogrib din Dinka div dv Divehi; Dhivehi; Maldivian doi Dogri dra Dravidian languages dsb Lower Sorbian dua Duala dum Dutch, Middle (ca.1050-1350) dut/nld nl Dutch; Flemish dyu Dyula dzo dz Dzongkha efi Efik egy Egyptian (Ancient) eka Ekajuk elx Elamite eng en English enm English, Middle (1100-1500) epo eo Esperanto est et Estonian ewe ee Ewe ewo Ewondo fan Fang fao fo Faroese fat Fanti fij fj Fijian fil Filipino; Pilipino fin fi Finnish fiu Finno-Ugrian languages) fon Fon fre/fra fr French frm French, Middle (ca.1400-1600) fro French, Old (842-ca.1400) frr Northern Frisian frs Eastern Frisian fry fy Western Frisian ful ff Fulah fur Friulian gaa Ga gay Gayo gba Gbaya gem Germanic languages geo/kat ka Georgian ger/deu de German gez Geez gil Gilbertese gla gd Gaelic; Scottish Gaelic gle ga Irish glg gl Galician glv gv Manx gmh German, Middle High (ca.1050-1500) goh German, Old High (ca.750-1050) gon Gondi gor Gorontalo got Gothic grb Grebo grc Greek, Ancient (to 1453) gre/ell el Greek, Modern (1453-) grn gn Guarani gsw Swiss German; Alemannic; Alsatian guj gu Gujarati gwi Gwich''in hai Haida hat ht Haitian; Haitian Creole hau ha Hausa haw Hawaiian heb he Hebrew her hz Herero hil Hiligaynon him Himachali hin hi Hindi hit Hittite hmn Hmong hmo ho Hiri Motu hrv hr Croatian hsb Upper Sorbian hun hu Hungarian hup Hupa iba Iban ibo ig Igbo ice/isl is Icelandic ido io Ido iii ii Sichuan Yi; Nuosu ijo Ijo languages iku iu Inuktitut ile ie Interlingue; Occidental ilo Iloko ina ia Interlingua (International Auxiliary Language Association) inc Indic languages ind id Indonesian ine Indo-European languages inh Ingush ipk ik Inupiaq ira Iranian languages iro Iroquoian languages ita it Italian jav jv Javanese jbo Lojban jpn ja Japanese jpr Judeo-Persian jrb Judeo-Arabic kaa Kara-Kalpak kab Kabyle kac Kachin; Jingpho kal kl Kalaallisut; Greenlandic kam Kamba kan kn Kannada kar Karen languages kas ks Kashmiri kau kr Kanuri kaw Kawi kaz kk Kazakh kbd Kabardian kha Khasi khi Khoisan languages khm km Central Khmer kho Khotanese; Sakan kik ki Kikuyu; Gikuyu kin rw Kinyarwanda kir ky Kirghiz; Kyrgyz kmb Kimbundu kok Konkani kom kv Komi kon kg Kongo kor ko Korean kos Kosraean kpe Kpelle krc Karachay-Balkar krl Karelian kro Kru languages kru Kurukh kua kj Kuanyama; Kwanyama kum Kumyk kur ku Kurdish kut Kutenai lad Ladino lah Lahnda lam Lamba lao lo Lao lat la Latin lav lv Latvian lez Lezghian lim li Limburgan; Limburger; Limburgish lin ln Lingala lit lt Lithuanian lol Mongo loz Lozi ltz lb Luxembourgish; Letzeburgesch lua Luba-Lulua lub lu Luba-Katanga lug lg Ganda lui Luiseno lun Lunda luo Luo (Kenya and Tanzania) lus Lushai mac/mkd mk Macedonian mad Madurese mag Magahi mah mh Marshallese mai Maithili mak Makasar mal ml Malayalam man Mandingo mao/mri mi Maori map Austronesian languages mar mr Marathi mas Masai may/msa ms Malay mdf Moksha mdr Mandar men Mende mga Irish, Middle (900-1200) mic Mi''kmaq; Micmac min Minangkabau mis Uncoded languages mkh Mon-Khmer languages mlg mg Malagasy mlt mt Maltese mnc Manchu mni Manipuri mno Manobo languages moh Mohawk mon mn Mongolian mos Mossi mul Multiple languages mun Munda languages mus Creek mwl Mirandese mwr Marwari myn Mayan languages myv Erzya nah Nahuatl languages nai North American Indian languages nap Neapolitan nau na Nauru nav nv Navajo; Navaho nbl nr Ndebele, South; South Ndebele nde nd Ndebele, North; North Ndebele ndo ng Ndonga nds Low German; Low Saxon; German, Low; Saxon, Low nep ne Nepali new Nepal Bhasa; Newari nia Nias nic Niger-Kordofanian languages niu Niuean nno nn Norwegian Nynorsk; Nynorsk, Norwegian nob nb Bokmal, Norwegian; Norwegian Bokmal nog Nogai non Norse, Old nor no Norwegian nqo N''Ko nso Pedi; Sepedi; Northern Sotho nub Nubian languages nwc Classical Newari; Old Newari; Classical Nepal Bhasa nya ny Chichewa; Chewa; Nyanja nym Nyamwezi nyn Nyankole nyo Nyoro nzi Nzima oci oc Occitan (post 1500) oji oj Ojibwa ori or Oriya orm om Oromo osa Osage oss os Ossetian; Ossetic ota Turkish, Ottoman (1500-1928) oto Otomian languages paa Papuan languages pag Pangasinan pal Pahlavi pam Pampanga; Kapampangan pan pa Panjabi; Punjabi pap Papiamento pau Palauan peo Persian, Old (ca.600-400 B.C.) per/fas fa Persian phi Philippine languages) phn Phoenician pli pi Pali pol pl Polish pon Pohnpeian por pt Portuguese pra Prakrit languages pro Provencal, Old (to 1500);Occitan, Old (to 1500) pus ps Pushto; Pashto qaa-qtz Reserved for local use que qu Quechua raj Rajasthani rap Rapanui rar Rarotongan; Cook Islands Maori roa Romance languages roh rm Romansh rom Romany rum/ron ro Romanian; Moldavian; Moldovan run rn Rundi rup Aromanian; Arumanian; Macedo-Romanian rus ru Russian sad Sandawe sag sg Sango sah Yakut sai South American Indian languages sal Salishan languages sam Samaritan Aramaic san sa Sanskrit sas Sasak sat Santali scn Sicilian sco Scots sel Selkup sem Semitic languages sga Irish, Old (to 900) sgn Sign Languages shn Shan sid Sidamo sin si Sinhala; Sinhalese sio Siouan languages sit Sino-Tibetan languages sla Slavic languages slo/slk sk Slovak slv sl Slovenian sma Southern Sami sme se Northern Sami smi Sami languages smj Lule Sami smn Inari Sami smo sm Samoan sms Skolt Sami sna sn Shona snd sd Sindhi snk Soninke sog Sogdian som so Somali son Songhai languages sot st Sotho, Southern spa es Spanish; Castilian srd sc Sardinian srn Sranan Tongo srp sr Serbian srr Serer ssa Nilo-Saharan languages ssw ss Swati suk Sukuma sun su Sundanese sus Susu sux Sumerian swa sw Swahili swe sv Swedish syc Classical Syriac syr Syriac tah ty Tahitian tai Tai languages tam ta Tamil tat tt Tatar tel te Telugu tem Timne ter Tereno tet Tetum tgk tg Tajik tgl tl Tagalog tha th Thai tib/bod bo Tibetan tig Tigre tir ti Tigrinya tiv Tiv tkl Tokelau tlh Klingon; tlhIngan-Hol tli Tlingit tmh Tamashek tog Tonga (Nyasa) ton to Tonga (Tonga Islands) tpi Tok Pisin tsi Tsimshian tsn tn Tswana tso ts Tsonga tuk tk Turkmen tum Tumbuka tup Tupi languages tur tr Turkish tut Altaic languages tvl Tuvalu twi tw Twi tyv Tuvinian udm Udmurt uga Ugaritic uig ug Uighur; Uyghur ukr uk Ukrainian umb Umbundu und Undetermined urd ur Urdu uzb uz Uzbek vai Vai ven ve Venda vie vi Vietnamese vol vo Volapuk vot Votic wak Wakashan languages wal Wolaitta; Wolaytta war Waray was Washo wel/cym cy Welsh wen Sorbian languages wln wa Walloon wol wo Wolof xal Kalmyk; Oirat xho xh Xhosa yao Yao yap Yapese yid yi Yiddish yor yo Yoruba ypk Yupik languages zap Zapotec zbl Blissymbols; Blissymbolics; Bliss zen Zenaga zha za Zhuang; Chuang znd Zande languages zul zu Zulu zun Zuni zxx No linguistic content; Not applicable zza Zaza; Dimili; Dimli; Kirdki; Kirmanjki; Zazaki'! Item was changed: ----- Method: ISOLanguageDefinition class>>readISOLanguagesFrom: (in category 'private') ----- readISOLanguagesFrom: stream "ISOLanguageDefinition readISOLanguagesFrom: ISOLanguageDefinition isoLanguages readStream " | languages language code3 index line | languages := Dictionary new. [stream atEnd or: [(line := stream nextLine readStream) atEnd]] whileFalse: [ language := ISOLanguageDefinition new. code3 := line upTo: Character tab. (index := code3 indexOf: $/) > 0 ifTrue: [ language iso3: (code3 copyFrom: 1 to: index-1). language iso3Alternate: (code3 copyFrom: index+1 to: code3 size)] ifFalse: [language iso3: code3]. language iso2: (line upTo: Character tab); language: line upToEnd. + languages at: language iso3 put: language. + language iso3Alternate ifNotNil: [ + languages at: language iso3Alternate put: language]]. - languages at: language iso3 put: language]. ^languages! Item was changed: ----- Method: ISOLanguageDefinition>>iso2 (in category 'accessing') ----- iso2 + ^iso2 ifNil: ['']! - ^iso2 ifNil: [self iso3]! Item was changed: Object subclass: #Locale + instanceVariableNames: 'id shortDate longDate time decimalSymbol digitGrouping currencySymbol currencyNotation measurement offsetLocalToUTC offsetVMToUTC dstActive leadingChar' + classVariableNames: 'Current CurrentPlatform KnownLocales Previous' - instanceVariableNames: 'id shortDate longDate time decimalSymbol digitGrouping currencySymbol currencyNotation measurement offsetLocalToUTC offsetVMToUTC dstActive' - classVariableNames: 'Current CurrentPlatform KnownLocales LanguageSymbols LocaleChangeListeners PlatformEncodings Previous' poolDictionaries: '' category: 'System-Localization'! !Locale commentStamp: '<historical>' prior: 0! Main comment stating the purpose of this class and relevant relationship to other classes. http://www.w3.org/WAI/ER/IG/ert/iso639.htm http://www.oasis-open.org/cover/iso639a.html See also http://oss.software.ibm.com/cvs/icu/~checkout~/icuhtml/design/language_code… http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.10 ISO 3166 http://mitglied.lycos.de/buran/knowhow/codes/locales/ ! Item was removed: - ----- Method: Locale class>>addLocalChangedListener: (in category 'notification') ----- - addLocalChangedListener: anObjectOrClass - self localeChangedListeners add: anObjectOrClass! Item was removed: - ----- Method: Locale class>>clipboadInterpreter (in category 'accessing') ----- - clipboadInterpreter - ^NoConversionClipboardInterpreter new! Item was changed: ----- Method: Locale class>>current (in category 'accessing') ----- current + + ^ Current ifNil: [Current := self currentPlatform]! - "Current := nil" - Current ifNil: [ - Current := self determineCurrentLocale. - "Transcript show: 'Current locale: ' , Current localeID asString; cr"]. - ^Current! Item was added: + ----- Method: Locale class>>current: (in category 'accessing') ----- + current: locale + + Current = locale ifTrue: [^ self]. + Current := locale. + self localeChanged.! Item was added: + ----- Method: Locale class>>current:during: (in category 'accessing') ----- + current: locale during: aBlock + "Alter current language during a block" + + | prior | + prior := self current. + [self current: locale. aBlock value] + ensure: [self current: prior].! Item was changed: + ----- Method: Locale class>>currentPlatform (in category 'platform specific') ----- - ----- Method: Locale class>>currentPlatform (in category 'accessing') ----- currentPlatform + + ^ CurrentPlatform ifNil: [CurrentPlatform := self new determineLocale]! - "CurrentPlatform := nil" - CurrentPlatform ifNil: [CurrentPlatform := self determineCurrentLocale]. - ^CurrentPlatform! Item was changed: + ----- Method: Locale class>>currentPlatform: (in category 'platform specific') ----- - ----- Method: Locale class>>currentPlatform: (in category 'accessing') ----- currentPlatform: locale + + CurrentPlatform := locale.! - CurrentPlatform := locale. - LanguageEnvironment startUp. - ! Item was changed: + ----- Method: Locale class>>currentPlatform:during: (in category 'platform specific') ----- - ----- Method: Locale class>>currentPlatform:during: (in category 'accessing') ----- currentPlatform: locale during: aBlock "Alter current language platform during a block" + + | prior | + prior := self currentPlatform. + [self currentPlatform: locale. aBlock value] + ensure: [self currentPlatform: prior]! - | backupPlatform | - backupPlatform := self currentPlatform. - [self currentPlatform: locale. - aBlock value] - ensure: [self currentPlatform: backupPlatform]! Item was added: + ----- Method: Locale class>>default (in category 'constants') ----- + default + + ^ self localeID: LocaleID default! Item was changed: ----- Method: Locale class>>defaultEncodingName: (in category 'platform specific') ----- + defaultEncodingName: languageSymbol + + self flag: #deprecated. + ^ (Locale isoString: languageSymbol) systemConverter class encodingNames first! - defaultEncodingName: languageSymbol - | encodings platformName osVersion | - platformName := Smalltalk platformName. - osVersion := Smalltalk getSystemAttribute: 1002. - encodings := self platformEncodings at: languageSymbol - ifAbsent: [self platformEncodings at: #default]. - encodings at: platformName ifPresent: [:encoding | ^encoding]. - encodings at: platformName , ' ' , osVersion - ifPresent: [:encoding | ^encoding]. - ^encodings at: #default! Item was changed: ----- Method: Locale class>>defaultInputInterpreter (in category 'platform specific') ----- defaultInputInterpreter + + self flag: #deprecated. + ^ Locale currentPlatform inputInterpreter! - | platformName | - platformName := Smalltalk platformName. - platformName = 'Win32' ifTrue: [^UTF32InputInterpreter new]. - ^NoInputInterpreter new! Item was removed: - ----- Method: Locale class>>determineCurrentLocale (in category 'private') ----- - determineCurrentLocale - "For now just return the default locale. - A smarter way would be to determine the current platforms default locale." - "Locale determineCurrentLocale" - - ^self new determineLocale! Item was changed: ----- Method: Locale class>>initKnownLocales (in category 'private') ----- initKnownLocales | locales | locales := Dictionary new. "Init the locales for which we have translations" + NaturalLanguageTranslator availableLanguageLocaleIDs do: [:id | - InternalTranslator availableLanguageLocaleIDs do: [:id | locales at: id put: (Locale new localeID: id)]. ^locales! Item was changed: ----- Method: Locale class>>initialize (in category 'class initialization') ----- initialize "Locale initialize" + + Smalltalk addToStartUpList: Locale before: NaturalLanguageTranslator. + - Smalltalk addToStartUpList: Locale. Preferences addPreference: #useLocale categories: #('general' ) default: false balloonHelp: 'Use the system locale to set the system language, etc., at startup. For time-zone handling, see automaticTimezone.'! Item was removed: - ----- Method: Locale class>>initializePlatformEncodings (in category 'class initialization') ----- - initializePlatformEncodings - "Locale initializePlatformEncodings" - - | platform | - PlatformEncodings isNil ifTrue: [ PlatformEncodings := Dictionary new ]. - - platform := PlatformEncodings at: 'default' ifAbsentPut: Dictionary new. - platform - at: 'default' put: 'iso8859-1'; - at: 'Win32 CE' put: 'utf-8'; - yourself. - - platform := PlatformEncodings at: 'ja' ifAbsentPut: Dictionary new. - platform - at: 'default' put: 'shift-jis'; - at: 'unix' put: 'euc-jp'; - at: 'Win32 CE' put: 'utf-8'; - yourself. - - platform := PlatformEncodings at: 'ko' ifAbsentPut: Dictionary new. - platform - at: 'default' put: 'euc-kr'; - at: 'Win32 CE' put: 'utf-8'; - yourself. - - platform := PlatformEncodings at: 'zh' ifAbsentPut: Dictionary new. - platform - at: 'default' put: 'gb2312'; - at: 'unix' put: 'euc-cn'; - at: 'Win32 CE' put: 'utf-8'; - yourself. - ! Item was changed: + ----- Method: Locale class>>isoLanguage: (in category 'instance lookup') ----- - ----- Method: Locale class>>isoLanguage: (in category 'accessing') ----- isoLanguage: isoLanguage ^self isoLanguage: isoLanguage isoCountry: nil! Item was changed: + ----- Method: Locale class>>isoLanguage:isoCountry: (in category 'instance lookup') ----- - ----- Method: Locale class>>isoLanguage:isoCountry: (in category 'accessing') ----- isoLanguage: isoLanguage isoCountry: isoCountry ^self localeID: (LocaleID isoLanguage: isoLanguage isoCountry: isoCountry)! Item was changed: ----- Method: Locale class>>isoLocale: (in category 'accessing') ----- isoLocale: aString + + self deprecated. + ^ self isoString: aString ! - ! Item was added: + ----- Method: Locale class>>isoString: (in category 'instance lookup') ----- + isoString: aString + + ^self localeID: (LocaleID isoString: aString)! Item was changed: ----- Method: Locale class>>languageSymbol: (in category 'accessing') ----- languageSymbol: languageSymbol "Locale languageSymbol: #Deutsch" + self flag: #deprecated. + ^ self isoLanguage: (languageSymbol caseOf: { + [#Deutsch] -> ['de']. [#Englisch] -> ['en']. [#Französisch] -> ['fr']. + [#German] -> ['de']. [#English] -> ['en']. [#French] -> ['fr']. + [#Allemand] -> ['de']. [#Anglais] -> ['en']. [#Français] -> ['fr']})! - ^self isoLanguage: (LanguageSymbols at: languageSymbol)! Item was removed: - ----- Method: Locale class>>localeChangedListeners (in category 'notification') ----- - localeChangedListeners - ^LocaleChangeListeners ifNil: [LocaleChangeListeners := OrderedCollection new]! Item was changed: + ----- Method: Locale class>>localeID: (in category 'instance lookup') ----- - ----- Method: Locale class>>localeID: (in category 'accessing') ----- localeID: id ^self knownLocales at: id ifAbsentPut: [Locale new localeID: id]! Item was removed: - ----- Method: Locale class>>platformEncodings (in category 'class initialization') ----- - platformEncodings - PlatformEncodings isEmptyOrNil ifTrue: [ self initializePlatformEncodings ]. - ^PlatformEncodings - ! Item was added: + ----- Method: Locale class>>previous: (in category 'accessing') ----- + previous: aLocale + Previous := aLocale + ! Item was changed: ----- Method: Locale class>>startUp: (in category 'system startUp') ----- startUp: resuming + resuming ifFalse: [^self]. + self currentPlatform: nil. + + (Preferences valueOfFlag: #useLocale) ifTrue: [ + self currentPlatform ~= self current ifTrue: [ + self + switchToID: self currentPlatform localeID + gently: true]].! - (Preferences valueOfFlag: #useLocale) - ifTrue: [ - | newID | - newID := self current determineLocaleID. - newID ~= LocaleID current - ifTrue: [self switchAndInstallFontToID: newID gently: true]]! Item was changed: ----- Method: Locale class>>switchAndInstallFontToID: (in category 'accessing') ----- switchAndInstallFontToID: localeID "Locale switchAndInstallFontToID: (LocaleID isoLanguage: 'de')" + + self flag: #deprecated. + ^ self switchAndInstallFontToID: localeID gently: false! - | locale | - locale := Locale localeID: localeID. - locale languageEnvironment isFontAvailable - ifFalse: [(self confirm: 'This language needs additional fonts. - Do you want to install the fonts?' translated) - ifTrue: [locale languageEnvironment installFont] - ifFalse: [^ self]]. - self - switchTo: locale! Item was changed: ----- Method: Locale class>>switchAndInstallFontToID:gently: (in category 'accessing') ----- switchAndInstallFontToID: localeID gently: gentlyFlag + "Change the system's locale to the given localeID. The gentlyFlag can be used to implement a less aggressive version of object updates. NOTE THAT the user is prompted to install missing fonts if not available." + + | locale env | - | locale result env envFound ret fontInImage menu | - "Logic: - - not in Rainbow, - - if the font is in the image, use the font. - - if the font is not in the image, - - ask to choose: - - load font - - try to enable pango, if pango is available - - or cancel. - - if the previous step fails, notify the user that you cannot switch to the language. - Details: - - how to check non-pango font is available: - - if the language environment for the locale doesn't exist, the font is not available. - - if font loading fails, it is not available. - - how to check if the language environment doesn't exist: - - if the locales languageEnvironment is Latin1 but the locale isn't it is not available. - " locale := Locale localeID: localeID. env := locale languageEnvironment. + + self flag: #deprecated. + env isFontAvailable ifFalse: [ + (self confirm: 'This language needs additional fonts.\Do you want to install the fonts?' translated withCRs) + ifFalse: [^ self]. + env installFont]. + + ^ self switchTo: locale gently: gentlyFlag! - result := true. - envFound := (Latin1Environment supportedLanguages includes: locale isoLanguage) or: [(env isMemberOf: Latin1Environment) not]. - fontInImage := envFound and: [env isFontAvailable]. - fontInImage ifFalse: [ - menu := MenuMorph new. - menu defaultTarget: menu. - envFound ifTrue: [menu add: 'load font' translated selector: #modalSelection: argument: #loadFont]. - menu add: 'cancel' translated selector: #modalSelection: argument: #cancel. - menu addTitle: 'This language needs additional fonts. - Do you want to install the fonts?' translated. - ret := menu invokeModal. - ret = #loadFont ifTrue: [result := env installFont. result ifTrue: [AbstractFont setupDefaultFallbackTextStyle]]. - (ret ~~ #loadFont and: [ret ~~ #enablePango]) ifTrue: [result := false]]. - result ifFalse: [self inform: 'Cannot load additional fonts' translated] ifTrue: [self switchTo: locale gently: gentlyFlag]. - ! Item was changed: ----- Method: Locale class>>switchTo:gently: (in category 'accessing') ----- switchTo: locale gently: gentlyFlag + "Change the system's locale, which also changes the current natural-language translator." "Locale switchTo: (Locale isoLanguage: 'de')" + + self current = locale ifTrue: [^ self]. + + Previous := Current. + Current := locale. + + gentlyFlag + ifTrue: [self localeChangedGently] + ifFalse: [self localeChanged].! - | availableID | - availableID := (NaturalLanguageTranslator availableForLocaleID: locale localeID) localeID. - Current localeID = availableID - ifFalse: [Previous := Current. - CurrentPlatform := Current := Locale localeID: availableID. - gentlyFlag ifTrue: [self localeChangedGently] ifFalse: [self localeChanged]]! Item was added: + ----- Method: Locale class>>switchToID:gently: (in category 'accessing') ----- + switchToID: localeID gently: gentlyFlag + + self switchTo: (Locale localeID: localeID) gently: gentlyFlag! Item was added: + ----- Method: Locale>>= (in category 'comparing') ----- + = other + + ^ self class == other class + and: [self localeID = other localeID]! Item was added: + ----- Method: Locale>>clipboardInterpreter (in category 'accessing - queries') ----- + clipboardInterpreter + + ^ self languageEnvironment clipboardInterpreter! Item was changed: + ----- Method: Locale>>determineLocale (in category 'initialize-release') ----- - ----- Method: Locale>>determineLocale (in category 'accessing') ----- determineLocale self localeID: self determineLocaleID! Item was changed: + ----- Method: Locale>>determineLocaleID (in category 'initialize-release') ----- - ----- Method: Locale>>determineLocaleID (in category 'accessing') ----- determineLocaleID "Locale current determineLocaleID" + + ^ LocaleID + isoLanguage: (self fetchISO2Language ifNil: ['en']) + isoCountry: self fetchISOCountry! - | isoLang isoCountry | - isoLang := self fetchISO2Language - ifNil: [^ self localeID]. - isoCountry := self fetchISOCountry - ifNil: [^ LocaleID isoLanguage: isoLang]. - ^ LocaleID isoLanguage: isoLang isoCountry: isoCountry! Item was changed: + ----- Method: Locale>>fetchISO2Language (in category 'initialize-release') ----- - ----- Method: Locale>>fetchISO2Language (in category 'private') ----- fetchISO2Language "Locale current fetchISO2Language" | lang isoLang | lang := self primLanguage. lang ifNil: [^nil]. lang := lang copyUpTo: 0 asCharacter. lang size == 2 ifTrue: [^lang]. isoLang := ISOLanguageDefinition iso3LanguageDefinition: lang. ^isoLang ifNil: [nil] ifNotNil: [isoLang iso2]! Item was changed: + ----- Method: Locale>>fetchISOCountry (in category 'initialize-release') ----- - ----- Method: Locale>>fetchISOCountry (in category 'private') ----- fetchISOCountry "Locale current fetchISOCountry" | countryCode | countryCode := self primCountry ifNil: [^ nil]. ^ countryCode copyUpTo: 0 asCharacter! Item was added: + ----- Method: Locale>>fileNameConverter (in category 'accessing - queries') ----- + fileNameConverter + + ^ self languageEnvironment fileNameConverter! Item was added: + ----- Method: Locale>>fileNameEncodingName (in category 'accessing - queries') ----- + fileNameEncodingName + + ^ self languageEnvironment fileNameConverter class encodingNames first ! Item was added: + ----- Method: Locale>>hash (in category 'comparing') ----- + hash + "Mix in class hash to not confuse with LocaleID hash:" + + ^ self class hash bitXor: self localeID hash! Item was changed: + ----- Method: Locale>>iconForNativeLanguage (in category 'accessing - queries') ----- - ----- Method: Locale>>iconForNativeLanguage (in category 'accessing') ----- iconForNativeLanguage ^ (NaturalLanguageFormTranslator localeID: self localeID) translate: 'LanguageNameInNativeLanguage'. ! Item was added: + ----- Method: Locale>>inputInterpreter (in category 'accessing - queries') ----- + inputInterpreter + + ^ self languageEnvironment inputInterpreter! Item was changed: + ----- Method: Locale>>isoCountry (in category 'accessing - queries') ----- - ----- Method: Locale>>isoCountry (in category 'accessing') ----- isoCountry ^self localeID isoCountry! Item was changed: + ----- Method: Locale>>isoLanguage (in category 'accessing - queries') ----- - ----- Method: Locale>>isoLanguage (in category 'accessing') ----- isoLanguage ^self localeID isoLanguage! Item was changed: + ----- Method: Locale>>isoLocale (in category 'accessing - queries') ----- - ----- Method: Locale>>isoLocale (in category 'accessing') ----- isoLocale + + self deprecated. + ^ self localeID isoString! - "<language>-<country>" - ^self isoCountry - ifNil: [self isoLanguage] - ifNotNil: [self isoLanguage , '-' , self isoCountry]! Item was changed: ----- Method: Locale>>languageEnvironment (in category 'accessing') ----- languageEnvironment + "Answer the language environment that is available for the receiver's locale ID. NOTE THAT client code should always query the language environment of the platform locale!!" + + ^ self localeID languageEnvironment! - ^LanguageEnvironment localeID: self localeID! Item was added: + ----- Method: Locale>>languageTranslator (in category 'accessing') ----- + languageTranslator + + ^ self localeID languageTranslator! Item was added: + ----- Method: Locale>>leadingChar (in category 'accessing') ----- + leadingChar + "Cached here because of Unicode class >> #value:." + + ^ leadingChar ifNil: [leadingChar := self languageEnvironment leadingChar]! Item was changed: + ----- Method: Locale>>offsetLocalToUTC (in category 'accessing - queries') ----- - ----- Method: Locale>>offsetLocalToUTC (in category 'accessing') ----- offsetLocalToUTC ^self primTimezone! Item was changed: + ----- Method: Locale>>printOn: (in category 'printing') ----- - ----- Method: Locale>>printOn: (in category 'accessing') ----- printOn: aStream + super printOn: aStream. + aStream + nextPut: $(; + print: id; + nextPut: $)! - aStream nextPutAll: '(' , id printString , ')'! Item was added: + ----- Method: Locale>>systemConverter (in category 'accessing - queries') ----- + systemConverter + + ^ self languageEnvironment systemConverter! Item was changed: Object subclass: #LocaleID instanceVariableNames: 'isoLanguage isoCountry' classVariableNames: '' poolDictionaries: '' category: 'System-Localization'! + + !LocaleID commentStamp: 'mt 1/26/2022 10:46' prior: 0! + I am an identifier for a Locale. My structure consists of a code for a language and a code for a country according to ISO 639 and ISO 3166 respectively. The country may specialize a language but it is not required. + + Here are some print-it/inspect-it examples: + + LocaleID isoString: 'en' + LocaleID isoString: 'en-US' + LocaleID isoString: 'en-GB' + LocaleID isoString: 'fr' + LocaleID isoString: 'fr-FR' + LocaleID isoString: 'de' + LocaleID isoString: 'de-DE' + LocaleID isoString: 'de-CH' + LocaleID isoString: 'de-AT' + + Note that any specialized identifier (e.g., 'en-US') has a generic #parent (e.g., 'en'). Try to favor the generic form whenver possible. You can use the specialized form, e.g., when translating natural language. + + Take a look at ISOLanguageDefinition to understand how the codes are expanded to language names and country names. You can also use 3-letter codes: + + LocaleID isoString: 'eng-USA' + LocaleID isoString: 'fre-FRA' + LocaleID isoString: 'deu-CHE' + + BE AWARE that you cannot compare (i.e. #=) a 2-letter id with a 3-letter id. So, make consistent use of either form only.! Item was removed: - ----- Method: LocaleID class>>countryFor: (in category 'accessing') ----- - countryFor: iso6391Code - "http://www.loc.gov/standards/iso639-2/php/code_list.php" - ^ iso6391Code - caseOf: - { ['af'] -> ['Afrikaans']. - ['ca'] -> ['Catalan']. - ['cs'] -> [ 'Czech']. - ['da'] -> [ 'Danish']. - ['de'] -> [ 'German']. - ['el'] -> [ 'Greek Modern']. - ['en'] -> [ 'English']. - ['es'] -> [ 'Spanish']. - ['eu'] -> [ 'Basque']. - ['fi'] -> [ 'Finnish']. - ['fo'] -> [ 'Faroese']. - ['fr'] -> [ 'French']. - ['ga'] -> [ 'Irish']. - ['gd'] -> [ 'Gaelic']. - ['hr'] -> [ 'Croatian']. - ['hu'] -> [ 'Hungarian']. - ['is'] -> [ 'Icelandic']. - ['it'] -> [ 'Italian']. - ['ja'] -> [ 'Japanese']. - ['ja-etoys'] -> [ 'Japanese']. - ['ko'] -> [ 'Korean']. - ['nl'] -> [ 'Dutch']. - ['no'] -> [ 'Norwegian']. - ['pt'] -> [ 'Portuguese']. - ['rm'] -> [ 'Romansh']. - ['ro'] -> [ 'Romainian']. - ['sk'] -> [ 'Slovak']. - ['sl'] -> [ 'Slovenian']. - ['sq'] -> [ 'Albanian']. - ['sv'] -> [ 'Swedish']. - ['sw'] -> [ 'Swahili']. - ['zh'] -> [ 'Chinese'] } - otherwise: - [ 'other' ]! Item was added: + ----- Method: LocaleID class>>default (in category 'constants') ----- + default + + ^ self isoLanguage: 'en'! Item was changed: ----- Method: LocaleID>>displayCountry (in category 'accessing') ----- displayCountry + + ^ self hasIsoCountry ifFalse: [ '' ] ifTrue: [ + ISOLanguageDefinition iso2Countries + at: self isoCountry + ifAbsent: [ ISOLanguageDefinition iso3Countries + at: self isoCountry + ifAbsent: [ self isoCountry ]]] ! - ^(ISOLanguageDefinition iso2Countries at: self isoCountry asUppercase ifAbsent: [ self isoCountry ]) ! Item was changed: ----- Method: LocaleID>>displayLanguage (in category 'accessing') ----- displayLanguage | language | language := (ISOLanguageDefinition iso2LanguageTable at: self isoLanguage + ifAbsent: [ISOLanguageDefinition iso3LanguageTable + at: self isoLanguage + ifAbsent: [^ self isoLanguage]]) language. + ^ self displayCountry + ifEmpty: [language] + ifNotEmpty: [:dc | language , ' (' , dc , ')']! - ifAbsent: [^ self isoLanguage]) language. - ^ self isoCountry - ifNil: [language] - ifNotNil: [language , ' (' , self displayCountry , ')']! Item was changed: ----- Method: LocaleID>>displayName (in category 'accessing') ----- displayName "Answer a proper name to represent the receiver in GUI. The wording is provided by translations of the magic value '<language display name>'. 'English' -> 'English' 'German' -> 'Deutsch' " | magicPhrase translatedMagicPhrase | + magicPhrase := 'Language-Name' translatedNoop. + translatedMagicPhrase := self languageTranslator translate: magicPhrase. - magicPhrase := '<language display name>'. - translatedMagicPhrase := NaturalLanguageTranslator translateWithoutLoading: magicPhrase toLocaleID: self. ^ translatedMagicPhrase = magicPhrase ifTrue: [self displayLanguage] ifFalse: [translatedMagicPhrase]! Item was added: + ----- Method: LocaleID>>hasIsoCountry (in category 'testing') ----- + hasIsoCountry + + ^ isoCountry notNil! Item was changed: ----- Method: LocaleID>>hasParent (in category 'testing') ----- hasParent + + ^self hasIsoCountry! - ^self isoCountry notNil! Item was removed: - ----- Method: LocaleID>>isoCountry: (in category 'accessing') ----- - isoCountry: aValue - - isoCountry := aValue! Item was changed: ----- Method: LocaleID>>isoLanguage:isoCountry: (in category 'initialize') ----- + isoLanguage: langString isoCountry: countryStringOrNil + + isoLanguage := langString asLowercase. + isoCountry := countryStringOrNil ifNotNil: [:c | c ifEmpty: [nil] ifNotEmpty: [c asUppercase]]. + ! - isoLanguage: langString isoCountry: countryStringOrNil - isoLanguage := langString. - isoCountry := countryStringOrNil ifNil: (self class countryFor: langString)! Item was changed: ----- Method: LocaleID>>isoString (in category 'accessing') ----- isoString + "<language>-<country>" + + ^ String streamContents: [:stream | + stream nextPutAll: self isoLanguage. + self hasIsoCountry ifTrue: [ + stream nextPut: $-; nextPutAll: self isoCountry]]! - ^self asString! Item was added: + ----- Method: LocaleID>>languageEnvironment (in category 'accessing') ----- + languageEnvironment + + ^ LanguageEnvironment forLocaleID: self! Item was added: + ----- Method: LocaleID>>languageTranslator (in category 'accessing') ----- + languageTranslator + "Answer the implicit translator for the receiver. Try GetText first." + + ^ GetTextTranslator forLocaleID: self ifAbsent: [InternalTranslator forLocaleID: self]! Item was changed: ----- Method: LocaleID>>parent (in category 'accessing') ----- parent + ^self class isoLanguage: self isoLanguage! - ^ (self class - isoLanguage: self isoLanguage) - isoCountry: nil; - yourself! Item was changed: + ----- Method: LocaleID>>posixName (in category 'accessing') ----- - ----- Method: LocaleID>>posixName (in category 'printing') ----- posixName "(LocaleID isoString: 'es-MX') posixName" "(LocaleID isoString: 'es') posixName" "language[_territory]" + ^ self hasIsoCountry + ifFalse: [self isoLanguage] + ifTrue: [self isoLanguage , '_' , self isoCountry]! - ^ self isoCountry - ifNil: [self isoLanguage] - ifNotNil: [self isoLanguage , '_' , self isoCountry]! Item was changed: ----- Method: LocaleID>>printOn: (in category 'printing') ----- printOn: stream + + stream + nextPutAll: self isoString; + space; nextPut: $<; + nextPutAll: self displayLanguage; + nextPut: $>.! - "<language>-<country>" - stream nextPutAll: self isoLanguage. - self isoCountry - ifNotNil: [stream nextPut: $-; nextPutAll: self isoCountry]! Item was changed: ----- Method: LocaleID>>storeOn: (in category 'printing') ----- storeOn: aStream + aStream nextPut: $(. aStream nextPutAll: self class name. aStream nextPutAll: ' isoString: '. + aStream store: self isoString. - aStream nextPutAll: '''' , self printString , ''''. aStream nextPut: $). ! Item was changed: ----- Method: LocaleID>>translator (in category 'accessing') ----- translator + + self flag: #deprecated. + ^ self languageTranslator! - ^ InternalTranslator localeID: self ! Item was added: + ----- Method: NaturalLanguageTranslator class>>cachedTranslations (in category 'accessing') ----- + cachedTranslations + + ^ Dictionary new! Item was added: + ----- Method: NaturalLanguageTranslator class>>forLocaleID: (in category 'accessing') ----- + forLocaleID: localeID + + ^ self localeID: localeID! Item was added: + ----- Method: NaturalLanguageTranslator class>>forLocaleID:ifAbsent: (in category 'accessing') ----- + forLocaleID: localeID ifAbsent: aBlock + + ^ self localeID: localeID! Item was changed: + (PackageInfo named: 'System') postscript: 'Locale resetKnownLocales. + Locale current: nil. + Locale currentPlatform: nil.'! - (PackageInfo named: 'System') postscript: 'UserInterfaceTheme cleanUpAndReset. "Reduces keyboardFocusWidth in themes because we now add borderWidth of scrollables extra. See Morph >> #drawKeyboardFocusIndicationOn:."'!

1 0

The Trunk: EToys-mt.466.mcz
by commits＠source.squeak.org 10 Mar '22

10 Mar '22

Marcel Taeumel uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-mt.466.mcz ==================== Summary ==================== Name: EToys-mt.466 Author: mt Time: 10 March 2022, 2:19:57.521707 pm UUID: cf39b2f9-09bf-904f-a635-fd7d95a19272 Ancestors: EToys-mt.465 Complements Multilingual-mt.269 =============== Diff against EToys-mt.465 =============== Item was removed: - ClipboardInterpreter subclass: #CP1253ClipboardInterpreter - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'Etoys-Squeakland-Multilingual-TextConversion'! Item was removed: - ----- Method: CP1253ClipboardInterpreter>>fromSystemClipboard: (in category 'as yet unclassified') ----- - fromSystemClipboard: aString - - | result converter | - result := WriteStream on: (String new: aString size). - converter := CP1253TextConverter new. - aString do: [:each | - result nextPut: (converter toSqueak: each macToSqueak) asCharacter. - ]. - ^ result contents. - ! Item was removed: - ----- Method: CP1253ClipboardInterpreter>>toSystemClipboard: (in category 'as yet unclassified') ----- - toSystemClipboard: aString - - | result converter r | - aString isAsciiString ifTrue: [^ aString asOctetString]. "optimization" - - result := WriteStream on: (String new: aString size). - converter := CP1253TextConverter new. - aString do: [:each | - r := converter fromSqueak: each. - r charCode < 255 ifTrue: [ - result nextPut: r squeakToMac]]. - ^ result contents. - ! Item was removed: - KeyboardInputInterpreter subclass: #CP1253InputInterpreter - instanceVariableNames: 'converter' - classVariableNames: '' - poolDictionaries: '' - category: 'Etoys-Squeakland-Multilingual-TextConversion'! Item was removed: - ----- Method: CP1253InputInterpreter>>initialize (in category 'as yet unclassified') ----- - initialize - - converter := CP1253TextConverter new. - ! Item was removed: - ----- Method: CP1253InputInterpreter>>nextCharFrom:firstEvt: (in category 'as yet unclassified') ----- - nextCharFrom: sensor firstEvt: evtBuf - - | keyValue | - keyValue := evtBuf third. - ^ converter toSqueak: keyValue asCharacter. - ! Item was removed: - ClipboardInterpreter subclass: #ISO88597ClipboardInterpreter - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'Etoys-Squeakland-Multilingual-TextConversion'! Item was removed: - ----- Method: ISO88597ClipboardInterpreter>>fromSystemClipboard: (in category 'as yet unclassified') ----- - fromSystemClipboard: aString - - ^ aString convertFromWithConverter: ISO88597TextConverter new. - ! Item was removed: - ----- Method: ISO88597ClipboardInterpreter>>toSystemClipboard: (in category 'as yet unclassified') ----- - toSystemClipboard: aString - - | result converter | - - aString isAsciiString ifTrue: [^ aString asOctetString]. "optimization" - - result := WriteStream on: (String new: aString size). - converter := ISO88597TextConverter new. - aString do: [:each | - result nextPut: (converter fromSqueak: each).]. - ^ result contents. - ! Item was removed: - KeyboardInputInterpreter subclass: #ISO88597InputInterpreter - instanceVariableNames: 'converter' - classVariableNames: '' - poolDictionaries: '' - category: 'Etoys-Squeakland-Multilingual-TextConversion'! Item was removed: - ----- Method: ISO88597InputInterpreter>>initialize (in category 'as yet unclassified') ----- - initialize - - converter := ISO88597TextConverter new. - ! Item was removed: - ----- Method: ISO88597InputInterpreter>>nextCharFrom:firstEvt: (in category 'as yet unclassified') ----- - nextCharFrom: sensor firstEvt: evtBuf - - | keyValue | - keyValue := evtBuf third. - ^ converter toSqueak: keyValue asCharacter. - ! Item was removed: - ----- Method: LanguageEnvironment class>>setUsePangoFlag (in category '*Etoys-Squeakland-private') ----- - setUsePangoFlag - - | new old | - old := Preferences usePangoRenderer. - Smalltalk at: #RomePluginCanvas ifPresent: [:c | - new := c pangoIsAvailable and: [Locale current languageEnvironment class usePangoRenderer]]. - (old not and: [new]) ifTrue: [ - Preferences setPreference: #usePangoRenderer toValue: new. - TextMorph usePango: new. - ].! Item was removed: - ----- Method: LanguageEnvironment class>>usePangoRenderer (in category '*Etoys-Squeakland-private') ----- - usePangoRenderer - - | tr font phraseTest fontName | - Preferences usePangoRenderer ifTrue: [^ true]. - - "first, see if people specified font." - tr := NaturalLanguageTranslator current. - fontName := tr translate: 'Linux-Font'. - (fontName ~= 'Linux-Font' - and: [(StrikeFont familyNames includes: fontName asSymbol) not]) ifTrue: [^ true]. - - font := TextStyle defaultFont. - phraseTest := [:phrase | - phrase do: [:c | - (font hasGlyphWithFallbackOf: c) ifFalse: [^ true]]]. - - "Hopefully people start translating phrases that are really used, but also people translate on the Pootle server which has a ideosyncratic ordering..." - #('Rectangle' 'Text' 'forward by' 'turn by' 'color' 'choose new graphic' 'linear gradient' 'open as Flash' 'set custom action' 'show compressed size' 'more smoothing') do: [:ph | phraseTest value: (tr translate: ph)]. - - "But it is not often the case; so a bit more testing..." - 10 timesRepeat: [ - phraseTest value: tr atRandom]. - - ^ false. - ! Item was removed: - ----- Method: Locale class>>previous: (in category '*Etoys-Squeakland-accessing') ----- - previous: aLocale - Previous := aLocale - ! Item was removed: - LanguageEnvironment subclass: #M17nEnvironment - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'Etoys-Squeakland-Multilingual-Languages'! - - !M17nEnvironment commentStamp: 'kks 10/2/2010 19:45' prior: 0! - This class supports multilingual Unicode environments that use UTF-8 encoding. Such a large scope implies the use of external fonts and external rendering engines like Pango. Currently, it is useful for Indic and a few Asian languages.! Item was removed: - ----- Method: M17nEnvironment class>>clipboardInterpreterClass (in category 'subclass responsibilities') ----- - clipboardInterpreterClass - - ^ UTF8ClipboardInterpreter. - ! Item was removed: - ----- Method: M17nEnvironment class>>fileNameConverterClass (in category 'subclass responsibilities') ----- - fileNameConverterClass - - ^ UTF8TextConverter. - ! Item was removed: - ----- Method: M17nEnvironment class>>inputInterpreterClass (in category 'subclass responsibilities') ----- - inputInterpreterClass - | platformName | - platformName := SmalltalkImage current platformName. - platformName = 'MacOS' - ifTrue: [^MacRomanInputInterpreter]. - ^M17nInputInterpreter.! Item was removed: - ----- Method: M17nEnvironment class>>leadingChar (in category 'subclass responsibilities') ----- - leadingChar - - ^ Unicode leadingChar. - ! Item was removed: - ----- Method: M17nEnvironment class>>supportedLanguages (in category 'subclass responsibilities') ----- - supportedLanguages - "Include languages that will not conflict with other languages" - - ^#('bn' 'gu' 'hi' 'kn' 'ml' 'mr' 'ta' 'te' 'sa')! Item was removed: - ----- Method: M17nEnvironment class>>systemConverterClass (in category 'subclass responsibilities') ----- - systemConverterClass - - ^ UTF8TextConverter.! Item was removed: - KeyboardInputInterpreter subclass: #M17nInputInterpreter - instanceVariableNames: 'converter' - classVariableNames: '' - poolDictionaries: '' - category: 'Etoys-Squeakland-Multilingual-TextConversion'! - - !M17nInputInterpreter commentStamp: 'kks 10/2/2010 23:26' prior: 0! - A flexible input interpreter that is tuned to variations in keyboard events coming in from the VM. - - Old VMs passed only a 8-bit keycode evt[3] and 0 in evt[6]. This code could be in any one of the code pages. On Mac, this used mac-roman, while on Unix, this could be ASCII or UTF-8 depending on the locale. - - Newer VMs pass UTF32 in evt[6]. This can be 'cooked' based on the current language setting to generate a Character.! Item was removed: - ----- Method: M17nInputInterpreter>>initialize (in category 'as yet unclassified') ----- - initialize - - converter := UTF8TextConverter new.! Item was removed: - ----- Method: M17nInputInterpreter>>nextCharFrom:firstEvt: (in category 'as yet unclassified') ----- - nextCharFrom: sensor firstEvt: evtBuf - | keyValue | - keyValue := evtBuf at: 6. - 0 = keyValue ifTrue: [ ^self nextUtf8Char: sensor firstEvt: evtBuf ]. - 256 > keyValue ifTrue: [ ^keyValue asCharacter ]. - ^ Character leadingChar: (Locale current languageEnvironment leadingChar) code: keyValue! Item was removed: - ----- Method: M17nInputInterpreter>>nextUtf8Char:firstEvt: (in category 'as yet unclassified') ----- - nextUtf8Char: sensor firstEvt: evtBuf - "this code should really go into InputSensor>>fullKey" - | aCollection bytes peekEvent keyValue type stream multiChar evt | - self flag: #fixthis. - keyValue := evtBuf third. - evtBuf fourth = EventKeyChar ifTrue: [type := #keystroke]. - peekEvent := sensor peekEvent. - (peekEvent notNil and: [peekEvent fourth = EventKeyDown]) ifTrue: [ - sensor nextEvent. - peekEvent := sensor peekEvent]. - - (type == #keystroke - and: [peekEvent notNil - and: [peekEvent first = EventTypeKeyboard - and: [peekEvent fourth = EventKeyChar]]]) ifTrue: [ - aCollection := OrderedCollection with: keyValue asCharacter. - bytes := (keyValue <= 127) - ifTrue: [ 0 ] - ifFalse: [ (keyValue bitAnd: 16rE0) = 192 - ifTrue: [ 1 ] - ifFalse: [ (keyValue bitAnd: 16rF0) = 224 - ifTrue: [ 2 ] - ifFalse: [ 3 ] - ] - ]. - [bytes > 0] whileTrue: [ - (evt := sensor nextEvent) fourth = EventKeyChar ifTrue: [ - bytes := bytes - 1. - aCollection add: (Character value: evt third)]]. - "aCollection do: [ :each | Transcript show: (each asciiValue hex , ' ')]. - Transcript show: Character cr." - stream := ReadStream on: (String withAll: aCollection). - multiChar := converter nextFromStream: stream. - multiChar isOctetCharacter ifFalse: [ sensor nextEvent ]. - ^ multiChar]. - - ^ keyValue asCharacter! Item was removed: - ClipboardInterpreter subclass: #MacUTF8ClipboardInterpreter - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'Etoys-Squeakland-Multilingual-TextConversion'! Item was removed: - ----- Method: MacUTF8ClipboardInterpreter>>fromSystemClipboard: (in category 'as yet unclassified') ----- - fromSystemClipboard: aString - ^ aString convertFromWithConverter: UTF8TextConverter new! Item was removed: - ----- Method: MacUTF8ClipboardInterpreter>>toSystemClipboard: (in category 'as yet unclassified') ----- - toSystemClipboard: text - - | string | - string := text asString. - string isAsciiString ifTrue: [^ string asOctetString]. - string isOctetString ifTrue: [^ string ]. - ^ string convertToWithConverter: UTF8TextConverter new . - ! Item was removed: - LanguageEnvironment subclass: #NepaleseEnvironment - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'Etoys-Squeakland-Multilingual-Languages'! Item was removed: - ----- Method: NepaleseEnvironment class>>clipboardInterpreterClass (in category 'subclass responsibilities') ----- - clipboardInterpreterClass - - ^ UTF8ClipboardInterpreter. - ! Item was removed: - ----- Method: NepaleseEnvironment class>>fileNameConverterClass (in category 'subclass responsibilities') ----- - fileNameConverterClass - - ^ UTF8TextConverter. - ! Item was removed: - ----- Method: NepaleseEnvironment class>>inputInterpreterClass (in category 'subclass responsibilities') ----- - inputInterpreterClass - | platformName | - platformName := SmalltalkImage current platformName. - platformName = 'Win32' - ifTrue: [^ UTF32NPInputInterpreter]. - platformName = 'Mac OS' - ifTrue: [^ MacUnicodeInputInterpreter]. - platformName = 'unix' - ifTrue: [^ UTF32NPInputInterpreter]. - ^ MacRomanInputInterpreter! Item was removed: - ----- Method: NepaleseEnvironment class>>leadingChar (in category 'subclass responsibilities') ----- - leadingChar - - ^ 15. - ! Item was removed: - ----- Method: NepaleseEnvironment class>>supportedLanguages (in category 'subclass responsibilities') ----- - supportedLanguages - "Return the languages that this class supports. - Any translations for those languages will use this class as their environment." - - ^#('ne')! Item was removed: - ----- Method: NepaleseEnvironment class>>systemConverterClass (in category 'subclass responsibilities') ----- - systemConverterClass - - ^ UTF8TextConverter. - ! Item was removed: - KeyboardInputInterpreter subclass: #UTF32CNInputInterpreter - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'Etoys-Squeakland-Multilingual-TextConversion'! Item was removed: - ----- Method: UTF32CNInputInterpreter>>nextCharFrom:firstEvt: (in category 'as yet unclassified') ----- - nextCharFrom: sensor firstEvt: evtBuf - | keyValue | - keyValue := evtBuf at: 6. - keyValue < 256 - ifTrue: [^Character value: keyValue]. - ^ Character leadingChar: SimplifiedChineseEnvironment leadingChar code: keyValue! Item was removed: - UTF32InputInterpreter subclass: #UTF32GreekInputInterpreter - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'Etoys-Squeakland-Multilingual-TextConversion'! Item was removed: - ----- Method: UTF32GreekInputInterpreter>>nextCharFrom:firstEvt: (in category 'as yet unclassified') ----- - nextCharFrom: sensor firstEvt: evtBuf - | keyValue | - keyValue := evtBuf at: 6. - keyValue < 256 - ifTrue: [^Character value: keyValue]. - ^ Character leadingChar: GreekEnvironment leadingChar code: keyValue! Item was removed: - KeyboardInputInterpreter subclass: #UTF32NPInputInterpreter - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'Etoys-Squeakland-Multilingual-TextConversion'! Item was removed: - ----- Method: UTF32NPInputInterpreter>>nextCharFrom:firstEvt: (in category 'all') ----- - nextCharFrom: sensor firstEvt: evtBuf - | keyValue | - keyValue := evtBuf at: 6. - keyValue < 256 - ifTrue: [^Character value: keyValue]. - ^ Character leadingChar: NepaleseEnvironment leadingChar code: keyValue! Item was removed: - UTF8ClipboardInterpreter subclass: #UTF8CNClipboardInterpreter - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'Etoys-Squeakland-Multilingual-TextConversion'! Item was removed: - ----- Method: UTF8CNClipboardInterpreter>>fromSystemClipboard: (in category 'as yet unclassified') ----- - fromSystemClipboard: aString - ^aString convertFromWithConverter: UTF8TextConverter new.! Item was removed: - UTF8ClipboardInterpreter subclass: #UTF8GreekClipboardInterpreter - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'Etoys-Squeakland-Multilingual-TextConversion'! Item was removed: - ----- Method: UTF8GreekClipboardInterpreter>>fromSystemClipboard: (in category 'as yet unclassified') ----- - fromSystemClipboard: aString - | str | - str := aString convertFromWithConverter: UTF8TextConverter new. - ^ str collect: [:c | - (#( - 16r20AC 16rFFFD 16r201A 16r0192 16r201E 16r2026 16r2020 16r2021 - 16rFFFD 16r2030 16rFFFD 16r2039 16rFFFD 16rFFFD 16rFFFD 16rFFFD - 16rFFFD 16r2018 16r2019 16r201C 16r201D 16r2022 16r2013 16r2014 - 16rFFFD 16r2122 16rFFFD 16r203A 16rFFFD 16rFFFD 16rFFFD 16rFFFD - 16r00A0 16r0385 16r0386 16r00A3 16r00A4 16r00A5 16r00A6 16r00A7 - 16r00A8 16r00A9 16rFFFD 16r00AB 16r00AC 16r00AD 16r00AE 16r2015 - 16r00B0 16r00B1 16r00B2 16r00B3 16r0384 16r00B5 16r00B6 16r00B7 - 16r0388 16r0389 16r038A 16r00BB 16r038C 16r00BD 16r038E 16r038F - 16r0390 16r0391 16r0392 16r0393 16r0394 16r0395 16r0396 16r0397 - 16r0398 16r0399 16r039A 16r039B 16r039C 16r039D 16r039E 16r039F - 16r03A0 16r03A1 16rFFFD 16r03A3 16r03A4 16r03A5 16r03A6 16r03A7 - 16r03A8 16r03A9 16r03AA 16r03AB 16r03AC 16r03AD 16r03AE 16r03AF - 16r03B0 16r03B1 16r03B2 16r03B3 16r03B4 16r03B5 16r03B6 16r03B7 - 16r03B8 16r03B9 16r03BA 16r03BB 16r03BC 16r03BD 16r03BE 16r03BF - 16r03C0 16r03C1 16r03C2 16r03C3 16r03C4 16r03C5 16r03C6 16r03C7 - 16r03C8 16r03C9 16r03CA 16r03CB 16r03CC 16r03CD 16r03CE 16rFFFD - ) includes: c charCode) ifTrue: [Character leadingChar: GreekEnvironment leadingChar code: c charCode] ifFalse: [c]]. - ! Item was removed: - UTF8ClipboardInterpreter subclass: #UTF8JPClipboardInterpreter - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'Etoys-Squeakland-Multilingual-TextConversion'! Item was removed: - ----- Method: UTF8JPClipboardInterpreter>>fromSystemClipboard: (in category 'as yet unclassified') ----- - fromSystemClipboard: aString - ^aString convertFromWithConverter: UTF8TextConverter new. - ! Item was removed: - KeyboardInputInterpreter subclass: #UnixEUCKRInputInterpreter - instanceVariableNames: 'converter' - classVariableNames: '' - poolDictionaries: '' - category: 'Etoys-Squeakland-Multilingual-TextConversion'! Item was removed: - ----- Method: UnixEUCKRInputInterpreter>>initialize (in category 'as yet unclassified') ----- - initialize - - converter := EUCKRTextConverter new. - ! Item was removed: - ----- Method: UnixEUCKRInputInterpreter>>nextCharFrom:firstEvt: (in category 'as yet unclassified') ----- - nextCharFrom: sensor firstEvt: evtBuf - - | firstChar secondChar peekEvent keyValue type stream multiChar | - keyValue := evtBuf third. - evtBuf fourth = EventKeyChar ifTrue: [type := #keystroke]. - peekEvent := sensor peekEvent. - (peekEvent notNil and: [peekEvent fourth = EventKeyDown]) ifTrue: [ - sensor nextEvent. - peekEvent := sensor peekEvent]. - - (type == #keystroke - and: [peekEvent notNil - and: [peekEvent first = EventTypeKeyboard - and: [peekEvent fourth = EventKeyChar]]]) ifTrue: [ - firstChar := keyValue asCharacter. - secondChar := (peekEvent third) asCharacter. - stream := ReadStream on: (String with: firstChar with: secondChar). - multiChar := converter nextFromStream: stream. - multiChar isOctetCharacter ifFalse: [sensor nextEvent]. - ^ multiChar]. - - ^ keyValue asCharacter!

1 0

The Trunk: Tests-nice.478.mcz
by commits＠source.squeak.org 10 Mar '22

10 Mar '22

Nicolas Cellier uploaded a new version of Tests to project The Trunk: http://source.squeak.org/trunk/Tests-nice.478.mcz ==================== Summary ==================== Name: Tests-nice.478 Author: nice Time: 10 March 2022, 10:50:22.837899 am UUID: 254a0ef5-89bc-4144-b38d-e52912d08150 Ancestors: Tests-ct.477 Add a test for ecnoding/decoding of Character literals. Related to https://github.com/OpenSmalltalk/opensmalltalk-vm/issues/618 =============== Diff against Tests-ct.477 =============== Item was added: + ----- Method: CompilerTest>>testCharacterLiteral (in category 'tests - literals') ----- + testCharacterLiteral + #(0 65 16r80 16rFF 16r100 16r7FFF + 16r8000 "bug https://github.com/OpenSmalltalk/opensmalltalk-vm/issues/618" + 16r10000 + 16r10FFFE "max unicode value - 1" + "Note: max unicode value cannot be encoded as a literal because it is used as the so called #DoIt character + which is used to mark the end of source stream in Smalltalk Parser") + do: [:code | + | literalValue | + literalValue := Compiler evaluate: (String with: $$ with: (Character value: code)). + self assert: literalValue isCharacter. + self assert: literalValue asInteger = code].!

1 0

The Trunk: Multilingual-mt.268.mcz
by commits＠source.squeak.org 10 Mar '22

10 Mar '22

Marcel Taeumel uploaded a new version of Multilingual to project The Trunk: http://source.squeak.org/trunk/Multilingual-mt.268.mcz ==================== Summary ==================== Name: Multilingual-mt.268 Author: mt Time: 10 March 2022, 10:43:43.715713 am UUID: fa723821-437e-3842-9b4a-408ea1ac7c96 Ancestors: Multilingual-mt.267 Fixes the dropped #leadingChar for RussianEnvironment, which happened when I integrated KOI8-R into the ByteTextConverter hierarchy. Also updates mac-cyrillic but preserves the old version (includiont the mac-ukranian variation). Note that #leadingChar and LanguageEnvironment are not sufficient to tag languages here at decoding time. For example, the MacCyrillicTextConverter covers Russian, Bulgarian, Belarusian, Macedonian, Serbian. =============== Diff against Multilingual-mt.267 =============== Item was added: + ----- Method: ByteTextConverter class>>applyLanguageInformation: (in category 'class initialization') ----- + applyLanguageInformation: aLanguage + "Set language information in the decodeTable. Note that you should only do this after filling the encodeTable to not spoil its keys. See #encode:. See other implementations of #applyLanguageInformation:." + + | l | + l := aLanguage leadingChar. + l = 0 ifTrue: [^ self "Ignore"]. + decodeTable := decodeTable collect: [:codePoint | + (codePoint ~= -1 and: [codePoint ~= 16rFFFD]) + ifTrue: [ (Character leadingChar: l code: codePoint) asInteger ] + ifFalse: [ codePoint "See #decode:" ]].! Item was changed: ----- Method: ByteTextConverter class>>initializeTables (in category 'class initialization') ----- initializeTables self == ByteTextConverter ifTrue: [ ^self ]. self initializeDecodeTable; initializeEncodeTable; + initializeLatin1MapAndEncodings; + applyLanguageInformation: self language - initializeLatin1MapAndEncodings ! Item was added: + ----- Method: ByteTextConverter class>>language (in category 'accessing') ----- + language + + ^ Unicode ! Item was added: + ----- Method: CP1253TextConverter class>>language (in category 'utilities') ----- + language + + ^ GreekEnvironment! Item was added: + ----- Method: ISO88597TextConverter class>>language (in category 'utilities') ----- + language + + ^ GreekEnvironment! Item was added: + ----- Method: KOI8TextConverter class>>language (in category 'utilities') ----- + language + + ^ RussianEnvironment! Item was added: + MacCyrillicTextConverter subclass: #MacCyrillicOldTextConverter + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Multilingual-TextConversion'! + + !MacCyrillicOldTextConverter commentStamp: 'mt 3/10/2022 10:28' prior: 0! + Encoding for mac-cyrillic before Mac OS 9.0.! Item was added: + ----- Method: MacCyrillicOldTextConverter class>>encodingNames (in category 'utilities') ----- + encodingNames + "Pre Mac OS 9.0 version of mac-cyrillic encoding. Should not be used anymore." + + ^ #('mac-cyrillic-old')! Item was added: + ----- Method: MacCyrillicOldTextConverter class>>initializeDecodeTable (in category 'class initialization') ----- + initializeDecodeTable + + super initializeDecodeTable. + decodeTable at: 16rA2 + 1 put: 16r00A2. + decodeTable at: 16rB6 + 1 put: 16r2202. + decodeTable at: 16rFF + 1 put: 16r00A4.! Item was changed: ----- Method: MacCyrillicTextConverter class>>initializeDecodeTable (in category 'class initialization') ----- initializeDecodeTable super initializeDecodeTable. decodeTable := self createTableFrom: ((decodeTable copyFrom: 1 to: 128) , #( 16r0410 16r0411 16r0412 16r0413 16r0414 16r0415 16r0416 16r0417 16r0418 16r0419 16r041A 16r041B 16r041C 16r041D 16r041E 16r041F 16r0420 16r0421 16r0422 16r0423 16r0424 16r0425 16r0426 16r0427 16r0428 16r0429 16r042A 16r042B 16r042C 16r042D 16r042E 16r042F + 16r2020 16r00B0 16r0490 16r00A3 16r00A7 16r2022 16r00B6 16r0406 - 16r2020 16r00B0 16r00A2 16r00A3 16r00A7 16r2022 16r00B6 16r0406 16r00AE 16r00A9 16r2122 16r0402 16r0452 16r2260 16r0403 16r0453 + 16r221E 16r00B1 16r2264 16r2265 16r0456 16r00B5 16r0491 16r0408 - 16r221E 16r00B1 16r2264 16r2265 16r0456 16r00B5 16r2202 16r0408 16r0404 16r0454 16r0407 16r0457 16r0409 16r0459 16r040A 16r045A 16r0458 16r0405 16r00AC 16r221A 16r0192 16r2248 16r2206 16r00AB 16r00BB 16r2026 16r00A0 16r040B 16r045B 16r040C 16r045C 16r0455 16r2013 16r2014 16r201C 16r201D 16r2018 16r2019 16r00F7 16r201E 16r040E 16r045E 16r040F 16r045F 16r2116 16r0401 16r0451 16r044F 16r0430 16r0431 16r0432 16r0433 16r0434 16r0435 16r0436 16r0437 16r0438 16r0439 16r043A 16r043B 16r043C 16r043D 16r043E 16r043F 16r0440 16r0441 16r0442 16r0443 16r0444 16r0445 16r0446 16r0447 + 16r0448 16r0449 16r044A 16r044B 16r044C 16r044D 16r044E 16r20AC)).! - 16r0448 16r0449 16r044A 16r044B 16r044C 16r044D 16r044E 16r00A4)).! Item was added: + ----- Method: MacCyrillicTextConverter class>>language (in category 'utilities') ----- + language + "Well, actually, this encoding covers Russian, Bulgarian, Belarusian, Macedonian, Serbian." + + ^ RussianEnvironment! Item was added: + ----- Method: MacGreekTextConverter class>>language (in category 'utilities') ----- + language + + ^ GreekEnvironment! Item was added: + MacCyrillicTextConverter subclass: #MacUkrainianTextConverter + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Multilingual-TextConversion'! + + !MacUkrainianTextConverter commentStamp: 'mt 3/10/2022 10:29' prior: 0! + Encoding for mac-ukrainian before Mac OS 9.0.! Item was added: + ----- Method: MacUkrainianTextConverter class>>encodingNames (in category 'as yet unclassified') ----- + encodingNames + + ^ #('macukrainian' 'mac-ukrainian') copy! Item was added: + ----- Method: MacUkrainianTextConverter class>>initializeDecodeTable (in category 'as yet unclassified') ----- + initializeDecodeTable + + super initializeDecodeTable. + decodeTable at: 16rA2 + 1 put: 16r0490. + decodeTable at: 16rB6 + 1 put: 16r0491. + decodeTable at: 16rFF + 1 put: 16r00A4.! Item was changed: + (PackageInfo named: 'Multilingual') postscript: 'ByteTextConverter withAllSubclassesDo: [:ea | ea initializeTables].'! - (PackageInfo named: 'Multilingual') postscript: 'EUCTextConverter withAllSubclassesDo: [:ea | ea initializeTables].'!

1 0

The Trunk: Kernel-nice.1447.mcz
by commits＠source.squeak.org 10 Mar '22

10 Mar '22

Nicolas Cellier uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-nice.1447.mcz ==================== Summary ==================== Name: Kernel-nice.1447 Author: nice Time: 10 March 2022, 10:17:27.088899 am UUID: 2d34a5d9-c171-c04b-8e95-8f97913fdeef Ancestors: Kernel-mt.1446 Fix interpretation of push character literal bytecode (233) See https://github.com/OpenSmalltalk/opensmalltalk-vm/issues/618. Since character have unsigned values, the extend B bytecode (225) value must be interpreted unsigned. We do this with bitAnd: 16rFF because it restores unsignedness of a single byte: (0 to: 255) allSatisfy: [:extB | ((extB > 127 ifTrue: [extB - 256] ifFalse: [extB]) bitAnd: 16rFF) = extB]. and because we assume that extB is a single byte. This would be untrue if we would use multiple consecutive extend B bytecode to encode character value > 16rFFFF, but until now we don't - see EncoderForSistaV1>>#genPushCharacter: =============== Diff against Kernel-mt.1446 =============== Item was changed: ----- Method: InstructionStream>>interpretNext2ByteSistaV1Instruction:for:extA:extB:startPC: (in category 'decoding - private - sista v1') ----- interpretNext2ByteSistaV1Instruction: bytecode for: client extA: extA extB: extB startPC: startPC "Send to the argument, client, a message that specifies the next instruction. This method handles the two-byte codes. For a table of the bytecode set, see EncoderForV1's class comment." | byte method | method := self method. byte := self method at: pc. pc := pc + 1. "We do an inline quasi-binary search on bytecode" bytecode < 234 ifTrue: "pushes" [bytecode < 231 ifTrue: [bytecode < 229 ifTrue: [| literal | bytecode = 226 ifTrue: [^client pushReceiverVariable: (extA bitShift: 8) + byte]. literal := method literalAt: (extA bitShift: 8) + byte + 1. bytecode = 227 ifTrue: [^client pushLiteralVariable: literal]. ^client pushConstant: literal]. bytecode = 229 ifTrue: [^client pushTemporaryVariable: byte]. ^self unusedBytecode: client at: startPC]. bytecode = 231 ifTrue: [^byte < 128 ifTrue: [client pushNewArrayOfSize: byte] ifFalse: [client pushConsArrayWithElements: byte - 128]]. bytecode = 232 ifTrue: [^client pushSpecialConstant: ((extB < 128 ifTrue: [extB] ifFalse: [extB - 256]) bitShift: 8) + byte]. + ^client pushSpecialConstant: (Character value: ((extB bitAnd: 16rFF) bitShift: 8) + byte)]. - ^client pushSpecialConstant: (Character value: (extB bitShift: 8) + byte)]. bytecode < 240 ifTrue: "sends, trap and jump" [bytecode < 236 ifTrue: "sends" [(bytecode = 235 and: [extB >= 64]) ifTrue: [^client directedSuperSend: (method literalAt: (extA bitShift: 5) + (byte // 8) + 1) numArgs: (extB - 64 bitShift: 3) + (byte \\ 8)]. ^client send: (method literalAt: (extA bitShift: 5) + (byte // 8) + 1) super: bytecode = 235 numArgs: (extB bitShift: 3) + (byte \\ 8)]. bytecode = 236 ifTrue: [^client callMappedInlinedPrimitive: byte]. bytecode = 237 ifTrue: [^client jump: (extB bitShift: 8) + byte]. ^client jump: (extB bitShift: 8) + byte if: bytecode = 238]. bytecode < 243 ifTrue: [bytecode = 240 ifTrue: [^client popIntoReceiverVariable: (extA bitShift: 8) + byte]. bytecode = 241 ifTrue: [^client popIntoLiteralVariable: (method literalAt: (extA bitShift: 8) + byte + 1)]. ^client popIntoTemporaryVariable: byte]. bytecode = 243 ifTrue: [^client storeIntoReceiverVariable: (extA bitShift: 8) + byte]. bytecode = 244 ifTrue: [^client storeIntoLiteralVariable: (method literalAt: (extA bitShift: 8) + byte + 1)]. bytecode = 245 ifTrue: [^client storeIntoTemporaryVariable: byte]. "246-247 1111011 i xxxxxxxx UNASSIGNED" ^self unusedBytecode: client at: startPC!

1 0

Question about a possible Utf8String (and Utf8Symbol)
by Marcel Taeumel 10 Mar '22

10 Mar '22

Hi there -- Did somebody already put some thought in the pros and cons of having an Utf8String (and Utf8Symbol) regarding: - #compareWith:collated: (primitive 158) - #compare:with:collated: (#primitiveCompareString in #MiscPrimitivePlugin) - #at:(put:) (primitives 63 and 64) Our current distinction between ByteString and WideString allows for fast #at:(put:) access but might be slow when comparing ByteString with WideString. Some external libraries (e.g. via FFI) might even expect Utf8 encoded strings as input. At the moment, we would have to put Utf8TextConverter to work explicitely. No call for action here. Just a survey. :-) Best, Marcel

2 2

The Trunk: Compiler-nice.471.mcz
by commits＠source.squeak.org 10 Mar '22

10 Mar '22

Nicolas Cellier uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-nice.471.mcz ==================== Summary ==================== Name: Compiler-nice.471 Author: nice Time: 10 March 2022, 10:06:12.445899 am UUID: ebc43c86-7bbc-764d-9bbb-6c9ecfb21a10 Ancestors: Compiler-mt.470 Workaround VM bug https://github.com/OpenSmalltalk/opensmalltalk-vm/issues/618 We avoid using extend B bytecode (225) + push character bytecode (233) when character value > 16r7FFF. In this case, the character literal will be accessed thru traditional genPushLiteral: bytecode. =============== Diff against Compiler-mt.470 =============== Item was changed: ----- Method: EncoderForSistaV1>>genPushCharacter: (in category 'bytecode generation') ----- genPushCharacter: aCharacterOrCode "233 11101001 i i i i i i i i Push Character #iiiiiiii (+ Extend B * 256)" "Why restrict the range to 16 bits when we could encode arbitrarily 32-bit Characters? Well, 16 bits requires 4 bytes (extB + byte, 78 + byte) and so beyond this range we lose space verses a single-byte pushLiteral and a 4 byte Character literal on 32-bits. And generating the same bytecode on 64-bit and 32-bit is important if we want to be able to load binary code from one to the other (e.g. via Fuel)." | code | code := aCharacterOrCode isInteger ifTrue: [aCharacterOrCode] ifFalse: [aCharacterOrCode asInteger]. + "Note: due to a bug at VM side, Character above 16r8000 are reconstructed with a negative value. + This is because extend B is interpreted as signed integer. + See https://github.com/OpenSmalltalk/opensmalltalk-vm/issues/618 + For compatibility with old VM, we restrict usage of push character bytecode to safe cases extB < 16r80." + (code < 0 or: [code > 16r7FFF]) ifTrue: + [^self outOfRangeError: 'character' index: code range: 0 to: 16r7FFF]. - (code < 0 or: [code > 65535]) ifTrue: - [^self outOfRangeError: 'character' index: code range: 0 to: 65535]. (code > 255) ifTrue: [self genUnsignedSingleExtendB: (code bitShift: -8)]. stream nextPut: 233; nextPut: (code bitAnd: 255)! Item was changed: ----- Method: EncoderForSistaV1>>isSpecialLiteralForPush: (in category 'special literal encodings') ----- isSpecialLiteralForPush: literal ^literal isInteger ifFalse: [literal isCharacter ifFalse: [false == literal or: [true == literal or: [nil == literal]]] ifTrue: + ["Restrict character range due to VM bug at character value reconstruction + See https://github.com/OpenSmalltalk/opensmalltalk-vm/issues/618" + literal asInteger between: 0 and: 16r7FFF]] - [literal asInteger between: 0 and: 65535]] ifTrue: [literal between: -32768 and: 32767]!

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
31
Older →

Jump to page: