Changeset 2799:b62c278ef730

Timestamp:

11/18/14 13:57:12 (11 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add an option to not leave date alone in media title

Files:

• admin/blog_pref.php (modified) (2 diffs)
• admin/media_item.php (modified) (4 diffs)
• locales/fr/main.po (modified) (1 diff)

admin/blog_pref.php

@@ -243 +243 @@
           $blog_settings->system->put('media_img_title_pattern',$_POST['media_img_title_pattern']);
           $blog_settings->system->put('media_img_use_dto_first',!empty($_POST['media_img_use_dto_first']));
+          $blog_settings->system->put('media_img_no_date_alone',!empty($_POST['media_img_no_date_alone']));
           $blog_settings->system->put('media_img_default_size',$_POST['media_img_default_size']);
           $blog_settings->system->put('media_img_default_alignment',$_POST['media_img_default_alignment']);
@@ -570 +571 @@
      '<h5>'.__('Default image insertion attributes').'</h5>'.
      '<p class="vertical-separator"><label for="media_img_title_pattern">'.__('Inserted image title').'</label>'.
-     form::combo('media_img_title_pattern',$img_title_combo,html::escapeHTML($blog_settings->system->media_img_title_pattern)).' '.
-     '<label for="media_img_use_dto_first" class="classic">'.
+     form::combo('media_img_title_pattern',$img_title_combo,html::escapeHTML($blog_settings->system->media_img_title_pattern)).'</p>'.
+     '<p><label for="media_img_use_dto_first" class="classic">'.
      form::checkbox('media_img_use_dto_first','1',$blog_settings->system->media_img_use_dto_first).
      __('Use original media date if possible').'</label></p>'.
+     '<p><label for="media_img_no_date_alone" class="classic">'.
+     form::checkbox('media_img_no_date_alone','1',$blog_settings->system->media_img_no_date_alone).
+     __('Do not display date if alone in title').'</label></p>'.
      '<p class="form-note info">'.__('It is retrieved from the picture\'s metadata.').'</p>'.
 

admin/media_item.php

@@ -169 +169 @@
 
 # Function to get image title based on meta
-function dcGetImageTitle($file,$pattern,$dto_first=false)
+function dcGetImageTitle($file,$pattern,$dto_first=false,$no_date_alone=false)
 {
      $res = array();
      $pattern = preg_split('/\s*;;\s*/',$pattern);
      $sep = ', ';
+     $dates = 0;
+     $items = 0;
 
      foreach ($pattern as $v) {
@@ -180 +182 @@
                     $res[] = $file->media_title;
                }
+               $items++;
           } elseif ($file->media_meta->{$v}) {
                if ((string) $file->media_meta->{$v} != '') {
                     $res[] = (string) $file->media_meta->{$v};
                }
+               $items++;
           } elseif (preg_match('/^Date\((.+?)\)$/u',$v,$m)) {
                if ($dto_first && ($file->media_meta->DateTimeOriginal != 0)) {
@@ -190 +194 @@
                     $res[] = dt::str($m[1],$file->media_dt);
                }
+               $items++;
+               $dates++;
           } elseif (preg_match('/^DateTimeOriginal\((.+?)\)$/u',$v,$m) && $file->media_meta->DateTimeOriginal) {
                $res[] = dt::dt2str($m[1],(string) $file->media_meta->DateTimeOriginal);
+               $items++;
+               $dates++;
           } elseif (preg_match('/^separator\((.*?)\)$/u',$v,$m)) {
                $sep = $m[1];
           }
+     }
+     if ($no_date_alone && $dates == count($res) && $dates < $items) {
+          // On ne laisse pas les dates seules, sauf si ce sont les seuls items du pattern (hors séparateur)
+          return '';
      }
      return implode($sep,$res);
@@ -276 +288 @@
           $media_desc = dcGetImageTitle($file,
                $core->blog->settings->system->media_img_title_pattern,
-               $core->blog->settings->system->media_img_use_dto_first);
+               $core->blog->settings->system->media_img_use_dto_first,
+               $core->blog->settings->system->media_img_no_date_alone);
           if ($media_desc == $file->basename) {
                $media_desc = '';

locales/fr/main.po

@@ -3682 +3682 @@
 msgstr "Protéger le blog des détournements de clic ou Clickjacking (voir <a href=\"https://fr.wikipedia.org/wiki/Clickjacking\">Wikipedia</a>)"
 
+msgid "Do not display date if alone in title"
+msgstr "Ne pas afficher la date si elle est seule dans le titre"
+
 #~ msgid "You don't have permissions to deactivate this plugin."
 #~ msgstr "Vous n'avez pas les permissions pour désactiver ce plugin."