language names in fr

vdelachaux · Dec 31, 2024 · be4aa9b · be4aa9b
1 parent 9939488
commit be4aa9b
Show file tree

Hide file tree

Showing 4 changed files with 95 additions and 7 deletions.
diff --git a/Project/Sources/Classes/_Editor.4dm b/Project/Sources/Classes/_Editor.4dm
@@ -17,6 +17,7 @@ Class constructor
 		This:C1470.LANGS.push(cs:C1710.language.new({\
 			lproj: $key; \
 			intl: This:C1470.RESOURCES.intl[$indx]; \
+			fr: This:C1470.RESOURCES.fr[$indx]; \
 			localized: This:C1470.RESOURCES.localized[$indx]; \
 			iso: This:C1470.RESOURCES["ISO639-1"][$indx]; \
 			legacy: This:C1470.RESOURCES.legacy[$indx]; \

diff --git a/Project/Sources/Classes/_WIZARD_Controller.4dm b/Project/Sources/Classes/_WIZARD_Controller.4dm
@@ -114,7 +114,7 @@ Function doSelectSourceLanguage()
 
 		End if 
 
-		For each ($language; $c.orderBy("lproj"))
+		For each ($language; $c.orderBy("localized"))
 
 			$menu.append($language.menuItem(); $language.lproj)\
 				.mark($language.lproj=Form:C1466.reference.lproj)
@@ -127,7 +127,7 @@ Function doSelectSourceLanguage()
 
 	$c:=$c.extract("lproj")
 
-	For each ($language; This:C1470.Editor.LANGS.orderBy("lproj"))
+	For each ($language; This:C1470.Editor.LANGS.orderBy("localized"))
 
 		If ($c.includes($language.lproj))
 
@@ -156,7 +156,7 @@ Function doAddTargetLanguage()
 
 	var $c : Collection:=Form:C1466.languages.copy().push(Form:C1466.reference).distinct().extract("lproj")
 
-	For each ($language; This:C1470.Editor.LANGS.orderBy("lproj"))
+	For each ($language; This:C1470.Editor.LANGS.orderBy("localized"))
 
 		$menu.append($language.menuItem(); $language.lproj)
 

diff --git a/Project/Sources/Classes/language.4dm b/Project/Sources/Classes/language.4dm
@@ -1,4 +1,4 @@
-property lproj; intl; localized; iso; legacy; flag; regional : Text
+property lproj; intl; fr; localized; iso; legacy; flag; regional : Text
 
 property xliff : cs:C1710.Xliff
 property root : Text
@@ -13,7 +13,7 @@ Class constructor($in : Object)
 
 	End for each 
 
-
+	// === === === === === === === === === === === === === === === === === === === === === === === ===
 Function menuItem($withoutFlag : Boolean) : Text
 
 	var $label : Text
@@ -28,10 +28,22 @@ Function menuItem($withoutFlag : Boolean) : Text
 
 	End if 
 
-	If (This:C1470.localized#This:C1470.intl)
+	If (Get database localization:C1009(User system localization:K5:23; *)="fr")\
+		 || (Get database localization:C1009(Current localization:K5:22; *)="fr")
+
+		If (This:C1470.localized#This:C1470.fr)
+
+			$label+=" ("+This:C1470.fr+")"
+
+		End if 
 
-		$label+=" ("+This:C1470.intl+")"
+	Else 
 
+		If (This:C1470.localized#This:C1470.intl)
+
+			$label+=" ("+This:C1470.intl+")"
+
+		End if 
 	End if 
 
 	return $label
diff --git a/Resources/languages.json b/Resources/languages.json
@@ -149,6 +149,81 @@
 		"Ukrainian",
 		"Viêt Namese"
 	],
+	"fr": [
+		"Afrikaans",
+		"Albanais",
+		"Biélorusse",
+		"Bulgare",
+		"Croate",
+		"Tchèque",
+		"Danois",
+		"Néerlandais Pays-Bas",
+		"Néerlandais Belgique",
+		"Anglais US",
+		"Anglais UK",
+		"Anglais Australie",
+		"Anglais Canada",
+		"Anglais Nouvelle-Zélande",
+		"Anglais Irlande",
+		"Anglais Afrique du Sud",
+		"Anglais Jamaïque",
+		"Anglais Belize",
+		"Anglais Trinidad",
+		"Estonien",
+		"Féroïen",
+		"Finnois",
+		"Français",
+		"Français Belgique",
+		"Français Canada",
+		"Français Suisse",
+		"Français Luxembourg",
+		"Allemand",
+		"Allemand Suisse",
+		"Allemand Autriche",
+		"Allemand Luxembourg",
+		"Allemand Liechtenstein",
+		"Grec",
+		"Hongrois",
+		"Islandais",
+		"Italien",
+		"Italien Suisse",
+		"Japonais",
+		"Letton",
+		"Lituanien",
+		"Norvégien",
+		"Polonais",
+		"Portugais",
+		"Portugais Brésilien",
+		"Roumain",
+		"Russe",
+		"Serbe",
+		"Slovaque",
+		"Slovène",
+		"Espagnol",
+		"Espagnol Mexique",
+		"Espagnol Guatemala",
+		"Espagnol Costa Rica",
+		"Espagnol Panama",
+		"Espagnol République Dominicaine",
+		"Espagnol Venezuela",
+		"Espagnol Colombie",
+		"Espagnol Pérou",
+		"Espagnol Argentine",
+		"Espagnol Équateur",
+		"Espagnol Chili",
+		"Espagnol Uruguay",
+		"Espagnol Paraguay",
+		"Espagnol Bolivie",
+		"Espagnol Salvadore",
+		"Espagnol Honduras",
+		"Espagnol Nicaragua",
+		"Espagnol Porto Rico",
+		"Suédois",
+		"Suédois Finlande",
+		"Turc",
+		"Ukrainien",
+		"Vietnamien"
+	],
 	"localized": [
 		"Afrikaans",
 		"Shqip",