Index: worldclock.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/worldclock/worldclock.module,v retrieving revision 1.1.4.3 diff -u -p -r1.1.4.3 worldclock.module --- worldclock.module 9 May 2008 13:37:57 -0000 1.1.4.3 +++ worldclock.module 11 May 2008 14:19:32 -0000 @@ -189,31 +189,31 @@ function get_location_info($loc) { $mon_array = array('', t('January'), t('February'), t('March'), t('April'), t('May'), t('June'), t('July'), t('August'), t('September'), t('October'), t('November'), t('December')); - $out = ''; + $output = ''; if ($loc[INDEX_GMT] >= 0) { - $out .= t('GMT +') . $loc[INDEX_GMT] .', '; + $output .= t('GMT +') . $loc[INDEX_GMT] .', '; } else { - $out .= t('GMT ') . $loc[INDEX_GMT] .', '; + $output .= t('GMT ') . $loc[INDEX_GMT] .', '; } if ($loc[INDEX_DST] == 0) { - $out .= t('No DST '); + $output .= t('No DST '); } else { - $out .= t('DST '); + $output .= t('DST '); // now add DST start and end information - $out .= t(' from !stime:00AM on !snth !sdow in !smonth', - array('!stime' => $loc[INDEX_STIME], - '!snth' => $nth_array[$loc[INDEX_SNTH]], - '!sdow' => $dow_array[$loc[INDEX_SDOW]], - '!smonth' => $mon_array[$loc[INDEX_SMON]])); - $out .= t(' to !etime:00AM on !enth !edow in !emonth', - array('!etime' => $loc[INDEX_ETIME], - '!enth' => $nth_array[$loc[INDEX_ENTH]], - '!edow' => $dow_array[$loc[INDEX_EDOW]], - '!emonth' => $mon_array[$loc[INDEX_EMON]])); + $output .= t(' from !stime:00AM on !snth !sdow in !smonth', + array('!stime' => $loc[INDEX_STIME], + '!snth' => $nth_array[$loc[INDEX_SNTH]], + '!sdow' => $dow_array[$loc[INDEX_SDOW]], + '!smonth' => $mon_array[$loc[INDEX_SMON]])); + $output .= t(' to !etime:00AM on !enth !edow in !emonth', + array('!etime' => $loc[INDEX_ETIME], + '!enth' => $nth_array[$loc[INDEX_ENTH]], + '!edow' => $dow_array[$loc[INDEX_EDOW]], + '!emonth' => $mon_array[$loc[INDEX_EMON]])); } - return $out; + return $output; } /** @@ -353,7 +353,7 @@ function worldclock_block($op='list', $d } /** - * Theme hook + * Theme hook for Drupal 6.x */ function worldclock_theme() { @@ -433,7 +433,7 @@ function worldclock_admin() { if ($loc_no) { $loc = $wc_location[$loc_no]; $loc_info = get_location_info($loc); - } + } // create a pull-down menu $form['location']['worldclock_location_'. $j] = array( '#type' => 'select', @@ -471,63 +471,63 @@ function worldclock_admin() { ); $form['display']['worldclock_format'] = array( - '#type' => 'select', - '#title' => t('Display format'), - '#options' => array( - 'm/d h:i A' => t('04/07 01:23 PM'), - 'm/d h:i a' => t('04/07 01:23 pm'), - 'm/d h:i:s A' => t('04/07 01:23:45 PM'), - 'm/d h:i:s a' => t('04/07 01:23:45 pm'), - 'm/d H:i' => t('04/07 13:23'), - 'm/d H:i:s' => t('04/07 13:23:45'), - - 'M d h:i A' => t('Apr 07 01:23 PM'), - 'M d h:i a' => t('Apr 07 01:23 pm'), - 'M d h:i:s A' => t('Apr 07 01:23:45 PM'), - 'M d h:i:s a' => t('Apr 07 01:23:45 pm'), - 'M d H:i' => t('Apr 07 13:23'), - 'M d H:i:s' => t('Apr 07 13:23:45'), - - 'd/m h:i A' => t('07/04 01:23 PM'), - 'd/m h:i a' => t('07/04 01:23 pm'), - 'd/m h:i:s A' => t('07/04 01:23:45 PM'), - 'd/m h:i:s a' => t('07/04 01:23:45 pm'), - 'd/m H:i' => t('07/04 13:23'), - 'd/m H:i:s' => t('07/04 13:23:45'), - - 'd M h:i A' => t('07 Apr 01:23 PM'), - 'd M h:i a' => t('07 Apr 01:23 pm'), - 'd M h:i:s A' => t('07 Apr 01:23:45 PM'), - 'd M h:i:s a' => t('07 Apr 01:23:45 pm'), - 'd M H:i' => t('07 Apr 13:23'), - 'd M H:i:s' => t('07 Apr 13:23:45'), + '#type' => 'select', + '#title' => t('Display format'), + '#options' => array( + 'm/d h:i A' => t('04/07 01:23 PM'), + 'm/d h:i a' => t('04/07 01:23 pm'), + 'm/d h:i:s A' => t('04/07 01:23:45 PM'), + 'm/d h:i:s a' => t('04/07 01:23:45 pm'), + 'm/d H:i' => t('04/07 13:23'), + 'm/d H:i:s' => t('04/07 13:23:45'), + + 'M d h:i A' => t('Apr 07 01:23 PM'), + 'M d h:i a' => t('Apr 07 01:23 pm'), + 'M d h:i:s A' => t('Apr 07 01:23:45 PM'), + 'M d h:i:s a' => t('Apr 07 01:23:45 pm'), + 'M d H:i' => t('Apr 07 13:23'), + 'M d H:i:s' => t('Apr 07 13:23:45'), + + 'd/m h:i A' => t('07/04 01:23 PM'), + 'd/m h:i a' => t('07/04 01:23 pm'), + 'd/m h:i:s A' => t('07/04 01:23:45 PM'), + 'd/m h:i:s a' => t('07/04 01:23:45 pm'), + 'd/m H:i' => t('07/04 13:23'), + 'd/m H:i:s' => t('07/04 13:23:45'), + + 'd M h:i A' => t('07 Apr 01:23 PM'), + 'd M h:i a' => t('07 Apr 01:23 pm'), + 'd M h:i:s A' => t('07 Apr 01:23:45 PM'), + 'd M h:i:s a' => t('07 Apr 01:23:45 pm'), + 'd M H:i' => t('07 Apr 13:23'), + 'd M H:i:s' => t('07 Apr 13:23:45'), - 'custom' => t('Custom format'), + 'custom' => t('Custom format'), ), - '#description' => t('Date/time used for the menu item is not a current time, but an example..'), - '#default_value' => $format, - '#attributes' => array('onchange' => 'ChangeFormat(this)'), + '#description' => t('Date/time used for the menu item is not a current time, but an example..'), + '#default_value' => $format, + '#attributes' => array('onchange' => 'ChangeFormat(this)'), ); if ($format == 'custom') { - $timestr_style = 'visibility: visible; overflow: hidden;'; + $timestr_style = 'visibility: visible; overflow: hidden;'; } else { - $timestr_style = 'visibility: hidden; height: 0px; overflow: hidden;'; + $timestr_style = 'visibility: hidden; height: 0px; overflow: hidden;'; } $timestr_example = date($timestr); $form['display']['worldclock_timestr'] = array( '#type' => 'textfield', - '#title' => t('Custom format string'), - '#size' => 20, - '#maxlength' => 20, - '#field_suffix' => t(' Example: !str1', array('!str1' => date($timestr))), - '#default_value' => $timestr, - '#description' => $format_desc, - '#prefix' => '
', - '#suffix' => '
', + '#title' => t('Custom format string'), + '#size' => 20, + '#maxlength' => 20, + '#field_suffix' => t(' Example: !str1', array('!str1' => date($timestr))), + '#default_value' => $timestr, + '#description' => $format_desc, + '#prefix' => '
', + '#suffix' => '
', ); $form['display']['worldclock_showdst'] = array( @@ -539,20 +539,20 @@ function worldclock_admin() { $form['display']['worldclock_dststr'] = array( '#type' => 'textfield', - '#title' => t('DST marker'), - '#size' => 10, - '#maxlength' => 10, - '#default_value' => variable_get('worldclock_dststr', '*'), - '#description' => t('Specify the DST marker (Symbol, character or a short text). HTML tags are allowed.'), + '#title' => t('DST marker'), + '#size' => 10, + '#maxlength' => 10, + '#default_value' => variable_get('worldclock_dststr', '*'), + '#description' => t('Specify the DST marker (Symbol, character or a short text). HTML tags are allowed.'), ); $form['display']['worldclock_footnote'] = array( '#type' => 'textfield', - '#title' => t('Footnote'), - '#size' => 60, - '#maxlength' => 60, - '#default_value' => variable_get('worldclock_footnote', ''), - '#description' => t('Footnote, if any (for example, an explanation about DST marker). HTML tags are allowed.'), + '#title' => t('Footnote'), + '#size' => 60, + '#maxlength' => 60, + '#default_value' => variable_get('worldclock_footnote', ''), + '#description' => t('Footnote, if any (for example, an explanation about DST marker). HTML tags are allowed.'), ); $form['advanced'] = array(