Changeset 2394

Timestamp:

02/28/05 16:31:01 (3 years ago)

Author:

ryan

Message:

Bump php-gettext to version 1.0.3. http://mosquito.wordpress.org/view.php?id=1001 Mad props to Nico Kaiser.

Files:

• trunk/wp-includes/gettext.php (modified) (7 diffs)
• trunk/wp-includes/streams.php (modified) (3 diffs)
• trunk/wp-includes/wp-l10n.php (modified) (1 diff)

trunk/wp-includes/gettext.php

@@ -2 +2 @@
-/*
-   Copyright (c) 2003 Danilo Segan <danilo@kvota.net>.
-
+
+
-   This file is part of PHP-gettext.
-
@@ -21 +22 @@
-*/
- 
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-class gettext_reader {
-
-
-
-
+
+
+
+
+
-  var $STREAM = NULL;
-  var $short_circuit = false;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  function readint() {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    // If there isn't a StreamReader, turn on short circuit mode.
-    if (! $Reader) {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-    $this->STREAM = $Reader;
@@ -70 +118 @@
-      return false;
-    }
-
+
-    // FIXME: Do we care about revision? We should.
-    $revision = $this->readint();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    $this->STREAM->seekto($offset);
-    $data = $this->STREAM->read($length);
-    return (string)$data;
-  }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    $this->STREAM->seekto($offset);
-    $data = $this->STREAM->read($length);
@@ -136 +193 @@
-  }
-  
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      if ($string == $txt)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  function translate($string) {
-
+
+
+
+
+
+
+
+
+
-        return $string;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  function get_plural_forms() {
-
+  
-    // this is true, right?
-
+
+
-    // cache header field for plural forms
-is_string($this->pluralheader)) 
-return $this->pluralheader;
-else {
-$header = $this->get_translation_number(0);
-
-if (eregi("plural-forms: (.*)\n",$header,$regs)) {
-
-} else {
-
-}
+! is_string($this->pluralheader)) {
+if ($this->enable_cache) {
+    $header = $this->cache_translations[""];
+} else {
+
+}
+
+  $expr = $regs[1];
+
+  $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
-      $this->pluralheader = $expr;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-  function select_string($n) {
-    $string = $this->get_plural_forms();
@@ -198 +301 @@
-    $string = str_replace("n",$n,$string);
-    $string = str_replace('plural',"\$plural",$string);
-
+
-    $total = 0;
-    $plural = 0;
-
-    eval("$string");
->=
+ >= 
-    return $plural;
-  }
-
+  /**
+   * Plural version of gettext
+   * 
+   * @access public
+   * @param string single
+   * @param string plural
+   * @param string number
+   * @return translated plural form
+   */
-  function ngettext($single, $plural, $number) {
-    if ($this->short_circuit) {
-
-
+
+
+
+
-    }
-
@@ -216 +330 @@
-    $select = $this->select_string($number); 
-    
-
-    // this should contains all strings separated by NULLs
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    } else {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-  }
@@ -234 +356 @@
-}
-
-
-?>

trunk/wp-includes/streams.php

@@ -1 +1 @@
-<?php
-/*
-
+, 2005
-
-   This file is part of PHP-gettext.
@@ -104 +104 @@
-
-  function read($bytes) {
-
-
-
-
-
+
+
+
+
+
+
+
-  }
-
@@ -131 +133 @@
-}
-
+// Preloads entire file in memory first, then creates a StringReader 
+// over it (it assumes knowledge of StringReader internals)
+class CachedFileReader extends StringReader {
+  function CachedFileReader($filename) {
+    if (file_exists($filename)) {
+
+      $length=filesize($filename);
+      $fd = fopen($filename,'rb');
+
+      if (!$fd) {
+    $this->error = 3; // Cannot read file, probably permissions
+    return false;
+      }
+      $this->_str = fread($fd, $length);
+      fclose($fd);
+
+    } else {
+      $this->error = 2; // File doesn't exist
+      return false;
+    }
+  }
+}
+
+
-?>

trunk/wp-includes/wp-l10n.php

@@ -67 +67 @@
-
-    if ( is_readable($mofile)) {
-
+Cached
-    }   else {
-        return;