From db58cafdb605dcf6d091ed0378257e4a42e6f1f2 Mon Sep 17 00:00:00 2001 From: jwangen Date: Sun, 6 Oct 2002 12:04:18 +0000 Subject: A few language updates, --- config.inc.php | 2 +- day.php | 4 +++- functions/ical_parser.php | 2 +- functions/list_icals.php | 4 ++-- languages/danish.inc.php | 13 +++++++------ languages/japanese.inc.php | 15 ++++++--------- month_bottom.php | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/config.inc.php b/config.inc.php index 075bb20..b596086 100644 --- a/config.inc.php +++ b/config.inc.php @@ -9,7 +9,7 @@ $style_sheet = 'silver'; // Themes support $calendar_path = './calendars'; // Path to directory with calendars $default_view = 'day'; // Default view for calendars = 'day', 'week', 'month' $default_cal = 'Home'; // Exact filename of calendar without .ics -$language = 'danish'; // Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish' +$language = 'japanese'; // Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish' $week_start_day = 'sunday'; // Day of the week your week starts on $day_start = '0700'; // Start time for day grid $gridLength = '15'; // Grid distance in minutes for day view, multiples of 15 preferred diff --git a/day.php b/day.php index de43161..8d46d1c 100644 --- a/day.php +++ b/day.php @@ -40,7 +40,7 @@ $thisday2 = localizeDate($dateFormat_week_list, $unix_time); $dayborder = 0; $nbrGridCols = 1; -if ($master_array[($getdate)]) { +if (is_array($master_array[($getdate)])) { foreach($master_array[($getdate)] as $ovlKey => $ovlValue) { if ($ovlKey != '-1') { foreach($ovlValue as $ovl2Value) { @@ -179,6 +179,8 @@ if ($master_array[($getdate)]) { for ($i=0;$i'; $drawWidth = $nbrGridCols / ($event_length[$i]['overlap'] + 1); + //print $nbrGridCols.' -- '; + //print $drawWidth; $emptyWidth = $emptyWidth - $drawWidth; switch ($event_length[$i]['state']) { case 'begin': diff --git a/functions/ical_parser.php b/functions/ical_parser.php index d357422..929392e 100644 --- a/functions/ical_parser.php +++ b/functions/ical_parser.php @@ -39,7 +39,7 @@ $this_year = $day_array2[1]; $parse_file = true; if ($is_webcal == false && $save_parsed_cals == 'yes') { $realcal_mtime = filemtime($filename); - $parsedcal = '/tmp/parsedcal-'.$cal_filename.'-'.$this_year.'-'.$realcal_mtime; + $parsedcal = '/tmp/parsedcal-'.$cal_filename.'-'.$this_year; if (file_exists($parsedcal)) { $parsedcal_mtime = filemtime($parsedcal); if ($realcal_mtime == $parsedcal_mtime) { diff --git a/functions/list_icals.php b/functions/list_icals.php index 5c9ff36..f72ac7b 100644 --- a/functions/list_icals.php +++ b/functions/list_icals.php @@ -24,9 +24,9 @@ if ($display_ical_list == "yes") { $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp); if (!in_array($cal_filename_tmp, $blacklisted_cals)) { if ($cal_tmp == $cal) { - print "\n"; + print "\n"; } else { - print "\n"; + print "\n"; } } } diff --git a/languages/danish.inc.php b/languages/danish.inc.php index 50bff36..afc87f3 100644 --- a/languages/danish.inc.php +++ b/languages/danish.inc.php @@ -4,6 +4,7 @@ // For version 0.6 PHP iCalendar // // Translation by Henrik Højmark (styxx@worldonline.dk) +// and Jakob Peterhänsel (marook@creepers.org) // // Submit new translations to chad@chadsdomain.com @@ -58,10 +59,10 @@ $monthsofyearshort_lang = array ('Jan','Feb','Mar','Apr','Maj','Jun','Jul','Aug $timeFormat = 'H:i'; // For date formatting, see note below -$dateFormat_day = '%A, %B %e'; -$dateFormat_week = '%B %e'; -$dateFormat_week_list = '%a, %b %e'; -$dateFormat_week_jump = '%b %e'; +$dateFormat_day = '%A, %e %B'; +$dateFormat_week = '%e %B'; +$dateFormat_week_list = '%a, %e %b'; +$dateFormat_week_jump = '%e %b'; $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %e %B'; @@ -87,9 +88,9 @@ $error_window_lang = 'Der opstod en fejl!'; $error_calendar_lang = 'Kalenderen "%s" blev benyttet da fejlen opstod.'; $error_path_lang = 'Kan ikke åbne stien : "%s"'; $error_back_lang = 'Brug venligst "Tilbage" knappen for at gå tilbage.'; -$error_remotecal_lang = 'Denne server blokerer for kalendere der ikke er blevet godkendt'; +$error_remotecal_lang = 'Denne server blokerer for eksterne kalendere der ikke er blevet godkendt'; $error_restrictedcal_lang = 'Du har forsøgt at få adgang til en beskyttet kalender på denne server.'; -$error_invalidcal_lang = 'Kalenderen er muligvis i stykker. Prøv en anden kalender.'; +$error_invalidcal_lang = 'Ugyldig kalender fil. Prøv en anden kalender.'; ?> diff --git a/languages/japanese.inc.php b/languages/japanese.inc.php index 0af3d78..bee99fe 100644 --- a/languages/japanese.inc.php +++ b/languages/japanese.inc.php @@ -38,7 +38,7 @@ $all_day_lang = '終日イベント'; $notes_lang = '注釈'; $todays_lang = '今日今週の予定'; -$this_weeks_lang = '今週の予定'; +$this_weeks_lang = '今週の予定'; $this_months_lang = '今月の予定'; $this_years_lang = '今年の予定'; $today_lang = '今日'; @@ -46,7 +46,7 @@ $this_week_lang = '今週'; $this_month_lang = '今月'; $this_year_lang = '今年'; -$jump_lang = 'Jump to'; +$jump_lang = '行く'; $tomorrows_lang = '翌日の予定'; $goday_lang = '今日に行く'; $goweek_lang = '今週に行く'; @@ -59,9 +59,6 @@ $daysofweekreallyshort_lang = array ('日','月','火','水','木','金','土'); $monthsofyear_lang = array ('1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月'); $monthsofyearshort_lang = $monthsofyear_lang; -// Set Location for date formatting, check out: http://www.php.net/manual/en/function.setlocale.php -setlocale (LC_TIME, 'ja_JP'); - // For time formatting, check out: http://www.php.net/manual/en/function.date.php $timeFormat = 'g:i A'; @@ -91,10 +88,10 @@ Notes about dateFormat_* // Error messages - %s will be replaced with a variable $error_title_lang = 'Error!'; -$error_window_lang = '間違いがあった!'; -$error_calendar_lang = 'The calendar "%s" was being processed when this error occurred.'; -$error_path_lang = 'Unable to open the path: "%s"'; -$error_back_lang = 'Please use the "Back" button to return.'; +$error_window_lang = '間違いがありました!'; +$error_calendar_lang = 'この間違いが起こましたきない、「%s」カレンダーを処理て居ました。'; +$error_path_lang = 'ディレクトリを開けることない:「%s」'; +$error_back_lang = '戻るに「Back」ボタンを用いて下さい。'; $error_remotecal_lang = 'このサーバーは遠隔カレンダーを妨げる承認されなかった。'; $error_restrictedcal_lang = 'あなたはカレンダーにアクセスすることを試みたこのサーバーで 限られている'; $error_invalidcal_lang = 'カレンダーファイルは無効であること。 別のカレンダーを試みなさい。'; diff --git a/month_bottom.php b/month_bottom.php index b20866a..406b534 100644 --- a/month_bottom.php +++ b/month_bottom.php @@ -330,7 +330,7 @@ ereg ("([0-9]{6})([0-9]{2})", $key, $regs); if ($regs[1] == $parse_month) { $dayofmonth = strtotime ($key); - $dayofmonth = strftime ($dateFormat_week_list, $dayofmonth); + $dayofmonth = localizeDate ($dateFormat_week_list, $dayofmonth); $i = 0; if ($getdate == $key) { $fontclass="class=\"G10BOLD\""; -- cgit v1.2.3