This patch enable the use of localised menuLabelSet ToolbarLabelSet and StringSet in system.profiles files. By placing the environment variables before system.profile* files integration, the language setting from theses files do not get overriden by environment variables.
I modified the system.profile-FR-* to set the langue to fr-FR. The langue setting for others country sharing a same langue should probably be modified in their respective system.profile-* files. It permit initial language adaptation for users.
Index: abi/src/wp/ap//xp/ap_Prefs.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_Prefs.cpp,v retrieving revision 1.18 diff -u -r1.18 ap_Prefs.cpp --- abi/src/wp/ap//xp/ap_Prefs.cpp 22 Oct 2001 15:18:59 -0000 1.18 +++ abi/src/wp/ap//xp/ap_Prefs.cpp 22 Jun 2002 17:13:38 -0000 @@ -65,6 +65,7 @@ loadBuiltinPrefs(); overlayEnvironmentPrefs(); + overlaySystemPrefs(); loadPrefsFile(); // stop blocking the signal and send the combined one @@ -134,7 +135,7 @@ parser.stopDecoder (); addScheme(pScheme); // set the builtin scheme in the base class - overlaySystemPrefs(); // so that the base class parser can overlay it. + // so that the base class parser can overlay it. return setCurrentScheme(szBuiltinSchemeName); Index: abi/user/wp//system.profile-fr-BE =================================================================== RCS file: /cvsroot/abi/user/wp/system.profile-fr-BE,v retrieving revision 1.1 diff -u -r1.1 system.profile-fr-BE --- abi/user/wp//system.profile-fr-BE 26 Jun 2001 20:54:09 -0000 1.1 +++ abi/user/wp//system.profile-fr-BE 22 Jun 2002 17:14:11 -0000 @@ -15,5 +15,8 @@ <SystemDefaults DocumentLocale="fr-BE" RulerUnits="cm" - DefaultPageSize="A4" + DefaultPageSize="A4" + MenuLabelSet="fr-FR" + ToolbarLabelSet="fr-FR" + StringSet="fr-FR" /> Index: abi/user/wp//system.profile-fr-CA =================================================================== RCS file: /cvsroot/abi/user/wp/system.profile-fr-CA,v retrieving revision 1.1 diff -u -r1.1 system.profile-fr-CA --- abi/user/wp//system.profile-fr-CA 26 Jun 2001 20:54:09 -0000 1.1 +++ abi/user/wp//system.profile-fr-CA 22 Jun 2002 17:14:11 -0000 @@ -15,5 +15,8 @@ <SystemDefaults DocumentLocale="fr-CA" RulerUnits="cm" - DefaultPageSize="A4" + DefaultPageSize="Letter" + MenuLabelSet="fr-FR" + ToolbarLabelSet="fr-FR" + StringSet="fr-FR" /> Index: abi/user/wp//system.profile-fr-CH =================================================================== RCS file: /cvsroot/abi/user/wp/system.profile-fr-CH,v retrieving revision 1.1 diff -u -r1.1 system.profile-fr-CH --- abi/user/wp//system.profile-fr-CH 26 Jun 2001 20:54:09 -0000 1.1 +++ abi/user/wp//system.profile-fr-CH 22 Jun 2002 17:14:11 -0000 @@ -15,5 +15,8 @@ <SystemDefaults DocumentLocale="fr-CH" RulerUnits="cm" - DefaultPageSize="A4" + DefaultPageSize="A4" + MenuLabelSet="fr-FR" + ToolbarLabelSet="fr-FR" + StringSet="fr-FR" />
Index: abi/src/wp/ap//xp/ap_Prefs.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_Prefs.cpp,v retrieving revision 1.19 diff -u -r1.19 ap_Prefs.cpp --- abi/src/wp/ap//xp/ap_Prefs.cpp 13 Jun 2002 20:03:42 -0000 1.19 +++ abi/src/wp/ap//xp/ap_Prefs.cpp 22 Jun 2002 17:09:43 -0000 @@ -65,7 +65,8 @@ loadBuiltinPrefs(); overlayEnvironmentPrefs(); - loadPrefsFile(); + overlaySystemPrefs(); + loadPrefsFile(); // stop blocking the signal and send the combined one endBlockChange(); @@ -130,7 +131,7 @@ } } addScheme(pScheme); // set the builtin scheme in the base class - overlaySystemPrefs(); // so that the base class parser can overlay it. + // so that the base class parser can overlay it. return setCurrentScheme(szBuiltinSchemeName); Index: abi/user/wp//system.profile-fr-BE =================================================================== RCS file: /cvsroot/abi/user/wp/system.profile-fr-BE,v retrieving revision 1.1 diff -u -r1.1 system.profile-fr-BE --- abi/user/wp//system.profile-fr-BE 26 Jun 2001 20:54:09 -0000 1.1 +++ abi/user/wp//system.profile-fr-BE 22 Jun 2002 17:14:11 -0000 @@ -15,5 +15,8 @@ <SystemDefaults DocumentLocale="fr-BE" RulerUnits="cm" - DefaultPageSize="A4" + DefaultPageSize="A4" + MenuLabelSet="fr-FR" + ToolbarLabelSet="fr-FR" + StringSet="fr-FR" /> Index: abi/user/wp//system.profile-fr-CA =================================================================== RCS file: /cvsroot/abi/user/wp/system.profile-fr-CA,v retrieving revision 1.1 diff -u -r1.1 system.profile-fr-CA --- abi/user/wp//system.profile-fr-CA 26 Jun 2001 20:54:09 -0000 1.1 +++ abi/user/wp//system.profile-fr-CA 22 Jun 2002 17:14:11 -0000 @@ -15,5 +15,8 @@ <SystemDefaults DocumentLocale="fr-CA" RulerUnits="cm" - DefaultPageSize="A4" + DefaultPageSize="Letter" + MenuLabelSet="fr-FR" + ToolbarLabelSet="fr-FR" + StringSet="fr-FR" /> Index: abi/user/wp//system.profile-fr-CH =================================================================== RCS file: /cvsroot/abi/user/wp/system.profile-fr-CH,v retrieving revision 1.1 diff -u -r1.1 system.profile-fr-CH --- abi/user/wp//system.profile-fr-CH 26 Jun 2001 20:54:09 -0000 1.1 +++ abi/user/wp//system.profile-fr-CH 22 Jun 2002 17:14:11 -0000 @@ -15,5 +15,8 @@ <SystemDefaults DocumentLocale="fr-CH" RulerUnits="cm" - DefaultPageSize="A4" + DefaultPageSize="A4" + MenuLabelSet="fr-FR" + ToolbarLabelSet="fr-FR" + StringSet="fr-FR" />
