Changeset 23449 for extensions/plugin_lang_analysis

Timestamp:

Jun 22, 2013, 11:27:26 PM (11 years ago)

Author:

mistic100

Message:

improve display, fix detection problem with "translate" without @

Location:

extensions/plugin_lang_analysis

Files:

• . (modified) (1 prop)
• include/functions.inc.php (modified) (4 diffs)
• template/main.tpl (modified) (3 diffs)
• template/style.css (modified) (4 diffs)

extensions/plugin_lang_analysis/include/functions.inc.php

@@ -64 +64 @@
   {
     // l10n
-    if (preg_match_all('#l10n\((?:[ ]*)(?:["\']{1})(.*?)(?:["\']{1})(?:[ ]*)\)#', $line, $matches))
+    if (preg_match_all('#l10n\((?:\s*)(?:["\']{1})(.*?)(?:["\']{1})(?:\s*)\)#', $line, $matches))
     {
       for ($j=0; $j<count($matches[1]); ++$j)
@@ -72 +72 @@
     }
     // translate
-    if (preg_match_all('#\{(?:["\']{1})(.*?)(?:["\']{1})\|\@translate#', $line, $matches))
+    if (preg_match_all('#\{(?:["\']{1})(.*?)(?:["\']{1})\|(?:@{0,1})translate#', $line, $matches))
     {
       for ($j=0; $j<count($matches[1]); ++$j)
@@ -80 +80 @@
     }
     // l10n_dec on one line
-    if (preg_match_all('#l10n_dec\((?:[ ]*)(?:["\']{1})(.*?)(?:["\']{1})(?:[ ]*),(?:[ ]*)(?:["\']{1})(.*?)(?:["\']{1})#', $line, $matches))
+    if (preg_match_all('#l10n_dec\((?:\s*)(?:["\']{1})(.*?)(?:["\']{1})(?:\s*),(?:\s*)(?:["\']{1})(.*?)(?:["\']{1})#', $line, $matches))
     {
       for ($j=0; $j<count($matches[1]); ++$j)
@@ -98 +98 @@
       }
       
-      if (preg_match_all('#l10n_dec\((?:[ ]*)(?:["\']{1})(.*?)(?:["\']{1})(?:[ ]*),(?:[ ]*)(?:["\']{1})(.*?)(?:["\']{1})#', $three_lines, $matches))
+      if (preg_match_all('#l10n_dec\((?:\s*)(?:["\']{1})(.*?)(?:["\']{1})(?:\s*),(?:\s*)(?:["\']{1})(.*?)(?:["\']{1})#', $three_lines, $matches))
       {
         for ($j=0; $j<count($matches[1]); ++$j)

extensions/plugin_lang_analysis/template/main.tpl

@@ -87 +87 @@
   $(this).addClass('active');
   
-  if ($(this).data('type') == 'common') {
+  if ($(this).hasClass('common')) {
     $(this).nextAll('input').val('false');
   }
@@ -106 +106 @@
   {foreach from=$PLA_FILES item=file}
     <div class="type-button">
-      <span class="item {if not $file.is_admin}active{/if}" data-type="common">{'Common'|@translate}</span><!--
-      --><span class="item {if $file.is_admin}active{/if}" data-type="admin">{'Admin'|@translate}</span>
+      <span class="item common {if not $file.is_admin}active{/if}">{'Common'|@translate}</span><!--
+      --><span class="item admin {if $file.is_admin}active{/if}">{'Admin'|@translate}</span>
       <input type="hidden" name="files[{$file.path}]" value="{if $file.is_admin}true{else}false{/if}">
     </div>
@@ -158 +158 @@
         <ul>
         {foreach from=$data.files item=lines key=file}
-          <li>{$file} <i>({', '|@implode:$lines})</i></li>
+          <li class="text-{if $PLA_FILES[$file].is_admin}admin{else}common{/if}">
+            {$file} <i>({', '|@implode:$lines})</i></li>
         {/foreach}
         </ul>
       </td>
-      <td>{if $data.is_admin}{'Admin'|@translate}{else}{'Common'|@translate}{/if}</td>
+      {if $data.is_admin}<td class="text-admin">{'Admin'|@translate}</td>
+      {else}<td class="text-common">{'Common'|@translate}</td>{/if}
       <td>{if $data.in_plugin}<b>{'Yes'|@translate}</b>{else}{'No'|@translate}{/if}</td>
       <td>{if $data.in_common}<b>{'Yes'|@translate}</b>{else}{'No'|@translate}{/if}</td>

extensions/plugin_lang_analysis/template/style.css

@@ +1 @@
+.text-common {
+  color:#5E9100 !important;
+}
+.text-admin {
+  color:#E23D3B !important;
+}
+    
 .type-button {
   display:inline-block;
@@ -7 +14 @@
     padding:5px 8px;
     margin:1px;
-    border:1px solid #d3d3d3;
     background:#e6e6e6;
     color:#555;
@@ -14 +20 @@
     .type-button span.active {
       color:#212121;
-      border-color:#aaa;
-      background:#fff;
+    }
+    .type-button span.common.active {
+      background:#BAFF3F;
+    }
+    .type-button span.admin.active {
+      background:#FF5E5B;
     }
     .type-button span:first-of-type {
@@ -33 +43 @@
     color:#eee;
     padding:2px 5px;
+    white-space:nowrap;
   }
     .strings thead th:not(:first-of-type) {