Changeset 658

Timestamp:

Dec 19, 2013, 11:23:12 PM (11 years ago)

Author:

maron

Message:

• Fixed: Export dbc text only, if varible ($s1,$t1..) is keep
• Added: Filter translation where varibles are bad translated

Location:

trunk

Files:

• Modules/Export/Export.php (modified) (3 diffs)
• Modules/Export/cmdmpqexport.php (modified) (1 diff)
• Modules/Translation/TranslationList.php (modified) (2 diffs)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Export/Export.php

@@ -278 +278 @@
   "</document>";
     return($Buffer);
-  }      
+  }    
+  
+  function HaveVarible($String1, $String2) 
+  {
+          //Export only if translate have same varible %
+            if (strpos($String1,'$')) {
+              while (strpos($String1,'$')) {
+                $String1 = substr($String1,strpos($String1,'$'));
+                $varible = $String1;
+                if (strpos($varible,' ')) $varible = substr($varible,0,strpos($varible,' '));
+                if (strpos($varible,'.')) $varible = substr($varible,0,strpos($varible,'.'));
+                if (strpos($varible,'%')) $varible = substr($varible,0,strpos($varible,'%'));
+                if (strpos($varible,chr(10))) $varible = substr($varible,0,strpos($varible,chr(10)));
+                if (false == strpos($String2,$varible)) {
+
+                 return(false);
+                }
+              }
+            }
+          return (true);
+  }  
 
   function ExportToDBC()
@@ -309 +329 @@
         $LookupTable = array();
         $DbResult2 = $this->Database->query($this->BuildQuery($Group));
-        while($DbRow = $DbResult2->fetch_assoc())
-          $LookupTable[$DbRow[$Group['PrimaryKeyItem']]] = $DbRow;
+        while($DbRow = $DbResult2->fetch_assoc()) {
+          //Export only if translate have same varible %
+          $CanExport = true;
+          foreach($TranslationTree[$Group['Id']]['Items'] as $Column)  {
+            $DbRow[$Column['Column']] = str_replace ( '$ ','$',$DbRow[$Column['Column']]);
+            if (!$this->HaveVarible($DbRow['En'.$Column['Column']],$DbRow[$Column['Column']])) {
+              $CanExport = false;
+            }  
+            if (!$this->HaveVarible($DbRow[$Column['Column']],$DbRow['En'.$Column['Column']])) {
+              $CanExport = false;
+            }  
+          }
+
+          if ($CanExport)
+            $LookupTable[$DbRow[$Group['PrimaryKeyItem']]] = $DbRow;
+          else echo 'NE='.$DbRow[$Column['ID']].',';
+        }
       
         // Open original DBC file
@@ -348 +383 @@
             $LookupTableItem = $LookupTable[$PrimaryKeyItem];          
             foreach($TranslationTree[$Group['Id']]['Items'] as $GroupItem)
-            {
+            {  
               if(array_key_exists($GroupItem['Id'], $ColumnIndexes))
                 $Line[$ColumnIndexes[$GroupItem['Id']]] = $LookupTableItem[$GroupItem['Column']];

trunk/Modules/Export/cmdmpqexport.php

@@ -36 +36 @@
   }
 }
-
+if(!array_key_exists('ExportId', $_GET) and !array_key_exists('dbc', $_GET) and !array_key_exists('lua', $_GET) and !array_key_exists('addon', $_GET)) {
+  $Output .= 'Usage type_export=id_export -for export<br />';
+  $Output .= 'Usage ExportId=id_export - for write export info<br />';
+  
+  $Output .= 'type_export={lua,dbc,addon} <br />';
+  $Output = str_replace('<br />','
+',$Output);
+}
                      //37
 if(array_key_exists('lua', $_GET)) {

trunk/Modules/Translation/TranslationList.php

@@ -41 +41 @@
                 else $Selected = '';
                 $Output .= '<option value="5"'.$Selected.'>Rozpracované-Nepřeložené</option>';
+                if($Filter['State'] == 6) $Selected = ' selected="selected"';
+                else $Selected = '';
+                $Output .= '<option value="6"'.$Selected.'>S chybějícím $N,$S..</option>';
                 $Output .= '</select></td>';
         
@@ -171 +174 @@
                                         ' AND (`Sub`.`Entry` = `T`.`Entry`) AND (`Sub`.`Complete` = 1) AND '.
                                         '(`Sub`.`VersionStart` = `T`.`VersionStart`) AND (`Sub`.`VersionEnd` = `T`.`VersionEnd`))';
+                        else if($Filter['State'] == 6) {
+                        
+                        if($Filter['Group'] != 0)
+                                foreach($TranslationTree[$Filter['Group']]['Items'] as $GroupItem)
+                                if($GroupItem['Visible'] == 1) {
+                                $Items[] = ''.  
+                           '`T`.`'.$GroupItem['Column'].'` NOT LIKE "%$%" '.
+                           ' AND EXISTS ('.
+                                          'SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE `Sub`.`'.$GroupItem['Column'].'` LIKE "%$%"'.
+                                                                        ' AND `Sub`.`Entry` = `T`.`Entry` AND `Sub`.`Language` = '.$this->System->Config['OriginalLanguage'].' AND '.
+                                                                        '`Sub`.`VersionStart` = `T`.`VersionStart` AND `Sub`.`VersionEnd` = `T`.`VersionEnd`'.
+                                        ')'.
+                        '';
+                      }
+        $Filter['SQL'] .= $UserFilter.$VersionFilter.' AND (`T`.`Complete` = 1) AND `T`.`Language` != '.$this->System->Config['OriginalLanguage'];
+
+        $Filter['SQL'] .= ' AND ('.implode(' OR ', $Items).') ';
+
+        
+       
+                    }
                 }
         

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 657; // Subversion revision
+$Revision = 658; // Subversion revision
 $DatabaseRevision = 646; // Database structure revision 
-$ReleaseTime = '2013-12-16';
+$ReleaseTime = '2013-12-19';