Saibamen / ReactOS-Translation-Tool

diff.php

Spacing +21 added lines, -21 removed lines

@@ -32,9 +32,9 @@ 
                 <div class="col-md-4">
                 <select id="dir" name="dir" class="form-control">
                     <option value="1">base, boot</option>
-                    <option value="2" <?php if(isset($_GET["dir"]) && $_GET["dir"] == '2'){echo("selected");}?>>dll</option>
-                    <option value="3" <?php if(isset($_GET["dir"]) && $_GET["dir"] == '3'){echo("selected");}?>>media, subsystems, win32ss</option>
-                    <option value="100" <?php if(isset($_GET["dir"]) && $_GET["dir"] == '100'){echo("selected");}?>>All ReactOS Source dir</option>
+                    <option value="2" <?php if (isset($_GET["dir"]) && $_GET["dir"] == '2') {echo("selected"); }?>>dll</option>
+                    <option value="3" <?php if (isset($_GET["dir"]) && $_GET["dir"] == '3') {echo("selected"); }?>>media, subsystems, win32ss</option>
+                    <option value="100" <?php if (isset($_GET["dir"]) && $_GET["dir"] == '100') {echo("selected"); }?>>All ReactOS Source dir</option>
                 </select>
                 </div>
             </div>
@@ -53,11 +53,11 @@ 
     switch ($_GET["dir"])
     {
         case "1":
-            $directory1 = new RecursiveDirectoryIterator($ROSDir. "base/applications");
-            $directory2 = new RecursiveDirectoryIterator($ROSDir. "base/setup");
-            $directory3 = new RecursiveDirectoryIterator($ROSDir. "base/shell");
-            $directory4 = new RecursiveDirectoryIterator($ROSDir. "base/system");
-            $directory5 = new RecursiveDirectoryIterator($ROSDir. "boot/freeldr/fdebug");
+            $directory1 = new RecursiveDirectoryIterator($ROSDir."base/applications");
+            $directory2 = new RecursiveDirectoryIterator($ROSDir."base/setup");
+            $directory3 = new RecursiveDirectoryIterator($ROSDir."base/shell");
+            $directory4 = new RecursiveDirectoryIterator($ROSDir."base/system");
+            $directory5 = new RecursiveDirectoryIterator($ROSDir."boot/freeldr/fdebug");
 
             $it = new AppendIterator();
             $it->append(new RecursiveIteratorIterator($directory1));
@@ -68,9 +68,9 @@ 
             break;
 
         case "2":
-            $directory6 = new RecursiveDirectoryIterator($ROSDir. "dll/cpl");
-            $directory7 = new RecursiveDirectoryIterator($ROSDir. "dll/shellext");
-            $directory8 = new RecursiveDirectoryIterator($ROSDir. "dll/win32");
+            $directory6 = new RecursiveDirectoryIterator($ROSDir."dll/cpl");
+            $directory7 = new RecursiveDirectoryIterator($ROSDir."dll/shellext");
+            $directory8 = new RecursiveDirectoryIterator($ROSDir."dll/win32");
 
             $it = new AppendIterator();
             $it->append(new RecursiveIteratorIterator($directory6));
@@ -79,9 +79,9 @@ 
             break;
 
         case "3":
-            $directory9 = new RecursiveDirectoryIterator($ROSDir. "media/themes");
-            $directory10 = new RecursiveDirectoryIterator($ROSDir. "subsystems/mvdm/ntvdm");
-            $directory11 = new RecursiveDirectoryIterator($ROSDir. "win32ss/user");
+            $directory9 = new RecursiveDirectoryIterator($ROSDir."media/themes");
+            $directory10 = new RecursiveDirectoryIterator($ROSDir."subsystems/mvdm/ntvdm");
+            $directory11 = new RecursiveDirectoryIterator($ROSDir."win32ss/user");
 
             $it = new AppendIterator();
             $it->append(new RecursiveIteratorIterator($directory9));
@@ -144,30 +144,30 @@ 
 
     set_error_handler('exceptions_error_handler');
 
-    $regex = new RegexIterator($it, '/^.+'. $langDir .'.+('. $originLang .')\.'. $fileExt .'$/i', RecursiveRegexIterator::GET_MATCH);
+    $regex = new RegexIterator($it, '/^.+'.$langDir.'.+('.$originLang.')\.'.$fileExt.'$/i', RecursiveRegexIterator::GET_MATCH);
 
     $missing = $allStrings = 0;
 
     $lang = htmlspecialchars($_GET["lang"]);
     // Search for eg. PL,Pl,pl
-    $fileSearch = strtoupper($lang) .",". ucfirst($lang) .",". strtolower($lang);
+    $fileSearch = strtoupper($lang).",".ucfirst($lang).",".strtolower($lang);
 
     // ReactOS and Wine Strings - array
     $ignoredROSStrings = file($ROSSpellFilename, FILE_IGNORE_NEW_LINES);
     $ignoredWineStrings = file($wineSpellFilename, FILE_IGNORE_NEW_LINES);
 
     $regex->rewind();
-    while($regex->valid())
+    while ($regex->valid())
     {
         if (!$regex->isDot())
         {
-            $file = glob($regex->getPathInfo() ."/*{". $fileSearch ."}*.". $fileExt, GLOB_BRACE);
+            $file = glob($regex->getPathInfo()."/*{".$fileSearch."}*.".$fileExt, GLOB_BRACE);
 
             $isFile = array_filter($file);
 
             if (empty($isFile))
             {
-                echo '<b>No translation</b> for path '. $regex->getPathInfo() .'<hr>';
+                echo '<b>No translation</b> for path '.$regex->getPathInfo().'<hr>';
             } else
             {
                 $fileContent1 = file_get_contents($regex->key());
@@ -177,7 +177,7 @@ 
 
                 if ($array['diff'])
                 {
-                    echo $regex->getPathInfo() .'<br><br>';
+                    echo $regex->getPathInfo().'<br><br>';
 
                     $currentMissing = $missing;
 
@@ -189,7 +189,7 @@ 
                             // Check if this same and ignore some words
                             if ($english === $array['rightVersion'][$index] && !in_array($english, $ignoredROSStrings) && !in_array($english, $ignoredWineStrings))
                             {
-                            	echo "<b>Missing translation:</b> ". htmlspecialchars($english) ."<br>";
+                            	echo "<b>Missing translation:</b> ".htmlspecialchars($english)."<br>";
                                 $missing++;
                             }
                             $allStrings++;

Indentation +2 added lines, -2 removed lines

@@ -189,7 +189,7 @@ 
                             // Check if this same and ignore some words
                             if ($english === $array['rightVersion'][$index] && !in_array($english, $ignoredROSStrings) && !in_array($english, $ignoredWineStrings))
                             {
-                            	echo "<b>Missing translation:</b> ". htmlspecialchars($english) ."<br>";
+                                echo "<b>Missing translation:</b> ". htmlspecialchars($english) ."<br>";
                                 $missing++;
                             }
                             $allStrings++;
@@ -202,7 +202,7 @@ 
                     }
                     if ($currentMissing == $missing)
                     {
-                    	echo "Seems OK :) Some strings was ignored by ReactOS and Wine spell files.<br>";
+                        echo "Seems OK :) Some strings was ignored by ReactOS and Wine spell files.<br>";
                     }
 
                     echo "<hr>";

index.php

Spacing +16 added lines, -16 removed lines

@@ -35,19 +35,19 @@ 
 
     if ($test === false)
     {
-        $directory1 = new RecursiveDirectoryIterator($ROSDir. "base/applications");
-        $directory2 = new RecursiveDirectoryIterator($ROSDir. "base/setup");
-        $directory3 = new RecursiveDirectoryIterator($ROSDir. "base/shell");
-        $directory4 = new RecursiveDirectoryIterator($ROSDir. "base/system");
-        $directory5 = new RecursiveDirectoryIterator($ROSDir. "boot/freeldr/fdebug");
+        $directory1 = new RecursiveDirectoryIterator($ROSDir."base/applications");
+        $directory2 = new RecursiveDirectoryIterator($ROSDir."base/setup");
+        $directory3 = new RecursiveDirectoryIterator($ROSDir."base/shell");
+        $directory4 = new RecursiveDirectoryIterator($ROSDir."base/system");
+        $directory5 = new RecursiveDirectoryIterator($ROSDir."boot/freeldr/fdebug");
 
-        $directory6 = new RecursiveDirectoryIterator($ROSDir. "dll/cpl");
-        $directory7 = new RecursiveDirectoryIterator($ROSDir. "dll/shellext");
-        $directory8 = new RecursiveDirectoryIterator($ROSDir. "dll/win32");
+        $directory6 = new RecursiveDirectoryIterator($ROSDir."dll/cpl");
+        $directory7 = new RecursiveDirectoryIterator($ROSDir."dll/shellext");
+        $directory8 = new RecursiveDirectoryIterator($ROSDir."dll/win32");
 
-        $directory9 = new RecursiveDirectoryIterator($ROSDir. "media/themes");
-        $directory10 = new RecursiveDirectoryIterator($ROSDir. "subsystems/mvdm/ntvdm");
-        $directory11 = new RecursiveDirectoryIterator($ROSDir. "win32ss/user");
+        $directory9 = new RecursiveDirectoryIterator($ROSDir."media/themes");
+        $directory10 = new RecursiveDirectoryIterator($ROSDir."subsystems/mvdm/ntvdm");
+        $directory11 = new RecursiveDirectoryIterator($ROSDir."win32ss/user");
 
         $it->append(new RecursiveIteratorIterator($directory1));
         $it->append(new RecursiveIteratorIterator($directory2));
@@ -67,25 +67,25 @@ 
         $it->append(new RecursiveIteratorIterator($directory));
     }
 
-    $regex = new RegexIterator($it, '/^.+'. $langDir .'.+('. $originLang .')\.'. $fileExt .'$/i', RecursiveRegexIterator::GET_MATCH);
+    $regex = new RegexIterator($it, '/^.+'.$langDir.'.+('.$originLang.')\.'.$fileExt.'$/i', RecursiveRegexIterator::GET_MATCH);
 
     $allEnglish = $missingFiles = 0;
 
     $lang = htmlspecialchars($_GET["lang"]);
     // Search for eg. PL,Pl,pl
-    $fileSearch = strtoupper($lang) .",". ucfirst($lang) .",". strtolower($lang);
+    $fileSearch = strtoupper($lang).",".ucfirst($lang).",".strtolower($lang);
 
     $regex->rewind();
-    while($regex->valid())
+    while ($regex->valid())
     {
         if (!$regex->isDot())
         {
-            $file = glob($regex->getPathInfo() ."/*{". $fileSearch ."}*.". $fileExt, GLOB_BRACE);
+            $file = glob($regex->getPathInfo()."/*{".$fileSearch."}*.".$fileExt, GLOB_BRACE);
 
             $isFile = array_filter($file);
             if (empty($isFile))
             {
-                echo '<b>No translation</b> for path '. $regex->getPathInfo() .'<br>';
+                echo '<b>No translation</b> for path '.$regex->getPathInfo().'<br>';
                 $missingFiles++;
             }
             $allEnglish++;

encoding.php

Spacing +21 added lines, -21 removed lines

@@ -32,9 +32,9 @@ 
                 <div class="col-md-4">
                 <select id="dir" name="dir" class="form-control">
                     <option value="1">base, boot</option>
-                    <option value="2" <?php if(isset($_GET["dir"]) && $_GET["dir"] == '2'){echo("selected");}?>>dll</option>
-                    <option value="3" <?php if(isset($_GET["dir"]) && $_GET["dir"] == '3'){echo("selected");}?>>media, subsystems, win32ss</option>
-                    <option value="100" <?php if(isset($_GET["dir"]) && $_GET["dir"] == '100'){echo("selected");}?>>All ReactOS Source dir</option>
+                    <option value="2" <?php if (isset($_GET["dir"]) && $_GET["dir"] == '2') {echo("selected"); }?>>dll</option>
+                    <option value="3" <?php if (isset($_GET["dir"]) && $_GET["dir"] == '3') {echo("selected"); }?>>media, subsystems, win32ss</option>
+                    <option value="100" <?php if (isset($_GET["dir"]) && $_GET["dir"] == '100') {echo("selected"); }?>>All ReactOS Source dir</option>
                 </select>
                 </div>
             </div>
@@ -53,11 +53,11 @@ 
     switch ($_GET["dir"])
     {
         case "1":
-            $directory1 = new RecursiveDirectoryIterator($ROSDir. "base/applications");
-            $directory2 = new RecursiveDirectoryIterator($ROSDir. "base/setup");
-            $directory3 = new RecursiveDirectoryIterator($ROSDir. "base/shell");
-            $directory4 = new RecursiveDirectoryIterator($ROSDir. "base/system");
-            $directory5 = new RecursiveDirectoryIterator($ROSDir. "boot/freeldr/fdebug");
+            $directory1 = new RecursiveDirectoryIterator($ROSDir."base/applications");
+            $directory2 = new RecursiveDirectoryIterator($ROSDir."base/setup");
+            $directory3 = new RecursiveDirectoryIterator($ROSDir."base/shell");
+            $directory4 = new RecursiveDirectoryIterator($ROSDir."base/system");
+            $directory5 = new RecursiveDirectoryIterator($ROSDir."boot/freeldr/fdebug");
 
             $it = new AppendIterator();
             $it->append(new RecursiveIteratorIterator($directory1));
@@ -68,9 +68,9 @@ 
             break;
 
         case "2":
-            $directory6 = new RecursiveDirectoryIterator($ROSDir. "dll/cpl");
-            $directory7 = new RecursiveDirectoryIterator($ROSDir. "dll/shellext");
-            $directory8 = new RecursiveDirectoryIterator($ROSDir. "dll/win32");
+            $directory6 = new RecursiveDirectoryIterator($ROSDir."dll/cpl");
+            $directory7 = new RecursiveDirectoryIterator($ROSDir."dll/shellext");
+            $directory8 = new RecursiveDirectoryIterator($ROSDir."dll/win32");
 
             $it = new AppendIterator();
             $it->append(new RecursiveIteratorIterator($directory6));
@@ -79,9 +79,9 @@ 
             break;
 
         case "3":
-            $directory9 = new RecursiveDirectoryIterator($ROSDir. "media/themes");
-            $directory10 = new RecursiveDirectoryIterator($ROSDir. "subsystems/mvdm/ntvdm");
-            $directory11 = new RecursiveDirectoryIterator($ROSDir. "win32ss/user");
+            $directory9 = new RecursiveDirectoryIterator($ROSDir."media/themes");
+            $directory10 = new RecursiveDirectoryIterator($ROSDir."subsystems/mvdm/ntvdm");
+            $directory11 = new RecursiveDirectoryIterator($ROSDir."win32ss/user");
 
             $it = new AppendIterator();
             $it->append(new RecursiveIteratorIterator($directory9));
@@ -102,23 +102,23 @@ 
             exit;
     }
 
-    $regex = new RegexIterator($it, '/^.+'. $langDir .'.+('. $originLang .')\.'. $fileExt .'$/i', RecursiveRegexIterator::GET_MATCH);
+    $regex = new RegexIterator($it, '/^.+'.$langDir.'.+('.$originLang.')\.'.$fileExt.'$/i', RecursiveRegexIterator::GET_MATCH);
 
     $allWrongEnc = 0;
 
     $lang = htmlspecialchars($_GET["lang"]);
     // Search for eg. PL,Pl,pl
-    $fileSearch = strtoupper($lang) .",". ucfirst($lang) .",". strtolower($lang);
+    $fileSearch = strtoupper($lang).",".ucfirst($lang).",".strtolower($lang);
 
     // UTF-8 BOM starts with EF BB BF
-    define ('UTF8_BOM', chr(0xEF) . chr(0xBB) . chr(0xBF));
+    define('UTF8_BOM', chr(0xEF).chr(0xBB).chr(0xBF));
 
     $regex->rewind();
-    while($regex->valid())
+    while ($regex->valid())
     {
         if (!$regex->isDot())
         {
-            $file = glob($regex->getPathInfo() ."/*{". $fileSearch ."}*.". $fileExt, GLOB_BRACE);
+            $file = glob($regex->getPathInfo()."/*{".$fileSearch."}*.".$fileExt, GLOB_BRACE);
 
             $isFile = array_filter($file);
 
@@ -132,13 +132,13 @@ 
                     // But UTF-8 with BOM not!
                     if ($first3 === UTF8_BOM)
                     {
-                        echo 'Detected <b>UTF-8 BOM</b> in '. $file[0] .'<br>';
+                        echo 'Detected <b>UTF-8 BOM</b> in '.$file[0].'<br>';
                         $allWrongEnc++;
                     }
                 } else
                 // Other encoding
                 {
-                    echo 'Detected <b>other encoding</b> in '. $file[0] .'<br>';
+                    echo 'Detected <b>other encoding</b> in '.$file[0].'<br>';
                     $allWrongEnc++;
                 }
             }

config.php

Braces +1 added lines, -2 removed lines

@@ -34,8 +34,7 @@
     if (strpos($uname, "linux") !== false)
     {
         echo "<br><br>For <b><u>Linux users</u></b>: make sure you have set the right permission rights for both the ReactOS source code directory and the tool directory. Use <i>chmod</i> command and set their rights to 755 for both these directories if necessary. In any case you're using XAMPP for Linux, change the user and usergroup to yours. To do so read this: <a href='https://askubuntu.com/a/221593'>Change XAMPP's usergroup and username (link)</a>";
-    }
-    elseif (strpos($uname, "win") !== false)
+    } elseif (strpos($uname, "win") !== false)
     {
         echo "<br><br>For <b><u>Windows users</u></b>: make sure the ReactOS source code path is <b>CORRECT</b> or that it is not <b>CORRUPT</b>";
     }