Changeset 17604

Timestamp:

Aug 21, 2012, 12:07:18 AM (12 years ago)

Author:

grum

Message:

bug:2726

Location:

extensions/lmt

Files:

• lmt_aip.class.inc.php (modified) (6 diffs)
• lmt_pip.class.inc.php (modified) (8 diffs)
• lmt_root.class.inc.php (modified) (1 diff)
• lmt_version.inc.php (modified) (1 diff)
• main.inc.php (modified) (2 diffs)

extensions/lmt/lmt_aip.class.inc.php

@@ -215 +215 @@
     foreach($filter_list_values as $key=>$val)
     {
-      $filter_list_labels[] = "[".l10n("lmt_lbl_cc_s-".strtolower($val))."] ".l10n("lmt_lbl_cc-".strtolower($val));
+      $filter_list_labels[] = "[".$this->translateCopyright("lmt_lbl_cc_s-".strtolower($val))."] ".$this->translateCopyright("lmt_lbl_cc-".strtolower($val));
       if($val==$_REQUEST['filter'])
       {
@@ -224 +224 @@
     $filter_list_values = array_merge(array(''), $filter_list_values);
     $filter_list_labels = array_merge(array(l10n('lmt_nofilter')), $filter_list_labels);
-    $default_licence = l10n("lmt_lbl_cc-".strtolower($this->config['lmt_licence_default']));
+    $default_licence = $this->translateCopyright("lmt_lbl_cc-".strtolower($this->config['lmt_licence_default']));
     $default_licence_img =LMT_PATH."img/".strtolower($this->config['lmt_licence_default'])."_80x15.png";
 
@@ -373 +373 @@
     foreach($licences_list_values as $key=>$val)
     {
-      $licences_list_labels[] = "[".l10n("lmt_lbl_cc_s-".strtolower($val))."] ".l10n("lmt_lbl_cc-".strtolower($val));
+      $licences_list_labels[] = "[".$this->translateCopyright("lmt_lbl_cc_s-".strtolower($val))."] ".$this->translateCopyright("lmt_lbl_cc-".strtolower($val));
     }
 
@@ -439 +439 @@
     foreach($lmt_licence_default_values as $key=>$val)
     {
-      $lmt_licence_default_labels[] = "[".l10n("lmt_lbl_cc_s-".strtolower($val))."] ".l10n("lmt_lbl_cc-".strtolower($val));
+      $lmt_licence_default_labels[] = "[".$this->translateCopyright("lmt_lbl_cc_s-".strtolower($val))."] ".$this->translateCopyright("lmt_lbl_cc-".strtolower($val));
 
       $tmp[]="'".str2url("ilmt_redirect_url-".strToLower($val))."'";
       $datas['lmt_redirect_urls'][str2url('lmt_redirect_url-'.strToLower($val))]=array(
-        'text' => l10n("lmt_lbl_cc_s-".strToLower($val)),
+        'text' => $this->translateCopyright("lmt_lbl_cc_s-".strToLower($val)),
         'langs' => array()
       );
@@ -660 +660 @@
       "author_list" => array(),
       "img_directory" => LMT_PATH."img/",
-      "default_licencepublished" => l10n("lmt_lbl_under-".strToLower($this->config['lmt_licence_default'])),
+      "default_licencepublished" => $this->translateCopyright("lmt_lbl_under-".strToLower($this->config['lmt_licence_default'])),
       "default_licenceL" => strToLower($this->config['lmt_licence_default']),
-      "default_licenceU" => l10n("lmt_lbl_cc_s-".strToLower($this->config['lmt_licence_default'])),
+      "default_licenceU" => $this->translateCopyright("lmt_lbl_cc_s-".strToLower($this->config['lmt_licence_default'])),
       "lmt_licence_logo" => $this->config['lmt_licence_logo'],
       "nbauthor" => 0,
@@ -770 +770 @@
     {
       $datas['shortlicencetext'][$val] = array(
-        "txt" => l10n("lmt_lbl_cc_s-".strtolower($val)),
-        "published" => l10n("lmt_lbl_under-".strtolower($val))
+        "txt" => $this->translateCopyright("lmt_lbl_cc_s-".strtolower($val)),
+        "published" => $this->translateCopyright("lmt_lbl_under-".strtolower($val))
       );
     }

extensions/lmt/lmt_pip.class.inc.php

@@ -17 +17 @@
 //include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/GPCPublicIntegration.class.inc.php');
 
-load_language('plugin.lang', LMT_PATH);
+global $user;
+
 
 class LMT_PIP extends LMT_root
@@ -46 +47 @@
     if($this->config['lmt_licence_activated']=='y')
     {
+      add_event_handler('user_init', array(&$this, 'loadLang'));
       add_event_handler('loc_end_picture', array(&$this, 'manageLicenceElement'));
 
@@ -61 +63 @@
   }
 
+  public function loadLang()
+  {
+    load_language('plugin.lang', LMT_PATH);
+  }
+
   /* -------------------------------------------------------------------------
     FUNCTIONS TO MANAGE LMT DISPLAY
@@ -66 +73 @@
   public function manageLicenceElement()
   {
-    global $template, $page, $user;
+    global $template, $page, $user, $lang;
 
     $licence=$this->getImageLicence($page['image_id']);
@@ -87 +94 @@
     }
 
-    $alternateText=" alt='".htmlspecialchars(l10n('lmt_lbl_cc_s-'.strtolower($licence['licence'])), ENT_QUOTES)."'
+    $alternateText=" alt='".htmlspecialchars($this->translateCopyright('lmt_lbl_cc_s-'.strToLower($licence['licence'])), ENT_QUOTES)."'
       title='".htmlspecialchars(
-        l10n('lmt_lbl_under-'.strtolower($licence['licence'])).' '.
-        l10n('lmt_lbl_cc_s-'.strtolower($licence['licence'])).' : '.
-        l10n('lmt_lbl_cc-'.strtolower($licence['licence'])),ENT_QUOTES
+        $this->translateCopyright('lmt_lbl_under-'.strtolower($licence['licence'])).' '.
+        $this->translateCopyright('lmt_lbl_cc_s-'.strtolower($licence['licence'])).' : '.
+        $this->translateCopyright('lmt_lbl_cc-'.strtolower($licence['licence'])),ENT_QUOTES
     )."' ";
 
@@ -123 +130 @@
         if($url!="")
         {
-          $text ="<br/>".l10n("lmt_lbl_under-".strToLower($licence['licence']))." <a href='".$url."'".$target.">".l10n("lmt_lbl_cc_s-".strToLower($licence['licence']))."</a> ".$licence['aut_text1']." ".$licence['aut_text2'];
+          $text ="<br/>".$this->translateCopyright("lmt_lbl_under-".strToLower($licence['licence']))." <a href='".$url."'".$target.">".$this->translateCopyright("lmt_lbl_cc_s-".strToLower($licence['licence']))."</a> ".$licence['aut_text1']." ".$licence['aut_text2'];
         }
         else
         {
-          $text ="<br/>".l10n("lmt_lbl_under-".strToLower($licence['licence']))." ".l10n("lmt_lbl_cc_s-".strToLower($licence['licence']))." ".$licence['aut_text1']." ".$licence['aut_text2'];
+          $text ="<br/>".$this->translateCopyright("lmt_lbl_under-".strToLower($licence['licence']))." ".$this->translateCopyright("lmt_lbl_cc_s-".strToLower($licence['licence']))." ".$licence['aut_text1']." ".$licence['aut_text2'];
         }
         break;
@@ -137 +144 @@
   public function manageWarningText()
   {
-    global $template, $user;
+    global $template, $user, $lang;
 
 
@@ -149 +156 @@
     }
 
-    $alternateText=" alt='".htmlspecialchars(l10n('lmt_lbl_cc_s-'.strtolower($this->config['lmt_licence_default'])), ENT_QUOTES)."'
+    $alternateText=" alt='".htmlspecialchars($this->translateCopyright('lmt_lbl_cc_s-'.strtolower($this->config['lmt_licence_default'])), ENT_QUOTES)."'
       title='".htmlspecialchars(
-        l10n('lmt_lbl_under-'.strtolower($this->config['lmt_licence_default'])).' '.
-        l10n('lmt_lbl_cc_s-'.strtolower($this->config['lmt_licence_default'])).' : '.
-        l10n('lmt_lbl_cc-'.strtolower($this->config['lmt_licence_default'])),ENT_QUOTES
+        $this->translateCopyright('lmt_lbl_under-'.strtolower($this->config['lmt_licence_default'])).' '.
+        $this->translateCopyright('lmt_lbl_cc_s-'.strtolower($this->config['lmt_licence_default'])).' : '.
+        $this->translateCopyright('lmt_lbl_cc-'.strtolower($this->config['lmt_licence_default'])),ENT_QUOTES
     )."' ";
 
     $patterns = array('/\[logo=80x15\]/i', '/\[logo=88x31\]/i', '/\[logo=text\]/i');
     $replacements = array(
-      "<img $alternateText class='logo80x15' src='". LMT_PATH."img/".strToLower($this->config['lmt_licence_default'])."_80x15.png'>",
-      "<img $alternateText class='logo88x31' src='". LMT_PATH."img/".strToLower($this->config['lmt_licence_default'])."_88x31.png'>",
-      l10n("lmt_lbl_cc_s-".strToLower($this->config['lmt_licence_default']))
+      "<img $alternateText class='logo80x15' src='". LMT_PATH."img/".strtolower($this->config['lmt_licence_default'])."_80x15.png'>",
+      "<img $alternateText class='logo88x31' src='". LMT_PATH."img/".strtolower($this->config['lmt_licence_default'])."_88x31.png'>",
+      $this->translateCopyright("lmt_lbl_cc_s-".strtolower($this->config['lmt_licence_default']))
     );
 

extensions/lmt/lmt_root.class.inc.php

@@ -243 +243 @@
   }
 
+  public function translateCopyright($key)
+  {
+    global $lang;
+    if(isset($lang[$key]) and $lang[$key]=='') return('');
+    return(l10n($key));
+  }
+
 } //class
 

extensions/lmt/lmt_version.inc.php

@@ -15 +15 @@
   if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-  define('LMT_VERSION',  '1.4.0');
-  define('LMT_VERSION2', '01.04.00');
+  define('LMT_VERSION',  '1.4.1');
+  define('LMT_VERSION2', '01.04.01');
   define('LMT_GPC_NEEDED', '3.5.2');
 ?>

extensions/lmt/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: LMT
-Version: 1.4.0
+Version: 1.4.1
 Description: Appliquer une licence sur ses photos / Apply a licence on photos
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=282
@@ -73 +73 @@
 |         |            |   . compatibility with piwigo 2.4
 |         |            |
+| 1.4.1   | 2012/08/20 | * mantis bug:2726
+|         |            |   .  Copyright display is not correct
+|         |            |     => use $this->translateCopyright() insted of l10n()
+|         |            |     => load langage file when user_init() is done
+|         |            |
+|         |            |
+|         |            |
+|         |            |
 |         |            |