From 65d8c7a70282d67693c6af0b15fff5f34a6d6a2f Mon Sep 17 00:00:00 2001 From: Gabriel Omar Cotelli Date: Tue, 27 Aug 2024 15:49:54 -0300 Subject: [PATCH] Avoid Zinc dependency --- .../NaturalLanguageTranslationScanner.class.st | 6 +----- .../PolyglotNaturalLanguageTranslatorTest.class.st | 2 +- .../PolyglotNaturalLanguageTranslator.class.st | 8 ++++---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/source/Buoy-Development-Tools-Pharo-12/NaturalLanguageTranslationScanner.class.st b/source/Buoy-Development-Tools-Pharo-12/NaturalLanguageTranslationScanner.class.st index f6f002b..a27c63a 100644 --- a/source/Buoy-Development-Tools-Pharo-12/NaturalLanguageTranslationScanner.class.st +++ b/source/Buoy-Development-Tools-Pharo-12/NaturalLanguageTranslationScanner.class.st @@ -12,7 +12,6 @@ Class { #superclass : 'Object', #instVars : [ 'targetRepository', - 'base64Codec', 'environment' ], #category : 'Buoy-Development-Tools-Pharo-12', @@ -41,7 +40,7 @@ NaturalLanguageTranslationScanner >> exportOn: writeStream [ translator := MonoglotNaturalLanguageTranslator for: 'en' asLanguageRange. translations := OrderedDictionary new. stringsToTranslate do: [ :string | - translations at: ( base64Codec encode: ( translator hashCodeFor: string ) ) put: string ]. + translations at: ( translator hashCodeFor: string ) hex put: string ]. ( NeoJSONWriter on: writeStream ) prettyPrint: true; @@ -69,9 +68,6 @@ NaturalLanguageTranslationScanner >> initializeForProjectNamed: aProjectName [ ( 'Missing repository for project named <1s>' expandMacrosWith: aProjectName ) ]. - base64Codec := ZnBase64Encoder new - beForURLEncoding; - noPadding. environment := RBBrowserEnvironment new forPackageNames: ( targetRepository project packageNames select: [ :name | PackageOrganizer default hasPackage: name ] ) diff --git a/source/Buoy-Localization-Tests/PolyglotNaturalLanguageTranslatorTest.class.st b/source/Buoy-Localization-Tests/PolyglotNaturalLanguageTranslatorTest.class.st index f3e1a53..277ecff 100644 --- a/source/Buoy-Localization-Tests/PolyglotNaturalLanguageTranslatorTest.class.st +++ b/source/Buoy-Localization-Tests/PolyglotNaturalLanguageTranslatorTest.class.st @@ -20,7 +20,7 @@ PolyglotNaturalLanguageTranslatorTest >> exportSpanishTranslationsIn: location [ spanishLocation / 'tests.json' writeStreamDo: [ :stream | stream nextPutAll: - '{"Tests":{"6guTfqMXEB7iwmsDpIQ6Gc7O2KK5Zzw89AmnJsorD9g":"Argentina","B_YrAhdx089n4uH68YdpzF5cEZrX1NGEehHhHW1afss":"Brasil","qlqzWpF0wgYrf3aXsz-v5c5ATPX-z2v7vw3Ja6DZAEY":"EEUU"}}' + '{"Tests":{"ea0b937ea317101ee2c26b03a4843a19ceced8a2b9673c3cf409a726ca2b0fd8":"Argentina","07f62b021771d3cf67e2e1faf18769cc5e5c119ad7d4d1847a11e11d6d5a7ecb":"Brasil","aa5ab35a9174c2062b7f7697b33fafe5ce404cf5fecf6bfbbf0dc96ba0d90046":"EEUU"}}' ] ] diff --git a/source/Buoy-Localization/PolyglotNaturalLanguageTranslator.class.st b/source/Buoy-Localization/PolyglotNaturalLanguageTranslator.class.st index a852a4b..3cc35ac 100644 --- a/source/Buoy-Localization/PolyglotNaturalLanguageTranslator.class.st +++ b/source/Buoy-Localization/PolyglotNaturalLanguageTranslator.class.st @@ -38,9 +38,7 @@ PolyglotNaturalLanguageTranslator >> loadJSONTranslationsFor: languageRange in: and a second level where the key is the translation key and the value is the translated string." - | codec monoglotTranslator | - codec := ZnBase64Encoder new. - codec beForURLEncoding. + | monoglotTranslator | monoglotTranslator := self translatorFor: languageRange. ^ localeDirectory files select: [ :file | file extension = 'json' ] thenDo: [ :file | @@ -48,7 +46,9 @@ PolyglotNaturalLanguageTranslator >> loadJSONTranslationsFor: languageRange in: groupedTranslations := STON fromString: file contents. groupedTranslations keysAndValuesDo: [ :group :translations | translations keysAndValuesDo: [ :translationKey :translation | - monoglotTranslator translationAt: ( codec decode: translationKey ) put: translation ] + monoglotTranslator + translationAt: ( ByteArray readHexFrom: translationKey ) + put: translation ] ] ] ]