From 57a6eb4b9e33c2d2e89f1f237111f2775f3f8309 Mon Sep 17 00:00:00 2001
From: Thomas Cort <tux-translate@tux.name>
Date: Mon, 12 Nov 2007 13:19:14 -0500
Subject: [PATCH] Remove more escaped characters to improve searches.

---
 tools/tt-loader.php | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/tools/tt-loader.php b/tools/tt-loader.php
index cef2b14..75bf8d3 100644
--- a/tools/tt-loader.php
+++ b/tools/tt-loader.php
@@ -100,6 +100,12 @@ function tt_insert_db($msgA, $langA, $msgB, $langB) {
 		$sql = "INSERT INTO " . mysql_real_escape_string($langA) . " (message) VALUES ('" . mysql_real_escape_string($msgA) . "');";
 		mysql_query($sql);
 
+		// get idA
+		$idA = db_get_message_id($msgA, $langA);
+		if ($idA == -1) {
+			return;
+		}
+
 		// insert pkg_langA
 		$sql = "INSERT INTO pkg_" . mysql_real_escape_string($langA) . " VALUES ('" . mysql_real_escape_string($pkgid) . "','" . mysql_real_escape_string($idA) . "');";
 		mysql_query($sql);
@@ -117,6 +123,12 @@ function tt_insert_db($msgA, $langA, $msgB, $langB) {
 		$sql = "INSERT INTO " . mysql_real_escape_string($langB) . " (message) VALUES ('" . mysql_real_escape_string($msgB) . "');";
 		mysql_query($sql);
 
+		// get idB
+		$idB = db_get_message_id($msgB, $langB);
+		if ($idB == -1) {
+			return;
+		}
+
 		// insert pkg_langB 
 		$sql = "INSERT INTO pkg_" . mysql_real_escape_string($langB) . " VALUES ('" . mysql_real_escape_string($pkgid) . "','" . mysql_real_escape_string($idB) . "');";
 		mysql_query($sql);
@@ -124,7 +136,7 @@ function tt_insert_db($msgA, $langA, $msgB, $langB) {
 
 	// get idB
 	$idB = db_get_message_id($msgB, $langB);
-	if ($idA == -1) {
+	if ($idB == -1) {
 		return;
 	}
 
@@ -208,6 +220,21 @@ function tt_parse_po($filename) {
 		$msgid = substr($lines[$i], strlen("msgid \""));
 		$msgid = substr($msgid, 0, -1);
 
+		// Remove double quotes from translation strings.
+		$msgid = preg_replace("/\\\\\" /", "", $msgid);
+		$msgid = preg_replace("/ \\\\\"/", "", $msgid);
+		$msgid = preg_replace("/\\\\\"/", "", $msgid);
+
+		// Remove quote from translation strings.
+		$msgid = preg_replace("/\\\' /", "", $msgid);
+		$msgid = preg_replace("/ \\\'/", "", $msgid);
+		$msgid = preg_replace("/\\\'/", "", $msgid);
+
+		// Remove slash from translation strings.
+		$msgid = preg_replace("/\\\\ /", "", $msgid);
+		$msgid = preg_replace("/ \\\\/", "", $msgid);
+		$msgid = preg_replace("/\\\\/", "", $msgid);
+
 		while (!preg_match("/^msgstr /", $lines[$i]) && $i < count($lines)) {
 			$i++;
 		}
@@ -217,6 +244,21 @@ function tt_parse_po($filename) {
 		$msgstr = substr($lines[$i], strlen("msgstr \""));
 		$msgstr = substr($msgstr, 0, -1);
 
+		// Remove double quotes from translation strings.
+		$msgstr = preg_replace("/\\\\\" /", "", $msgstr);
+		$msgstr = preg_replace("/ \\\\\"/", "", $msgstr);
+		$msgstr = preg_replace("/\\\\\"/", "", $msgstr);
+
+		// Remove quote from translation strings.
+		$msgstr = preg_replace("/\\\' /", "", $msgstr);
+		$msgstr = preg_replace("/ \\\'/", "", $msgstr);
+		$msgstr = preg_replace("/\\\'/", "", $msgstr);
+
+		// Remove slash from translation strings.
+		$msgstr = preg_replace("/\\\\ /", "", $msgstr);
+		$msgstr = preg_replace("/ \\\\/", "", $msgstr);
+		$msgstr = preg_replace("/\\\\/", "", $msgstr);
+
 		if (strlen($msgid) != 0 && strlen($msgstr) != 0) {
 			$t = new tt_translation();
 			$t->msgid = trim($msgid);
-- 
2.11.4.GIT