Changeset 1073:8c279d188ea1

Timestamp:

12/17/12 14:40:06 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Media title may now use the EXIF (original) date if exist instead of file date (see blog prefs). Fixes #1305

Files:

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

admin/blog_pref.php

@@ -225 +225 @@
           $blog_settings->system->put('media_img_m_size',$media_img_m_size);
           $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_default_size',$_POST['media_img_default_size']);
           $blog_settings->system->put('media_img_default_alignment',$_POST['media_img_default_alignment']);
@@ -482 +483 @@
      '<p>'.__('This defines image tag title when you insert it in a post from the media manager. It is retrieved from the picture\'s metadata.').'</p>'.
      '<p>'.form::combo('media_img_title_pattern',$img_title_combo,html::escapeHTML($blog_settings->system->media_img_title_pattern)).'</p>'.
-     '</div>'.
-
-     '<div class="col">'.
+     '<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>'.
+
      '<h4>'.__('Default image insertion attributes').'</h4>'.
      '<p><label for="media_img_default_size">'.__('Image size:').

admin/media_item.php

@@ -135 +135 @@
 
 # Function to get image title based on meta
-function dcGetImageTitle($file,$pattern)
+function dcGetImageTitle($file,$pattern,$dto_first=false)
 {
      $res = array();
@@ -147 +147 @@
                $res[] = (string) $file->media_meta->{$v};
           } elseif (preg_match('/^Date\((.+?)\)$/u',$v,$m)) {
-               $res[] = dt::str($m[1],$file->media_dt);
+               if ($dto_first && $file->media_meta->DateTimeOriginal) {
+                    $res[] = dt::dt2str($m[1],(string) $file->media_meta->DateTimeOriginal);
+               } else {
+                    $res[] = dt::str($m[1],$file->media_dt);
+               }
           } elseif (preg_match('/^DateTimeOriginal\((.+?)\)$/u',$v,$m) && $file->media_meta->DateTimeOriginal) {
                $res[] = dt::dt2str($m[1],(string) $file->media_meta->DateTimeOriginal);
@@ -214 +218 @@
      {
           $media_type = 'image';
-          $media_desc = dcGetImageTitle($file,$core->blog->settings->system->media_img_title_pattern);
+          $media_desc = dcGetImageTitle($file,
+               $core->blog->settings->system->media_img_title_pattern,
+               $core->blog->settings->system->media_img_use_dto_first);
           if ($media_desc == $file->basename) {
                $media_desc = '';

locales/fr/main.po

@@ -373 +373 @@
 msgstr "Ceci définit le titre de la balise d'une image insérée depuis le gestionnaire de media. Les informations sont obtenues depuis les métadonnées de l'image."
 
+msgid "Use original media date if possible"
+msgstr "Utiliser la date originale du média si possible"
+
 msgid "Search engines robots policy"
 msgstr "Paramètres d'indexation par les moteurs de recherche"