#96110# Fontname of textcontrol localized

wizards/source/schedule/CalendarMain.xba

@@ -90,14 +90,18 @@ Dim iThisMonth as Integer
 		Select Case sCurLangLocale
 			Case "ja"
 				.lstOwnData.FontName = "HG Mincho Light J"
+				.txtEvent.FontName = "HG Mincho Light J"
 			Case "zh"
 				If oDocument.CharLocale.Country = "CN" Then
 					.lstOwnData.FontName = "HG MSung Light SC"
+					.txtEvent.FontName = "HG MSung Light SC"
 				Else
 					.lstOwnData.FontName = "HG MSung Light TC"
+					.txtEvent.FontName = "HG MSung Light TC"
 				End If
 			Case "ko"
 				.lstOwnData.FontName = "HG MyeongJo Light K"
+				.txtEvent.FontName = "HG MyeongJo Light K"
 		End Select
 		.lstOwnEventMonth.StringItemList() = cCalShortMonthNames()
 		.optYear.State = 1

wizards/source/schedule/DlgCalendar.xdl

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog1" dlg:left="160" dlg:top="81" dlg:width="208" dlg:height="156" dlg:page="1" dlg:help-url="HID:34700">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog1" dlg:left="160" dlg:top="81" dlg:width="208" dlg:height="156" dlg:page="2" dlg:help-url="HID:34700">
  <dlg:styles>
   <dlg:style dlg:style-id="0" dlg:border="none"/>
   <dlg:style dlg:style-id="1" dlg:font-name="Cumberland" dlg:font-stylename="Standard" dlg:font-family="modern" dlg:font-charset="ansi"/>

wizards/source/schedule/LocalHolidays.xba

@@ -409,13 +409,13 @@ End Function
 
 Sub FindWholeYearHolidays_CN(YearInt as Integer)
 	CalculateChineseNewYear(YearInt)
-	CalInsertBankholiday(DateSerial(YearInt, 1, 1), "元旦", cHolidayType_Full)				' New Year
+	CalInsertBankholiday(DateSerial(YearInt, 1, 1), "元旦", cHolidayType_Full)			' New Year
 	CalInsertBankholiday(DateSerial(YearInt, 5, 8), "妇女节", cHolidayType_Half)			' Women's Day
 	CalInsertBankholiday(DateSerial(YearInt, 4, 5), "清明节", cHolidayType_Half)			' Day of the deads
 	CalInsertBankholiday(DateSerial(YearInt, 5, 1), "劳动节", cHolidayType_Full)			' International Labour Day
 	CalInsertBankholiday(DateSerial(YearInt, 6, 1), "儿童节", cHolidayType_Half)			' Children's Day
 	CalInsertBankholiday(DateSerial(YearInt, 8, 1), "建军节", cHolidayType_Half)			' Foundation of military
-	CalInsertBankholiday(DateSerial(YearInt, 10, 1), "国庆节", cHolidayType_Full)		' National festival day
+	CalInsertBankholiday(DateSerial(YearInt, 10, 1), "国庆节", cHolidayType_Full)			' National festival day
 End Sub
 
 
@@ -478,8 +478,8 @@ Dim lDate as Long
 		Case Else
 			Exit Sub
 	End Select
-	Select Case  sCurLangLocale
+	Select Case  sCurCountryLocale
-		Case "zh"
+		Case "CN"
 			CalInsertBankholiday(lDate-1, "春节", cHolidayType_Full)
 			CalInsertBankholiday(lDate, "春节", cHolidayType_Full)
 			CalInsertBankholiday(lDate+1, "春节", cHolidayType_Full)

wizards/source/schedule/OwnEvents.xba

@@ -15,7 +15,7 @@ Dim FileName as String
 Dim FileChannel as Integer
 Dim i as Integer
 	If bCalOwnDataChanged Then
-		FileName = GetPathSettings("Config", False) & "/" & "DATE.DAT"
+		FileName = GetPathSettings("UserConfig", False) & "/" & "DATE.DAT"
 		SaveDataToFile(FileName, DlgCalModel.lstOwnData.StringItemList())
 	End If
 End Sub
@@ -24,7 +24,7 @@ End Sub
 Sub CalLoadOwnData()
 Dim FileName as String
 Dim LocList() as String
-	FileName = GetPathSettings("Config", False) & "/DATE.DAT"
+	FileName = GetPathSettings("UserConfig", False) & "/DATE.DAT"
 	If LoadDataFromFile(FileName, LocList()) Then
 		DlgCalModel.lstOwnData.StringItemList() = LocList()
 	End If