Merge pull request #1346 from SeasideSt/gettext-testing-improvements

Gettext: fix for issue https://github.com/SeasideSt/Grease/issues/146…
SeasideSt · Nov 13, 2022 · 3bae043 · 3bae043
2 parents 4211f09 + abbf1fd
commit 3bae043
Show file tree

Hide file tree

Showing 49 changed files with 241 additions and 186 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,12 +22,7 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
     name: ${{ matrix.smalltalk }}
     steps:
-      - name: Get current date
-        id: date
-        run: echo "::set-output name=date::$(date +'%Y-%m-%dT%H:%M:%S')"
-      - name: Log date
-        run: echo "${{ steps.date.outputs.date }}"
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.workflow_dispatch.ref }}
       - uses: hpi-swa/setup-smalltalkCI@v1

diff --git a/repository/Seaside-Gettext-Core.package/.filetree b/repository/Seaside-Gettext-Core.package/.filetree
@@ -1,4 +1,5 @@
 {
-	"noMethodMetaData" : true,
 	"separateMethodMetaAndSource" : false,
-	"useCypressPropertiesFile" : true }
+	"noMethodMetaData" : true,
+	"useCypressPropertiesFile" : true
+}
diff --git a/repository/Seaside-Gettext-Core.package/GRPackage.extension/properties.json b/repository/Seaside-Gettext-Core.package/GRPackage.extension/properties.json
@@ -1,2 +1,3 @@
 {
-	"name" : "GRPackage" }
+	"name" : "GRPackage"
+}
diff --git a/repository/Seaside-Gettext-Core.package/GRPlatform.extension/properties.json b/repository/Seaside-Gettext-Core.package/GRPlatform.extension/properties.json
@@ -1,2 +1,3 @@
 {
-	"name" : "GRPlatform" }
+	"name" : "GRPlatform"
+}
diff --git a/...tory/Seaside-Gettext-Core.package/GetTextSucessfulTranslationResult.class/properties.json b/...tory/Seaside-Gettext-Core.package/GetTextSucessfulTranslationResult.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "Seaside-Gettext-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "GetTextSucessfulTranslationResult",
-	"pools" : [
-		 ],
 	"super" : "GetTextTranslationResult",
-	"type" : "normal" }
+	"category" : "Seaside-Gettext-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "GetTextSucessfulTranslationResult",
+	"type" : "normal"
+}
diff --git a/repository/Seaside-Gettext-Core.package/GetTextTranslationResult.class/properties.json b/repository/Seaside-Gettext-Core.package/GetTextTranslationResult.class/properties.json
@@ -1,15 +1,14 @@
 {
-	"category" : "Seaside-Gettext-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
+	"super" : "Object",
+	"category" : "Seaside-Gettext-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
 	"instvars" : [
 		"original",
-		"translation" ],
+		"translation"
+	],
 	"name" : "GetTextTranslationResult",
-	"pools" : [
-		 ],
-	"super" : "Object",
-	"type" : "normal" }
+	"type" : "normal"
+}
diff --git a/...ry/Seaside-Gettext-Core.package/GetTextUnsucessfulTranslationResult.class/properties.json b/...ry/Seaside-Gettext-Core.package/GetTextUnsucessfulTranslationResult.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "Seaside-Gettext-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "GetTextUnsucessfulTranslationResult",
-	"pools" : [
-		 ],
 	"super" : "GetTextTranslationResult",
-	"type" : "normal" }
+	"category" : "Seaside-Gettext-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "GetTextUnsucessfulTranslationResult",
+	"type" : "normal"
+}
diff --git a/repository/Seaside-Gettext-Core.package/String.extension/properties.json b/repository/Seaside-Gettext-Core.package/String.extension/properties.json
@@ -1,2 +1,3 @@
 {
-	"name" : "String" }
+	"name" : "String"
+}
diff --git a/repository/Seaside-Gettext-Core.package/WAApplication.extension/properties.json b/repository/Seaside-Gettext-Core.package/WAApplication.extension/properties.json
@@ -1,2 +1,3 @@
 {
-	"name" : "WAApplication" }
+	"name" : "WAApplication"
+}
diff --git a/repository/Seaside-Gettext-Core.package/WACurrentLocalizationContext.class/properties.json b/repository/Seaside-Gettext-Core.package/WACurrentLocalizationContext.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "Seaside-Gettext-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "JohanBrichau 7/23/2022 16:35",
-	"instvars" : [
-		 ],
-	"name" : "WACurrentLocalizationContext",
-	"pools" : [
-		 ],
 	"super" : "WADynamicVariable",
-	"type" : "normal" }
+	"category" : "Seaside-Gettext-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "WACurrentLocalizationContext",
+	"type" : "normal"
+}
diff --git a/repository/Seaside-Gettext-Core.package/WAGetTextConfiguration.class/properties.json b/repository/Seaside-Gettext-Core.package/WAGetTextConfiguration.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "Seaside-Gettext-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "WAGetTextConfiguration",
-	"pools" : [
-		 ],
 	"super" : "WASystemConfiguration",
