Skip to content

W
wine-winehq
Commit a7728660 authored by Pablo Saratxaga's avatar Pablo Saratxaga Committed by Alexandre Julliard
Browse files
Options

Display the language id for "XXX not supported for your language"

messages. Added all languages and sublanguages for languages supported in resources/sysres_Xx.
parent a23a1b3f
Show whitespace changes
Inline Side-by-side
Showing with 191 additions and 47 deletions
include/winnls.h
View file @ a7728660
......@@ -315,9 +315,10 @@
#define SUBLANG_SPANISH_URUGUAY 0x0e
#define SUBLANG_SPANISH_PARAGUAY 0x0f
#define SUBLANG_SPANISH_BOLIVIA 0x10
#define SUBLANG_SPANISH_HONDURAS 0x11
#define SUBLANG_SPANISH_NICARAGUA 0x12
#define SUBLANG_SPANISH_PUERTO_RICO 0x13
#define SUBLANG_SPANISH_EL_SALVADOR 0x11
#define SUBLANG_SPANISH_HONDURAS 0x12
#define SUBLANG_SPANISH_NICARAGUA 0x13
#define SUBLANG_SPANISH_PUERTO_RICO 0x14
/* FIXME: I don't know the symbolic names for those */
#define SUBLANG_ROMANIAN 0x01
#define SUBLANG_ROMANIAN_MOLDAVIA 0x02
......
ole/nls/README
View file @ a7728660
......@@ -8,9 +8,8 @@ and LOCALE_IDEFAULTANSICODEPAGE use decimal.
I'll appreciate info on the others numeric fields; and a confirmation
about the numeric fields I told above.
I have also doubts for the alphanumeric fields; what character encoding
should be used for non ascii strings ? DOS code page ? Windows code page ?
Unix standard encoding (what I did until now) ? Unicode ?
For the alphanumeric fields the encoding used is the one used by MS-Windows
for that language (the one in LOCALE_IDEFAULTANSICODEPAGE).
--
......
ole/nls/cze.nls
View file @ a7728660
/*
* OLE2NLS library
* Czech Republic
* (Czech strings in iso-8859-2)
* (Czech strings in cp1250)
*/
LOCVAL(LOCALE_ILANGUAGE,"0405")
......
ole/nls/ese.nls
View file @ a7728660
......@@ -2,7 +2,7 @@
* OLE2NLS library
* Spanish (El Salvador)
*
* (spanish strings in iso-8859-1)
* (spanish strings in cp1252)
*/
LOCVAL(LOCALE_ILANGUAGE,"440a")
......
ole/nls/esg.nls
View file @ a7728660
/*
* OLE2NLS library
* Spanish (Guatemala)
* (spanish strings in iso-8859-1)
* (spanish strings in cp1252)
*/
LOCVAL(LOCALE_ILANGUAGE,"100a")
......
ole/nls/est.nls
View file @ a7728660
......@@ -2,7 +2,7 @@
* OLE2NLS library
* Estonia
*
* (estonian strings in iso-8859-15)
* (estonian strings in cp1252)
*/
LOCVAL(LOCALE_ILANGUAGE,"0425")
......
ole/nls/euq.nls
View file @ a7728660
/*
* OLE2NLS library
* Basque
*
* email: srtxg@chanae.alphanet.ch
*/
LOCVAL(LOCALE_ILANGUAGE,"042d")
......
ole/nls/fos.nls
View file @ a7728660
......@@ -2,7 +2,7 @@
* OLE2NLS library
* Faroe Islands
*
* (faroese strings in iso-8859-1)
* (faroese strings in cp1252)
*/
LOCVAL(LOCALE_ILANGUAGE,"0438")
......
ole/nls/hrv.nls
View file @ a7728660
/*
* OLE2NLS library
* Croatia
* (Croatian strings in iso-8859-2)
* (Croatian strings in cp1250)
*/
LOCVAL(LOCALE_ILANGUAGE,"041a")
......
ole/nls/hun.nls
View file @ a7728660
/*
* OLE2NLS library
* Hungarian
* (Hungarian strings in iso-8859-2)
* (Hungarian strings in cp1250)
*/
LOCVAL(LOCALE_ILANGUAGE,"040e")
......
ole/nls/isl.nls
View file @ a7728660
/*
* OLE2NLS library
* Iceland
* (Icelandic strings in iso-8859-1)
* (Icelandic strings in cp1252)
*/
LOCVAL(LOCALE_ILANGUAGE,"040f")
......
ole/nls/nor.nls
View file @ a7728660
/*
* OLE2NLS library
* Norway (Bokmaal)
* (Norwegian strings in iso-8859-1)
* (Norwegian strings in cp1252)
*/
LOCVAL(LOCALE_ILANGUAGE,"0414")
......
ole/nls/plk.nls
View file @ a7728660
/*
* OLE2NLS library
* Poland
* (Polish strings in iso-8859-2)
* (Polish strings in cp1250)
*/
LOCVAL(LOCALE_ILANGUAGE,"0415")
......@@ -58,9 +58,9 @@ LOCVAL(LOCALE_ICALENDARTYPE, "1")
LOCVAL(LOCALE_SDAYNAME1,"Poniedzia\263ek")
LOCVAL(LOCALE_SDAYNAME2,"Wtorek")
LOCVAL(LOCALE_SDAYNAME3,"roda")
LOCVAL(LOCALE_SDAYNAME3,"\214roda")
LOCVAL(LOCALE_SDAYNAME4,"Czwartek")
LOCVAL(LOCALE_SDAYNAME5,"Pitek")
LOCVAL(LOCALE_SDAYNAME5,"Pi\271tek")
LOCVAL(LOCALE_SDAYNAME6,"Sobota")
LOCVAL(LOCALE_SDAYNAME7,"Niedziela")
......@@ -81,7 +81,7 @@ LOCVAL(LOCALE_SMONTHNAME6,"Czerwiec")
LOCVAL(LOCALE_SMONTHNAME7,"Lipiec")
LOCVAL(LOCALE_SMONTHNAME8,"Sierpie\xF1")
LOCVAL(LOCALE_SMONTHNAME9,"Wrzesie\xF1")
LOCVAL(LOCALE_SMONTHNAME10,"Padziernik")
LOCVAL(LOCALE_SMONTHNAME10,"Pa\237dziernik")
LOCVAL(LOCALE_SMONTHNAME11,"Listapad")
LOCVAL(LOCALE_SMONTHNAME12,"Grudzie\xF1")
LOCVAL(LOCALE_SMONTHNAME13,"")
......@@ -95,7 +95,7 @@ LOCVAL(LOCALE_SABBREVMONTHNAME6,"Cze")
LOCVAL(LOCALE_SABBREVMONTHNAME7,"Lip")
LOCVAL(LOCALE_SABBREVMONTHNAME8,"Sie")
LOCVAL(LOCALE_SABBREVMONTHNAME9,"Wrz")
LOCVAL(LOCALE_SABBREVMONTHNAME10,"Pa")
LOCVAL(LOCALE_SABBREVMONTHNAME10,"Pa\237")
LOCVAL(LOCALE_SABBREVMONTHNAME11,"Lis")
LOCVAL(LOCALE_SABBREVMONTHNAME12,"Gru")
LOCVAL(LOCALE_SABBREVMONTHNAME13,"")
......
ole/nls/ptg.nls
View file @ a7728660
......@@ -2,7 +2,7 @@
* OLE2NLS library
* Portugal
*
* (portuguese strings in iso-8859-1)
* (portuguese strings in cp1252)
*/
LOCVAL(LOCALE_ILANGUAGE, "0816")
......
ole/nls/rom.nls
View file @ a7728660
/*
* OLE2NLS library
* Romania
* (Romanian strings in iso-8859-2)
* (Romanian strings in cp1250)
*/
LOCVAL(LOCALE_ILANGUAGE,"0418")
......
ole/nls/slv.nls
View file @ a7728660
/*
* OLE2NLS library
* Slovenia
* (Slovenian strings in iso-8859-2)
* (Slovenian strings in cp1250)
*/
LOCVAL(LOCALE_ILANGUAGE,"0424")
......
ole/nls/sve.nls
View file @ a7728660
......@@ -2,7 +2,7 @@
* OLE2NLS library
* Sweden
*
* (swedish strings in iso-8859-1)
* (swedish strings in cp1252)
*/
LOCVAL(LOCALE_ILANGUAGE,"041d")
......
ole/ole2nls.c
View file @ a7728660
......@@ -472,9 +472,9 @@ INT32 WINAPI GetLocaleInfo32A(LCID lcid,LCTYPE LCType,LPSTR buf,INT32 len)
found=0; i=0; lang=lcid;
if ((lang & 0xff) == 0x00) /*LANG_NEUTRAL ==> US English*/
if ((lang & 0x3ff) == 0x000) /*LANG_NEUTRAL ==> US English*/
{
lang = 0x409;
lang = 0x0409;
WARN(ole,"no language set, assume LANG_ENGLISH_US \n");
}
......@@ -483,63 +483,204 @@ INT32 WINAPI GetLocaleInfo32A(LCID lcid,LCTYPE LCType,LPSTR buf,INT32 len)
{ switch(lang)
{
LANG_BEGIN (LANG_GERMAN, SUBLANG_GERMAN) /*0x407*/
#include "nls/deu.nls"
/* add languages in numerical order of main language (last two digits)
* it is much easier to find the missing holes that way */
LANG_BEGIN (LANG_CATALAN, SUBLANG_DEFAULT) /*0x0403*/
#include "nls/cat.nls"
LANG_END
LANG_BEGIN (LANG_CZECH, SUBLANG_DEFAULT) /*0x0405*/
#include "nls/cze.nls"
LANG_END
LANG_BEGIN (LANG_DANISH, SUBLANG_DEFAULT) /*0x406*/
LANG_BEGIN (LANG_DANISH, SUBLANG_DEFAULT) /*0x0406*/
#include "nls/dan.nls"
LANG_END
LANG_BEGIN (LANG_ENGLISH, SUBLANG_ENGLISH_US) /*0x409*/
LANG_BEGIN (LANG_GERMAN, SUBLANG_GERMAN) /*0x0407*/
#include "nls/deu.nls"
LANG_END
LANG_BEGIN (LANG_GERMAN, SUBLANG_GERMAN_SWISS) /*0x0807*/
#include "nls/des.nls"
LANG_END
LANG_BEGIN (LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN) /*0x0C07*/
#include "nls/dea.nls"
LANG_END
LANG_BEGIN (LANG_GERMAN, SUBLANG_GERMAN_LUXEMBOURG) /*0x1007*/
#include "nls/del.nls"
LANG_END
LANG_BEGIN (LANG_GERMAN, SUBLANG_GERMAN_LIECHTENSTEIN) /*0x1407*/
#include "nls/dec.nls"
LANG_END
LANG_BEGIN (LANG_ENGLISH, SUBLANG_ENGLISH_US) /*0x0409*/
#include "nls/enu.nls"
LANG_END
LANG_BEGIN (LANG_ENGLISH, SUBLANG_ENGLISH_UK) /*0x0809*/
#include "nls/eng.nls"
LANG_END
LANG_BEGIN (LANG_ENGLISH, SUBLANG_ENGLISH_AUS) /*0x0C09*/
#include "nls/ena.nls"
LANG_END
LANG_BEGIN (LANG_ENGLISH, SUBLANG_ENGLISH_CAN) /*0x1009*/
#include "nls/enc.nls"
LANG_END
LANG_BEGIN (LANG_ENGLISH, SUBLANG_ENGLISH_NZ) /*0x1409*/
#include "nls/enz.nls"
LANG_END
LANG_BEGIN (LANG_ENGLISH, SUBLANG_ENGLISH_EIRE) /*0x1809*/
#include "nls/irl.nls"
LANG_END
LANG_BEGIN (LANG_ENGLISH, SUBLANG_ENGLISH_SAFRICA) /*0x1C09*/
#include "nls/ens.nls"
LANG_END
LANG_BEGIN (LANG_ENGLISH, SUBLANG_ENGLISH_JAMAICA) /*0x2009*/
#include "nls/enj.nls"
LANG_END
LANG_BEGIN (LANG_ENGLISH, SUBLANG_ENGLISH_CARRIBEAN) /*0x2409*/
#include "nls/enb.nls"
LANG_END
LANG_BEGIN (LANG_ENGLISH, SUBLANG_ENGLISH_BELIZE) /*0x2809*/
#include "nls/enl.nls"
LANG_END
LANG_BEGIN (LANG_ENGLISH, SUBLANG_ENGLISH_TRINIDAD) /*0x2C09*/
#include "nls/ent.nls"
LANG_END
LANG_BEGIN (LANG_ESPERANTO, SUBLANG_DEFAULT) /*0x48f*/
#include "nls/esperanto.nls"
LANG_BEGIN (LANG_SPANISH, SUBLANG_SPANISH) /*0x040a*/
#include "nls/esp.nls"
LANG_END
LANG_BEGIN (LANG_SPANISH, SUBLANG_SPANISH_MEXICAN) /*0x080a*/
#include "nls/esm.nls"
LANG_END
LANG_BEGIN (LANG_SPANISH, SUBLANG_SPANISH_MODERN) /*0x0C0a*/
#include "nls/esn.nls"
LANG_END
LANG_BEGIN (LANG_SPANISH, SUBLANG_SPANISH_GUATEMALA) /*0x100a*/
#include "nls/esg.nls"
LANG_END
LANG_BEGIN (LANG_SPANISH, SUBLANG_SPANISH_COSTARICA) /*0x140a*/
#include "nls/esc.nls"
LANG_END
LANG_BEGIN (LANG_SPANISH, SUBLANG_SPANISH_PANAMA) /*0x180a*/
#include "nls/esa.nls"
LANG_END
LANG_BEGIN (LANG_SPANISH, SUBLANG_SPANISH_DOMINICAN) /*0x1C0A*/
#include "nls/esd.nls"
LANG_END
LANG_BEGIN (LANG_SPANISH, SUBLANG_SPANISH_VENEZUELA) /*0x200a*/
#include "nls/esv.nls"
LANG_END
LANG_BEGIN (LANG_SPANISH, SUBLANG_SPANISH_COLOMBIA) /*0x240a*/
#include "nls/eso.nls"
LANG_END
LANG_BEGIN (LANG_SPANISH, SUBLANG_SPANISH_PERU) /*0x280a*/
#include "nls/esr.nls"
LANG_END
LANG_BEGIN (LANG_SPANISH, SUBLANG_SPANISH_ARGENTINA) /*0x2c0a*/
#include "nls/ess.nls"
LANG_END
LANG_BEGIN (LANG_SPANISH, SUBLANG_SPANISH_ECUADOR) /*0x300a*/
#include "nls/esf.nls"
LANG_END
LANG_BEGIN (LANG_SPANISH, SUBLANG_SPANISH_CHILE) /*0x340a*/
#include "nls/esl.nls"
LANG_END
LANG_BEGIN (LANG_SPANISH, SUBLANG_SPANISH_URUGUAY) /*0x380a*/
#include "nls/esy.nls"
LANG_END
LANG_BEGIN (LANG_SPANISH, SUBLANG_SPANISH_PARAGUAY) /*0x3c0a*/
#include "nls/esz.nls"
LANG_END
LANG_BEGIN (LANG_SPANISH, SUBLANG_SPANISH_BOLIVIA) /*0x400a*/
#include "nls/esb.nls"
LANG_END
LANG_BEGIN (LANG_SPANISH, SUBLANG_SPANISH_EL_SALVADOR) /*0x440a*/
#include "nls/ese.nls"
LANG_END
LANG_BEGIN (LANG_SPANISH, SUBLANG_SPANISH_HONDURAS) /*0x480a*/
#include "nls/esh.nls"
LANG_END
LANG_BEGIN (LANG_SPANISH, SUBLANG_SPANISH_NICARAGUA) /*0x4c0a*/
#include "nls/esi.nls"
LANG_END
LANG_BEGIN (LANG_SPANISH, SUBLANG_SPANISH_PUERTO_RICO) /*0x500a*/
#include "nls/esu.nls"
LANG_END
LANG_BEGIN (LANG_FINNISH, SUBLANG_DEFAULT) /*0x040B*/
#include "nls/fin.nls"
LANG_END
LANG_BEGIN (LANG_FRENCH, SUBLANG_DEFAULT) /*0x040C*/
LANG_BEGIN (LANG_FRENCH, SUBLANG_FRENCH) /*0x040C*/
#include "nls/fra.nls"
LANG_END
LANG_BEGIN (LANG_FRENCH, SUBLANG_FRENCH_BELGIAN) /*0x080C*/
#include "nls/frb.nls"
LANG_END
LANG_BEGIN (LANG_FRENCH, SUBLANG_FRENCH_CANADIAN) /*0x0C0C*/
#include "nls/frc.nls"
LANG_END
LANG_BEGIN (LANG_FRENCH, SUBLANG_FRENCH_SWISS) /*0x100C*/
#include "nls/frs.nls"
LANG_END
LANG_BEGIN (LANG_FRENCH, SUBLANG_FRENCH_LUXEMBOURG) /*0x140C*/
#include "nls/frl.nls"
LANG_END
LANG_BEGIN (LANG_ITALIAN, SUBLANG_ITALIAN) /*0x410*/
#include "nls/ita.nls"
LANG_BEGIN (LANG_HUNGARIAN, SUBLANG_DEFAULT) /*0x040e*/
#include "nls/hun.nls"
LANG_END
LANG_BEGIN (LANG_ENGLISH, SUBLANG_ENGLISH_UK) /*0x809*/
#include "nls/eng.nls"
LANG_BEGIN (LANG_ITALIAN, SUBLANG_ITALIAN) /*0x0410*/
#include "nls/ita.nls"
LANG_END
LANG_BEGIN (LANG_ITALIAN, SUBLANG_ITALIAN_SWISS) /*0x0810*/
#include "nls/its.nls"
LANG_END
LANG_BEGIN (LANG_KOREAN, SUBLANG_KOREAN) /*0x412*/
LANG_BEGIN (LANG_KOREAN, SUBLANG_KOREAN) /*0x0412*/
#include "nls/kor.nls"
LANG_END
LANG_BEGIN (LANG_HUNGARIAN, SUBLANG_DEFAULT) /*0x40e*/
#include "nls/hun.nls"
LANG_BEGIN (LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL) /*0x0414*/
#include "nls/nor.nls"
LANG_END
LANG_BEGIN (LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NYNORSK) /*0x0814*/
#include "nls/non.nls"
LANG_END
LANG_BEGIN (LANG_POLISH, SUBLANG_DEFAULT) /*0x415*/
LANG_BEGIN (LANG_POLISH, SUBLANG_DEFAULT) /*0x0415*/
#include "nls/plk.nls"
LANG_END
LANG_BEGIN (LANG_PORTUGUESE ,SUBLANG_PORTUGUESE_BRAZILIAN) /*0x416*/
LANG_BEGIN (LANG_PORTUGUESE ,SUBLANG_PORTUGUESE_BRAZILIAN) /*0x0416*/
#include "nls/ptb.nls"
LANG_END
LANG_BEGIN (LANG_PORTUGUESE ,SUBLANG_PORTUGUESE) /*0x0816*/
#include "nls/ptg.nls"
LANG_END
LANG_BEGIN (LANG_SWEDISH, SUBLANG_DEFAULT) /*0x41d*/
LANG_BEGIN (LANG_SLOVAK, SUBLANG_DEFAULT) /*0x041b*/
#include "nls/sky.nls"
LANG_END
LANG_BEGIN (LANG_SWEDISH, SUBLANG_SWEDISH) /*0x041d*/
#include "nls/sve.nls"
LANG_END
LANG_BEGIN (LANG_SWEDISH, SUBLANG_SWEDISH_FINLAND) /*0x081d*/
#include "nls/svf.nls"
LANG_END
LANG_BEGIN (LANG_SLOVAK, SUBLANG_DEFAULT) /*0x41b*/
#include "nls/sky.nls"
LANG_BEGIN (LANG_THAI, SUBLANG_DEFAULT) /*0x41e*/
#include "nls/tha.nls"
LANG_END
LANG_BEGIN (LANG_ESPERANTO, SUBLANG_DEFAULT) /*0x048f*/
#include "nls/esperanto.nls"
LANG_END
/*Insert other languages here*/
default:
found=0;
......@@ -557,7 +698,8 @@ LANG_END
} while (!found && i<3);
if(!found)
{ ERR(ole,"'%s' not supported for your language.\n", retString);
{ ERR(ole,"'%s' not supported for your language (%4X).\n",
retString,lang);
SetLastError(ERROR_INVALID_PARAMETER);
return 0;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment