Basic Croatian language support.

documentation/languages

@@ -16,21 +16,21 @@ hour or two.
 To add a new language to the list of languages that Wine can handle
 you must...
 
-0.  Find the language ID in /include/winnls.h .
+0.  Find the language ID in include/winnls.h .
 
 1.  Look in ole/ole2nls.c if your language is already incorporated in
     the "static const struct NLS_langlocale". If not: find the 
-    appropriate entries in /include/winnls.h and add them to the list.
+    appropriate entries in include/winnls.h and add them to the list.
 
-2.  Edit the parameters defined in /ole/nls/*.nls to fit your local 
+2.  Edit the parameters defined in ole/nls/*.nls to fit your local 
     habits and language.
 
-3.  Edit documentation/wine.man (search for -language) to show the new
+3.  Edit documentation/wine.man.in (search for -language) to show the new
     language abbreviation.
 
 4.  Edit misc/main.c variable "Languages" to contain the new language
-    abbreviation and language ID.  Also edit macro "USAGE" to show the
-    new abbreviation.
+    abbreviation and language ID.  Also edit struct "option_table" in
+    misc/options.c to show the new abbreviation.
 
 5.  Edit include/options.h enum "WINE_LANGUAGE" to have a member called
     LANG_XX where XX is the new abbreviation.
@@ -79,3 +79,4 @@ of places.]
 
 Therefore revised Februari 1999 by Klaas van Gend
 Revised again May 23, 1999, Klaas van Gend
+Updated May 26, 2000, Zoran Dzelajlija

documentation/wine.man.in

@@ -215,8 +215,8 @@ is only valid when used in conjunction with --winver win31.
 .I --language xx
 Set the language to
 .I xx
-(one of Br, Ca, Cs, Cy, Da, De, En, Eo, Es, Fi, Fr, Ga, Gd, Gv, Hu,
-It, Ko, Kw, No, Pl, Pt, Ru, Sk, Sv, Wa)
+(one of Br, Ca, Cs, Cy, Da, De, En, Eo, Es, Fi, Fr, Ga, Gd, Gv, Hr,
+Hu, It, Ko, Kw, No, Pl, Pt, Ru, Sk, Sv, Wa)
 .TP
 .I --managed
 Create each top-level window as a properly managed X window instead of

include/options.h

@@ -42,7 +42,8 @@ typedef enum
     LANG_Gd,  /* Scots Gaelic */
     LANG_Gv,  /* Manx Gaelic */
     LANG_Kw,  /* Cornish */
-    LANG_Ja   /* Japanese */
+    LANG_Ja,  /* Japanese */
+    LANG_Hr   /* Croatian */
 } WINE_LANGUAGE;
 
 typedef struct

misc/main.c

@@ -75,6 +75,7 @@ const WINE_LANGUAGE_DEF Languages[] =
     {"Cy",0x0492},	/* LANG_Cy */
     {"Br",0x0493},	/* LANG_Br  */
     {"Ja",0x0411},	/* LANG_Ja */
+    {"Hr",0x041A},	/* LANG_Hr */
     {NULL,0}
 };
 

ole/nls/hrv.nls

@@ -27,8 +27,8 @@ LOCVAL(LOCALE_IDEFAULTANSICODEPAGE,"1250")
 /* LOCVAL(LOCALE_ILZERO,"1") */
 /* LOCVAL(LOCALE_INEGNUMBER) */
 LOCVAL(LOCALE_SNATIVEDIGITS,"0123456789")
-LOCVAL(LOCALE_SCURRENCY,"Din")
-LOCVAL(LOCALE_SINTLSYMBOL,"HRD")
+LOCVAL(LOCALE_SCURRENCY,"Kn")
+LOCVAL(LOCALE_SINTLSYMBOL,"HRK")
 /* LOCVAL(LOCALE_SMONDECIMALSEP,",") */
 /* LOCVAL(LOCALE_SMONTHOUSANDSEP,".") */
 LOCVAL(LOCALE_SMONGROUPING,"3;0")
@@ -56,48 +56,48 @@ LOCVAL(LOCALE_ICALENDARTYPE, "1")
 /* LOCVAL(LOCALE_IFIRSTDAYOFWEEK) */
 /* LOCVAL(LOCALE_IFIRSTWEEKOFYEAR) */
 