-	"type" : "normal" }
+	"category" : "Seaside-Gettext-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "WAGetTextConfiguration",
+	"type" : "normal"
+}
diff --git a/...sitory/Seaside-Gettext-Core.package/WAGetTextTranslator.class/class/addTranslator.for..st b/...sitory/Seaside-Gettext-Core.package/WAGetTextTranslator.class/class/addTranslator.for..st
@@ -0,0 +1,6 @@
+translators registry
+addTranslator: aTranslator for: anApplicationName
+	"Register translator for the named application"
+	TranslatorRegistry 
+		at: anApplicationName
+		put: aTranslator
diff --git a/...aside-Gettext-Core.package/WAGetTextTranslator.class/class/addTranslatorFor.fromFiles..st b/...aside-Gettext-Core.package/WAGetTextTranslator.class/class/addTranslatorFor.fromFiles..st
@@ -0,0 +1,6 @@
+translators registry
+addTranslatorFor: anApplicationName fromFiles: aCollectionOfMOFiles
+	"Create and register a translator for the named application with given gettext translation files"
+	self 
+		addTranslator: (self newFromMOFiles: aCollectionOfMOFiles)
+		for: anApplicationName
diff --git a/...ide-Gettext-Core.package/WAGetTextTranslator.class/class/addTranslatorFor.fromFilesIn..st b/...ide-Gettext-Core.package/WAGetTextTranslator.class/class/addTranslatorFor.fromFilesIn..st
@@ -0,0 +1,7 @@
+translators registry
+addTranslatorFor: anApplicationName fromFilesIn: aDirectoryPathString
+	"Create and register a translator for the named application with gettext translation files located in the given directory.
+	The argument directory is the top directory of the Gettext translation filestructure."
+	self 
+		addTranslator: (self newFromMOFilesIn: aDirectoryPathString forName: anApplicationName)
+		for: anApplicationName
diff --git a/...-Gettext-Core.package/WAGetTextTranslator.class/class/createTranslatorFor.fromFilesIn..st b/...-Gettext-Core.package/WAGetTextTranslator.class/class/createTranslatorFor.fromFilesIn..st
diff --git a/repository/Seaside-Gettext-Core.package/WAGetTextTranslator.class/class/newFromMOFiles..st b/repository/Seaside-Gettext-Core.package/WAGetTextTranslator.class/class/newFromMOFiles..st
@@ -0,0 +1,7 @@
+instance creation
+newFromMOFiles: aCollectionOfMOFiles
+	| translator |
+	translator := self new.
+	aCollectionOfMOFiles do:[ :moFile | 
+		translator addMOFile: moFile forLocaleID: moFile localeId ].
+	^ translator
diff --git a/...Seaside-Gettext-Core.package/WAGetTextTranslator.class/instance/addMOFile.forLocaleID..st b/...Seaside-Gettext-Core.package/WAGetTextTranslator.class/instance/addMOFile.forLocaleID..st
@@ -0,0 +1,5 @@
+private
+addMOFile: moFile forLocaleID: localeId 
+  ^ moFilePerLocaleId
+    at: localeId
+    put: moFile
diff --git a/...ide-Gettext-Core.package/WAGetTextTranslator.class/instance/addMOFileFromPath.forName..st b/...ide-Gettext-Core.package/WAGetTextTranslator.class/instance/addMOFileFromPath.forName..st
@@ -1,16 +1,16 @@
 private
 addMOFileFromPath: pathString forName: anApplicationName
-  | locale fileName |
-  locale := WALocale fromString: (GRPlatform current localNameOf: pathString).
-  fileName := String
-    streamContents: [ :str | 
-      str
-        nextPutAll: pathString;
-        nextPutAll: GRPlatform current pathSeparator;
-        nextPutAll: 'LC_MESSAGES';
-        nextPutAll: GRPlatform current pathSeparator;
-        nextPutAll: anApplicationName;
-        nextPutAll: '.mo' ].
-  ^ moFilePerLocaleId
-    at: locale localeId
-    put: (WAMOFile new initializeFromFile: fileName localeId: locale localeId)
+
+	| locale fileName |
+	locale := WALocale fromString: (GRPlatform current localNameOf: pathString).
+	fileName := String streamContents: [ :str | 
+		            str
+			            nextPutAll: pathString;
+			            nextPutAll: GRPlatform current pathSeparator;
+			            nextPutAll: 'LC_MESSAGES';
+			            nextPutAll: GRPlatform current pathSeparator;
+			            nextPutAll: anApplicationName;
+			            nextPutAll: '.mo' ].
+	^ self
+		  addMOFile: (WAMOFile new initializeFromFile: fileName localeId: locale localeId)
+		  forLocaleID: locale localeId
diff --git a/repository/Seaside-Gettext-Core.package/WAGetTextTranslator.class/instance/initialize.st b/repository/Seaside-Gettext-Core.package/WAGetTextTranslator.class/instance/initialize.st
@@ -0,0 +1,4 @@
+initialization
+initialize
+	super initialize.
+	 moFilePerLocaleId := Dictionary new.
diff --git a/...ttext-Core.package/WAGetTextTranslator.class/instance/initializeFromMOFilesIn.forName..st b/...ttext-Core.package/WAGetTextTranslator.class/instance/initializeFromMOFilesIn.forName..st
@@ -1,6 +1,5 @@
 initialization
 initializeFromMOFilesIn: aDirectoryPathString forName: anApplicationName
   self initialize.
