Mambo > Projects > Mambo CMS > SVN

Diff of /mambo/branches/4.6/includes/phpgettext/phpgettext.class.php

-revision 265, Sun Feb 12 23:49:14 2006 UTC
+revision 266, Sun Feb 12 23:49:56 2006 UTC
 Line 16
      /**
       * The current locale. eg: en-GB
       */
+     var $lang;
+     /**
+      * The current locale. eg: en-GB
+      */
      var $locale;
      /**
-Line 34
+Line 38
      var $text_domains = array();
      /**
+      * The asssociative array of headers for the current domain
+      */
+     var $headers = array();
+     /**
       * The asssociative array of messages for the current domain
       */
      var $messages = array();
-Line 59
+Line 67
       * @return unknown
       */
-     function setlocale($lang) {
+     function setlocale($lang, $locale) {
          #dump(setlocale(LC_ALL, 0));
-         $this->locale =  $lang;
          putenv("LANGUAGE=$lang");
          putenv("LC_ALL=$lang");
          putenv("LC_MESSAGE=$lang");
-Line 70
+Line 77
          $_ENV['LC_ALL'] = $lang;
          $_ENV['LC_MESSAGE'] = $lang;
          $_ENV['LANG'] = $lang;*/
-         setlocale(LC_ALL, '');
+         $this->lang =  $lang;
-         return  $this->locale;
+         $this->locale =  setlocale(LC_ALL, $locale);
+         setlocale(LC_ALL, $locale);
      }
      function getlocale() {
-Line 103
+Line 111
              $str = sprintf($html, ($untranslated ? 'red' : 'green'), str_replace('\\', '/', $trace[2]['file']), $trace[2]['line'], $message);
              break;
              case 1:
-             $str    = sprintf('T_(%s)%s',$message, $untranslated ? ';' : '');
+             $str    = sprintf('%sT_(%s)',$untranslated ? '!' : '', $message);
              break;
              case 0:
              default:
-Line 149
+Line 157
      function dgettext($domain, $message){
          $translation = $message;
          if (array_key_exists($domain, $this->messages)){
+             if (isset($this->messages[$domain][$message]))
              $translation = $this->messages[$domain][$message];
          }
          $untranslated = (strcmp($translation, $message) === 0) ? true : false;
-Line 156
+Line 165
      }
      /**
-      * Plural version of gettext      *
+      * Plural version of gettext
-      * not yet implemented
       */
-     function ngettext($msg1, $msg2, $count){
+     function ngettext($msgid, $msgid_plural, $count){
-         $translation = $msg1;
          if ($this->has_gettext){
-             $translation = ngettext($msg1, $msg2, $count);
+             $translation = ngettext($msgid, $msgid_plural, $count);
          }
-         if (isset( $this->messages[$this->domain][$msg1])) {
+         $plural = $this->getplural($count, $this->domain);
-             $translation = $this->messages[$this->domain][$msg1];
+         if (isset($this->messages[$this->domain][$msgid][$plural])) {
-             return $translation;
+             $translation  = $this->messages[$this->domain][$msgid][$plural];
+         } else {
+             $original   = array($msgid, $msgid_plural);
+             $translation  = $original[$plural];
          }
-         $untranslated = (strcmp($translation, $msg1) === 0) ? true : false;
+         $untranslated = (strcmp($translation, $original[$plural]) === 0) ? true : false;
          return $this->output($translation, $untranslated);
      }
      /**
-      * Plural version of dgettext .
+      * Plural version of dgettext
-      * not yet implemented
       */
-     function dngettext($domain, $msg1, $msg2, $count){
+     function dngettext($domain, $msgid, $msgid_plural, $count){
-         return $msg1;
+         $original   = array($msgid, $msgid_plural);
+         $plural = $this->getplural($count, $domain);
+         if ($this->has_gettext){
+             $translation = dngettext($domain, $msgid, $msgid_plural, $count);
+         } else {
+             if (isset($this->messages[$domain][$msgid][$plural])) {
+                 $translation  = $this->messages[$domain][$msgid][$plural];
+             } else {
+                 $translation  = $original[$plural];
+             }
+         }
+         $untranslated = (strcmp($translation, $original[$plural]) === 0) ? true : false;
+         return $this->output($translation, $untranslated);
      }
      /**
-Line 210
+Line 231
       */
      function textdomain($domain = null){
          if ($this->has_gettext){
-             textdomain($domain);
+             $domain = textdomain($domain);
          }
-         if (is_null($domain))
+         elseif (!is_null($domain)) {
-         return $this->domain;
+             $this->domain = $domain;
-         else
+             $this->load($domain, $this->text_domains[$this->domain]['path']);
-         return $this->domain = $domain;
      }
+         return $this->domain;
-     function load($domain, $path) {
-         require_once('phpgettext.catalog.php');
-         $catalog = new PHPGettext_catalog($domain, $path);
-         $catalog->setproperty('mode', _MODE_MO_);
-         $catalog->setproperty('lang', $this->getlocale());
-         $catalog->load();
-         foreach ($catalog->strings as $string)
-         $this->messages[$domain][$string->msgid] = $string->msgstr;
      }
      /**
-      * Overrides the domain for a single lookup string
+      * Overrides the domain for a single lookup
       * This function allows you to override the current domain for a single message lookup.
       * It also allows you to specify a category.
       * Categories are folders within the languages directory  .
-Line 251
+Line 263
      }
      /**
-      * Plural version of dcgettext
+      * dcngettext -- Plural version of dcgettext
       * not yet implemented
       */
      function dcngettext($domain, $msg1, $msg2, $count, $category){
-Line 259
+Line 271
      }
+     /**
+      * Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;
+      *
+      * nplurals - total number of plurals
+      * plural   - the plural index
+      *
+      * Plural-Forms: nplurals=1; plural=0;
+      * 1 form only
+      *
+      * Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;
+      * Plural-Forms: nplurals=2; plural=n != 1;
+      * 2 forms, singular used for one only
+      *
+      * Plural-Forms: nplurals=2; plural=n>1;
+      * 2 forms, singular used for zero and one
+      *
+      * Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;
+      * 3 forms, special case for zero
+      *
+      * Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;
+      * 3 forms, special cases for one and two
+      *
+      * Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3;
+      * 4 forms, special case for one and all numbers ending in 02, 03, or 04
+      */
+     function getplural($count, $domain) {
+         if (isset($this->headers[$domain]['Plural-Forms'])) {
+             $plural_forms = $this->headers[$domain]['Plural-Forms'];
+             preg_match('/nplurals[\s]*[=]{1}[\s]*([\d]+);[\s]*plural[\s]*[=]{1}[\s]*(.*);$/', $plural_forms, $matches);
+             $nplurals   = $matches[1];
+             $plural_exp = $matches[2];
+             if ($nplurals > 1 && strpos($plural_exp, ':') === false) {
+                 $plural =  'return ('.preg_replace('/n/', $count, $plural_exp).') ? 1 : 0;';
+             } else {
+                 $plural = 'return '.preg_replace('/n/', $count, $plural_exp);
+             }
+         } else {
+             $plural = 'return '.preg_replace('/n/', $count, 'n != 1 ? 1 : 0;');
+         }
+         return eval($plural);
+     }
+     function load($domain, $path) {
+         require_once('phpgettext.catalog.php');
+         $catalog = new PHPGettext_catalog($domain, $path);
+         $catalog->setproperty('mode', _MODE_MO_);
+         $catalog->setproperty('lang', $this->lang);
+         $catalog->load();
+         $this->headers[$domain] = $catalog->headers;
+         foreach ($catalog->strings as $string)
+         $this->messages[$domain][$string->msgid] = $string->msgstr;
+     }
  }
  class PHPGettextAdmin
-Line 284
+Line 348
       * @param unknown_type $domain
       * @param unknown_type $langdir
       */
-     function msgmerge ($outdated, $recent, $langdir) {
+     function msgmerge ($args) {
-         #msgmerge $langdir/$old.po $new.po
          $cmd = "msgmerge";
-         $arg = "$langdir/$outdated $recent";
+         return $this->execute($cmd.$args);
-         //$exec = 'msgmerge --help';
-         return $this->execute($cmd, $arg);
      }
      /**
-Line 300
+Line 361
       * @return unknown
       */
      function xgettext($args) {
-         $cmd  = substr(strtoupper(PHP_OS), 0, 3) == 'WIN' ? "xgettext.exe " : "xgettext ";
+         $cmd  = "xgettext ";
          return $this->execute($cmd.$args);
      }
-Line 316
+Line 377
          $return = false;
          if (substr(strtoupper(PHP_OS), 0, 3) == 'WIN'){
              $outputfile = session_save_path() . DIRECTORY_SEPARATOR . md5(uniqid(rand(), true)) . ".txt";
-             $shell = new COM("WScript.Shell");
+             $fp = fopen("execute.bat", 'w+');
-             $shell->Run("cmd /C $cmd > $outputfile", 0, true);
+             fwrite($fp, "@echo on\r\n $cmd");
-             $return = file_get_contents($outputfile);
+             fclose($fp);
-             unlink($outputfile);
+             exec("execute.bat", $output, $return);
+             unlink("execute.bat");
          } else {
              $cmd = "$cmd";
              $lastline = exec($cmd, $output, $return);
-Line 328
+Line 390
      }
  }
  /**
   * Enter description here...
   *
-Line 349
+Line 408
      }
      return $gettext;
  }
  function T_($message) {
      $gettext =& phpgettext();
      $trans = $gettext->gettext($message);
      return $trans;
  }
  function Tn_($msg1, $msg2, $count) {
      $gettext =& phpgettext();
      return $gettext->ngettext($msg1, $msg2, $count);
-Line 368
+Line 425
      $gettext =& phpgettext();
      return $gettext->dngettext($domain, $msg1, $msg2, $count);
  }
  ?>

 Legend:



Removed from v.265
 


changed lines


 
Added in v.266
 Legend:



Removed from v.265
 


changed lines


 
Added in v.266
-Removed from v.265
+Added in v.266

	ViewVC Help
Powered by ViewVC 1.0.0

Web Hosting provided by Network Redux.

MyGforge Home

Mambo CMS

Diff of /mambo/branches/4.6/includes/phpgettext/phpgettext.class.php