-LOCVAL(LOCALE_SDAYNAME1,"ponedeljak")
+LOCVAL(LOCALE_SDAYNAME1,"ponedjeljak")
 LOCVAL(LOCALE_SDAYNAME2,"utorak")
-LOCVAL(LOCALE_SDAYNAME3,"sreda")
+LOCVAL(LOCALE_SDAYNAME3,"srijeda")
 LOCVAL(LOCALE_SDAYNAME4,"etvrtak")
 LOCVAL(LOCALE_SDAYNAME5,"petak")
 LOCVAL(LOCALE_SDAYNAME6,"subota")
-LOCVAL(LOCALE_SDAYNAME7,"nedelja")
+LOCVAL(LOCALE_SDAYNAME7,"nedjelja")
 
 LOCVAL(LOCALE_SABBREVDAYNAME1,"pon")
-LOCVAL(LOCALE_SABBREVDAYNAME2,"tor")
-LOCVAL(LOCALE_SABBREVDAYNAME3,"sre")
+LOCVAL(LOCALE_SABBREVDAYNAME2,"uto")
+LOCVAL(LOCALE_SABBREVDAYNAME3,"sri")
 LOCVAL(LOCALE_SABBREVDAYNAME4,"et")
 LOCVAL(LOCALE_SABBREVDAYNAME5,"pet")
 LOCVAL(LOCALE_SABBREVDAYNAME6,"sub")
 LOCVAL(LOCALE_SABBREVDAYNAME7,"ned")
 
-LOCVAL(LOCALE_SMONTHNAME1,"januar") 
-LOCVAL(LOCALE_SMONTHNAME2,"februar") 
-LOCVAL(LOCALE_SMONTHNAME3,"mart")
-LOCVAL(LOCALE_SMONTHNAME4,"april")
-LOCVAL(LOCALE_SMONTHNAME5,"maj")
-LOCVAL(LOCALE_SMONTHNAME6,"jun")
-LOCVAL(LOCALE_SMONTHNAME7,"jul")
-LOCVAL(LOCALE_SMONTHNAME8,"august")
-LOCVAL(LOCALE_SMONTHNAME9,"septembar")
-LOCVAL(LOCALE_SMONTHNAME10,"oktobar")
-LOCVAL(LOCALE_SMONTHNAME11,"novembar")
-LOCVAL(LOCALE_SMONTHNAME12,"decembar")
+LOCVAL(LOCALE_SMONTHNAME1,"sijeanj") 
+LOCVAL(LOCALE_SMONTHNAME2,"veljaa") 
+LOCVAL(LOCALE_SMONTHNAME3,"o\236ujak")
+LOCVAL(LOCALE_SMONTHNAME4,"travanj")
+LOCVAL(LOCALE_SMONTHNAME5,"svibanj")
+LOCVAL(LOCALE_SMONTHNAME6,"lipanj")
+LOCVAL(LOCALE_SMONTHNAME7,"srpanj")
+LOCVAL(LOCALE_SMONTHNAME8,"kolovoz")
+LOCVAL(LOCALE_SMONTHNAME9,"rujan")
+LOCVAL(LOCALE_SMONTHNAME10,"listopad")
+LOCVAL(LOCALE_SMONTHNAME11,"studeni")
+LOCVAL(LOCALE_SMONTHNAME12,"prosinac")
 LOCVAL(LOCALE_SMONTHNAME13,"")
 
