Changeset 3676 for trunk/wp-includes/template-functions-general.php

Timestamp:

04/02/2006 12:20:11 AM (19 years ago)

Author:

ryan

Message:

WP_Locale. Props Sewar. fixes #2568

File:

• trunk/wp-includes/template-functions-general.php (modified) (12 diffs)

trunk/wp-includes/template-functions-general.php

@@ -135 +135 @@
 function wp_title($sep = '»', $display = true) {
     global $wpdb;
-    global $m, $year, $monthnum, $day, $category_name, $month, $posts;
+    global $m, $year, $monthnum, $day, $category_name, $wp_locale, $posts;
 
     $cat = get_query_var('cat');
@@ -174 +174 @@
     if ( !empty($m) ) {
         $my_year = substr($m, 0, 4);
-        $my_month = $month[substr($m, 4, 2)];
+        $my_month = $wp_locale->get_month($m);
         $title = "$my_year $sep $my_month";
     }
@@ -181 +181 @@
         $title = $year;
         if ( !empty($monthnum) )
-            $title .= " $sep ".$month[zeroise($monthnum, 2)];
+            $title .= " $sep ".$wp_locale->get_month($monthnum);
         if ( !empty($day) )
             $title .= " $sep ".zeroise($day, 2);
@@ -241 +241 @@
 
 function single_month_title($prefix = '', $display = true ) {
-    global $m, $monthnum, $month, $year;
+    global $m, $monthnum, $wp_locale, $year;
     if ( !empty($monthnum) && !empty($year) ) {
         $my_year = $year;
-        $my_month = $month[str_pad($monthnum, 2, '0', STR_PAD_LEFT)];
+        $my_month = $wp_locale->get_month($monthnum);
     } elseif ( !empty($m) ) {
         $my_year = substr($m, 0, 4);
-        $my_month = $month[substr($m, 4, 2)];
+        $my_month = $wp_locale->get_month($m);
     }
 
@@ -293 +293 @@
 
 function get_archives($type='', $limit='', $format='html', $before = '', $after = '', $show_post_count = false) {
-    global $month, $wpdb;
+    global $wp_locale, $wpdb;
 
     if ( '' == $type )
@@ -331 +331 @@
                 $url    = get_month_link($arcresult->year,  $arcresult->month);
                 if ( $show_post_count ) {
-                    $text = sprintf('%s %d', $month[zeroise($arcresult->month,2)], $arcresult->year);
+                    $text = sprintf('%s %d', $wp_locale->get_month($arcresult->month), $arcresult->year);
                     $after = ' ('.$arcresult->posts.')' . $afterafter;
                 } else {
-                    $text = sprintf('%s %d', $month[zeroise($arcresult->month,2)], $arcresult->year);
+                    $text = sprintf('%s %d', $wp_locale->get_month($arcresult->month), $arcresult->year);
                 }
                 echo get_archives_link($url, $text, $format, $before, $after);
@@ -394 +394 @@
 
 
-function get_calendar($daylength = 1) {
-    global $wpdb, $m, $monthnum, $year, $timedifference, $month, $month_abbrev, $weekday, $weekday_initial, $weekday_abbrev, $posts;
+function get_calendar($initial = true) {
+    global $wpdb, $m, $monthnum, $year, $timedifference, $wp_locale, $posts;
 
     // Quick check. If we have no posts at all, abort!
@@ -451 +451 @@
 
     echo '<table id="wp-calendar">
-    <caption>' . $month[zeroise($thismonth, 2)] . ' ' . date('Y', $unixmonth) . '</caption>
+    <caption>' . $wp_locale->get_month($thismonth) . ' ' . date('Y', $unixmonth) . '</caption>
     <thead>
     <tr>';
 
-    $day_abbrev = $weekday_initial;
-    if ( $daylength > 1 )
-        $day_abbrev = $weekday_abbrev;
-
     $myweek = array();
 
     for ( $wdcount=0; $wdcount<=6; $wdcount++ ) {
-        $myweek[]=$weekday[($wdcount+$week_begins)%7];
+        $myweek[] = $wp_locale->get_weekday(($wdcount+$week_begins)%7);
     }
 
     foreach ( $myweek as $wd ) {
-        echo "\n\t\t<th abbr=\"$wd\" scope=\"col\" title=\"$wd\">" . $day_abbrev[$wd] . '</th>';
+        $day_name = (true == $initial) ? $wp_locale->get_weekday_initial($wd) : $wp_locale->get_weekday_abbrev($wd);
+        echo "\n\t\t<th abbr=\"$wd\" scope=\"col\" title=\"$wd\">$day_name</th>";
     }
 
@@ -477 +474 @@
 
     if ( $previous ) {
-        echo "\n\t\t".'<td abbr="' . $month[zeroise($previous->month, 2)] . '" colspan="3" id="prev"><a href="' .
-        get_month_link($previous->year, $previous->month) . '" title="' . sprintf(__('View posts for %1$s %2$s'), $month[zeroise($previous->month, 2)],
-            date('Y', mktime(0, 0 , 0, $previous->month, 1, $previous->year))) . '">&laquo; ' . $month_abbrev[$month[zeroise($previous->month, 2)]] . '</a></td>';
+        echo "\n\t\t".'<td abbr="' . $wp_locale->get_month($previous->month) . '" colspan="3" id="prev"><a href="' .
+        get_month_link($previous->year, $previous->month) . '" title="' . sprintf(__('View posts for %1$s %2$s'), $wp_locale->get_month($previous->month),
+            date('Y', mktime(0, 0 , 0, $previous->month, 1, $previous->year))) . '">&laquo; ' . $wp_locale->get_month_abbrev($wp_locale->get_month($previous->month)) . '</a></td>';
     } else {
         echo "\n\t\t".'<td colspan="3" id="prev" class="pad">&nbsp;</td>';
@@ -487 +484 @@
 
     if ( $next ) {
-        echo "\n\t\t".'<td abbr="' . $month[zeroise($next->month, 2)] . '" colspan="3" id="next"><a href="' .
-        get_month_link($next->year, $next->month) . '" title="' . sprintf(__('View posts for %1$s %2$s'), $month[zeroise($next->month, 2)],
-            date('Y', mktime(0, 0 , 0, $next->month, 1, $next->year))) . '">' . $month_abbrev[$month[zeroise($next->month, 2)]] . ' &raquo;</a></td>';
+        echo "\n\t\t".'<td abbr="' . $wp_locale->get_month($next->month) . '" colspan="3" id="next"><a href="' .
+        get_month_link($next->year, $next->month) . '" title="' . sprintf(__('View posts for %1$s %2$s'), $wp_locale->get_month($next->month),
+            date('Y', mktime(0, 0 , 0, $next->month, 1, $next->year))) . '">' . $wp_locale->get_month_abbrev($wp_locale->get_month($next->month)) . ' &raquo;</a></td>';
     } else {
         echo "\n\t\t".'<td colspan="3" id="next" class="pad">&nbsp;</td>';
@@ -676 +673 @@
 
 function the_weekday() {
-    global $weekday, $id, $post;
-    $the_weekday = $weekday[mysql2date('w', $post->post_date)];
+    global $wp_locale, $id, $post;
+    $the_weekday = $wp_locale->get_weekday(mysql2date('w', $post->post_date));
     $the_weekday = apply_filters('the_weekday', $the_weekday);
     echo $the_weekday;
@@ -684 +681 @@
 
 function the_weekday_date($before='',$after='') {
-    global $weekday, $id, $post, $day, $previousweekday;
+    global $wp_locale, $id, $post, $day, $previousweekday;
     $the_weekday_date = '';
     if ( $day != $previousweekday ) {
         $the_weekday_date .= $before;
-        $the_weekday_date .= $weekday[mysql2date('w', $post->post_date)];
+        $the_weekday_date .= $wp_locale->get_weekday(mysql2date('w', $post->post_date));
         $the_weekday_date .= $after;
         $previousweekday = $day;