deal with some edge case and better create model format

badetitou · Feb 27, 2023 · 54c82f4 · 54c82f4
1 parent 410b751
commit 54c82f4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/Casino-18N-Model-PropertyExporter-Tests/CS18NPropertiesExporterTest.class.st b/src/Casino-18N-Model-PropertyExporter-Tests/CS18NPropertiesExporterTest.class.st
@@ -118,7 +118,7 @@ CS18NPropertiesExporterTest >> testExportValueWithNamedAttribute [
 		         entry: entry;
 		         yourself.
 	value addValueVariable: (CS18NValueVariable new
-			 name: '{label}';
+			 name: 'label';
 			 startPos: 7;
 			 endPos: 13;
 			 yourself).

diff --git a/src/Casino-18N-Model-PropertyExporter/CS18NPropertiesExporter.class.st b/src/Casino-18N-Model-PropertyExporter/CS18NPropertiesExporter.class.st
@@ -34,10 +34,16 @@ CS18NPropertiesExporter >> constructValueString: aCS18NValue [
 
 	| string |
 	string := aCS18NValue name copyReplaceAll: '[%]' with: '{{ noname }}'.
-	aCS18NValue valueVariables do: [ :valueVariable | 
-		valueVariable name = 'noname' ifFalse: [ 
-			string := '{{ ' , valueVariable name allButFirst allButLast , ' }}' 
-				          join: (string splitOn: valueVariable name) ] ].
+
+	aCS18NValue valueVariables ifNotNil: [ 
+		| col |
+		col := aCS18NValue valueVariables select: [ :var | 
+			       var name ~= 'noname' ].
+		col ifNotEmpty: [ 
+			| dic |
+			dic := Dictionary new.
+			col do: [ :var | dic at: var name put: '{{ ' , var name , ' }}' ].
+			string := string format: dic ] ].
 	^ string
 ]
 

diff --git a/src/Casino-18N-Model-PropertyImporter/CS18NPropertiesImporter.class.st b/src/Casino-18N-Model-PropertyImporter/CS18NPropertiesImporter.class.st
@@ -95,7 +95,7 @@ CS18NPropertiesImporter >> extractModelValueAttributes: aModelValue [
 				 name: 'noname';
 				 yourself) ].
 	rangesRegEx := aModelValue name allRangesOfRegexMatches: '{[^}]*}'.
-	rangesRegEx do: [ :range | 
+	rangesRegEx do: [ :range |
 		attributes add: (CS18NValueVariable new
 				 startPos: range first;
 				 endPos: range last;