-LOCVAL(LOCALE_SABBREVMONTHNAME1,"jan")
-LOCVAL(LOCALE_SABBREVMONTHNAME2,"feb")
-LOCVAL(LOCALE_SABBREVMONTHNAME3,"mar")
-LOCVAL(LOCALE_SABBREVMONTHNAME4,"apr")
-LOCVAL(LOCALE_SABBREVMONTHNAME5,"maj")
-LOCVAL(LOCALE_SABBREVMONTHNAME6,"jun")
-LOCVAL(LOCALE_SABBREVMONTHNAME7,"jul")
-LOCVAL(LOCALE_SABBREVMONTHNAME8,"aug")
-LOCVAL(LOCALE_SABBREVMONTHNAME9,"sep")
-LOCVAL(LOCALE_SABBREVMONTHNAME10,"okt")
-LOCVAL(LOCALE_SABBREVMONTHNAME11,"nov")
-LOCVAL(LOCALE_SABBREVMONTHNAME12,"dec")
+LOCVAL(LOCALE_SABBREVMONTHNAME1,"sij")
+LOCVAL(LOCALE_SABBREVMONTHNAME2,"vel")
+LOCVAL(LOCALE_SABBREVMONTHNAME3,"o\236u")
+LOCVAL(LOCALE_SABBREVMONTHNAME4,"tra")
+LOCVAL(LOCALE_SABBREVMONTHNAME5,"svi")
+LOCVAL(LOCALE_SABBREVMONTHNAME6,"lip")
+LOCVAL(LOCALE_SABBREVMONTHNAME7,"srp")
+LOCVAL(LOCALE_SABBREVMONTHNAME8,"kol")
+LOCVAL(LOCALE_SABBREVMONTHNAME9,"ruj")
+LOCVAL(LOCALE_SABBREVMONTHNAME10,"lis")
+LOCVAL(LOCALE_SABBREVMONTHNAME11,"stu")
+LOCVAL(LOCALE_SABBREVMONTHNAME12,"pro")
 LOCVAL(LOCALE_SABBREVMONTHNAME13,"")
 
 /* LOCVAL(LOCALE_SPOSITIVESIGN, "") */

ole/ole2nls.c

@@ -240,6 +240,10 @@ LANG_BEGIN (LANG_RUSSIAN, SUBLANG_DEFAULT)	/*0x419*/
 #include "nls/rus.nls"
 LANG_END
 
+LANG_BEGIN (LANG_CROATIAN, SUBLANG_CROATIAN)	/*0x41a*/
+#include "nls/hrv.nls"
+LANG_END
+
 LANG_BEGIN (LANG_SLOVAK, SUBLANG_DEFAULT)	/*0x041b*/
 #include "nls/sky.nls"
 LANG_END

windows/x11drv/keyboard.c

@@ -282,6 +282,26 @@ static const char main_key_PL[MAIN_LEN][4] =
  "<>|"
 };
 
+/*** Croatian keyboard layout specific for me <jelly@srk.fer.hr> ***/
+static const char main_key_HR_jelly[MAIN_LEN][4] =
+{
+ "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+",
+ "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","[{","]}",
+ "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";:","'\"","\\|",
+ "zZ","xX","cC","vV","bB","nN","mM",",<",".>","/?",
+ "<>|"
+};
+
+/*** Croatian keyboard layout ***/
+static const char main_key_HR[MAIN_LEN][4] =
+{
+ "","1!","2\"","3#^","4$","5%","6&","7/`","8(","9)","0=","'?","+*",
+ "qQ\\","wW|","eE","rR","tT","zZ","uU","iI","oO","pP","","",
+ "aA","sS","dD","fF[","gG]","hH","jJ","kK","lL","","","",
+ "yY","xX","cC","vV@","bB{","nN}","mM",",;",".:","-_/",
+ "<>"
+};
+
 /*** Japanese 106 keyboard layout ***/
 static const char main_key_JA_jp106[MAIN_LEN][4] =
 {
@@ -332,6 +352,8 @@ static struct {
  {MAKELANGID(LANG_ICELANDIC,SUBLANG_DEFAULT),      1252, 850, &main_key_IS},
  {MAKELANGID(LANG_HUNGARIAN,SUBLANG_DEFAULT),      1252, 850, &main_key_HU},
  {MAKELANGID(LANG_POLISH,SUBLANG_DEFAULT),         1250, 852, &main_key_PL},
+ {MAKELANGID(LANG_CROATIAN,SUBLANG_CROATIAN),      1250, 852, &main_key_HR},
+ {MAKELANGID(LANG_CROATIAN,SUBLANG_CROATIAN),      1250, 852, &main_key_HR_jelly},
  {MAKELANGID(LANG_JAPANESE,SUBLANG_DEFAULT),        932, 932, &main_key_JA_jp106},
  {MAKELANGID(LANG_JAPANESE,SUBLANG_DEFAULT),        932, 932, &main_key_JA_pc98x1},