Changeset 23472 for extensions/plugin_lang_analysis/admin.php

Timestamp:

Jun 23, 2013, 7:50:07 PM (11 years ago)

Author:

mistic100

Message:

somes fixes and improvments

File:

• extensions/plugin_lang_analysis/admin.php (modified) (13 diffs)

extensions/plugin_lang_analysis/admin.php

@@ -7 +7 @@
 
 include_once(PLA_PATH . 'include/functions.inc.php');
-include_once(PHPWG_ROOT_PATH . '/admin/include/plugins.class.php');
+include_once(PHPWG_ROOT_PATH . 'admin/include/plugins.class.php');
 $plugins = new plugins();
 
-/* PLUGINS LIST */
+/* SELECT */
 if (!isset($_GET['plugin_id']))
 {
@@ -20 +20 @@
 }
 
-/* FILES LIST */
+/* CONFIG */
 else if (!isset($_GET['analyze']))
 {
@@ -45 +45 @@
   foreach ($files as &$file)
   {
-    if (isset($saved_files[$file]))
-    {
-      $file = $saved_files[$file];
+    if (isset($saved_files[ $file ]))
+    {
+      $file = $saved_files[ $file ];
       $file['lang_files'] = array_intersect($file['lang_files'], array_keys($language_files));
     }
@@ -65 +65 @@
     'PLA_PLUGIN' => $plugins->fs_plugins[ $_GET['plugin_id'] ],
     'PLA_FILES' => $files,
-    'PLA_LANG_FILES' => $language_files,
+    'PLA_LANG_FILES' => array_keys($language_files),
     'F_ACTION' => PLA_ADMIN.'&plugin_id='.$_GET['plugin_id'].'&analyze',
     'U_BACK' => PLA_ADMIN,
     ));
 }
+
+/* ANALYSIS */
 else
 {
@@ -78 +80 @@
     foreach ($_POST['files'] as $file => $data)
     {
-      $files[$file] = array(
+      $files[ $file ] = array(
         'path' => $file,
         'is_admin' => $data['is_admin']=='true',
@@ -85 +87 @@
       if (!empty($data['lang_files']))
       {
-        $files[$file]['lang_files'] = array_keys(array_filter($data['lang_files'], create_function('$f', 'return $f=="true";')));
+        $files[ $file ]['lang_files'] = array_keys(array_filter($data['lang_files'], create_function('$f', 'return $f=="true";')));
       }
     }
@@ -125 +127 @@
   }
   
-  // analyze
+  // analyse
   foreach ($strings as $string => &$string_data)
   {
-    // find where teh string is defined
+    // find where the string is defined
     $string_data['in_common'] = array_key_exists($string, $lang_common);
     $string_data['in_admin'] = array_key_exists($string, $lang_admin);
@@ -137 +139 @@
     }
     
+    // very rare case
+    if (count($string_data['in_plugin'])>1)
+    {
+      $string_data['warnings'][] = l10n('This string is translated in multiple files');
+    }
+    
     $missing = $useless = $ok = false;
     $string_data['is_admin'] = true;
     
-    // analyze for each file where the string exists
+    // analyse for each file where the string exists
     foreach ($string_data['files'] as $file => &$file_data)
     {
@@ -147 +155 @@
       
       // find if the string is translated in one of the language files included in this file
-      $exists = false;
-      foreach ($file_data['lang_files'] as $lang_file)
-      {
-        if (in_array($lang_file, $string_data['in_plugin']))
-        {
-          $exists = true;
-          break;
-        }
-      }
+      $exists = count(array_intersect($file_data['lang_files'], $string_data['in_plugin'])) > 0;
       
       // useless if translated in the plugin AND in common or admin
@@ -193 +193 @@
     else
     {
+      // another very rare case
+      if ($useless)
+      {
+        $string_data['warnings'][] = l10n('This string is useless in some files');
+      }
+      
       $string_data['stat'] = 'ok';
       $counts['ok']++;
@@ -199 +205 @@
   unset($string_data);
   
-  uksort($strings, 'strnatcasecmp');
+  uksort($strings, 'strnatcasecmp'); // natural sort
   $counts['total'] = array_sum($counts);
   
@@ -206 +212 @@
     'PLA_PLUGIN' => $plugins->fs_plugins[ $_GET['plugin_id'] ],
     'PLA_STRINGS' => $strings,
-    'PLA_LANG_FILES' => $language_files,
+    'PLA_LANG_FILES' => array_keys($language_files),
     'PLA_COUNTS' => $counts,
     'U_BACK' => PLA_ADMIN.'&plugin_id='.$_GET['plugin_id'],
@@ -215 +221 @@
 $template->assign(array(
   'PLA_PATH'=> PLA_PATH, 
-  'PLA_ABS_PATH'=> realpath(PLA_PATH), 
+  'PLA_ABS_PATH'=> realpath(PLA_PATH).'/', 
   'PLA_ADMIN' => PLA_ADMIN,
   ));