Changeset 29808 for extensions/LLGBO2

Timestamp:

Sep 27, 2014, 9:54:32 AM (10 years ago)

Author:

gbo

Message:

fix issue for admin translation and title on frame

Location:

extensions/LLGBO2

Files:

• include/manage_picture_content.php (modified) (2 diffs)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• language/hu_HU/plugin.lang.php (modified) (1 diff)
• language/pl_PL/plugin.lang.php (modified) (1 diff)
• main.inc.php (modified) (3 diffs)

extensions/LLGBO2/include/manage_picture_content.php

@@ -70 +70 @@
                         $PictSizeWH[1] = $PictSizeWH[1] + $frame_border;
                         $frame_size = "\n".'<div   id="llgbo0" class="llgbo" style="border:0 ;width:'.$PictSizeWH[0].'px; height:'.$PictSizeWH[1].'px;">';
-        
+                $frame_title = "";
                         if ($conf['LLGBO2']['titleframe']) {
-                                $frame_title =  "\n".'<!-- Begin LLGBO -->'."\n".'<span  id="llgboh2" style ="background:transparent;z-index:3;color:'.$conf['LLGBO2']['FR-titlecolor'].'">'.$element_info['name'].'</span>';   
+                                $frame_title =  "\n".'<!-- Begin LLGBO -->'."\n".'<span  id="llgboh2" style ="background:transparent;z-index:3;color:'.$conf['LLGBO2']['FR-titlecolor'].'">';   
                                 }
                         
                         $template->append('llgbo', array(   
-                                                        'FRAME_TITLE' => $frame_title,
+                                                        'FRAME_TITLE1' => $frame_title,
+                                                        'FRAME_TITLE3' => '</span>',
                                                         'FRAME_SIZE' => $frame_size ,
                                                         'FRAME_BEGIN' => $frame_begin,
@@ -115 +116 @@
         // --------------------------------------   
                 $patern = '/'.'<img(.*)id="theMainImage"(.*)>'.'/';     
-        $replacement =  $replacement.'{$llgbo.FRAME_TITLE}'.'{$llgbo.FRAME_SIZE}'.'{$llgbo.FRAME_BEGIN}'."\n".'<img $1 id="theMainImage" $2>'.'{$llgbo.FRAME_END}';
+        $replacement =  $replacement.'{if !empty($llgbo.FRAME_TITLE1)}{$llgbo.FRAME_TITLE1}{$current.TITLE} {$llgbo.FRAME_TITLE3}{/if}{$llgbo.FRAME_SIZE}{$llgbo.FRAME_BEGIN}'."\n".'<img $1 id="theMainImage" $2>'.'{$llgbo.FRAME_END}';
                 $content = preg_replace($patern, $replacement, $content);  
         return $content;

extensions/LLGBO2/language/fr_FR/plugin.lang.php

@@ -6 +6 @@
 // +-----------------------------------------------------------------------+
 $lang['submit'] = 'Valider';
-$lang['Title'] = 'Look like GBo';
+$lang['llgbo_title'] = 'Look like GBo';
 $lang['llgbo_admin_plugin_title'] = 'Ce plugin gère la présentation de la page Image.<br>';
 $lang['llgbo_adim_settings_title'] = 'Paramétrage du Plugin ';

extensions/LLGBO2/language/hu_HU/plugin.lang.php

@@ -6 +6 @@
 // +-----------------------------------------------------------------------+
 $lang['submit'] = 'Küldés';
-$lang['Title'] = 'Look like GBo';
+$lang['llgbo_title'] = 'Look like GBo';
 $lang['llgbo_admin_plugin_title'] = 'Ez a bővítmény lehetővé teszi, hogy módosítsa az oldalon lévő képek megjelenését.<br>';
 $lang['llgbo_adim_settings_title'] = 'Bővítmény beállítások';

extensions/LLGBO2/language/pl_PL/plugin.lang.php

@@ -6 +6 @@
 // +-----------------------------------------------------------------------+
 $lang['submit'] = 'Zatwierdź';
-$lang['Title'] = 'Look like GBo';
+$lang['llgbo_title'] = 'Look like GBo';
 $lang['llgbo_admin_plugin_title'] = 'Ta wtyczka umożliwia zmianę prezentacji strony ze zdjęciami.';
 $lang['llgbo_adim_settings_title'] = 'Ustawienia wtyczki';

extensions/LLGBO2/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: Look_like_gbo2 
-Version:  2.7.A
+Version:  2.7.B
 Plugin URI: http://phpwebgallery.net/ext/extension_view.php?eid=251
 Author: GBo 
@@ -12 +12 @@
         -- 10-09-2014   
                 2.7.A Compliance Piwigo 2.7rc1  new administration management
+                2.7.A fix issue with extended description and improve translation
  */
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
@@ -18 +19 @@
 // | Plugin constants                                               |
 // +-----------------------------------------------------------------------+
-define('LLGBO_VERSION', '2.7.A');
+define('LLGBO_VERSION', '2.7.B');
 define('LLGBO_ID',       basename(dirname(__FILE__)));
 define('LLGBO_PATH' ,    PHPWG_PLUGINS_PATH . LLGBO_ID . '/');