On 05/08/13 10:41, Francois Gouget wrote:
On Sun, 4 Aug 2013, Ken Sharp wrote:
Hi everyone,
Would anyone mind looking at the attached patch?
I wonder if this is something that could be handled at the NLS level instead. Maybe in dlls/kernel32/nls/enp.nls. Would LOCALE_SNAME "en-PH" be relevant here? Or would it make sense to add a setting to map en_PH to en_US somehow?
Otherwise the symlink approach sounds fine by me.
I had a look in the kernel but I couldn't see any way to do it. If it can be done then that would be great. It would avoid creating an extra .mo, although that isn't the end of the world.
I tried
diff --git a/include/winnt.rh b/include/winnt.rh index 1013a24..45896ad 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -247,7 +247,7 @@ #define SUBLANG_ENGLISH_BELIZE 0x0a #define SUBLANG_ENGLISH_TRINIDAD 0x0b #define SUBLANG_ENGLISH_ZIMBABWE 0x0c -#define SUBLANG_ENGLISH_PHILIPPINES 0x0d +#define SUBLANG_ENGLISH_PHILIPPINES SUBLANG_DEFAULT #define SUBLANG_ENGLISH_INDIA 0x10 #define SUBLANG_ENGLISH_MALAYSIA 0x11 #define SUBLANG_ENGLISH_SINGAPORE 0x12
or
+#define SUBLANG_ENGLISH_PHILIPPINES SUBLANG_ENGLISH_US
but this simply causes confusion.
/home/test/wine-git/dlls/kernel32/nls/enp.nls:26:109: Error: Stringtable ID 88 already in use
One problem to note is that if it maps everything to _DEFAULT or _US then it will lose details like
LOCALE_SENGCOUNTRY "Republic of the Philippines" LOCALE_SENGCURRNAME "Philippine Peso" LOCALE_SINTLSYMBOL "PHP" LOCALE_SISO3166CTRYNAME "PH" LOCALE_SLANGUAGE "English (Philippines)"
which of course would not be correct. Linking POs does avoid this.
As an aside:
#define SUBLANG_SINDHI_PAKISTAN SUBLANG_SINDHI_AFGHANISTAN
This may cause problems if these languages are ever implemented. Not sure if Wine handles these differently.