Changeset 4374

Timestamp:

06/25/07 16:23:37 (6 years ago)

Author:

fabien

Message:

backported changes from trunk

Files:

• plugins/sfI18nExtractPlugin/data/tasks/sfPakeI18N.php (modified) (2 diffs)
• plugins/sfI18nExtractPlugin/lib/sfI18nYamlValidateExtractor.class.php (modified) (1 diff)
• plugins/sfI18nExtractPlugin/package.xml (modified) (1 diff)

plugins/sfI18nExtractPlugin/data/tasks/sfPakeI18N.php

@@ -75 +75 @@
-  pake_echo_action('i18n', sprintf('found "%d" old i18n strings', count($extract->getOldMessages())));
-
+  if (isset($options['display-new']))
+  {
+    pake_echo_action('i18n', sprintf('display new i18n strings', count($extract->getOldMessages())));
+    foreach ($extract->getNewMessages() as $message)
+    {
+      echo '               '.$message."\n";
+    }
+  }
+
-  if (isset($options['auto-save']))
-  {
@@ -80 +89 @@
-
-    $extract->saveNewMessages();
+  }
+
+  if (isset($options['display-old']))
+  {
+    pake_echo_action('i18n', sprintf('display old i18n strings', count($extract->getOldMessages())));
+    foreach ($extract->getOldMessages() as $message)
+    {
+      echo '               '.$message."\n";
+    }
-  }
-

plugins/sfI18nExtractPlugin/lib/sfI18nYamlValidateExtractor.class.php

@@ -64 +64 @@
-          continue;
-        }
+
-        foreach ($config['validators'][$name]['param'] as $key => $value)
+        {
+          if (preg_match('/(msg|error)$/', $key))
+          {
+            $strings[] = $value;
+          }
+        }
+      }
+    }
+
+    // Old validate.yml format
+
+    // required messages
+    if (isset($config['names']))
+    {
+      foreach ($config['names'] as $key => $value)
+      {
+        if (isset($value['required_msg']))
+        {
+          $strings[] = $value['required_msg'];
+        }
+      }
+    }
+
+    // validators
+    foreach ($config as $key => $value)
+    {
+      if (isset($value['param']) && isset($value['class']))
+      {
+        foreach ($value['param'] as $key => $value)
-        {
-          if (preg_match('/(msg|error)$/', $key))

plugins/sfI18nExtractPlugin/package.xml

@@ -13 +13 @@
- <date>2007-06-25</date>
- <version>
-2
+3
-   <api>1.0.0</api>
- </version>