Changeset 1817

Timestamp:

10/19/2004 12:18:12 AM (20 years ago)

Author:

rboren

Message:

Default textdomain loading cleanup. Fix for bug 230.

Location:

trunk/wp-includes

Files:

• gettext.php (modified) (1 diff)
• wp-l10n.php (modified) (5 diffs)

trunk/wp-includes/gettext.php

@@ -116 +116 @@
     $length = $meta[0];
     $offset = $meta[1];
+        if (! $length) {
+            return '';
+        }
     $this->STREAM->seekto($offset);
     $data = $this->STREAM->read($length);

trunk/wp-includes/wp-l10n.php

@@ -3 +3 @@
  
 require_once($parentpath.'/wp-config.php');
-
-$curpath = dirname(__FILE__).'/';
 
 $locale = '';
@@ -17 +15 @@
 }
 
-$mofile = $curpath . "languages/$locale.mo";
-
-require($curpath . 'streams.php');
-require($curpath . 'gettext.php');
-
-// If the mo file does not exist or is not readable, or if the locale is
-// en_US, do not load the mo.
-if ( is_readable($mofile) && ($locale != 'en_US') ) {
-    $input = new FileReader($mofile);
-} else {
-    $input = false;
-}
-
-$l10n['default'] = new gettext_reader($input);
+require_once(ABSPATH . 'wp-includes/streams.php');
+require_once(ABSPATH . 'wp-includes/gettext.php');
 
 // Return a translated string.    
@@ -68 +54 @@
     global $l10n;
 
+    if (isset($l10n[$domain])) {
+        return;
+    }
+
     if ( is_readable($mofile)) {
     $input = new FileReader($mofile);
@@ -75 +65 @@
 
     $l10n[$domain] = new gettext_reader($input);
+}
+
+function load_default_textdomain() {
+    global $l10n, $locale;
+
+    $mofile = ABSPATH . "wp-includes/languages/$locale.mo";
+    
+    load_textdomain('default', $mofile);
 }
 
@@ -91 +89 @@
 }
 
+// Load the default domain.
+load_default_textdomain();
+
 require($curpath . 'locale.php');
 ?>