diff options
author | jwangen <jwangen> | 2002-10-28 21:06:38 +0000 |
---|---|---|
committer | jwangen <jwangen> | 2002-10-28 21:06:38 +0000 |
commit | a5d9c88f08bc23a454688f2601aec1d43bd637d2 (patch) | |
tree | 52abd94188c45df8fc2fed1004c19b07dfc42742 | |
parent | 9fefac069b9077c78c99d7323d0ebbe966ecbd1b (diff) | |
download | phpicalendar-a5d9c88f08bc23a454688f2601aec1d43bd637d2.tar.gz phpicalendar-a5d9c88f08bc23a454688f2601aec1d43bd637d2.tar.bz2 phpicalendar-a5d9c88f08bc23a454688f2601aec1d43bd637d2.zip |
Fixed error when just a space is given
-rw-r--r-- | languages/norwegian.inc.php | 26 | ||||
-rw-r--r-- | search.php | 10 |
2 files changed, 22 insertions, 14 deletions
diff --git a/languages/norwegian.inc.php b/languages/norwegian.inc.php index aa63f7b..893cd8c 100644 --- a/languages/norwegian.inc.php +++ b/languages/norwegian.inc.php @@ -24,7 +24,7 @@ $last_week_lang = 'Forrige uke'; $last_year_lang = 'Forrige år'; $subscribe_lang = 'Abonnér'; $download_lang = 'Last ned'; -$powered_by_lang = 'Powered by'; +$powered_by_lang = 'Kjøres med'; $version_lang = '0.8'; $event_lang = 'Hendelse'; $event_start_lang = 'Start tid'; @@ -46,21 +46,21 @@ $gomonth_lang = 'Gå til denne måneden'; $goyear_lang = 'Gå til dette året'; // new in 0.8 ------------- -$search_lang = 'Search'; // the verb -$results_lang = 'Search Results'; -$query_lang = 'Query: '; // will be followed by the search query -$no_results_lang = 'No events found'; +$search_lang = 'Søk'; // the verb +$results_lang = 'Søkeresultater'; +$query_lang = 'Spørsmål '; // will be followed by the search query +$no_results_lang = 'Ingen hendelser funnet'; -$goprint_lang = 'Printer Friendly'; -$time_lang = 'Time'; -$summary_lang = 'Summary'; -$description_lang = 'Description'; +$goprint_lang = 'Utskriftsvennlig'; +$time_lang = 'Tid'; +$summary_lang = 'Oppsummering'; +$description_lang = 'Beskrivelse'; // RSS text for 0.8 -$this_site_is_lang = 'This site is'; -$no_events_day_lang = 'No events today.'; -$no_events_week_lang = 'No events this week.'; -$no_events_month_lang = 'No events this month.'; +$this_site_is_lang = 'Dette nettstedet er'; +$no_events_day_lang = 'Ingen hendleser i dag.'; +$no_events_week_lang = 'Ingen hendelser denne uken.'; +$no_events_month_lang = 'Ingen hendelser denne måneden.'; $rss_day_date = 'g:i A'; // Lists just the time $rss_week_date = '%b %e'; // Lists just the day $rss_month_date = '%b %e'; // Lists just the day @@ -43,7 +43,11 @@ $search_box .= $search_started = getmicrotime(); if ($search_valid) { $format_search_arr = format_search($query); - $formatted_search = $format_search_arr[0]; + if (!$format_search_arr[0]) { + $formatted_search = '<b>No query given</b>'; + } else { + $formatted_search = $format_search_arr[0]; + } if (isset($master_array) && is_array($master_array)) { foreach($master_array as $date_key_tmp => $date_tmp) { if (is_array($date_tmp)) { @@ -291,6 +295,8 @@ function format_search($search_str) { $search_str = strtolower($search_str); + if ($search_str == ' ') return array(false,$and_arr,$or_arr,$not_arr); + // clean up search string $search_str = trim($search_str); $search_str = str_replace(' and ', ' ', $search_str); @@ -367,6 +373,8 @@ function search_boolean($needle_arr, $haystack) { $or_arr = $needle_arr[2]; $not_arr = $needle_arr[3]; + if (!$needle_arr[0]) return false; + // compare lowercase versions of the strings $haystack = strtolower($haystack); |