Changeset 23536

Timestamp:

Jun 25, 2013, 9:30:39 PM (11 years ago)

Author:

flop25

Message:

2.6 pattern updates and smarty3 correction for OS_default

Location:

extensions

Files:

• floOS/OS_default/26x.pattern.php (added)
• floOS/OS_default/template/menubar_categories.tpl (modified) (2 diffs)
• floOS/OS_default/template/menubar_tags.tpl (modified) (1 diff)
• floPure/Pure_autumn/themeconf.inc.php (modified) (2 diffs)
• floPure/Pure_default/26x.pattern.php (added)
• hr_glass_xl/26x.pattern.php (added)
• hr_os/26x.pattern.php (added)
• hr_os_xl/26x.pattern.php (added)
• hr_os_xl/icon/favicon.ico (added)

extensions/floOS/OS_default/template/menubar_categories.tpl

@@ -19 +19 @@
   {else}
     </li>
-    {'</ul></li>'|@str_repeat:$ref_level-$cat.LEVEL}
+    {'</ul></li>'|@str_repeat:($ref_level-$cat.LEVEL)}
   {/if}
     <li {if $cat.SELECTED}class="selected"{/if}>
@@ -33 +33 @@
 {'</li></ul>'|@str_repeat:$ref_level}
 
-        <p class="totalImages">{$pwg->l10n_dec('%d photo', '%d photos', $block->data.NB_PICTURE)}</p>
+        <p class="totalImages">{$block->data.NB_PICTURE|@translate_dec:'%d photo':'%d photos'}</p>
 </dd>

extensions/floOS/OS_default/template/menubar_tags.tpl

@@ -10 +10 @@
                         <a class="tagLevel{$tag.level}" href=
                         {if isset($tag.U_ADD)}
-                                "{$tag.U_ADD}" title="{$pwg->l10n_dec('%d photo is also linked to current tags', '%d photos are also linked to current tags', $tag.counter)}" rel="nofollow">+
+                                "{$tag.U_ADD}" title="{$tag.counter|@translate_dec:'%d photo is also linked to current tags':'%d photos are also linked to current tags'}" rel="nofollow">+
                         {else}
                                 "{$tag.URL}" title="{'display photos linked to this tag'|@translate}">

extensions/floPure/Pure_autumn/themeconf.inc.php

@@ -34 +34 @@
         <div class="thumbnailCategory">';
   }
-  elseif ($pwgversion_array[0].$pwgversion_array[1]=="24" or $pwgversion_array[0].$pwgversion_array[1]=="25" )
+  elseif ($pwgversion_array[0].$pwgversion_array[1]=="24" or $pwgversion_array[0].$pwgversion_array[1]=="25" or $pwgversion_array[0].$pwgversion_array[1]=="26" )
   {
     $search = '#<li class="\{if \$smarty\.foreach.*odd\{else\}even\{/if\}">#s';
@@ -63 +63 @@
         <span class="wrap1">';
   }
-  elseif ($pwgversion_array[0].$pwgversion_array[1]=="24" or $pwgversion_array[0].$pwgversion_array[1]=="25")
+  elseif ($pwgversion_array[0].$pwgversion_array[1]=="24" or $pwgversion_array[0].$pwgversion_array[1]=="25" or $pwgversion_array[0].$pwgversion_array[1]=="26")
   {
   $search = '#<li>[\s]*<span class="wrap1">#';