File tine20-translation.patch of Package tine20

Overview Repositories Revisions Requests Users Attributes Meta

File tine20-translation.patch of Package tine20 (Revision bd1471bbbece42f756e7259842a38e43)

Currently displaying revision bd1471bbbece42f756e7259842a38e43 , Show latest

diff -ur tine20-orig/Tinebase/Translation.php tine20-new/Tinebase/Translation.php
--- tine20-orig/Tinebase/Translation.php	2013-12-19 13:49:24.000000000 +0100
+++ tine20-new/Tinebase/Translation.php	2013-12-19 14:56:30.563288691 +0100
@@ -45,13 +45,23 @@
         $availableTranslations = array();
 
         // look for po files in Tinebase 
+        // look for po and mo files in Tinebase
         $officialTranslationsDir = dirname(__FILE__) . "/../$appName/translations";
         foreach(scandir($officialTranslationsDir) as $poFile) {
             list ($localestring, $suffix) = explode('.', $poFile);
-            if ($suffix == 'po') {
+            if ($suffix == 'mo') {
                 $availableTranslations[$localestring] = array(
                     'path' => "$officialTranslationsDir/$poFile" 
                 );
+            } else if ($suffix == 'po') {
+                if ( !isset($availableTranslations[$localestring]) ||
+                    (filemtime($officialTranslationsDir/$poFile)
+                        >= filemtime($availableTranslations[$localestring]))) {
+                    // whenever no .mo files is available or .po files are newer then use it
+                    $availableTranslations[$localestring] = array(
+                        'path' => "$officialTranslationsDir/$poFile"
+                    );
+                }
             }
         }
         
@@ -62,10 +72,17 @@
             if ($customTranslationsDir) {
                 foreach((array) @scandir($customTranslationsDir) as $dir) {
                     $poFile = "$customTranslationsDir/$dir/$appName/translations/$dir.po";
-                    if (is_readable($poFile)) {
-                        $availableTranslations[$dir] = array(
-                            'path' => $poFile
-                        );
+                    $moFile = "$customTranslationsDir/$dir/Tinebase/translations/$dir.mo";
+                    if (is_readable($poFile) && is_readable($moFile)) {
+                        if (filemtime($poFile) >= filemtime($moFile)) {
+                            $availableTranslations[$dir] = array('path' => $poFile);
+                        } else {
+                            $availableTranslations[$dir] = array('path' => $moFile);
+                        }
+                    } else if (is_readable($moFile)) {
+                        $availableTranslations[$dir] = array('path' => $moFile);
+                    } else if (is_readable($poFile)) {
+                        $availableTranslations[$dir] = array('path' => $poFile);
                     }
                 }
             }

Places

File tine20-translation.patch of Package tine20 (Revision bd1471bbbece42f756e7259842a38e43)

Places