-  moFilePerLocaleId := Dictionary new.
   (GRPlatform current directoriesIn: aDirectoryPathString)
     do: [ :dirPathString | self addMOFileFromPath: dirPathString forName: anApplicationName ]
diff --git a/repository/Seaside-Gettext-Core.package/WAGetTextTranslator.class/properties.json b/repository/Seaside-Gettext-Core.package/WAGetTextTranslator.class/properties.json
@@ -1,14 +1,15 @@
 {
+	"commentStamp" : "MelvinRoest 3/25/2022 14:19",
+	"super" : "Object",
 	"category" : "Seaside-Gettext-Core",
-	"classinstvars" : [
-		 ],
+	"classinstvars" : [ ],
+	"pools" : [ ],
 	"classvars" : [
-		"TranslatorRegistry" ],
-	"commentStamp" : "MelvinRoest 3/25/2022 14:19",
+		"TranslatorRegistry"
+	],
 	"instvars" : [
-		"moFilePerLocaleId" ],
+		"moFilePerLocaleId"
+	],
 	"name" : "WAGetTextTranslator",
-	"pools" : [
-		 ],
-	"super" : "Object",
-	"type" : "normal" }
+	"type" : "normal"
+}
diff --git a/repository/Seaside-Gettext-Core.package/WALazyTranslatedString.class/properties.json b/repository/Seaside-Gettext-Core.package/WALazyTranslatedString.class/properties.json
@@ -1,14 +1,13 @@
 {
-	"category" : "Seaside-Gettext-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
+	"super" : "WAObject",
+	"category" : "Seaside-Gettext-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
 	"instvars" : [
-		"key" ],
+		"key"
+	],
 	"name" : "WALazyTranslatedString",
-	"pools" : [
-		 ],
-	"super" : "WAObject",
-	"type" : "normal" }
+	"type" : "normal"
+}
diff --git a/repository/Seaside-Gettext-Core.package/WALocalizationContext.class/properties.json b/repository/Seaside-Gettext-Core.package/WALocalizationContext.class/properties.json
@@ -1,15 +1,14 @@
 {
-	"category" : "Seaside-Gettext-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "MelvinRoest 3/25/2022 11:23",
+	"super" : "WAObject",
+	"category" : "Seaside-Gettext-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
 	"instvars" : [
 		"translator",
-		"locale" ],
+		"locale"
+	],
 	"name" : "WALocalizationContext",
-	"pools" : [
-		 ],
-	"super" : "WAObject",
-	"type" : "normal" }
+	"type" : "normal"
+}
diff --git a/repository/Seaside-Gettext-Core.package/WALocalizationContextFilter.class/properties.json b/repository/Seaside-Gettext-Core.package/WALocalizationContextFilter.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "Seaside-Gettext-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "MelvinRoest 3/25/2022 12:09",
-	"instvars" : [
-		 ],
-	"name" : "WALocalizationContextFilter",
-	"pools" : [
-		 ],
 	"super" : "WARequestFilter",
-	"type" : "normal" }
+	"category" : "Seaside-Gettext-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "WALocalizationContextFilter",
+	"type" : "normal"
+}
diff --git a/...tory/Seaside-Gettext-Core.package/WAMOFile.class/instance/initializeFromFile.localeId..st b/...tory/Seaside-Gettext-Core.package/WAMOFile.class/instance/initializeFromFile.localeId..st
@@ -3,7 +3,7 @@ initializeFromFile: aFileName localeId: aLocaleString
 	"Entry point for loading translations. All of strings are loaded. Translation strings are converted to internal string format on load time.
 	Original string/index pairs are registerd to Dictionary on load time."
 	self initialize.
-	localeString := aLocaleString.
+	localeId := aLocaleString.
 	fileName := aFileName.
 	GRPlatform current 
 		readFileStreamOn: aFileName 

diff --git a/...ry/Seaside-Gettext-Core.package/WAMOFile.class/instance/initializeFromStream.localeId..st b/...ry/Seaside-Gettext-Core.package/WAMOFile.class/instance/initializeFromStream.localeId..st
@@ -1,5 +1,5 @@
 initialization
 initializeFromStream: aStream localeId: aLocaleString
 	self initialize.
-	localeString := aLocaleString.
+	localeId := aLocaleString.
 	self privateLoadStream: aStream
diff --git a/repository/Seaside-Gettext-Core.package/WAMOFile.class/instance/localeId.st b/repository/Seaside-Gettext-Core.package/WAMOFile.class/instance/localeId.st
@@ -0,0 +1,3 @@
+accessing
+localeId 
+	^ localeId