Changeset 745

Timestamp:

Jan 10, 2014, 6:02:59 PM (11 years ago)

Author:

maron

Message:

• Added: Translator

Location:

trunk

Files:

• Modules/Translation/Form.php (modified) (3 diffs)
• includes/Version.php (modified) (1 diff)
• includes/global.php (modified) (3 diffs)

trunk/Modules/Translation/Form.php

@@ -49 +49 @@
           foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
             $Columns .= ' `Orig`.`'.$TextItem['Column'].'` as `Orig_'.$TextItem['Column'].'`, `Tran`.`'.$TextItem['Column'].'` as `'.$TextItem['Column'].'`,';
-
-
-            //search for same text with other entry
-                                          foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
-                                                  if($TextItem['Visible'] == 1)
-                                                  if (($LineAJ[$TextItem['Column']] <> '') and 
-                    ($LineAJ[$TextItem['Column']] == $Line[$TextItem['Column']]) and
-                    (strlen($LineAJ[$TextItem['Column']]) < 20)
-                   )
-                 {       
-                                $sql = 'SELECT '.$Columns.' Tran.`Entry` FROM `'.$Table.'` as Tran';
-                    $join = ' JOIN `'.$Table.'` as `Orig` ON `Orig`.`Language` = 0 AND `Tran`.`Entry` = `Orig`.`Entry` AND `Tran`.`VersionEnd` = `Orig`.`VersionEnd` ';
-                    $where = ' WHERE '.'( `Tran`.'.$Language.' ) AND '.' `Orig`.`'.$TextItem['Column'].'` = "'.$LineAJ[$TextItem['Column']].'" ORDER BY `Tran`.`ModifyTime` DESC LIMIT 1';
-                    $DbResult = $this->Database->query($sql.$join.$where);
-                    while ($LineSearch = $DbResult->fetch_assoc()) {
-                      $Line[$TextItem['Column']] = $LineSearch[$TextItem['Column']];
-                    }
-                 }      
+  
           
                                 $sql = 'SELECT '.$Columns.' Tran.`Entry` FROM `'.$Table.'` as Tran';
@@ -85 +68 @@
                  }      
           }
-          
                     
         } else {
@@ -248 +230 @@
                                                 }
                                                 $Output .= '</table></div>';
-                                                if($this->System->User->Licence(LICENCE_USER)) $Output .= '</form>';
+                                                if($this->System->User->Licence(LICENCE_USER)) {
+              $Output .= '</form>';
+              
+              $Output .= '<table class="BaseTable">'.
+                                            '<tr><th>Translátor:</th><th>Nepřeložené</th><th>Přeložené</th>';
+                                          foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+                                                  if($TextItem['Visible'] == 1)
+                                                  if ($LineAJ[$TextItem['Column']] <> '')
+                    $Output .= '<tr><td>'.$TextItem['Column'].'</td><td>'.$LineAJ[$TextItem['Column']].'</td><td>'.GetTranslateGoogle($LineAJ[$TextItem['Column']]).'</td></tr>';
+             
+             
+              $Output .= '</table>';
+            }
                                 }
                         }

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 744; // Subversion revision
+$Revision = 745; // Subversion revision
 $DatabaseRevision = 732; // Database structure revision 
 $ReleaseTime = '2014-01-08';

trunk/includes/global.php

@@ -140 +140 @@
   $month = $month - $year * 12; 
   return($year.'r '.$month.'m '.$Days.'d');
+}
+
+
+function GetTranslateGoogle($text) {
+
+//  $text = 'Balthule\'s letter is dire. This Cult of the Dark Strand is a thorn in my side that must be removed. I have been dealing with some of the Dark Strand scum northeast of here at Ordil\'Aran. One of their number possesses a soul gem that I believe holds the secret to the cult\'s power.$b$bBring it to me, and I will be able to decipher the secrets held within.';
+ // $text = htmlspecialchars($text);
+  $text = urlencode($text);
+//  $text = str_replace('&','',$text);
+//  $text = str_replace(' ','%20',$text);
+ // $text = str_replace('$B','$B%20',$text);
+  $url = 'http://translate.google.cz/?sl=en&tl=cs&text='.$text;
+
+
+  error_reporting(E_ALL ^ E_WARNING);
+  if (($handle = @fopen($url, "r")) === FALSE) return false;
+    
+  $data = stream_get_contents($handle);
+  $data = substr($data, strpos($data,'result_box'));
+  $data = substr($data, strpos($data,'>')+1);
+  $data = substr($data, 0, strpos($data,'</div>'));
+  while (strpos($data,'>') !== false and strpos($data,'<') !== false) 
+  {
+    $partbefore = substr($data, 0, strpos($data,'<'));
+    //  echo $partbefore;
+    $partafter = substr($data, strpos($data,'>')+1);
+    // echo $partafter;
+    $data = $partbefore.' '.$partafter;
+  }
+
+  $data = str_replace('$ ','$',$data);
+  $data = str_replace('| ','|',$data);
+  
+  return $data; 
 }
 
@@ -583 +617 @@
 
         //find word only if is 3 characters and more, and if starts by upper char, and search only once
-        if ((strlen($ArrStr[$i]) > 3) and ((!$FirstBig) or (ctype_upper(substr($ArrStr[$i],0,1)))) and (array_search($ArrStr[$i], $ArrStr) == $i)) {
+        if (((strlen($ArrStr[$i]) > 3) or (strlen($Text) < 10))  and ((!$FirstBig) or (ctype_upper(substr($ArrStr[$i],0,1)))) and (array_search($ArrStr[$i], $ArrStr) == $i)) {
           $where .= '(`O`.`'.$Column.'` LIKE "'.addslashes($ArrStr[$i]).'%") OR ';
           $SqlOK = true;
@@ -601 +635 @@
     if ($SqlOK) {
         $orderby = ' ORDER BY LENGTH(Orig) DESC ';
+      // echo $sqlall. $orderby;
         $DbResult = $System->Database->query($sqlall.$orderby);
     //  echo ($sql.'|'.$where.'|'.$groupby);