[phpwiki-checkins] CVS: phpwiki/lib WikiPlugin.php,1.7,1.8

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv11558

Modified Files:
	WikiPlugin.php 
Log Message:
Updated strings to provide localized error messages. Added FIXME note: $op == '||=' doesn't work yet for multiple plugin args.

Index: WikiPlugin.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiPlugin.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** WikiPlugin.php	2002/01/07 01:12:34	1.7
--- WikiPlugin.php	2002/01/07 04:19:05	1.8
***************
*** 62,66 ****
  
          foreach (array_merge($argstr_args, $argstr_defaults) as $arg => $val) {
!             trigger_error("$arg: argument not declared by plugin",
                            E_USER_NOTICE);
          }
--- 62,66 ----
  
          foreach (array_merge($argstr_args, $argstr_defaults) as $arg => $val) {
!             trigger_error(sprintf(_("argument '%s' not declared by plugin"),$arg),
                            E_USER_NOTICE);
          }
***************
*** 98,101 ****
--- 98,104 ----
              }
              else {
+                 // FIXME: doesn't work for multiple args
+                 // e.g. <plugin RecentChanges days||=1 show_all||=0 show_minor||=0>
+                 //      url: RecentChanges?days=1+show_all=1+show_minor=0
                  assert($op == '||=');
                  $defaults[$arg] = $val;
***************
*** 104,108 ****
          
          if ($argstr) {
!             trigger_error("trailing cruft in plugin args: '$argstr'", E_USER_WARNING);
          }
  
--- 107,111 ----
          
          if ($argstr) {
!             trigger_error(sprintf(_("trailing cruft in plugin args: '%s'"),$argstr), E_USER_WARNING);
          }
  
***************
*** 228,232 ****
      function expandPI($pi, $dbi, $request) {
          if (!preg_match('/^\s*<\?(plugin(?:-form|-link)?)\s+(\w+)\s*(.*?)\s*\?>\s*$/s', $pi, $m))
!             return $this->_error("Bad PI");
  
          list(, $pi_name, $plugin_name, $plugin_args) = $m;
--- 231,235 ----
      function expandPI($pi, $dbi, $request) {
          if (!preg_match('/^\s*<\?(plugin(?:-form|-link)?)\s+(\w+)\s*(.*?)\s*\?>\s*$/s', $pi, $m))
!             return $this->_error(sprintf(_("Bad %s"),'PI'));
  
          list(, $pi_name, $plugin_name, $plugin_args) = $m;
***************
*** 267,272 ****
          if (!class_exists($plugin_class)) {
              if ($include_failed)
!                 return $this->_error("Include of '$plugin_source' failed");
!             return $this->_error("$plugin_class: no such class");
          }
          
--- 270,275 ----
          if (!class_exists($plugin_class)) {
              if ($include_failed)
!                 return $this->_error(sprintf(_("Include of '%s' failed"),$plugin_source));
!             return $this->_error(sprintf(_("%s: no such class"),$plugin_class));
          }
          
***************
*** 274,278 ****
          $plugin = new $plugin_class;
          if (!is_subclass_of($plugin, "WikiPlugin"))
!             return $this->_error("$plugin_class: not a subclass of WikiPlugin");
  
          return $plugin;
--- 277,281 ----
          $plugin = new $plugin_class;
          if (!is_subclass_of($plugin, "WikiPlugin"))
!             return $this->_error(sprintf(_("%s: not a subclass of WikiPlugin"),$plugin_class));
  
          return $plugin;