Changeset 328

Timestamp:

04/03/08 23:22:49 (2 years ago)

Author:

rcrowley

Message:

Updates to the string import script to properly fix everything from Smarty in the DTDs

Files:

• trunk/uploadr/strings_import.php (modified) (3 diffs)

trunk/uploadr/strings_import.php

@@ -26 +26 @@
-                }
-
-and save
+PHP garbage out
-                $text = file_get_contents("$argv[1]/$l/$file");
-                if (false === $text) {
@@ -33 +33 @@
-                }
-                $text = trim(str_replace("\n\n", "\n", preg_replace('/^<\?php.*\?>$/ms', '', $text)));
+
+                # Process each string
+                $lines = explode("\n", $text);
+                $ii = sizeof($lines);
+                $replace = array();
+                for ($i = 0; $i < $ii; ++$i) {
+
+                        # Escape & and " properly
+                        if (preg_match('/^(<!ENTITY [a-zA-Z0-9.]+ ")(.+)(">)$/', $lines[$i], $s)) {
+                                $lines[$i] = $s[1] . str_replace('"', '&#34;',
+                                        preg_replace('/&(?!#\d\d;)/', '&#38;', $s[2])) . $s[3];
+                        }
+
+                        # Split up combined complicated strings
+                        if (preg_match('/^<!ENTITY ([a-zA-Z0-9.]+) "(.+)">$/', $lines[$i], $s)
+                                && preg_match('/^(.+)\.joined$/', $s[1], $k)) {
+                                $parts = explode('  ', $s[2]);
+                                if (2 == sizeof($parts)) {
+                                        $replace["{$k[1]}.1"] = "{$parts[0]} ";
+                                        $replace["{$k[1]}.2"] = " {$parts[1]}";
+                                        $lines[$i] = '';
+                                }
+                        }
+
+                }
+
+                # Replace split up versions with their translations
+                for ($i = 0; $i < $ii; ++$i) {
+                        if (preg_match('/^<!ENTITY ([a-zA-Z0-9.]+) ".+">$/', $lines[$i], $s)
+                                && isset($replace[$s[1]])) {
+                                $lines[$i] = "<!ENTITY {$s[1]} \"{$replace[$s[1]]}\">";
+                        }
+                }
+
+                # Write and save
-                $file = next($match);
-                $file_p = fopen("$locale/$l/$file", 'w');
@@ -39 +74 @@
-                        continue;
-                }
-$text
+array_diff($lines, array(''))
-                        echo "[error] Writing $file\n";
-                }