Mambo > Projects > Mambo CMS > SVN

Diff of /mambo/branches/4.6/administrator/components/com_languages/actions/save.action.php

-revision 915, Sat Jan 27 05:28:56 2007 UTC
+revision 1756, Thu May 28 06:41:09 2009 UTC
 Line 1
  <?php
+ /**
+ * @package Mambo
+ * @subpackage Languages
+ * @author Mambo Foundation Inc see README.php
+ * @copyright (C) 2000 - 2009 Mambo Foundation Inc.
+ * See COPYRIGHT.php for copyright notices and details.
+ * @license GNU/GPL Version 2, see LICENSE.php
+ *
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * Mambo is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2 of the License.
+ */
  defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
  class saveAction extends Action
  {
-Line 11
+Line 26
          $lang .= strlen($iso3166) == 2 ? '_'.$iso3166 : '';
          $root = mamboCore::get('rootPath');
          $langfile = $root.'/language/'.$lang.'.xml';
+         $act = mosGetParam($_POST,'act');
-         switch ($_POST['act'])
+         switch ($act)
          {
              case 'language':
              if (file_exists($langfile)) {
-Line 38
+Line 54
          $default = $locales['locales'][$iso639];
          $lang  = $iso639;
          $lang .= strlen($iso3166) == 2 ? '_'.$iso3166 : '';
+         $pluralform = mosGetParam($_POST,'plural_form');
          $language =& new mamboLanguage($lang);
          foreach ($default as $k => $v) {
              if (in_array($k, array_keys(get_class_vars(get_class($language))))) {
-Line 58
+Line 76
          $language->author = 'Mambo Foundation Inc.';
          $language->authorurl = 'http://www.mambo-foundation.org';
          $language->authoremail = 'translation@mambo-foundation.org';
-         $language->copyright = '(C) 2005 - 2006 Mambo Foundation Inc.';
+         $language->copyright = 'Refer to copyright.php';
-         $language->license = 'http://www.gnu.org/copyleft/gpl.html GNU/GPL';
+         $language->license = 'http://www.opensource.org/licenses/gpl-2.0.php GNU/GPL';
-         $language->setPlurals($_POST['plural_form']);
+         $language->setPlurals($pluralform );
          $textdomain = rtrim($language->path, '\/');
          $dir = $textdomain.'/'.$language->name;
-Line 89
+Line 107
      function updatelanguage($lang)
      {
+         $pluralform = mosGetParam($_POST,'plural_form');
          $language =& new mamboLanguage($lang);
          $language->load();
-Line 97
+Line 116
                  $language->$k = $v;
              }
          }
-         $language->setPlurals($_POST['plural_form']);
+         $language->setPlurals($pluralform);
          $language->save();
      }
      function updatecatalog($compile = true, $add_to_dict = true)
      {
-         $domain     = $_POST['domain'];
+         $domain     = mosGetParam($_POST,'domain');
-         $textdomain = $_POST['textdomain'];
+         $textdomain = mosGetParam($_POST,'textdomain');
-         $lang       = $_POST['lang'];
+         $lang       = mosGetParam($_POST,'lang');
+         $comments   = mosGetParam($_POST,'comments');
+         $headers    = mosGetParam($_POST,'headers');
          $catalog = new PHPGettext_catalog($domain, $textdomain);
          $catalog->setproperty('mode', 'po');
          $catalog->setproperty('lang', $lang);
          $catalog->load();
-         $catalog->setComments($_POST['comments']);
+         $catalog->setComments($comments);
-         $catalog->setHeaders($_POST['headers']);
+         $catalog->setHeaders($headers);
+         $plural_forms = $catalog->headers['Plural-Forms'];
+         preg_match('/nplurals[\s]*[=]{1}[\s]*([\d]+);[\s]*plural[\s]*[=]{1}[\s]*(.*);/', $plural_forms, $matches);
+         $is_plural = $matches[1] > 1;
          foreach ($_POST as $key => $value) {
              if (preg_match('/^([a-z]+[_]?[a-z]+?)[_]?([0-9]+)?_([0-9]+)$/', $key, $matches))  {
                  switch ($matches[1])
-Line 123
+Line 146
                      case 'msgid':
                                                  if (get_magic_quotes_gpc() == 1){
                                                          $value = stripslashes($value);
-                                                         $value = htmlentities($value);
+                             //$value = htmlentities($value);
                                                  }
                      $messages[$matches[3]]['msgid'] = $value;
                      break;
                      case 'msgid_plural':
+                         if ($is_plural){
                      $messages[$matches[3]]['msgid_plural'] = $value;
+                         }
                      break;
                      case 'msgstr':
                      if (!empty($messages[$matches[3]]['msgid_plural'])) {
-Line 152
+Line 177
          foreach ($messages as $index => $arr) {
              if (strcmp($catalog->strings[$index]->msgid, $arr['msgid']) == 0) {
                  $catalog->strings[$index]->setmsgstr($arr['msgstr']);
-                 if ($arr['fuzzy']) {
+                 $catalog->strings[$index]->msgid_plural = isset($arr['msgid_plural'])?$arr['msgid_plural']:null;;
                      $catalog->strings[$index]->setfuzzy($arr['fuzzy']);
                  }
              }
-         }
          $catalog->save();
          $language = new mamboLanguage($lang);
          $language->save();
-         $gettext_admin = new PHPGettextAdmin();
+         $configuration =& mamboCore::getMamboCore();
-         $gettext_admin->add_to_dict($domain, $textdomain, $lang, $language->charset);
+         $gettext_admin = new PHPGettextAdmin($configuration->get('mosConfig_locale_use_gettext'));
+         $gettext_admin->add_to_dict($domain, $textdomain, $lang, $language->charset, $language->plural_form['expression']);
          $catalog->load();
          if ($compile) {

 Legend:



Removed from v.915
 


changed lines


 
Added in v.1756
 Legend:



Removed from v.915
 


changed lines


 
Added in v.1756
-Removed from v.915
+Added in v.1756

	ViewVC Help
Powered by ViewVC 1.0.0

Web Hosting provided by Network Redux.

MyGforge Home

Mambo CMS

Diff of /mambo/branches/4.6/administrator/components/com_languages/actions/save.action.php