Changeset 819 for trunk

Timestamp:

Feb 23, 2015, 12:56:12 AM (10 years ago)

Author:

chronos

Message:

• Added: Class for UTF8 to other charset conversion.
• Fixed: Google translate text conversion to UTF8.
• Fixed: Correct $System variable reference in TranslateList.

Location:

trunk

Files:

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

trunk/Modules/Translation/Form.php

@@ -205 +205 @@
           //todo javascript
 
-          $Output .= '<script src="'.$System->Link('/style/jquery.js').'"></script>'.
+          $Output .= '<script src="'.$this->System->Link('/style/jquery.js').'"></script>'.
              '<script>';
           $Output .=    '$(document).ready(function() {';
@@ -237 +237 @@
               $Output .= '</form>';
 
-              $Output .= '<table class="BaseTable">'.
+              $Output .= '<br/><table class="BaseTable">'.
               '<tr><th>Překladač:</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 .= '<tr><td>'.$TextItem['Column'].'</td>'.
+                      '<td>'.$LineAJ[$TextItem['Column']].'</td>'.
+                      '<td>'.GetTranslateGoogle($LineAJ[$TextItem['Column']]).'</td></tr>';
 
 

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 818; // Subversion revision
+$Revision = 819; // Subversion revision
 $DatabaseRevision = 811; // Database structure revision
 $ReleaseTime = '2015-02-22';

trunk/includes/global.php

@@ -11 +11 @@
 include_once(dirname(__FILE__).'/AppModule.php');
 include_once(dirname(__FILE__).'/Locale.php');
+include_once(dirname(__FILE__).'/UTF8.php');
 require_once(dirname(__FILE__).'/../HTML/BBCodeParser2.php');
 
@@ -145 +146 @@
 }
 
-
-function GetTranslateGoogle($text,$withouttitle = false) {
+function GetTranslateGoogle($text, $withouttitle = false)
+{
   global $System;
+
 //  $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 = str_replace('$B','$B ',$text);
+  $text = str_replace('$B','$B ', $text);
   $text = urlencode($text);
  // $text = strtolower($text);
 //  $text = str_replace('&','',$text);
 //  $text = str_replace(' ','%20',$text);
-  if ($System->User->Language == 2)
-    $lang = 'sk';
-  else $lang = 'cs';
+  $DbResult = $System->Database->select('Language', 'Code', 'Id='.$System->User->Language);
+  $DbRow = $DbResult->fetch_assoc();
+  $lang = $DbRow['Code'];
   $url = 'http://translate.google.cz/?sl=en&tl='.$lang.'&text='.$text;
 
-
   error_reporting(E_ALL ^ E_WARNING);
-  if (($handle = @fopen($url, "r")) === FALSE) return false;
+  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>'));
+  $data = substr($data, strpos($data, 'result_box'));
+  $data = substr($data, strpos($data, '>') + 1);
+  $data = substr($data, 0, strpos($data, '</div>'));
 
   if ($withouttitle)
-  while ((strpos($data,'>') !== false and strpos($data,'<') !== false) and (strpos($data,'>') > strpos($data,'<')))
-  {
-    $partbefore = substr($data, 0, strpos($data,'<'));
+  while ((strpos($data, '>') !== false and (strpos($data, '<') !== false)) and (strpos($data, '>') > strpos($data, '<')))
+  {
+    $partbefore = substr($data, 0, strpos($data, '<'));
     //  echo $partbefore;
-    $partafter = substr($data, strpos($data,'>')+1);
+    $partafter = substr($data, strpos($data, '>') + 1);
     // echo $partafter;
     $data = $partbefore.' '.$partafter;
   }
 
-  $data = utf8_encode($data);
-
-  $data = str_replace('$ ','$',$data);
-  $data = str_replace('$b $b','$b$b',$data);
-  $data = str_replace('| ','|',$data);
-
-  return $data;
+  $Encoding = new Encoding();
+  $data = $Encoding->ToUTF8($data);
+  //$data = utf8_encode($data);
+
+  $data = str_replace('$ ', '$',$data);
+  $data = str_replace('$b $b', '$b$b', $data);
+  $data = str_replace('| ', '|', $data);
+
+  return($data);
 }